lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #308 from Arcaratus/master

Browse source 
Updated things
This commit is contained in:
WayofTime 2015-04-19 22:27:21 -04:00
parent 7747d2221a c2c2b1693e
commit 201c70a766
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java
View file

@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.achievements;
import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.ModItems;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.block.Block;
import net.minecraft.stats.Achievement; import net.minecraft.stats.Achievement;
import java.util.ArrayList; import java.util.ArrayList;
@ -40,4 +41,9 @@ public class AchievementsRegistry
} }
return null; return null;
} }
public static Achievement getAchievementForBlock(Block block)
{
return null;
}
} }

24
src/main/java/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java
View file

@ -24,7 +24,7 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.IDemon;
import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
@ -152,7 +152,7 @@ public class DaggerOfSacrifice extends EnergyItems
int posX = (int) Math.round(sacrifice.posX - 0.5f); int posX = (int) Math.round(sacrifice.posX - 0.5f);
int posY = (int) sacrifice.posY; int posY = (int) sacrifice.posY;
int posZ = (int) Math.round(sacrifice.posZ - 0.5f); int posZ = (int) Math.round(sacrifice.posZ - 0.5f);
TEAltar altarEntity = this.getAltar(world, posX, posY, posZ); IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ);
if (altarEntity == null) if (altarEntity == null)
{ {
@ -169,7 +169,7 @@ public class DaggerOfSacrifice extends EnergyItems
int posX = (int) Math.round(sacrifice.posX - 0.5f); int posX = (int) Math.round(sacrifice.posX - 0.5f);
int posY = (int) sacrifice.posY; int posY = (int) sacrifice.posY;
int posZ = (int) Math.round(sacrifice.posZ - 0.5f); int posZ = (int) Math.round(sacrifice.posZ - 0.5f);
TEAltar altarEntity = this.getAltar(world, posX, posY, posZ); IBloodAltar altarEntity = this.getAltar(world, posX, posY, posZ);
if (altarEntity == null) if (altarEntity == null)
{ {
@ -181,7 +181,7 @@ public class DaggerOfSacrifice extends EnergyItems
return true; return true;
} }
public TEAltar getAltar(World world, int x, int y, int z) public IBloodAltar getAltar(World world, int x, int y, int z)
{ {
TileEntity tileEntity = null; TileEntity tileEntity = null;
@ -193,27 +193,27 @@ public class DaggerOfSacrifice extends EnergyItems
{ {
tileEntity = world.getTileEntity(i + x, k + y, j + z); tileEntity = world.getTileEntity(i + x, k + y, j + z);
if ((tileEntity instanceof TEAltar)) if ((tileEntity instanceof IBloodAltar))
{ {
return (TEAltar) tileEntity; return (IBloodAltar) tileEntity;
} }
} }
if ((tileEntity instanceof TEAltar)) if ((tileEntity instanceof IBloodAltar))
{ {
return (TEAltar) tileEntity; return (IBloodAltar) tileEntity;
} }
} }
if ((tileEntity instanceof TEAltar)) if ((tileEntity instanceof IBloodAltar))
{ {
return (TEAltar) tileEntity; return (IBloodAltar) tileEntity;
} }
} }
if ((tileEntity instanceof TEAltar)) if ((tileEntity instanceof IBloodAltar))
{ {
return (TEAltar) tileEntity; return (IBloodAltar) tileEntity;
} }
return null; return null;