diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 5519ca808..38b1c7f38 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -38,7 +38,7 @@ import javax.annotation.Nonnull; public final class BaubleRenderHandler implements LayerRenderer { @Override - public void doRenderLayer(@Nonnull EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) { + public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; diff --git a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java index 89bc0e915..7170e0603 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java +++ b/src/main/java/vazkii/botania/client/core/handler/BotaniaPlayerController.java @@ -22,8 +22,8 @@ public class BotaniaPlayerController extends PlayerControllerMP implements IExte private float distance = 0F; - public BotaniaPlayerController(Minecraft p_i45062_1_, NetHandlerPlayClient p_i45062_2_) { - super(p_i45062_1_, p_i45062_2_); + public BotaniaPlayerController(Minecraft mc, NetHandlerPlayClient netHandler) { + super(mc, netHandler); } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index eebce5624..0ff8c52c5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -43,7 +43,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } }, @@ -53,7 +53,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); @@ -69,7 +69,7 @@ public final class ColorHandler { blocks.registerBlockColorHandler( new IBlockColor() { @Override - public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 7c548c1db..e8d066e1c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -48,7 +48,7 @@ public final class ContributorFancinessHandler implements LayerRenderer { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon p_110775_1_) { - return null; + protected ResourceLocation getEntityTexture(@Nonnull EntityBabylonWeapon entity) { + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index f4115cb79..599140677 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -19,8 +19,8 @@ import vazkii.botania.common.entity.EntityCorporeaSpark; public class RenderCorporeaSpark extends RenderSparkBase { - public RenderCorporeaSpark(RenderManager p_i46185_1_) { - super(p_i46185_1_); + public RenderCorporeaSpark(RenderManager manager) { + super(manager); } protected DataParameter getInvisibilityParam() { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index f0074b805..cfa912b81 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; @@ -39,8 +40,8 @@ public class RenderManaStorm extends Render { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm p_110775_1_) { - return null; + protected ResourceLocation getEntityTexture(@Nonnull EntityManaStorm entity) { + return TextureMap.LOCATION_BLOCKS_TEXTURE; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index c648ddc2d..b98cdf83e 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -22,13 +22,13 @@ public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); - public RenderPinkWither(RenderManager p_i46130_1_) { - super(p_i46130_1_); + public RenderPinkWither(RenderManager manager) { + super(manager); } @Nonnull @Override - protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityWither entity) { return resource; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index e5dceff22..230086138 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -24,12 +24,12 @@ import javax.annotation.Nonnull; public class RenderPoolMinecart extends RenderMinecart { - public RenderPoolMinecart(RenderManager p_i46155_1_) { - super(p_i46155_1_); + public RenderPoolMinecart(RenderManager manager) { + super(manager); } @Override - protected void renderCartContents(EntityPoolMinecart poolCart, float p_147910_2_, @Nonnull IBlockState state) { + protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) { RenderTilePool.forceVariant = PoolVariant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); TileEntityRendererDispatcher.instance.getSpecialRendererByClass(TilePool.class).renderTileEntityAt(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 39c8053a9..de1fbafa5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -29,8 +29,8 @@ import java.util.Random; public abstract class RenderSparkBase extends Render { - public RenderSparkBase(RenderManager p_i46185_1_) { - super(p_i46185_1_); + public RenderSparkBase(RenderManager manager) { + super(manager); } @Override @@ -98,7 +98,7 @@ public abstract class RenderSparkBase extends Render { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(@Nonnull Entity entity) { return TextureMap.LOCATION_BLOCKS_TEXTURE; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 4efbfd999..8410a27fd 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -31,13 +31,13 @@ public class RenderThornChakram extends Render { } @Override - public void doRender(@Nonnull EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + public void doRender(@Nonnull EntityThornChakram c, double x, double y, double z, float entityYaw, float partialTicks) { boolean fire = c.isFire(); TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); if(iicon != null) { GlStateManager.pushMatrix(); - GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GlStateManager.translate((float)x, (float)y, (float)z); GlStateManager.enableRescaleNormal(); GlStateManager.scale(0.5F, 0.5F, 0.5F); bindEntityTexture(c); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7e3c3a79d..783bd6f29 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -101,8 +101,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { - return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Blocks.DIRT.getItemDropped(state, rand, fortune); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 919ccd960..66a18720d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -110,8 +110,8 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 265d62f06..d45fd01b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -45,8 +45,8 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { - return Blocks.DIRT.getItemDropped(state, p_149650_2_, p_149650_3_); + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return Blocks.DIRT.getItemDropped(state, rand, fortune); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index a11501f8b..04a945156 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -72,7 +72,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 4; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 58f99808f..f6ab2b843 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -65,26 +65,26 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @Override - public void onBlockAdded(World p_149726_1_, BlockPos pos, IBlockState state) { - super.onBlockAdded(p_149726_1_, pos, state); + public void onBlockAdded(World world, BlockPos pos, IBlockState state) { + super.onBlockAdded(world, pos, state); - if(!p_149726_1_.isRemote && p_149726_1_.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && p_149726_1_.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) { - p_149726_1_.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); - p_149726_1_.setBlockState(pos.down(), Blocks.AIR.getDefaultState(), 2); - p_149726_1_.setBlockState(pos.down(2), Blocks.AIR.getDefaultState(), 2); - EntityBlaze blaze = new EntityBlaze(p_149726_1_); + if(!world.isRemote && world.getBlockState(pos.down()).getBlock() == Blocks.IRON_BARS && world.getBlockState(pos.down(2)).getBlock() == Blocks.IRON_BARS) { + world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2); + world.setBlockState(pos.down(), Blocks.AIR.getDefaultState(), 2); + world.setBlockState(pos.down(2), Blocks.AIR.getDefaultState(), 2); + EntityBlaze blaze = new EntityBlaze(world); blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F); blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true); - p_149726_1_.spawnEntityInWorld(blaze); - p_149726_1_.notifyNeighborsOfStateChange(pos, Blocks.AIR); - p_149726_1_.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR); - p_149726_1_.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR); + world.spawnEntityInWorld(blaze); + world.notifyNeighborsOfStateChange(pos, Blocks.AIR); + world.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR); + world.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR); } } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 876dc3ab7..a69d006c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -49,12 +49,12 @@ public class BlockGaiaHead extends BlockSkull { @Nonnull @Override - public List getDrops(@Nonnull IBlockAccess p_149749_1_, @Nonnull BlockPos pos, IBlockState state, int fortune) { + public List getDrops(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); - TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(pos); + TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); if(tileentityskull == null) return ret; @@ -65,7 +65,7 @@ public class BlockGaiaHead extends BlockSkull { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.gaiaHead; } @@ -76,7 +76,7 @@ public class BlockGaiaHead extends BlockSkull { @Nonnull @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileGaiaHead(); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 856e4c57a..d22f988c7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -102,8 +102,8 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite())); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 32866f435..1b2babb8e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -82,7 +82,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index e85a6a224..0a3776833 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -97,7 +97,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } @@ -108,12 +108,12 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World p_149668_1_, @Nonnull BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { return null; } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index bf5073a8c..5209556d2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -163,9 +163,9 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(@Nonnull Item p_149666_1_, CreativeTabs p_149666_2_, @Nonnull List p_149666_3_) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { for(int i = 0; i < COUNT; ++i) - p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); + stacks.add(new ItemStack(item, 1, i)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 2182b5500..f825b95bb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -43,12 +43,12 @@ public class BlockRoot extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.manaResource; } @Override - public int damageDropped(IBlockState p_149692_1_) { + public int damageDropped(IBlockState state) { return 20; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 0c82c362d..96801691f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -48,7 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World p_149674_1_, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random p_149674_5_) { + public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 677b53497..ca898e756 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -85,7 +85,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } 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 4de5a9e5e..708293ecc 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -73,7 +73,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 340f40d8c..e54086ab0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -62,7 +62,7 @@ public class BlockBuriedPetals extends BlockModFlower { } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.petal; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 8dbc34b52..9bda6cca4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -85,7 +85,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return true; } 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 b9c2ddaa9..cf78b3348 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -91,7 +91,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void updateTick(@Nonnull World p_149674_1_, @Nonnull BlockPos pos, IBlockState state, Random p_149674_5_) { + public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) { // NO-OP, to prevent spreading } 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 be89ded75..1b2db8806 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 @@ -86,7 +86,7 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } 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 909ecd6b8..b6107bfee 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 @@ -80,7 +80,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 44b05e7a8..57f8d55d2 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -29,13 +29,13 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull @Override - public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { - EnumFacing enumfacing = BlockDispenser.getFacing(p_82487_1_.getBlockMetadata()); - World world = p_82487_1_.getWorld(); - double d0 = p_82487_1_.getX() + enumfacing.getFrontOffsetX() * 1.125F; - double d1 = p_82487_1_.getY() + enumfacing.getFrontOffsetY() * 1.125F; - double d2 = p_82487_1_.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; - BlockPos pos = p_82487_1_.getBlockPos().offset(enumfacing); + public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + EnumFacing enumfacing = BlockDispenser.getFacing(source.getBlockMetadata()); + World world = source.getWorld(); + double d0 = source.getX() + enumfacing.getFrontOffsetX() * 1.125F; + double d1 = source.getY() + enumfacing.getFrontOffsetY() * 1.125F; + double d2 = source.getZ() + enumfacing.getFrontOffsetZ() * 1.125F; + BlockPos pos = source.getBlockPos().offset(enumfacing); IBlockState state = world.getBlockState(pos); double d3; @@ -43,24 +43,24 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { d3 = 0.0D; else { if(state.getMaterial() != Material.AIR || !BlockRailBase.isRailBlock(world.getBlockState(pos.down()))) - return super.dispenseStack(p_82487_1_, p_82487_2_); + return super.dispenseStack(source, stack); d3 = -1.0D; } EntityMinecart entityminecart = new EntityPoolMinecart(world, d0, d1 + d3, d2); - if(p_82487_2_.hasDisplayName()) - entityminecart.setCustomNameTag(p_82487_2_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setCustomNameTag(stack.getDisplayName()); world.spawnEntityInWorld(entityminecart); - p_82487_2_.splitStack(1); - return p_82487_2_; + stack.splitStack(1); + return stack; } @Override - protected void playDispenseSound(IBlockSource p_82485_1_) { - p_82485_1_.getWorld().playEvent(1000, p_82485_1_.getBlockPos(), 0); + protected void playDispenseSound(IBlockSource source) { + source.getWorld().playEvent(1000, source.getBlockPos(), 0); } } 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 7d3b0d0a1..e03223cec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -74,8 +74,8 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing()), 2); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing()), 2); } @Override 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 573bd3513..ce9b17f43 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -94,7 +94,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public Item getItemDropped(IBlockState state, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(Blocks.LAPIS_BLOCK); } 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 85c085056..cee06a999 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -171,7 +171,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World p_149743_1_, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); 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 3962d5f4c..0c6bf4fbd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -77,8 +77,8 @@ public class BlockPump extends BlockMod implements ILexiconable { } @Override - public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { + world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite()), 2); } @Nonnull 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 af7c61eca..a647b1ed5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -86,7 +86,7 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean isPassable(IBlockAccess p_149655_1_, BlockPos pos) { + public boolean isPassable(IBlockAccess world, BlockPos pos) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 774f91a05..6bd123d34 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -82,7 +82,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index c69fc2482..2ba68987d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -123,7 +123,7 @@ public class TileCraftCrate extends TileOpenCrate { InventoryCrafting craft = new InventoryCrafting(new Container() { @Override - public boolean canInteractWith(@Nonnull EntityPlayer p_75145_1_) { + public boolean canInteractWith(@Nonnull EntityPlayer player) { return false; } }, 3, 3); 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 27c8c1b49..2103a5435 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -266,7 +266,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public boolean attackEntityFrom(@Nonnull DamageSource p_70097_1_, float p_70097_2_) { + public boolean attackEntityFrom(@Nonnull DamageSource source, float damage) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 9d2b7baf3..c030fe615 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -19,24 +19,24 @@ import java.util.Random; public class TileRedStringFertilizer extends TileRedString { - public boolean canGrow(World p_149851_1_, boolean p_149851_5_) { + public boolean canGrow(World world, boolean isClient) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).canGrow(p_149851_1_, binding, p_149851_1_.getBlockState(binding), p_149851_5_) : false; + return block instanceof IGrowable ? ((IGrowable) block).canGrow(world, binding, world.getBlockState(binding), isClient) : false; } - public boolean canUseBonemeal(World p_149852_1_, Random p_149852_2_) { + public boolean canUseBonemeal(World world, Random rand) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).canUseBonemeal(p_149852_1_, p_149852_2_, binding, p_149852_1_.getBlockState(binding)) : false; + return block instanceof IGrowable ? ((IGrowable) block).canUseBonemeal(world, rand, binding, world.getBlockState(binding)) : false; } - public void grow(World p_149853_1_, Random p_149853_2_) { + public void grow(World world, Random rand) { BlockPos binding = getBinding(); Block block = getBlockAtBinding(); if(block instanceof IGrowable) - ((IGrowable) block).grow(p_149853_1_, p_149853_2_, binding, p_149853_1_.getBlockState(binding)); + ((IGrowable) block).grow(world, rand, binding, world.getBlockState(binding)); } @Override diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index f6ca3a26c..c0f142445 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -33,7 +33,7 @@ public class CommandOpen extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return ""; } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 9a5b10846..10b187f99 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -29,7 +29,7 @@ public class CommandShare extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return ""; } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 89c94229d..c4d89764e 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -32,7 +32,7 @@ public class CommandSkyblockSpread extends CommandBase { @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender p_71518_1_) { + public String getCommandUsage(@Nonnull ICommandSender sender) { return " []"; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c9026e397..1614ad34b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -414,8 +414,8 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBoss { } @Override - public void onDeath(@Nonnull DamageSource p_70645_1_) { - super.onDeath(p_70645_1_); + public void onDeath(@Nonnull DamageSource source) { + super.onDeath(source); EntityLivingBase entitylivingbase = getAttackingEntity(); if(entitylivingbase instanceof EntityPlayer) { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianKill, 1); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 526cda76c..0a86083f2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -194,9 +194,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override @SideOnly(Side.CLIENT) - public void setPositionAndRotationDirect(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_, boolean p_70056_10) { - setPosition(p_70056_1_, p_70056_3_, p_70056_5_); - setRotation(p_70056_7_, p_70056_8_); + public void setPositionAndRotationDirect(double x, double y, double z, float yaw, float pitch, int posRotationIncrements, boolean teleport) { + setPosition(x, y, z); + setRotation(yaw, pitch); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 9e9586a53..5b9b0abe4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -33,8 +33,8 @@ public class EntityManaStorm extends Entity { public int burstsFired; public int deathTime; - public EntityManaStorm(World p_i1582_1_) { - super(p_i1582_1_); + public EntityManaStorm(World world) { + super(world); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 3e1b721ed..963754adb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -28,8 +28,8 @@ import java.util.Iterator; public class EntityPinkWither extends EntityWither { - public EntityPinkWither(World p_i1701_1_) { - super(p_i1701_1_); + public EntityPinkWither(World world) { + super(world); Iterator taskIter = this.tasks.taskEntries.iterator(); while (taskIter.hasNext()) { @@ -78,7 +78,7 @@ public class EntityPinkWither extends EntityWither { } @Override - protected void dropFewItems(boolean p_70628_1_, int p_70628_2_) { + protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 117e218f0..50c3f069d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -43,12 +43,12 @@ public class EntityPoolMinecart extends EntityMinecart { private static final String TAG_MANA = "mana"; private static final DataParameter MANA = EntityDataManager.createKey(EntityPoolMinecart.class, DataSerializers.VARINT); - public EntityPoolMinecart(World p_i1712_1_) { - super(p_i1712_1_); + public EntityPoolMinecart(World world) { + super(world); } - public EntityPoolMinecart(World p_i1715_1_, double p_i1715_2_, double p_i1715_4_, double p_i1715_6_) { - super(p_i1715_1_, p_i1715_2_, p_i1715_4_, p_i1715_6_); + public EntityPoolMinecart(World world, double x, double y, double z) { + super(world, x, y, z); } @Override @@ -81,8 +81,8 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - public void killMinecart(DamageSource p_94095_1_) { - super.killMinecart(p_94095_1_); + public void killMinecart(DamageSource source) { + super.killMinecart(source); dropItemWithOffset(Item.getItemFromBlock(ModBlocks.pool), 1, 0.0F); } @@ -167,15 +167,15 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - protected void writeEntityToNBT(@Nonnull NBTTagCompound p_70014_1_) { - super.writeEntityToNBT(p_70014_1_); - p_70014_1_.setInteger(TAG_MANA, getMana()); + protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { + super.writeEntityToNBT(cmp); + cmp.setInteger(TAG_MANA, getMana()); } @Override - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { - super.readEntityFromNBT(p_70037_1_); - setMana(p_70037_1_.getInteger(TAG_MANA)); + protected void readEntityFromNBT(NBTTagCompound cmp) { + super.readEntityFromNBT(cmp); + setMana(cmp.getInteger(TAG_MANA)); } public int getMana() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 4e802fd32..9a8b926f0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -31,9 +31,9 @@ public class EntityThrownItem extends EntityItem { super(par1World); } - public EntityThrownItem(World p_i1710_1_, double p_i1710_2_, - double p_i1710_4_, double p_i1710_6_, EntityItem item) { - super(p_i1710_1_, p_i1710_2_, p_i1710_4_, p_i1710_6_, item.getEntityItem()); + public EntityThrownItem(World world, double x, + double y, double z, EntityItem item) { + super(world, x, y, z, item.getEntityItem()); int pickupDelay = 0; try { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 4812eb2bb..3f6923860 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -135,7 +135,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public void onUpdate(ItemStack itemstack, World p_77663_2_, Entity entity, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(ItemStack itemstack, World world, Entity entity, int slot, boolean selected) { Block block = getBlock(itemstack); if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.AIR && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index c998c8aee..7134cb647 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -37,9 +37,9 @@ public class ItemManaCookie extends ItemFood { } @Override - protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, @Nonnull EntityPlayer p_77849_3_) { - super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_); - p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); + protected void onFoodEaten(ItemStack stack, World world, @Nonnull EntityPlayer player) { + super.onFoodEaten(stack, world, player); + player.addStat(ModAchievements.manaCookieEat, 1); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 60e487881..f2bc9d8f5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -64,8 +64,8 @@ public class ItemPinkinator extends ItemMod { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(I18n.format("botaniamisc.pinkinatorDesc")); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + tooltip.add(I18n.format("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index f123544ba..46bf17e79 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -41,18 +41,18 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin @Nonnull @Override - public EnumActionResult onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, BlockPos pos, EnumHand hand, 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_, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + if(BlockRailBase.isRailBlock(world.getBlockState(pos))) { + if(!world.isRemote) { + EntityMinecart entityminecart = new EntityPoolMinecart(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - if(p_77648_1_.hasDisplayName()) - entityminecart.setCustomNameTag(p_77648_1_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setCustomNameTag(stack.getDisplayName()); - p_77648_3_.spawnEntityInWorld(entityminecart); + world.spawnEntityInWorld(entityminecart); } - --p_77648_1_.stackSize; + --stack.stackSize; return EnumActionResult.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 88d896190..f09078471 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -68,21 +68,21 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return drinkSpeed; } @Nonnull @Override - public EnumAction getItemUseAction(ItemStack p_77661_1_) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.DRINK; } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { - p_77659_3_.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + player.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index c75ca1414..894592791 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -63,8 +63,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Nonnull @Override @SideOnly(Side.CLIENT) - public String getUnlocalizedName(ItemStack p_77667_1_) { - String name = super.getUnlocalizedName(p_77667_1_); + public String getUnlocalizedName(ItemStack stack) { + String name = super.getUnlocalizedName(stack); if(ClientProxy.jingleTheBells) name = name.replaceAll("manaweave", "santaweave"); return name; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 2a565ae3f..88a36b1a8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -79,30 +79,30 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS @Nonnull @Override - public EnumActionResult onItemUse(@Nonnull ItemStack p_77648_1_, EntityPlayer p_77648_2_, @Nonnull World p_77648_3_, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(!p_77648_2_.canPlayerEdit(pos, side, p_77648_1_)) + public EnumActionResult onItemUse(@Nonnull ItemStack stack, EntityPlayer player, @Nonnull World world, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ) { + if(!player.canPlayerEdit(pos, side, stack)) return EnumActionResult.PASS; else { - UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, pos); + UseHoeEvent event = new UseHoeEvent(player, stack, world, pos); if(MinecraftForge.EVENT_BUS.post(event)) return EnumActionResult.FAIL; if(event.getResult() == Result.ALLOW) { - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return EnumActionResult.SUCCESS; } - Block block = p_77648_3_.getBlockState(pos).getBlock(); + Block block = world.getBlockState(pos).getBlock(); - if(side != EnumFacing.DOWN && p_77648_3_.getBlockState(pos.up()).getBlock().isAir(p_77648_3_.getBlockState(pos.up()), p_77648_3_, pos.up()) && (block == Blocks.GRASS || block == Blocks.DIRT)) { + if(side != EnumFacing.DOWN && world.getBlockState(pos.up()).getBlock().isAir(world.getBlockState(pos.up()), world, pos.up()) && (block == Blocks.GRASS || block == Blocks.DIRT)) { Block block1 = Blocks.FARMLAND; - p_77648_3_.playSound(null, pos, block1.getSoundType().getStepSound(), SoundCategory.BLOCKS, (block1.getSoundType().getVolume() + 1.0F) / 2.0F, block1.getSoundType().getPitch() * 0.8F); + world.playSound(null, pos, block1.getSoundType().getStepSound(), SoundCategory.BLOCKS, (block1.getSoundType().getVolume() + 1.0F) / 2.0F, block1.getSoundType().getPitch() * 0.8F); - if (p_77648_3_.isRemote) + if (world.isRemote) return EnumActionResult.SUCCESS; else { - p_77648_3_.setBlockState(pos, block1.getDefaultState()); - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + world.setBlockState(pos, block1.getDefaultState()); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return EnumActionResult.SUCCESS; } } 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 8b55de12d..ccc913ce0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -63,14 +63,14 @@ public class ItemDye extends Item16Colors { } @Override - public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_, EnumHand hand) { - if(p_111207_3_ instanceof EntitySheep) { - EntitySheep entitysheep = (EntitySheep)p_111207_3_; - EnumDyeColor i = EnumDyeColor.byMetadata(p_111207_1_.getItemDamage()); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target, EnumHand hand) { + if(target instanceof EntitySheep) { + EntitySheep entitysheep = (EntitySheep)target; + EnumDyeColor i = EnumDyeColor.byMetadata(stack.getItemDamage()); if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { entitysheep.setFleeceColor(i); - --p_111207_1_.stackSize; + --stack.stackSize; } return true; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 21c2c041b..9cae941e0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -33,24 +33,24 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return 32; } @Nonnull @Override - public EnumAction getItemUseAction(ItemStack p_77661_1_) { - return isBoot(p_77661_1_) ? EnumAction.DRINK : EnumAction.EAT; + public EnumAction getItemUseAction(ItemStack stack) { + return isBoot(stack) ? EnumAction.DRINK : EnumAction.EAT; } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_, EnumHand hand) { - if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) { - p_77659_3_.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, p_77659_1_); + public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + if(player.canEat(false) && isRightPlayer(player, stack)) { + player.setActiveHand(hand); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, p_77659_1_); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 6762623b2..170a9cfe5 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -53,8 +53,8 @@ public class ItemRelic extends ItemMod implements IRelic { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); + public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + addBindInfo(tooltip, stack, player); } @SideOnly(Side.CLIENT) @@ -185,7 +185,7 @@ public class ItemRelic extends ItemMod implements IRelic { @Nonnull @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 977c7dabf..45235087f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -42,9 +42,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { - if(p_77663_3_ instanceof EntityPlayer) - dummy.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean held) { + if(entity instanceof EntityPlayer) + dummy.updateRelic(stack, (EntityPlayer) entity); } @Override @@ -111,7 +111,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { @Nonnull @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 369f03b31..86c56db08 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -60,7 +60,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity par3Entity, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(ItemStack stack, World world, Entity par3Entity, int slot, boolean held) { if(!(par3Entity instanceof EntityPlayer)) return;