From 2376287dd76d56c8aabe9712b9056fd0258b024d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Nov 2015 13:09:45 -0600 Subject: [PATCH] Some items --- .../botania/common/item/Item16Colors.java | 6 +- .../common/item/ItemBlackHoleTalisman.java | 13 +-- .../botania/common/item/ItemBlackLotus.java | 6 +- .../botania/common/item/ItemBottledMana.java | 21 ++--- .../botania/common/item/ItemCacophonium.java | 2 +- .../vazkii/botania/common/item/ItemMod.java | 7 -- .../common/item/ItemOvergrowthSeed.java | 13 +-- .../botania/common/item/ItemPinkinator.java | 3 +- .../botania/common/item/ItemPoolMinecart.java | 14 ++-- .../botania/common/item/ItemSextant.java | 10 +-- .../botania/common/item/ItemSignalFlare.java | 11 +-- .../botania/common/item/ItemSlingshot.java | 4 +- .../vazkii/botania/common/item/ItemSpark.java | 10 ++- .../botania/common/item/ItemSpawnerMover.java | 12 +-- .../botania/common/item/ItemSpellCloth.java | 7 +- .../botania/common/item/ItemTwigWand.java | 84 ++++++++----------- .../botania/common/item/ItemWorldSeed.java | 6 +- 17 files changed, 101 insertions(+), 128 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 5abafdc6c..6ba258099 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -15,6 +15,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -28,11 +29,10 @@ public class Item16Colors extends ItemMod { @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() >= EntitySheep.fleeceColorTable.length) + if(par1ItemStack.getItemDamage() >= EnumDyeColor.values().length) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par1ItemStack.getItemDamage()]; - return new Color(color[0], color[1], color[2]).getRGB(); + return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9604249ff..7dae1cef9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -24,10 +24,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.*; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.RecipeSorter; @@ -72,7 +70,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { Block block = par3World.getBlock(par4, par5, par6); int meta = par3World.getBlockMetadata(par4, par5, par6); boolean set = setBlock(par1ItemStack, block, meta); @@ -217,14 +215,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return getContainerItem(stack) != null; } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { - return false; - } - private boolean setBlock(ItemStack stack, Block block, int meta) { if(getBlock(stack) == Blocks.air || getBlockCount(stack) == 0) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block)); + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 132b01575..15bde98a7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -42,7 +42,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public boolean hasEffect(ItemStack par1ItemStack, int pass) { + public boolean hasEffect(ItemStack par1ItemStack) { return par1ItemStack.getItemDamage() > 0; } @@ -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); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); } for(int i = 0; i < 50; i++) { @@ -76,7 +76,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { float my = (float) Math.random() * m; float mz = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(item.worldObj, item.posX, tile.yCoord + 0.5F, item.posZ, r, g, b, s, mx, my, mz); + Botania.proxy.wispFX(item.worldObj, item.posX, tile.getPos().getY() + 0.5F, item.posZ, r, g, b, s, mx, my, mz); } item.worldObj.playSoundAtEntity(item, "botania:blackLotus", 0.5F, t2 ? 0.1F : 1F); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 2e89850b1..245d23b5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -26,11 +26,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; +import net.minecraft.util.*; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -57,8 +54,8 @@ public class ItemBottledMana extends ItemMod { break; } case 1 : { // Water - if(!player.worldObj.isRemote && !player.worldObj.provider.isHellWorld) - player.worldObj.setBlock(MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), Blocks.flowing_water); + if(!player.worldObj.isRemote && !player.worldObj.provider.doesWaterVaporize()) + player.worldObj.setBlockState(new BlockPos(player), Blocks.flowing_water.getDefaultState()); break; } case 2 : { // Set on Fire @@ -72,7 +69,7 @@ public class ItemBottledMana extends ItemMod { break; } case 4 : { // Mega Jump - if(!player.worldObj.provider.isHellWorld) { + if(!player.worldObj.provider.doesWaterVaporize()) { if(!player.worldObj.isRemote) player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); player.motionY = 6; @@ -87,7 +84,7 @@ public class ItemBottledMana extends ItemMod { } case 6 : { // Lots O' Hearts if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 20 * 60 * 2, 9)); + player.addPotionEffect(new PotionEffect(Potion.absorption.id, 20 * 60 * 2, 9)); break; } case 7 : { // All your inventory is belong to us @@ -113,8 +110,8 @@ public class ItemBottledMana extends ItemMod { MathHelper.floor_double(player.posY); int z = MathHelper.floor_double(player.posZ); for(int i = 256; i > 0; i--) { - Block block = player.worldObj.getBlock(x, i, z); - if(!block.isAir(player.worldObj, x, i, z)) { + Block block = player.worldObj.getBlockState(new BlockPos(x, i, z)).getBlock(); + if(!block.isAir(player.worldObj, new BlockPos(x, i, z))) { if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); @@ -227,7 +224,7 @@ public class ItemBottledMana extends ItemMod { } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { randomEffect(par3EntityPlayer, par1ItemStack); par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); randomSeed(par1ItemStack); @@ -244,7 +241,7 @@ public class ItemBottledMana extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.drink; + return EnumAction.DRINK; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 88c213065..b552d36b3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -114,7 +114,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.block; + return EnumAction.BLOCK; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index e8ddc0903..ce7b9a5ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.client.core.helper.IconHelper; @@ -37,10 +36,4 @@ public class ItemMod extends Item { public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index fd9c25a08..3632eb8ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -11,8 +11,11 @@ package vazkii.botania.common.item; import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; 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; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; @@ -25,15 +28,15 @@ public class ItemOvergrowthSeed extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { - Block block = world.getBlock(x, y, z); - ItemStack blockStack = new ItemStack(block); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xs, float ys, float zs) { + IBlockState state = world.getBlockState(pos); + ItemStack blockStack = new ItemStack(state.getBlock()); int[] ids = OreDictionary.getOreIDs(blockStack); for(int i : ids) { String name = OreDictionary.getOreName(i); if(name.equals("grass")) { - world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block)); - world.setBlock(x, y, z, ModBlocks.enchantedSoil); + world.playAuxSFX(2001, pos, Block.getStateId(state)); + world.setBlockState(pos, ModBlocks.enchantedSoil.getDefaultState()); stack.stackSize--; return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 41a11fa10..51567f8b3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -16,6 +16,7 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.common.achievement.ModAchievements; @@ -45,7 +46,7 @@ public class ItemPinkinator extends ItemMod { } player.addStat(ModAchievements.pinkinator, 1); - world.spawnParticle("hugeexplosion", wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.stackSize--; return stack; } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 07dc38d8c..c4be8eb31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -17,6 +17,8 @@ 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.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -36,13 +38,13 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(BlockRailBase.func_150051_a(p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_))) { + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + if(BlockRailBase.isRailBlock(p_77648_3_.getBlockState(pos))) { if(!p_77648_3_.isRemote) { - EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, p_77648_4_ + 0.5, p_77648_5_ + 0.5, p_77648_6_ + 0.5); + EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); if(p_77648_1_.hasDisplayName()) - entityminecart.setMinecartName(p_77648_1_.getDisplayName()); + entityminecart.setCustomNameTag(p_77648_1_.getDisplayName()); p_77648_3_.spawnEntityInWorld(entityminecart); } @@ -66,12 +68,12 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin @Override public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k) { - if(BlockRailBase.func_150051_a(world.getBlock(i, j, k))) { + if(BlockRailBase.isRailBlock(world.getBlockState(new BlockPos(i, j, k)))) { if(!world.isRemote) { EntityMinecart entityminecart = new EntityPoolMinecart(world, i + 0.5,j + 0.5, k + 0.5); if(cart.hasDisplayName()) - entityminecart.setMinecartName(cart.getDisplayName()); + entityminecart.setCustomNameTag(cart.getDisplayName()); if(world.spawnEntityInWorld(entityminecart)) return entityminecart; diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 453fc5ffc..ef15146a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -44,7 +44,7 @@ public class ItemSextant extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override @@ -95,9 +95,9 @@ public class ItemSextant extends ItemMod { MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); if(pos != null && pos.entityHit == null) { if(!par2World.isRemote) { - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.blockX); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.blockY); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.blockZ); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.getBlockPos().getX()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.getBlockPos().getY()); + ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.getBlockPos().getZ()); } } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); @@ -134,7 +134,7 @@ public class ItemSextant extends ItemMod { if(onUse == stack && stack.getItem().getMaxItemUseDuration(stack) - time >= 10) { double radius = calculateRadius(stack, player); - FontRenderer font = Minecraft.getMinecraft().fontRenderer; + FontRenderer font = Minecraft.getMinecraft().fontRendererObj; int x = resolution.getScaledWidth() / 2 + 30; int y = resolution.getScaledHeight() / 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index b3311f2b7..703dd0ff5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -19,6 +19,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -108,11 +109,10 @@ public class ItemSignalFlare extends ItemMod { return 0xFFFFFF; int colorv = getColor(par1ItemStack); - if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0) + if(colorv >= EnumDyeColor.values().length || colorv < 0) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)]; - return new Color(color[0], color[1], color[2]).getRGB(); + return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue; } @Override @@ -121,11 +121,6 @@ public class ItemSignalFlare extends ItemMod { par3List.add(forColor(i)); } - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index cd52a80f4..9c1fa8f78 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -49,7 +49,7 @@ public class ItemSlingshot extends ItemMod { } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemUseFinish(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { return par1ItemStack; } @@ -60,7 +60,7 @@ public class ItemSlingshot extends ItemMod { @Override public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.bow; + return EnumAction.BOW; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index ae80aa31c..f1cc3b5a1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -16,6 +16,8 @@ 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.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -35,18 +37,18 @@ public class ItemSpark extends ItemMod implements ICraftAchievement { } @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); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xv, float yv, float zv) { + TileEntity tile = world.getTileEntity(pos); if(tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) { stack.stackSize--; if(!world.isRemote) { EntitySpark spark = new EntitySpark(world); - spark.setPosition(x + 0.5, y + 1.5, z + 0.5); + spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); world.spawnEntityInWorld(spark); attach.attachSpark(spark); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, , x); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } 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 484865d50..2dd341494 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -20,6 +20,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.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -104,22 +106,22 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float xOffset, float yOffset, float zOffset) { if(getEntityId(itemstack) == null) { - if(world.getBlock(x, y, z).equals(Blocks.mob_spawner)) { - TileEntity te = world.getTileEntity(x, y, z); + if(world.getBlockState(pos).getBlock().equals(Blocks.mob_spawner)) { + TileEntity te = world.getTileEntity(pos); NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TAG_SPAWNER, new NBTTagCompound()); te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER)); tag.setInteger(TAG_PLACE_DELAY, 20); itemstack.setTagCompound(tag); - world.setBlockToAir(x, y, z); + world.setBlockToAir(pos); player.renderBrokenItemStack(itemstack); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(world, x + 0.5, y + 0.5, z + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); + Botania.proxy.wispFX(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, red, green, blue, (float) Math.random() * 0.1F + 0.05F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F, (float) (Math.random() - 0.5F) * 0.15F); } return true; } else return false; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index af76e2698..dc95b05e8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -40,7 +40,7 @@ public class ItemSpellCloth extends ItemMod { } @Override - public boolean hasContainerItem() { + public boolean hasContainerItem(ItemStack stack) { return true; } @@ -51,9 +51,4 @@ public class ItemSpellCloth extends ItemMod { return stack; } - @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { - return false; - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 6bc133a7e..b23078907 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -21,15 +21,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.EnumDyeColor; 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.*; import net.minecraft.util.BlockPos; import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -58,6 +57,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { private static final String TAG_BOUND_TILE_Y = "boundTileY"; private static final String TAG_BOUND_TILE_Z = "boundTileZ"; private static final String TAG_BIND_MODE = "bindMode"; + private static final BlockPos UNBOUND_POS = new BlockPos(0, -1, 0); public ItemTwigWand() { super(LibItemNames.TWIG_WAND); @@ -65,41 +65,41 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { + Block block = par3World.getBlockState(pos).getBlock(); BlockPos boundTile = getBoundTile(par1ItemStack); - 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(boundTile.getY() != -1 && par2EntityPlayer.isSneaking() && !pos.equals(boundTile)) { + TileEntity tile = par3World.getTileEntity(boundTile); if(tile instanceof IWandBindable) { - 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); + if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, pos, side)) { + Vector3 orig = new Vector3(boundTile.getX() + 0.5, boundTile.getY() + 0.5, boundTile.getZ() + 0.5); + Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); doParticleBeam(par3World, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, , boundTile.posX); - setBoundTile(par1ItemStack, 0, -1, 0); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile); + setBoundTile(par1ItemStack, UNBOUND_POS); } return true; - } else setBoundTile(par1ItemStack, 0, -1, 0); + } else setBoundTile(par1ItemStack, UNBOUND_POS); } else if(par2EntityPlayer.isSneaking()) { - block.rotateBlock(par3World, par4, par5, par6, ForgeDirection.getOrientation(par7)); + block.rotateBlock(par3World, pos, side); if(par3World.isRemote) par2EntityPlayer.swingItem(); } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { int meta = -1; - if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 0)) + if(TileEnchanter.canEnchanterExist(par3World, pos, 0)) meta = 0; - else if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 1)) + else if(TileEnchanter.canEnchanterExist(par3World, pos, 1)) meta = 1; if(meta != -1 && !par3World.isRemote) { - par3World.setBlock(par4, par5, par6, ModBlocks.enchanter, meta, 1 | 2); + par3World.setBlockState(pos, ModBlocks.enchanter, meta, 1 | 2); par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSoundEffect(par4, par5, par6, "botania:enchanterBlock", 0.5F, 0.6F); + par3World.playSoundEffect(pos.getX(), pos.getY(), pos.getZ(), "botania:enchanterBlock", 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -111,18 +111,18 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { float velMul = 0.07F; - Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(par3World, pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); } } } else if(block instanceof IWandable) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = par3World.getTileEntity(pos); boolean bindable = tile instanceof IWandBindable; boolean wanded = false; - 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); + if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, pos, side)) { + if(boundTile.equals(pos)) + setBoundTile(par1ItemStack, UNBOUND_POS); + else setBoundTile(par1ItemStack, pos); if(par3World.isRemote) par2EntityPlayer.swingItem(); @@ -130,7 +130,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, , par4, , par5); + wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, pos, side); if(wanded && par3World.isRemote) par2EntityPlayer.swingItem(); } @@ -138,7 +138,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return wanded; } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); - String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.dimensionId, par4, par5, par6); + String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.getDimensionId(), pos); BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); @@ -178,9 +178,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { BlockPos coords = getBoundTile(par1ItemStack); - TileEntity tile = par2World.getTileEntity(coords.posX, coords.posY, coords.posZ); + TileEntity tile = par2World.getTileEntity(coords); if(tile == null || !(tile instanceof IWandBindable)) - setBoundTile(par1ItemStack, 0, -1, 0); + setBoundTile(par1ItemStack, UNBOUND_POS); } @Override @@ -218,18 +218,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(par2 == 0 || par2 == 3) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)]; - return new Color(color[0], color[1], color[2]).getRGB(); - } - - @Override - public boolean requiresMultipleRenderPasses() { - return true; - } - - @Override - public int getRenderPasses(int metadata) { - return 4; + EnumDyeColor color = EnumDyeColor.byMetadata(par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)); + return color.getMapColor().colorValue; } @Override @@ -250,7 +240,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public EnumRarity getRarity(ItemStack par1ItemStack) { - return EnumRarity.rare; + return EnumRarity.RARE; } public static ItemStack forColors(int color1, int color2) { @@ -269,10 +259,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return ItemNBTHelper.getInt(stack, TAG_COLOR2, 0); } - public static void setBoundTile(ItemStack stack, int x, int y, int z) { - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_X, x); - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Y, y); - ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Z, z); + public static void setBoundTile(ItemStack stack, BlockPos pos) { + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_X, pos.getX()); + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Y, pos.getY()); + ItemNBTHelper.setInt(stack, TAG_BOUND_TILE_Z, pos.getZ()); } public static BlockPos getBoundTile(ItemStack stack) { @@ -297,12 +287,12 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public BlockPos getBinding(ItemStack stack) { BlockPos bound = getBoundTile(stack); - if(bound.posY != -1) + if(bound.getY() != -1) return bound; MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null) { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); + TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); return coords; diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index ebf75a8b4..9c8ae52b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -28,12 +28,12 @@ public class ItemWorldSeed extends ItemMod { public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { BlockPos coords = world.getSpawnPoint(); - if(MathHelper.pointDistanceSpace(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5, player.posX, player.posY, player.posZ) > 24) { + if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { player.rotationPitch = 0F; player.rotationYaw = 0F; - player.setPositionAndUpdate(coords.posX + 0.5, coords.posY + 1.6, coords.posZ + 0.5); + player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while(!world.getCollidingBoundingBoxes(player, player.boundingBox).isEmpty()) + while(!world.getCollidingBoundingBoxes(player, player.getBoundingBox()).isEmpty()) player.setPositionAndUpdate(player.posX, player.posY + 1, player.posZ); world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F);