diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 522308fa6..d64281c28 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -86,16 +86,16 @@ public final class BotaniaAPI { public static Set looniumBlacklist = new LinkedHashSet(); public static Set paintableBlocks = new LinkedHashSet(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", 18, new int[] { 2, 6, 5, 2 }, 18); + public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); + public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", 5, new int[] { 1, 2, 2, 1 }, 18); + public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18); public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 4bebf6ebc..e60f7f987 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -22,9 +22,10 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; public final class CorporeaHelper { @@ -237,15 +238,15 @@ public final class CorporeaHelper { return null; TileEntity tile = (TileEntity) inv; - return getSparkForBlock(tile.getWorld(), tile.xCoord, tile.yCoord, tile.zCoord); + return getSparkForBlock(tile.getWorld(), tile.getPos()); } /** * Gets the spark attached to the block in the coords passed in. Note that the coords passed * in are for the block that the spark will be on, not the coords of the spark itself. */ - public static ICorporeaSpark getSparkForBlock(World world, int x, int y, int z) { - List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(x, y + 1, z, x + 1, y + 2, z + 1)); + public static ICorporeaSpark getSparkForBlock(World world, BlockPos pos) { + List sparks = world.getEntitiesWithinAABB(ICorporeaSpark.class, new AxisAlignedBB(pos.up(), pos.add(1, 2, 1))); return sparks.isEmpty() ? null : sparks.get(0); } @@ -253,15 +254,15 @@ public final class CorporeaHelper { * Gets if the block in the coords passed in has a spark attached. Note that the coords passed * in are for the block that the spark will be on, not the coords of the spark itself. */ - public static boolean doesBlockHaveSpark(World world, int x, int y, int z) { - return getSparkForBlock(world, x, y, z) != null; + public static boolean doesBlockHaveSpark(World world, BlockPos pos) { + return getSparkForBlock(world, pos) != null; } /** * Gets if the slot passed in can be extracted from by a spark. */ public static boolean isValidSlot(IInventory inv, int slot) { - return !(inv instanceof ISidedInventory) || arrayHas(((ISidedInventory) inv).getAccessibleSlotsFromSide(ForgeDirection.UP.ordinal()), slot) && ((ISidedInventory) inv).canExtractItem(slot, inv.getStackInSlot(slot), ForgeDirection.UP.ordinal()); + return !(inv instanceof ISidedInventory) || arrayHas(((ISidedInventory) inv).getSlotsForFace(EnumFacing.UP), slot) && ((ISidedInventory) inv).canExtractItem(slot, inv.getStackInSlot(slot), EnumFacing.UP); } /** diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index f74d0cac9..4b8cc5ac2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; @@ -28,12 +28,12 @@ public class DummyManaNetwork implements IManaNetwork { } @Override - public TileEntity getClosestPool(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestPool(BlockPos pos, World world, int limit) { return null; } @Override - public TileEntity getClosestCollector(ChunkCoordinates pos, World world, int limit) { + public TileEntity getClosestCollector(BlockPos pos, World world, int limit) { return null; } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index d8eb34330..b81b8307f 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -212,7 +213,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public boolean isBotaniaFlower(World world, int x, int y, int z) { + public boolean isBotaniaFlower(World world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 54b000f40..94222cd1a 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -20,6 +20,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -118,7 +119,7 @@ public interface IInternalMethodHandler { public long getWorldElapsedTicks(); - public boolean isBotaniaFlower(World world, int x, int y, int z); + public boolean isBotaniaFlower(World world, BlockPos pos); public void sendBaubleUpdatePacket(EntityPlayer player, int slot); diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 945aa9916..479e0109d 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.UUID; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. @@ -48,17 +48,17 @@ public interface IManaBurst { public void setGravity(float gravity); - public ChunkCoordinates getBurstSourceChunkCoordinates(); + public BlockPos getBurstSourceBlockPos(); - public void setBurstSourceCoords(int x, int y, int z); + public void setBurstSourceCoords(BlockPos pos); public ItemStack getSourceLens(); public void setSourceLens(ItemStack lens); - public boolean hasAlreadyCollidedAt(int x, int y, int z); + public boolean hasAlreadyCollidedAt(BlockPos pos); - public void setCollidedAt(int x, int y, int z); + public void setCollidedAt(BlockPos pos); public int getTicksExisted(); diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index fc4553e46..f2cb29436 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -13,7 +13,7 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; @@ -38,7 +38,7 @@ public interface IManaNetwork { * @param limit The maximum distance the closest block can be, if the closest block * is farther away than that, null will be returned instead. */ - public TileEntity getClosestCollector(ChunkCoordinates pos, World world, int limit); + public TileEntity getClosestCollector(BlockPos pos, World world, int limit); /** * Gets the closest Mana Pool in the network to the Chunk Coordinates passed in, @@ -49,7 +49,7 @@ public interface IManaNetwork { * @param limit The maximum distance the closest block can be, if the closest block * is farther away than that, null will be returned instead. */ - public TileEntity getClosestPool(ChunkCoordinates pos, World world, int limit); + public TileEntity getClosestPool(BlockPos pos, World world, int limit); /** * Gets the list of all Mana Collectors (eg. Mana Spreader) in the dimension diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index d62088a53..79d251138 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; public final class VanillaPacketDispatcher { @@ -24,13 +25,13 @@ public final class VanillaPacketDispatcher { for(Object player : players) if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; - if(pointDistancePlane(mp.posX, mp.posZ, tile.xCoord + 0.5, tile.zCoord + 0.5) < 64) + if(pointDistancePlane(mp.posX, mp.posZ, tile.getPos().getX() + 0.5, tile.getPos().getZ() + 0.5) < 64) ((EntityPlayerMP) player).playerNetServerHandler.sendPacket(tile.getDescriptionPacket()); } } - public static void dispatchTEToNearbyPlayers(World world, int x, int y, int z) { - TileEntity tile = world.getTileEntity(x, y, z); + public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { + TileEntity tile = world.getTileEntity(pos); if(tile != null) dispatchTEToNearbyPlayers(tile); } diff --git a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java index 7713eaa5b..62cafe0d3 100644 --- a/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java @@ -12,7 +12,7 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * An extension of IWireframeCoordinateListProvider that allows for @@ -23,6 +23,6 @@ public interface IExtendedWireframeCoordinateListProvider extends IWireframeCoor /** * Gets the source wireframe to draw, this one will be drawn thicker. */ - public ChunkCoordinates getSourceWireframe(EntityPlayer player, ItemStack stack); + public BlockPos getSourceWireframe(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 056dec187..ae7a1ba13 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -14,7 +14,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,10 +26,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface IWireframeCoordinateListProvider { /** - * Returns a list of ChunkCoordinates for the wireframes to draw. + * Returns a list of BlockPos for the wireframes to draw. * Can be null. */ @SideOnly(Side.CLIENT) - public List getWireframesToDraw(EntityPlayer player, ItemStack stack); + public List getWireframesToDraw(EntityPlayer player, ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java index 5baff9f51..008fbb21c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -23,6 +24,6 @@ public interface ILexiconable { /** * Gets the lexicon entry to open at this location. null works too. */ - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon); + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 4cf34b858..2b956a179 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -17,7 +17,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; /** @@ -52,7 +52,7 @@ public class Multiblock { * coords should be pivoted to the center of the structure. */ public void addComponent(int x, int y, int z, Block block, int meta) { - addComponent(new MultiblockComponent(new ChunkCoordinates(x, y, z), block, meta)); + addComponent(new MultiblockComponent(new BlockPos(x, y, z), block, meta)); } private void changeAxisForNewComponent(int x, int y, int z) { @@ -171,7 +171,7 @@ public class Multiblock { * Adds a single component to the location cache */ private void addComponentToLocationCache(MultiblockComponent comp) { - ChunkCoordinates pos = comp.getRelativePosition(); + BlockPos pos = comp.getRelativePosition(); locationCache.put(Arrays.asList( pos.posX, pos.posY, diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java index 56d640ca1..9fcdde2ab 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -19,7 +19,7 @@ import net.minecraft.world.World; */ public class AnyComponent extends MultiblockComponent { - public AnyComponent(ChunkCoordinates relPos, Block block, int meta) { + public AnyComponent(BlockPos relPos, Block block, int meta) { super(relPos, block, meta); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 27eb32ae2..e79a8789c 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -21,7 +21,7 @@ import vazkii.botania.api.BotaniaAPI; */ public class ColorSwitchingComponent extends MultiblockComponent { - public ColorSwitchingComponent(ChunkCoordinates relPos, Block block) { + public ColorSwitchingComponent(BlockPos relPos, Block block) { super(relPos, block, -1); } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java index 8a4f0ad72..d59a92e56 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java @@ -11,7 +11,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -20,13 +20,13 @@ import vazkii.botania.api.BotaniaAPI; */ public class FlowerComponent extends ColorSwitchingComponent { - public FlowerComponent(ChunkCoordinates relPos, Block block) { + public FlowerComponent(BlockPos relPos, Block block) { super(relPos, block); } @Override public boolean matches(World world, int x, int y, int z) { - return BotaniaAPI.internalHandler.isBotaniaFlower(world, x, y, z); + return BotaniaAPI.internalHandler.isBotaniaFlower(, world, , x); } @Override diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index b375e0ccf..afa6a8a19 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -13,7 +13,7 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -24,25 +24,25 @@ import net.minecraftforge.fml.relauncher.SideOnly; */ public class MultiblockComponent { - public ChunkCoordinates relPos; + public BlockPos relPos; public final Block block; public final int meta; public final TileEntity tileEntity; public boolean doFancyRender; - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta) { + public MultiblockComponent(BlockPos relPos, Block block, int meta) { this(relPos, block, meta, null); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender) { this(relPos, block, meta, doFancyRender, null); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, TileEntity tileEntity) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, TileEntity tileEntity) { this(relPos, block, meta, block.hasTileEntity() == (tileEntity != null), tileEntity); } - public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { + public MultiblockComponent(BlockPos relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { this.relPos = relPos; this.block = block; this.meta = meta; @@ -50,7 +50,7 @@ public class MultiblockComponent { this.doFancyRender = doFancyRender; } - public ChunkCoordinates getRelativePosition() { + public BlockPos getRelativePosition() { return relPos; } @@ -78,7 +78,7 @@ public class MultiblockComponent { double xn = x * cos - z * sin; double zn = x * sin + z * cos; - relPos = new ChunkCoordinates((int) Math.round(xn), relPos.posY, (int) Math.round(zn)); + relPos = new BlockPos((int) Math.round(xn), relPos.posY, (int) Math.round(zn)); } public MultiblockComponent copy() { diff --git a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java index dfa294513..4658e6a24 100644 --- a/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java +++ b/src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.mana; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -17,6 +18,6 @@ import net.minecraft.world.World; */ public interface ILaputaImmobile { - public boolean canMove(World world, int x, int y, int z); + public boolean canMove(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java index 61aadfcaa..128f6210a 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaTrigger.java +++ b/src/main/java/vazkii/botania/api/mana/IManaTrigger.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.mana; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -18,6 +19,6 @@ import vazkii.botania.api.internal.IManaBurst; */ public interface IManaTrigger { - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z); + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 19248e69b..aa9170360 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -16,6 +16,7 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; @@ -78,9 +79,9 @@ public class RecipePureDaisy { * Should only place the block if !world.isRemote, but should return true if it would've placed * it otherwise. You may return false to cancel the normal particles and do your own. */ - public boolean set(World world, int x, int y, int z, SubTileEntity pureDaisy) { + public boolean set(World world, BlockPos pos, SubTileEntity pureDaisy) { if(!world.isRemote) - world.setBlock(x, y, z, output, outputMeta, 1 | 2); + world.setBlockState(pos, output.getStateFromMeta(outputMeta), 1 | 2); // todo 1.8 - should this remain meta? return true; } diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index f16eda6b4..5ff9a45cb 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -11,7 +11,7 @@ package vazkii.botania.api.subtile; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; /** * This object describes the Radius of a SubTileEntity. It can either be @@ -19,13 +19,13 @@ import net.minecraft.util.ChunkCoordinates; */ public class RadiusDescriptor { - final ChunkCoordinates subtileCoords; + final BlockPos subtileCoords; - public RadiusDescriptor(ChunkCoordinates subtileCoords) { + public RadiusDescriptor(BlockPos subtileCoords) { this.subtileCoords = subtileCoords; } - public ChunkCoordinates getSubtileCoords() { + public BlockPos getSubtileCoords() { return subtileCoords; } @@ -45,7 +45,7 @@ public class RadiusDescriptor { final double radius; - public Circle(ChunkCoordinates subtileCoords, double radius) { + public Circle(BlockPos subtileCoords, double radius) { super(subtileCoords); this.radius = radius; } @@ -66,7 +66,7 @@ public class RadiusDescriptor { final AxisAlignedBB aabb; - public Rectangle(ChunkCoordinates subtileCoords, AxisAlignedBB aabb) { + public Rectangle(BlockPos subtileCoords, AxisAlignedBB aabb) { super(subtileCoords); this.aabb = aabb; } @@ -80,8 +80,8 @@ public class RadiusDescriptor { public static class Square extends Rectangle { - public Square(ChunkCoordinates subtileCoords, int expand) { - super(subtileCoords, new AxisAlignedBB(subtileCoords.posX - expand, subtileCoords.posY, subtileCoords.posZ - expand, subtileCoords.posX + 1 + expand, subtileCoords.posY, subtileCoords.posZ + 1 + expand)); + public Square(BlockPos subtileCoords, int expand) { + super(subtileCoords, new AxisAlignedBB(subtileCoords.add(-expand, 0, -expand), subtileCoords.add(expand + 1, 0, expand + 1))); } } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 19aa48f85..014fd0a6b 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -19,8 +19,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.IIcon; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -155,7 +155,7 @@ public class SubTileEntity { * when the sub tile is being hovered with a wand of the forest. */ @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return null; } @@ -169,23 +169,23 @@ public class SubTileEntity { } /** - * Gets a ChunkCoordinates instance with the position of this sub tile. + * Gets a BlockPos instance with the position of this sub tile. */ - public ChunkCoordinates toChunkCoordinates() { - return new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); + public BlockPos toBlockPos() { + return supertile.getPos(); } /** - * @see IWandBindable#canSelect(EntityPlayer, ItemStack, int, int, int, int) + * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) */ - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } /** - * @see IWandBindable#bindTo(EntityPlayer, ItemStack, int, int, int, int) + * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing) */ - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return false; } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 54863c864..e9bf6bf0f 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -18,9 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -46,7 +46,7 @@ public class SubTileFunctional extends SubTileEntity { TileEntity linkedPool = null; public int knownMana = -1; - ChunkCoordinates cachedPoolCoordinates = null; + BlockPos cachedPoolCoordinates = null; /** * If set to true, redstoneSignal will be updated every tick. @@ -72,8 +72,8 @@ public class SubTileFunctional extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -93,9 +93,9 @@ public class SubTileFunctional extends SubTileEntity { if(cachedPoolCoordinates != null) { needsNew = false; - if(supertile.getWorld().blockExists(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ)) { + if(supertile.getWorld().isBlockLoaded(cachedPoolCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates.posX, cachedPoolCoordinates.posY, cachedPoolCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedPoolCoordinates); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { linkedPool = tileAt; needsNew = false; @@ -104,7 +104,7 @@ public class SubTileFunctional extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedPool.getPos()); if(tileAt != null && tileAt instanceof IManaPool) linkedPool = tileAt; } @@ -113,8 +113,7 @@ public class SubTileFunctional extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllPoolsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedPool = network.getClosestPool(coords, supertile.getWorld(), RANGE); + linkedPool = network.getClosestPool(supertile.getPos(), supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -155,7 +154,7 @@ public class SubTileFunctional extends SubTileEntity { int y = cmp.getInteger(TAG_POOL_Y); int z = cmp.getInteger(TAG_POOL_Z); - cachedPoolCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); + cachedPoolCoordinates = y < 0 ? null : new BlockPos(x, y, z); } @Override @@ -163,13 +162,13 @@ public class SubTileFunctional extends SubTileEntity { cmp.setInteger(TAG_MANA, mana); if(cachedPoolCoordinates != null) { - cmp.setInteger(TAG_POOL_X, cachedPoolCoordinates.posX); - cmp.setInteger(TAG_POOL_Y, cachedPoolCoordinates.posY); - cmp.setInteger(TAG_POOL_Z, cachedPoolCoordinates.posZ); + cmp.setInteger(TAG_POOL_X, cachedPoolCoordinates.getX()); + cmp.setInteger(TAG_POOL_Y, cachedPoolCoordinates.getY()); + cmp.setInteger(TAG_POOL_Z, cachedPoolCoordinates.getZ()); } else { - int x = linkedPool == null ? 0 : linkedPool.xCoord; - int y = linkedPool == null ? -1 : linkedPool.yCoord; - int z = linkedPool == null ? 0 : linkedPool.zCoord; + int x = linkedPool == null ? 0 : linkedPool.getPos().getX(); + int y = linkedPool == null ? -1 : linkedPool.getPos().getY(); + int z = linkedPool == null ? 0 : linkedPool.getPos().getZ(); cmp.setInteger(TAG_POOL_X, x); cmp.setInteger(TAG_POOL_Y, y); @@ -178,25 +177,25 @@ public class SubTileFunctional extends SubTileEntity { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(linkedPool == null) return null; - return new ChunkCoordinates(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord); + return linkedPool.getPos(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { int range = 10; range *= range; double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(x, y, z); + TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaPool) { linkedPool = tile; return true; @@ -207,7 +206,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.xCoord, linkedPool.yCoord, linkedPool.zCoord) == linkedPool; + return linkedPool != null && !linkedPool.isInvalid() && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @Override diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 71bac81f2..50d6692b5 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -23,10 +23,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -54,7 +54,7 @@ public class SubTileGenerating extends SubTileEntity { public int knownMana = -1; public int passiveDecayTicks; - ChunkCoordinates cachedCollectorCoordinates = null; + BlockPos cachedCollectorCoordinates = null; /** * If set to true, redstoneSignal will be updated every tick. @@ -81,8 +81,8 @@ public class SubTileGenerating extends SubTileEntity { if(acceptsRedstone()) { redstoneSignal = 0; - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + for(EnumFacing dir : EnumFacing.VALUES) { + int redstoneSide = supertile.getWorld().getIndirectPowerLevelTo(supertile.getPos().offset(dir), dir.ordinal()); redstoneSignal = Math.max(redstoneSignal, redstoneSide); } } @@ -100,9 +100,9 @@ public class SubTileGenerating extends SubTileEntity { if(passive && muhBalance > 0 && passiveDecayTicks > muhBalance) { supertile.getWorld().playAuxSFX(2001, supertile.xCoord, supertile.yCoord, supertile.zCoord, Block.getIdFromBlock(supertile.getBlockType())); - if(supertile.getWorld().getBlock(supertile.xCoord, supertile.yCoord - 1, supertile.zCoord).isSideSolid(supertile.getWorld(), supertile.xCoord, supertile.yCoord - 1, supertile.zCoord, ForgeDirection.UP)) - supertile.getWorld().setBlock(supertile.xCoord, supertile.yCoord, supertile.zCoord, Blocks.deadbush); - else supertile.getWorld().setBlockToAir(supertile.xCoord, supertile.yCoord, supertile.zCoord); + if(supertile.getWorld().getBlockState(supertile.getPos().down()).getBlock().isSideSolid(supertile.getWorld(), supertile.getPos().down(), EnumFacing.DOWN)) + supertile.getWorld().setBlockState(supertile.getPos(), Blocks.deadbush.getDefaultState()); + else supertile.getWorld().setBlockToAir(supertile.getPos()); } } @@ -117,9 +117,9 @@ public class SubTileGenerating extends SubTileEntity { if(cachedCollectorCoordinates != null) { needsNew = false; - if(supertile.getWorld().blockExists(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ)) { + if(supertile.getWorld().isBlockLoaded(cachedCollectorCoordinates)) { needsNew = true; - TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates.posX, cachedCollectorCoordinates.posY, cachedCollectorCoordinates.posZ); + TileEntity tileAt = supertile.getWorld().getTileEntity(cachedCollectorCoordinates); if(tileAt != null && tileAt instanceof IManaCollector && !tileAt.isInvalid()) { linkedCollector = tileAt; needsNew = false; @@ -128,7 +128,7 @@ public class SubTileGenerating extends SubTileEntity { } } } else { - TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + TileEntity tileAt = supertile.getWorld().getTileEntity(linkedCollector.getPos()); if(tileAt != null && tileAt instanceof IManaCollector) linkedCollector = tileAt; } @@ -137,8 +137,7 @@ public class SubTileGenerating extends SubTileEntity { IManaNetwork network = BotaniaAPI.internalHandler.getManaNetworkInstance(); int size = network.getAllCollectorsInWorld(supertile.getWorld()).size(); if(BotaniaAPI.internalHandler.shouldForceCheck() || size != sizeLastCheck) { - ChunkCoordinates coords = new ChunkCoordinates(supertile.xCoord, supertile.yCoord, supertile.zCoord); - linkedCollector = network.getClosestCollector(coords, supertile.getWorld(), RANGE); + linkedCollector = network.getClosestCollector(supertile.getPos(), supertile.getWorld(), RANGE); sizeLastCheck = size; } } @@ -243,7 +242,7 @@ public class SubTileGenerating extends SubTileEntity { int y = cmp.getInteger(TAG_COLLECTOR_Y); int z = cmp.getInteger(TAG_COLLECTOR_Z); - cachedCollectorCoordinates = y < 0 ? null : new ChunkCoordinates(x, y, z); + cachedCollectorCoordinates = y < 0 ? null : new BlockPos(x, y, z); } @Override @@ -253,13 +252,13 @@ public class SubTileGenerating extends SubTileEntity { cmp.setInteger(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks); if(cachedCollectorCoordinates != null) { - cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.posX); - cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.posY); - cmp.setInteger(TAG_COLLECTOR_Z, cachedCollectorCoordinates.posZ); + cmp.setInteger(TAG_COLLECTOR_X, cachedCollectorCoordinates.getX()); + cmp.setInteger(TAG_COLLECTOR_Y, cachedCollectorCoordinates.getY()); + cmp.setInteger(TAG_COLLECTOR_Z, cachedCollectorCoordinates.getZ()); } else { - int x = linkedCollector == null ? 0 : linkedCollector.xCoord; - int y = linkedCollector == null ? -1 : linkedCollector.yCoord; - int z = linkedCollector == null ? 0 : linkedCollector.zCoord; + int x = linkedCollector == null ? 0 : linkedCollector.getPos().getX(); + int y = linkedCollector == null ? -1 : linkedCollector.getPos().getY(); + int z = linkedCollector == null ? 0 : linkedCollector.getPos().getZ(); cmp.setInteger(TAG_COLLECTOR_X, x); cmp.setInteger(TAG_COLLECTOR_Y, y); @@ -268,25 +267,25 @@ public class SubTileGenerating extends SubTileEntity { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(linkedCollector == null) return null; - return new ChunkCoordinates(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord); + return linkedCollector.getPos(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { int range = 6; range *= range; double dist = (x - supertile.xCoord) * (x - supertile.xCoord) + (y - supertile.yCoord) * (y - supertile.yCoord) + (z - supertile.zCoord) * (z - supertile.zCoord); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(x, y, z); + TileEntity tile = player.worldObj.getTileEntity(pos); if(tile instanceof IManaCollector) { linkedCollector = tile; return true; @@ -298,7 +297,7 @@ public class SubTileGenerating extends SubTileEntity { public boolean isValidBinding() { - return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.xCoord, linkedCollector.yCoord, linkedCollector.zCoord) == linkedCollector; + return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector; } @Override diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index eb1d42737..4c28dcbf9 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -1,7 +1,7 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -13,6 +13,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; public interface ICoordBoundItem { @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding(ItemStack stack); + public BlockPos getBinding(ItemStack stack); } diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 77c1ffcc7..3b2f42312 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -10,7 +10,7 @@ */ package vazkii.botania.api.wand; -import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -25,6 +25,6 @@ public interface ITileBound { * Gets where this block is bound to, can return null. */ @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding(); + public BlockPos getBinding(); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index 0c5786c12..ef1e4f7b2 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -12,6 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; /** * A TileEntity that implements this can be bound to another block @@ -23,12 +25,12 @@ public interface IWandBindable extends ITileBound { /** * Return true if the Wand can select this tile. */ - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side); + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side); /** * Call to bind the TileEntity to where the player clicked. Return true to deselect * the TileEntity for another bind or false case the TileEntity should stay selected. */ - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side); + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandHUD.java b/src/main/java/vazkii/botania/api/wand/IWandHUD.java index a75e44abc..1c054ec0a 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandHUD.java +++ b/src/main/java/vazkii/botania/api/wand/IWandHUD.java @@ -12,6 +12,7 @@ package vazkii.botania.api.wand; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -20,6 +21,6 @@ import net.minecraft.world.World; */ public interface IWandHUD { - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z); + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 52349fa05..2bdef4242 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -12,6 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; /** @@ -23,6 +25,6 @@ public interface IWandable { * Called when the block is used by a wand. Note that the player parameter can be null * if this function is called from a dispenser. */ - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side); + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side); } diff --git a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java index 3b6e807e7..284d9772c 100644 --- a/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java +++ b/src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java @@ -11,6 +11,7 @@ package vazkii.botania.api.wand; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; /** @@ -19,6 +20,6 @@ import net.minecraft.world.World; */ public interface IWireframeAABBProvider { - public AxisAlignedBB getWireframeAABB(World world, int x, int y, int z); + public AxisAlignedBB getWireframeAABB(World world, BlockPos pos); } diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 9e0fa81ed..63d1d82c0 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -12,6 +12,7 @@ package vazkii.botania.api.wiki; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -33,18 +34,16 @@ public class SimpleWikiProvider implements IWikiProvider { @Override public String getBlockName(World world, MovingObjectPosition pos) { - int x = pos.blockX; - int y = pos.blockY; - int z = pos.blockZ; + BlockPos bPos = pos.getBlockPos(); - Block block = world.getBlock(x, y, z); + Block block = world.getBlockState(bPos).getBlock(); if(block == null) return null; - ItemStack stack = block.getPickBlock(pos, world, x, y, z); + ItemStack stack = block.getPickBlock(pos, world, bPos); if(stack == null || stack.getItem() == null) - stack = new ItemStack(block, 1, world.getBlockMetadata(x, y, z)); + stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos))); if(stack.getItem() == null) return null; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index efec93478..813539a46 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -105,7 +105,7 @@ public final class BoundTileRenderer { AxisAlignedBB axis; if(block instanceof IWireframeAABBProvider) - axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, pos.posX, pos.posY, pos.posZ); + axis = ((IWireframeAABBProvider) block).getWireframeAABB(world, , pos.posX); else axis = block.getSelectedBoundingBoxFromPool(world, pos.posX, pos.posY, pos.posZ); if(axis == null) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c9386910d..b539a68ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -109,7 +109,7 @@ public final class HUDHandler { if(block instanceof IWandHUD) { profiler.startSection("wandItem"); - ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.blockX, pos.blockY, pos.blockZ); + ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, , pos.blockX); profiler.endSection(); } } @@ -350,7 +350,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.blockX, pos.blockY, pos.blockZ, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, , pos.blockX, mc.thePlayer, mc.thePlayer.getCurrentEquippedItem()); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 2e8245885..8c04f72c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -15,6 +15,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -57,12 +59,12 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.alfhomancyIntro; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded(); if(did && player != null) player.addStat(ModAchievements.elfPortalOpen, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index bf29f1ff6..1018cd796 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,6 +26,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -269,7 +270,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.apothecary; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index f6eed4756..b1b7a8e58 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -171,7 +172,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.avatar; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 3aa09c559..287aeb9bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -105,7 +106,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 49eb55010..414d40f2f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -17,6 +17,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -76,7 +77,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index b538b2372..abd21934c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -42,7 +43,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dandelifeon; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index bcf82a503..f2ad6fa4f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -19,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -95,7 +96,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.cocoon; } diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 8c570787b..1a7771e49 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.item.block.ItemBlockDreamwood; @@ -21,7 +22,7 @@ public class BlockDreamwood extends BlockLivingwood { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 71e597b32..481f150e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -95,7 +96,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.overgrowthSeed; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 5ea86885a..aa31c5b65 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -64,7 +65,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.enderEyeBlock; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index f87f8ac90..a717c5337 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -98,7 +99,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.gardenOfGlass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index efca3ee32..f427fce8b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -135,7 +137,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); } @@ -155,7 +157,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @@ -170,7 +172,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index aa03b96cc..74af9aa59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -76,7 +77,7 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.forestEye; } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 984f13ebf..d208c18b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockRailBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -86,7 +87,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.ghostRail; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 99c51a1d5..0524d5ca6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -22,7 +22,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -178,7 +180,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!world.isRemote && !burst.isFake()) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.move = !tile.move; @@ -187,20 +189,20 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.lock = !tile.lock; return false; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(x, y, z); tile.renderHUD(res); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.hourglass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 1a44465f0..b19225371 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -18,6 +18,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -147,7 +148,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.incense; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 9b23841e1..3cf7934f2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -96,7 +97,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.luminizerTransport; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 2d1748753..bd6e87294 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -22,6 +22,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -144,12 +146,12 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return false; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.luminizerTransport; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 017156b2f..25fafd642 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index fbacb7a6d..c19e3db5e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -97,7 +98,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 5154cd727..be0b410b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; @@ -36,7 +37,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(!burst.isFake() && !world.isRemote) { world.playAuxSFX(2001, x, y, z, getIdFromBlock(this)); world.setBlockToAir(x, y, z); @@ -47,7 +48,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaBomb; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 529bbf0e6..07f128fa9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -27,6 +27,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -223,7 +224,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 8ebf8141f..ea3424cc3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -24,6 +24,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -124,7 +125,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 1c136f456..bc67da973 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -13,6 +13,8 @@ package vazkii.botania.common.block; import java.util.List; import java.util.Random; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -172,18 +174,18 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return world.getBlockMetadata(x, y, z) == 0 ? LexiconData.openCrate : LexiconData.craftCrate; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(x, y, z); return crate.onWanded(player, stack); } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(x, y, z); if(tile instanceof TileCraftCrate) { TileCraftCrate craft = (TileCraftCrate) tile; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 2e81885c3..643336199 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -28,6 +28,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.MinecraftForge; @@ -123,7 +125,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { if(player == null) return false; @@ -275,7 +277,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pistonRelay; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 5ae575622..b52b79f4b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -21,6 +21,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -100,13 +102,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.platform : meta == 2 ? null : LexiconData.spectralPlatform; } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { TilePlatform tile = (TilePlatform) world.getTileEntity(x, y, z); return tile.onWanded(player); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index f0eb91678..814c7390a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -21,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -105,7 +106,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual; } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 4a5810bfe..7017bcd59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -49,7 +50,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.gardenOfGlass; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 6f452e27a..7c029d75f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -66,7 +67,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.vineBall; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index f8a69fe9f..c62267b3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -173,7 +174,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.sparkChanger; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 58640dd02..98dd5f967 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -29,6 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; @@ -230,12 +232,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).getEntry(); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); } @@ -269,7 +271,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index e0104455f..7bdd62c58 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -87,7 +88,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.pool : LexiconData.terrasteel; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index f07afe3df..65126e62e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -19,6 +19,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -127,7 +128,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.teruTeruBozu; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 6720700cf..a084605b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -49,7 +50,7 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.tinyPlanet; } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index c41f79dbd..bf03acb59 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -86,7 +87,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaCrystalCube; } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 0ce2ef19f..eee670582 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -66,7 +67,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaFunnel; } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index f2f604cc5..205569783 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -64,7 +65,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaIndex; } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index b8c18f027..dbe1d24c8 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -75,7 +76,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaInterceptor; } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 2d804b714..c9452b043 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -70,7 +71,7 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.corporeaRetainer; } diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index d5005f0b4..37682ea31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -83,7 +84,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java index 483e6cb99..be934af38 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java @@ -16,6 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -39,7 +40,7 @@ public class BlockBlaze extends BlockMod implements ILexiconable, IFuelHandler { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.blazeBlock; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 919aa5932..30acb6b76 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -85,7 +86,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta >= 4 ? LexiconData.azulejo : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index f15b80c96..2aaae3384 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -16,6 +16,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; @@ -96,7 +97,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dirtPath; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index f4597f2b9..7be671bc8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -54,7 +55,7 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 6c2e265c1..725bce703 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 2572c1c39..f3ba76fa4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -24,6 +24,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -139,7 +140,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab if(type != null && type != flower.getIslandType()) { if(!world.isRemote) { flower.setIslandType(type); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } if(!player.capabilities.isCreativeMode) @@ -161,7 +162,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index d8143da52..7d81bdd63 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -105,7 +106,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index b38cc8e33..154f63572 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -58,7 +59,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pool; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 46e51d48e..13f3dff72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -22,6 +22,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -132,7 +133,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.mushrooms; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 8a6068d4f..8dcc43686 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -20,6 +20,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -72,7 +73,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.flowers; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index fa696ebf5..48c67f02c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -104,7 +105,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 8484f6e32..7df9eabcd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -56,7 +57,7 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 8f868a740..26544a639 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -42,7 +43,7 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 724abac77..f8eb3f701 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; @@ -56,7 +57,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index d1fdedc25..1a8a91c01 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; @@ -55,7 +56,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rainbowRod; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index db5a17ca8..74986f074 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -51,7 +52,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.shinyFlowers; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index bbde621f0..39820eae5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -67,7 +68,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.starfield; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java index 2efb25986..16e6815b3 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockThatch.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -30,7 +31,7 @@ public class BlockThatch extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 60843202f..9224062a7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -128,7 +129,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.tinyPotato; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index a26bd40f0..637bb355e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -21,6 +21,7 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -99,7 +100,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 3cb3c3202..ca1add61b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -86,7 +87,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 31e4dce0e..b36c27a8e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -148,7 +149,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartz ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 7fd954b0e..2456f25fe 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -108,7 +109,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return this == ModFluffBlocks.elfQuartzSlab ? LexiconData.elvenResources : LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java index b2494da45..bd7f49181 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzStairs.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.quartz; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,8 +27,8 @@ public class BlockSpecialQuartzStairs extends BlockModStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { - return this == ModFluffBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, x, y, z, player, lexicon); + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return this == ModFluffBlocks.elfQuartzStairs ? LexiconData.elvenResources : super.getEntry(world, pos, player, lexicon); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java index b5ff215d6..6526bc1a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/Block18StoneSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -40,7 +41,7 @@ public class Block18StoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index aa20c9def..57ec2b292 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -41,7 +42,7 @@ public class BlockBiomeStoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java index a91b5bbab..766b536cc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockDirtPathSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -37,7 +38,7 @@ public class BlockDirtPathSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.dirtPath; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java index 4a2a65d9f..8e04c7053 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEndStoneSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -39,7 +40,7 @@ public class BlockEndStoneSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java index ce28c608b..0161321fd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockEnderBrickSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -39,7 +40,7 @@ public class BlockEnderBrickSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index 948babdb3..10ab14fcc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -73,7 +74,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java index 9e071232f..e22c09114 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockPavementSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -40,7 +41,7 @@ public class BlockPavementSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pavement; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java index 23c955d44..bf821d25c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockReedSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -38,7 +39,7 @@ public class BlockReedSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java index 228ec633a..0ff31277e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockThatchSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -38,7 +39,7 @@ public class BlockThatchSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java index 7c6cde0e1..ac246e112 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/bricks/BlockCustomBrickSlab.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.slabs.bricks; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -44,7 +45,7 @@ public class BlockCustomBrickSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java index b9e385f03..8e4de8496 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/prismarine/BlockPrismarineSlab.java @@ -3,6 +3,7 @@ package vazkii.botania.common.block.decor.slabs.prismarine; import net.minecraft.block.BlockSlab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -34,7 +35,7 @@ public class BlockPrismarineSlab extends BlockLivingSlab { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java index 3873be4c1..77fc40da2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/Block18StoneStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -24,7 +25,7 @@ public class Block18StoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java index 20ff8e624..c00be8d6d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockBiomeStoneStairs.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; @@ -24,7 +25,7 @@ public class BlockBiomeStoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java index a2da6e37b..9a508aba0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEndStoneStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockEndStoneStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java index fdd23147c..1ed7a72b2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockEnderBrickStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockEnderBrickStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.endStoneDecor; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 7394b4b66..191ca88f0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -28,7 +29,7 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java index fd9624717..d30d1f8d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockPavementStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -24,7 +25,7 @@ public class BlockPavementStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pavement; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java index c2c045307..61832d37e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockReedStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockReedStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java index d55162c51..3e2dc2c36 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockThatchStairs.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.stairs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -24,7 +25,7 @@ public class BlockThatchStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java index e49976d2a..ca8f88916 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/bricks/BlockCustomBrickStairs.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.stairs.bricks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -19,7 +20,7 @@ public class BlockCustomBrickStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java index 3a823ffd3..18867cc7a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/prismarine/BlockPrismarineStairs.java @@ -2,6 +2,7 @@ package vazkii.botania.common.block.decor.stairs.prismarine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -19,7 +20,7 @@ public class BlockPrismarineStairs extends BlockLivingStairs { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 64b30f695..832d3cca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,7 +27,7 @@ public class Block18StoneWall extends BlockVariantWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.stoneAlchemy; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index 3f8a3e037..eea518179 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; @@ -26,7 +27,7 @@ public class BlockBiomeStoneWall extends BlockVariantWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.marimorphosis; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 3ef9e4c7c..7f9a34abc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -65,7 +66,7 @@ public class BlockModWall extends BlockWall implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.decorativeBlocks; } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java index 0c0029950..23e2b0629 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockPrismarineWall.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.decor.walls; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModBlocks; @@ -27,7 +28,7 @@ public class BlockPrismarineWall extends BlockModWall { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prismarine; } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index b50b971f7..0d0e9c0ae 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -30,7 +30,7 @@ public class BehaviourWand extends BehaviorDefaultDispenseItem { World world = par1IBlockSource.getWorld(); Block block = world.getBlock(x, y, z); if(block instanceof IWandable) { - ((IWandable) block).onUsedByWand(null, par2ItemStack, world, x, y, z, facing.getOpposite().ordinal()); + ((IWandable) block).onUsedByWand(null, par2ItemStack, world, , x, , y); return par2ItemStack; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 0c60b1635..01485c500 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -54,7 +55,7 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.alchemy; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 341061899..6867b6549 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -16,6 +16,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -87,7 +88,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.bellows; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 1c83b153c..d52a52859 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -23,6 +23,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -156,12 +157,12 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.brewery; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileBrewery) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java index 818223a53..3c1749dd6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockConjurationCatalyst.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; @@ -24,7 +25,7 @@ public class BlockConjurationCatalyst extends BlockAlchemyCatalyst { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.conjurationCatalyst; } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index f5b8aba15..79e7ddc66 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -55,7 +56,7 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.distributor; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 2318fc4cb..1325a70ee 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -25,7 +25,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -141,18 +143,18 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileEnchanter) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaEnchanting; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileEnchanter) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 36b394ba1..5648a0d10 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -26,6 +26,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; @@ -107,7 +108,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { if(burst.isFake()) return; @@ -169,7 +170,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); switch(meta) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 2487ce7b4..5dcaea36a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -78,7 +79,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaDetector; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 622375863..808b950c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -51,7 +52,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.manaVoid; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index b44106997..fbe604d4f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -27,6 +27,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -116,7 +118,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, if(par5Entity instanceof EntityItem) { TilePool tile = (TilePool) par1World.getTileEntity(par2, par3, par4); if(tile.collideEntityItem((EntityItem) par5Entity)) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, par2, par3, par4); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, , par2); } } @@ -171,18 +173,18 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TilePool) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TilePool) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.pool; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 0748d9321..195172129 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; @@ -177,14 +178,14 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { + public void onBurstCollision(IManaBurst burst, World world, BlockPos pos) { TileEntity tile = world.getTileEntity(x, y, z); if(tile != null && tile instanceof TilePrism) ((TilePrism) tile).onBurstCollision(burst); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.prism; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index aa4a4c6e6..8af11d76e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -103,7 +104,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.poolCart; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 0f401ab9d..642dec0a2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -14,6 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -48,7 +49,7 @@ public class BlockRFGenerator extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.rfGenerator; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index d5133c48e..c0cf6efc1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -153,18 +155,18 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileRuneAltar) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.runicAltar; } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileRuneAltar) world.getTileEntity(x, y, z)).renderHUD(mc, res); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index c21a20fb5..c1f0b5859 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -20,6 +20,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -73,7 +74,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.spawnerClaw; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 138ed232e..311598c29 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -29,6 +29,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -223,7 +225,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileSpreader) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @@ -234,18 +236,18 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileSpreader) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { int meta = world.getBlockMetadata(x, y, z); return meta == 0 ? LexiconData.spreader : meta == 1 ? LexiconData.redstoneSpreader : LexiconData.dreamwoodSpreader; } @Override - public AxisAlignedBB getWireframeAABB(World world, int x, int y, int z) { + public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) { float f = 1F / 16F; return new AxisAlignedBB(x + f, y + f, z + f, x + 1 - f, y + 1 - f, z + 1 - f); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 6a157af6d..229fab824 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -74,7 +75,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.terrasteel; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index ea88ef91c..30d90be03 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -17,6 +17,8 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -58,18 +60,18 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan } @Override - public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { + public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { ((TileTurntable) world.getTileEntity(x, y, z)).renderHUD(mc, res); } @Override - public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { + public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { ((TileTurntable) world.getTileEntity(x, y, z)).onWanded(player, stack); return true; } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.turntable; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index 38616bca8..7ae8b230e 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -72,7 +73,7 @@ public abstract class BlockRedString extends BlockModContainer im } @Override - public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index ffd292e5c..dc9f669e3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,7 +19,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -132,8 +134,8 @@ public class SubTileSpectranthemum extends SubTileFunctional { } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { - boolean bound = super.bindTo(player, wand, x, y, z, side); + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { + boolean bound = super.bindTo(player, wand, pos, side); if(!bound && (x != bindX || y != bindY || z != bindZ) && MathHelper.pointDistanceSpace(x, y, z, supertile.xCoord, supertile.yCoord, supertile.zCoord) <= BIND_RANGE && (x != supertile.xCoord || y != supertile.yCoord || z != supertile.zCoord)) { bindX = x; @@ -149,7 +151,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override @SideOnly(Side.CLIENT) - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return Minecraft.getMinecraft().thePlayer.isSneaking() && bindY != -1 ? new ChunkCoordinates(bindX, bindY, bindZ) : super.getBinding(); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 935598494..e2c2a5961 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -62,7 +62,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I stack.stackSize--; if(stack.stackSize == 0) item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } @@ -150,7 +150,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public void trySetLastRecipe(EntityPlayer player) { tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public static void tryToSetLastRecipe(EntityPlayer player, IInventory inv, List lastRecipe) { @@ -218,7 +218,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I didChange = collideEntityItem(item) || didChange; if(didChange) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stackAt = getStackInSlot(i); @@ -304,12 +304,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I @Override public void setWater(boolean water) { hasWater = water; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public void setLava(boolean lava) { hasLava = lava; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 5edf99248..37e358206 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -64,7 +64,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) { this.recipe = recipe; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index ddc14b7d1..033bd4eea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -295,7 +295,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override @@ -369,11 +369,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { return false; for(int[] pylon : PYLON_LOCATIONS[meta]) - if(world.getBlock(pylon[0] + x, pylon[1] + y, pylon[2] + z) != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(world, pylon[0] + x, pylon[1] + y - 1, pylon[2] + z)) + if(world.getBlock(pylon[0] + x, pylon[1] + y, pylon[2] + z) != ModBlocks.pylon || !BotaniaAPI.internalHandler.isBotaniaFlower(, world, , pylon[0] + x)) return false; for(int[] flower : FLOWER_LOCATIONS) - if(!BotaniaAPI.internalHandler.isBotaniaFlower(world, flower[0] + x, flower[1] + y, flower[2] + z)) + if(!BotaniaAPI.internalHandler.isBotaniaFlower(, world, , flower[0] + x)) return false; return true; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index f8ebe2eac..822a0e57f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -23,8 +23,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; @@ -135,17 +137,17 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return bindY == -1 ? null : new ChunkCoordinates(bindX, bindY, bindZ); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(player.worldObj.getBlock(x, y, z) != ModBlocks.lightRelay || MathHelper.pointDistanceSpace(x, y, z, xCoord, yCoord, zCoord) > MAX_DIST) return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 192c0a203..471a8eea8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -69,7 +69,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } if(did) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); return true; } @@ -136,7 +136,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(manaToGet != this.manaToGet) { worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:runeAltarStart", 1F, 1F); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } @@ -154,7 +154,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public void trySetLastRecipe(EntityPlayer player) { TileAltar.tryToSetLastRecipe(player, this, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public boolean hasValidRecipe() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 3f3fa1b56..5e45ddbe9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -20,7 +20,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -182,24 +184,24 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(subTile == null) return null; return subTile.getBinding(); } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.canSelect(player, wand, x, y, z, side); + return subTile.canSelect(player, wand, , x, , y); } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { if(subTile == null) return false; - return subTile.bindTo(player, wand, x, y, z, side); + return subTile.bindTo(player, wand, , x, , y); } public int getLightValue() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 21282014b..ca95a1f50 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -91,7 +91,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); mana = 0; worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index d3af0ac8e..3bf5c9af2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -17,7 +17,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class TileCorporeaBase extends TileSimpleInventory { public ICorporeaSpark getSpark() { - return CorporeaHelper.getSparkForBlock(worldObj, xCoord, yCoord, zCoord); + return CorporeaHelper.getSparkForBlock(worldObj, , xCoord); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 841981fad..aca08e46e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -59,7 +59,7 @@ public class TileCorporeaRetainer extends TileMod { if(!hasPendingRequest()) return; - ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestX, requestY, requestZ); + ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, , requestX); if(spark != null) { IInventory inv = spark.getInventory(); if(inv != null && inv instanceof ICorporeaRequestor) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 11dfaa35f..12139ab14 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -131,7 +131,7 @@ public class TileBellows extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index e0aa3d60f..81f726eb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -56,7 +56,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { for(IManaReceiver pool : validPools) { pool.recieveMana(manaForEach); TileEntity tile = (TileEntity) pool; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , tile.xCoord); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 8f81a0796..7c70f02e1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -324,7 +324,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc if(player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } if(!worldObj.isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 0f15e6304..dd7cec640 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -93,7 +93,7 @@ public class TilePump extends TileMod { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 5275211bd..529254d0a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -24,12 +24,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.*; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -233,7 +229,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiverLastTick != receiver && !worldObj.isRemote) { requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } redstoneLastTick = redstone; @@ -382,7 +378,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, checkForReceiver(); requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } } } @@ -591,11 +587,11 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void markDirty() { checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { if(receiver == null) return null; @@ -619,12 +615,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public boolean canSelect(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { return true; } @Override - public boolean bindTo(EntityPlayer player, ItemStack wand, int x, int y, int z, int side) { + public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(x + 0.5, y + 0.5, z + 0.5); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 23a0b1426..dbe3635cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -73,7 +73,7 @@ public class TileTurntable extends TileMod { if(player.isSneaking()) backwards = !backwards; else speed = speed == 6 ? 1 : speed + 1; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xCoord); } public void renderHUD(Minecraft mc, ScaledResolution res) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 2d386a6e1..097cd5b3f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.wand.ITileBound; @@ -69,7 +70,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { } @Override - public ChunkCoordinates getBinding() { + public BlockPos getBinding() { return binding; } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 2ec2fbad4..3ab5ad07a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -23,6 +23,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -243,7 +244,7 @@ public class InternalMethodHandler extends DummyMethodHandler { } @Override - public boolean isBotaniaFlower(World world, int x, int y, int z) { + public boolean isBotaniaFlower(World world, BlockPos pos) { Block block = world.getBlock(x, y, z); return block == ModBlocks.flower || block == ModBlocks.shinyFlower || block == ModBlocks.specialFlower; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 728acdcec..03a7f9cad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -27,11 +27,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.*; import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; @@ -106,7 +103,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { this.fake = fake; - setBurstSourceCoords(tile.xCoord, tile.yCoord, tile.zCoord); + setBurstSourceCoords(tile.xCoord); setLocationAndAngles(tile.xCoord + 0.5, tile.yCoord + 0.5, tile.zCoord + 0.5, 0, 0); rotationYaw = -(spreader.getRotationX() + 90F); rotationPitch = spreader.getRotationY(); @@ -121,7 +118,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public EntityManaBurst(EntityPlayer player) { this(player.worldObj); - setBurstSourceCoords(0, -1, 0); + setBurstSourceCoords(0); setLocationAndAngles(player.posX, player.posY + player.getEyeHeight(), player.posZ, player.rotationYaw + 180, -player.rotationPitch); posX -= MathHelper.cos((rotationYaw + 180) / 180.0F * (float) Math.PI) * 0.16F; @@ -470,7 +467,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); int z = par1nbtTagCompound.getInteger(TAG_SPREADER_Z); - setBurstSourceCoords(x, y, z); + setBurstSourceCoords(x); double lastMotionX = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_X); double lastMotionY = par1nbtTagCompound.getDouble(TAG_LAST_MOTION_Y); @@ -590,7 +587,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { onRecieverImpact((IManaReceiver) tile, tile.xCoord, tile.yCoord, tile.zCoord); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + ((IManaTrigger) block).onBurstCollision(this, worldObj, , movingobjectposition.blockX); boolean ghost = tile instanceof IManaCollisionGhost; dead = !ghost; @@ -605,7 +602,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(lens != null) dead = lens.collideBurst(this, movingobjectposition, collidedTile != null && collidedTile instanceof IManaReceiver && ((IManaReceiver) collidedTile).canRecieveManaFromBursts(), dead, getSourceLens()); - if(collided && !hasAlreadyCollidedAt(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ)) + if(collided && !hasAlreadyCollidedAt(movingobjectposition.blockX)) alreadyCollidedAt.add(getCollisionLocString(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ)); if(dead && !isDead) { @@ -637,7 +634,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { tile.recieveMana(mana); if(tile instanceof IThrottledPacket) ((IThrottledPacket) tile).markDispatchable(); - else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, x, y, z); + else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , x); } @Override @@ -748,7 +745,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - public void setBurstSourceCoords(int x, int y, int z) { + public void setBurstSourceCoords(BlockPos pos) { dataWatcher.updateObject(coordsStart, x); dataWatcher.updateObject(coordsStart + 1, y); dataWatcher.updateObject(coordsStart + 2, z); @@ -791,13 +788,13 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } @Override - public boolean hasAlreadyCollidedAt(int x, int y, int z) { + public boolean hasAlreadyCollidedAt(BlockPos pos) { return alreadyCollidedAt.contains(getCollisionLocString(x, y, z)); } @Override - public void setCollidedAt(int x, int y, int z) { - if(!hasAlreadyCollidedAt(x, y, z)) + public void setCollidedAt(BlockPos pos) { + if(!hasAlreadyCollidedAt(x)) alreadyCollidedAt.add(getCollisionLocString(x, y, z)); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1c5c260d8..1189ec70b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -119,7 +119,7 @@ public class EntityPoolMinecart extends EntityMinecart { } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xp_, y, zp_); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, , xp_); pump.hasCart = true; if(!pump.active) pump.setActive(true); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 69002fd3d..132b01575 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -62,7 +62,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { if(!item.worldObj.isRemote) { pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); } for(int i = 0; i < 50; i++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 2efd3a7e7..a83a92818 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -44,7 +44,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, x, y, z)) { + if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, , x)) { stack.stackSize--; if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index fa7504baf..b30562b0c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -119,7 +119,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet if(inRange(x, y, z, srcx, srcy, srcz, range, heightscale, pointy)) { Block block = world.getBlock(x, y, z); - if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, x, y, z)) && block.getBlockHardness(world, x, y, z) != -1) { + if(!block.isAir(world, x, y, z) && !block.isReplaceable(world, x, y, z) && !(block instanceof BlockFalling) && (!(block instanceof ILaputaImmobile) || ((ILaputaImmobile) block).canMove(world, , x)) && block.getBlockHardness(world, x, y, z) != -1) { int id = Block.getIdFromBlock(block); int meta = world.getBlockMetadata(x, y, z); TileEntity tile = world.getTileEntity(x, y, z); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index faaf5dbcd..fe214d36b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -63,7 +63,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, par4, par5, par6, par2EntityPlayer, par1ItemStack); + LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, , par4, par2EntityPlayer, par1ItemStack); if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); Botania.proxy.setLexiconStack(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 2c3fd28e1..95af41cee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -263,7 +264,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { IManaPool pool = getManaPool(stack); return pool == null || pool instanceof DummyPool ? null : getPoolCoords(stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index c7db85b29..ae80aa31c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -46,7 +46,7 @@ public class ItemSpark extends ItemMod implements ICraftAchievement { spark.setPosition(x + 0.5, y + 1.5, z + 0.5); world.spawnEntityInWorld(spark); attach.attachSpark(spark); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 981d009a4..484865d50 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -196,7 +196,7 @@ public class ItemSpawnerMover extends ItemMod { tag.setInteger("y", y); tag.setInteger("z", z); te.readFromNBT(tag); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 0b706a86b..60610b6eb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -25,6 +25,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; @@ -71,12 +72,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) { TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { + if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, , par4, , par5)) { Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); doParticleBeam(par3World, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, , boundTile.posX); setBoundTile(par1ItemStack, 0, -1, 0); } @@ -118,7 +119,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { boolean bindable = tile instanceof IWandBindable; boolean wanded = false; - if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { + if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, , par4, , par5)) { if(boundTile.posX == par4 && boundTile.posY == par5 && boundTile.posZ == par6) setBoundTile(par1ItemStack, 0, -1, 0); else setBoundTile(par1ItemStack, par4, par5, par6); @@ -129,7 +130,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par7); + wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, , par4, , par5); if(wanded && par3World.isRemote) par2EntityPlayer.swingItem(); } @@ -294,7 +295,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { ChunkCoordinates bound = getBoundTile(stack); if(bound.posY != -1) return bound; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index e1e4e5cb1..6316fe45b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -56,7 +56,7 @@ public class LensMine extends Lens { items.addAll(block.getDrops(world, x, y, z, meta, 0)); - if(!burst.hasAlreadyCollidedAt(x, y, z)) { + if(!burst.hasAlreadyCollidedAt(x)) { if(!burst.isFake() && !entity.worldObj.isRemote) { world.setBlockToAir(x, y, z); if(ConfigHandler.blockBreakParticles) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 34f4d0dd8..23787954d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -33,7 +33,7 @@ public class LensWarp extends Lens { int worldId = Integer.parseInt(tokens[0]), x = Integer.parseInt(tokens[1]), y = Integer.parseInt(tokens[2]), z = Integer.parseInt(tokens[3]); if(worldId == entity.worldObj.provider.dimensionId) { entity.setPosition(x + 0.5, y + 0.5, z + 0.5); - burst.setCollidedAt(x, y, z); + burst.setCollidedAt(x); return false; } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 49e5fe629..15261d5e0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -53,7 +53,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable { if(meta != dyable.getColor()) { dyable.setColor(meta); stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, , tile.xCoord); } } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index d6f9e20f6..8c40cf10d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; +import net.minecraft.util.BlockPos; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -114,7 +115,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } @Override - public ChunkCoordinates getBinding(ItemStack stack) { + public BlockPos getBinding(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_X, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z, 0);