diff --git a/src/main/java/vazkii/botania/client/gui/SlotLocked.java b/src/main/java/vazkii/botania/client/gui/SlotLocked.java index 72b7ccadd..a200c73c8 100644 --- a/src/main/java/vazkii/botania/client/gui/SlotLocked.java +++ b/src/main/java/vazkii/botania/client/gui/SlotLocked.java @@ -27,7 +27,7 @@ public class SlotLocked extends Slot { } @Override - public boolean isItemValid(ItemStack p_75214_1_) { + public boolean isItemValid(ItemStack stack) { return false; } diff --git a/src/main/java/vazkii/botania/client/gui/bags/ContainerMagicPlantBag.java b/src/main/java/vazkii/botania/client/gui/bags/ContainerMagicPlantBag.java index c0179d6d6..9e8ad12a3 100644 --- a/src/main/java/vazkii/botania/client/gui/bags/ContainerMagicPlantBag.java +++ b/src/main/java/vazkii/botania/client/gui/bags/ContainerMagicPlantBag.java @@ -51,15 +51,15 @@ public abstract class ContainerMagicPlantBag extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { + public ItemStack transferStackInSlot(EntityPlayer player, int index) { ItemStack itemstack = null; - Slot slot = (Slot)inventorySlots.get(p_82846_2_); + Slot slot = (Slot)inventorySlots.get(index); if(slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if(p_82846_2_ < 16) { + if(index < 16) { if(!mergeItemStack(itemstack1, 16, 52, true)) return null; } else { @@ -78,7 +78,7 @@ public abstract class ContainerMagicPlantBag extends Container { if(itemstack1.stackSize == itemstack.stackSize) return null; - slot.onPickupFromSlot(p_82846_1_, itemstack1); + slot.onPickupFromSlot(player, itemstack1); } return itemstack; diff --git a/src/main/java/vazkii/botania/client/gui/bags/GuiMagicPlantBag.java b/src/main/java/vazkii/botania/client/gui/bags/GuiMagicPlantBag.java index 92c65bce7..b3d174773 100644 --- a/src/main/java/vazkii/botania/client/gui/bags/GuiMagicPlantBag.java +++ b/src/main/java/vazkii/botania/client/gui/bags/GuiMagicPlantBag.java @@ -24,14 +24,14 @@ public abstract class GuiMagicPlantBag extends GuiContainer { } @Override - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { String s = StatCollector.translateToLocal(getLocalizedNameKey()); fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752); fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(texture); int k = (width - xSize) / 2; @@ -55,7 +55,7 @@ public abstract class GuiMagicPlantBag extends GuiContainer { } @Override - protected boolean checkHotbarKeys(int p_146983_1_) { + protected boolean checkHotbarKeys(int keyCode) { return false; } diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 24d54be75..dbcf42ddd 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -89,16 +89,16 @@ public class ContainerBaubleBox extends Container { } @Override - public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { + public ItemStack transferStackInSlot(EntityPlayer player, int index) { ItemStack itemstack = null; - Slot slot = (Slot)inventorySlots.get(p_82846_2_); + Slot slot = (Slot)inventorySlots.get(index); if(slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - System.out.println(p_82846_2_ + " " + itemstack); - if(p_82846_2_ < 28) { + System.out.println(index + " " + itemstack); + if(index < 28) { if(!mergeItemStack(itemstack1, 28, 64, true)) return null; } else { @@ -113,7 +113,7 @@ public class ContainerBaubleBox extends Container { if(itemstack1.stackSize == itemstack.stackSize) return null; - slot.onPickupFromSlot(p_82846_1_, itemstack1); + slot.onPickupFromSlot(player, itemstack1); } return itemstack; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 798a95373..37a1220f9 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -29,12 +29,12 @@ public class GuiBaubleBox extends InventoryEffectRenderer { } @Override - protected boolean checkHotbarKeys(int p_146983_1_) { + protected boolean checkHotbarKeys(int keyCode) { return false; } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(texture); int k = (width - xSize) / 2; @@ -47,7 +47,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer { drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16); } - GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - p_146976_2_, guiTop + 45 - 30 - p_146976_3_, mc.thePlayer); + GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer); } } diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index e335f5229..334da13da 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -57,7 +57,7 @@ public class ContainerCraftingHalo extends ContainerWorkbench { } @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { + public boolean canInteractWith(EntityPlayer player) { return true; } } diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index fbc503ff6..3f5d8ccf5 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -28,13 +28,13 @@ public class GuiCraftingHalo extends GuiContainer { } @Override - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752); fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(craftingTableGuiTextures); int k = (width - xSize) / 2; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index b352679b9..5b331198f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -17,13 +17,13 @@ import net.minecraft.util.ResourceLocation; public class GuiButtonLexicon extends GuiButton { - public GuiButtonLexicon(int p_i1021_1_, int p_i1021_2_, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) { - super(p_i1021_1_, p_i1021_2_, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_); + public GuiButtonLexicon(int stateName, int id, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) { + super(stateName, id, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_); } @Override - public void func_146113_a(SoundHandler p_146113_1_) { - p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F)); + public void func_146113_a(SoundHandler soundHandlerIn) { + soundHandlerIn.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F)); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 4fa921ada..762368870 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -39,10 +39,10 @@ public class BlockAlfPortal extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconOff = IconHelper.forBlock(par1IconRegister, this, 0); - iconOn = IconHelper.forBlock(par1IconRegister, this, 1); - portalTex = IconHelper.forBlock(par1IconRegister, this, "Inside"); + public void registerBlockIcons(IIconRegister register) { + iconOff = IconHelper.forBlock(register, this, 0); + iconOn = IconHelper.forBlock(register, this, 1); + portalTex = IconHelper.forBlock(register, this, "Inside"); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 9c11f5df1..c9afd73b2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -56,9 +56,9 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -73,10 +73,10 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[SUBTYPES * 2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override @@ -102,8 +102,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + public Item getItemDropped(int meta, Random random, int fortune) { + return Blocks.dirt.getItemDropped(0, random, fortune); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 9893f9b60..ec6c833ec 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -65,7 +65,7 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -75,9 +75,9 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -87,11 +87,11 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { - if(par5Entity instanceof EntityItem) { - TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4); + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity collider) { + if(collider instanceof EntityItem) { + TileAltar tile = (TileAltar) world.getTileEntity(x, y, z); if (tile == null) return; - if(tile.collideEntityItem((EntityItem) par5Entity)) + if(tile.collideEntityItem((EntityItem) collider)) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } } @@ -104,61 +104,61 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); - TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + ItemStack stack = player.getCurrentEquippedItem(); + TileAltar tile = (TileAltar) world.getTileEntity(x, y, z); if (tile == null) return false; - if(par5EntityPlayer.isSneaking()) { + if(player.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = tile.getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + if(!player.inventory.addItemStackToInventory(copy)) + player.dropPlayerItemWithRandomChoice(copy, false); tile.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); break; } } } else if(tile.isEmpty() && tile.hasWater && stack == null) - tile.trySetLastRecipe(par5EntityPlayer); + tile.trySetLastRecipe(player); else { - if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, false))) { + if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { if(!tile.hasWater) { if(stack.getItem() == ModItems.waterRod) - ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, true); - else if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); + ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); + else if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); tile.setWater(true); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); } return true; } else if(stack != null && stack.getItem() == Items.lava_bucket) { - if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack)); tile.setLava(true); tile.setWater(false); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); return true; } else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { ItemStack bucket = tile.hasLava ? new ItemStack(Items.lava_bucket) : new ItemStack(Items.water_bucket); if(stack.stackSize == 1) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket); + player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket); else { - if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false); + if(!player.inventory.addItemStackToInventory(bucket)) + player.dropPlayerItemWithRandomChoice(bucket, false); stack.stackSize--; } if(tile.hasLava) tile.setLava(false); else tile.setWater(false); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); return true; } @@ -212,8 +212,8 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public IIcon getIcon(int par1, int par2) { - return par2 == 0 ? Blocks.cobblestone.getIcon(par1, par2) : ModFluffBlocks.biomeStoneA.getIcon(par1, par2 + 7); + public IIcon getIcon(int side, int meta) { + return meta == 0 ? Blocks.cobblestone.getIcon(side, meta) : ModFluffBlocks.biomeStoneA.getIcon(side, meta + 7); } @Override @@ -237,8 +237,8 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -249,14 +249,14 @@ public class BlockAltar extends BlockModContainer implements ILexicon float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -268,10 +268,10 @@ public class BlockAltar extends BlockModContainer implements ILexicon } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override @@ -280,8 +280,8 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileAltar altar = (TileAltar) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileAltar altar = (TileAltar) world.getTileEntity(x, y, z); if (altar == null) return 0; return altar.hasWater ? 15 : 0; } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 6f696acf2..d2be226ae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -91,8 +91,8 @@ public class BlockAvatar extends BlockModContainer implements ILexic } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -103,14 +103,14 @@ public class BlockAvatar extends BlockModContainer implements ILexic float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -122,16 +122,16 @@ public class BlockAvatar extends BlockModContainer implements ILexic } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2); } @Override @@ -140,7 +140,7 @@ public class BlockAvatar extends BlockModContainer implements ILexic } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 37b8014bf..ff4f68003 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -61,15 +61,15 @@ public class BlockBifrost extends BlockModContainer implements ILex return new ItemStack(ModItems.rainbowRod); } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) { + Block block = worldIn.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + return shouldSideBeRendered1(worldIn, x, y, z, 1 - side); } @Override @@ -93,7 +93,7 @@ public class BlockBifrost extends BlockModContainer implements ILex @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 49eb55010..d8b5e52e1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -44,7 +44,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -53,15 +53,15 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) { + Block block = worldIn.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + return shouldSideBeRendered1(worldIn, x, y, z, 1 - side); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index aaf9a7573..737eb71b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -72,9 +72,9 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if(!player.capabilities.isCreativeMode) + dropBlockAsItem(world, x, y, z, meta, 0); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 968d83492..8beab868b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -31,8 +31,8 @@ public abstract class BlockCamo extends BlockModContainer { static List validRenderTypes = Arrays.asList(0, 31, 39); - protected BlockCamo(Material par2Material) { - super(par2Material); + protected BlockCamo(Material material) { + super(material); } @Override @@ -59,12 +59,12 @@ public abstract class BlockCamo extends BlockModContainer { } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileEntity tile = world.getTileEntity(x, y, z); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - ItemStack currentStack = par5EntityPlayer.getCurrentEquippedItem(); + ItemStack currentStack = player.getCurrentEquippedItem(); if(currentStack == null) currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0); @@ -87,7 +87,7 @@ public abstract class BlockCamo extends BlockModContainer { if(doChange && currentStack.getItem() != null) { int metadata = currentStack.getItemDamage(); if(block instanceof BlockDirectional) { - switch (par6) { + switch (side) { case 0: case 1: break; @@ -107,7 +107,7 @@ public abstract class BlockCamo extends BlockModContainer { } camo.camo = Block.getBlockFromItem(currentStack.getItem()); camo.camoMeta = metadata; - par1World.markBlockForUpdate(par2,par3,par4); + world.markBlockForUpdate(x,y,z); return true; } @@ -128,8 +128,8 @@ public abstract class BlockCamo extends BlockModContainer { @Override @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess par1World, int par2, int par3, int par4) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) { + TileEntity tile = worldIn.getTileEntity(x, y, z); if(tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; Block block = camo.camo; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 5f090fcd8..57846c0da 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -41,12 +41,12 @@ public class BlockCocoon extends BlockModContainer implements ILexic } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + public IIcon getIcon(int side, int meta) { return Blocks.web.getBlockTextureFromSide(0); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 09a0fd47a..2fd8e89cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -55,7 +55,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -79,8 +79,8 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); + public Item getItemDropped(int meta, Random random, int fortune) { + return Blocks.dirt.getItemDropped(0, random, fortune); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 2de1fb3fb..af3007676 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -37,9 +37,9 @@ public class BlockEnderEye extends BlockModContainer implements IL } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconOff = IconHelper.forBlock(par1IconRegister, this, 0); - iconOn = IconHelper.forBlock(par1IconRegister, this, 1); + public void registerBlockIcons(IIconRegister register) { + iconOff = IconHelper.forBlock(register, this, 0); + iconOn = IconHelper.forBlock(register, this, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index f6814ef51..1488cb5ee 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -51,7 +51,7 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 4; } @@ -76,7 +76,7 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public boolean canCollideCheck(int par1, boolean par2) { + public boolean canCollideCheck(int meta, boolean includeLiquid) { return false; } @@ -86,7 +86,7 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public boolean canDropFromExplosion(Explosion par1Explosion) { + public boolean canDropFromExplosion(Explosion explosion) { return false; } @@ -96,7 +96,7 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index b429f4708..3764ed913 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -49,38 +49,38 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return p_149691_1_ == 1 ? top : p_149691_1_ == 0 ? top : p_149691_2_ == 2 && p_149691_1_ == 2 ? face : p_149691_2_ == 3 && p_149691_1_ == 5 ? face : p_149691_2_ == 0 && p_149691_1_ == 3 ? face : p_149691_2_ == 1 && p_149691_1_ == 4 ? face : blockIcon; + public IIcon getIcon(int side, int meta) { + return side == 1 ? top : side == 0 ? top : meta == 2 && side == 2 ? face : meta == 3 && side == 5 ? face : meta == 0 && side == 3 ? face : meta == 1 && side == 4 ? face : blockIcon; } @Override - public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) { - super.onBlockAdded(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_); + public void onBlockAdded(World world, int x, int y, int z) { + super.onBlockAdded(world, x, y, z); - if(!p_149726_1_.isRemote && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_) == Blocks.iron_bars && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_) == Blocks.iron_bars) { - p_149726_1_.setBlock(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0), 0, 2); - p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0), 0, 2); - p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0), 0, 2); - EntityBlaze blaze = new EntityBlaze(p_149726_1_); - blaze.setLocationAndAngles(p_149726_2_ + 0.5D, p_149726_3_ - 1.95D, p_149726_4_ + 0.5D, 0.0F, 0.0F); + if(!world.isRemote && world.getBlock(x, y - 1, z) == Blocks.iron_bars && world.getBlock(x, y - 2, z) == Blocks.iron_bars) { + world.setBlock(x, y, z, getBlockById(0), 0, 2); + world.setBlock(x, y - 1, z, getBlockById(0), 0, 2); + world.setBlock(x, y - 2, z, getBlockById(0), 0, 2); + EntityBlaze blaze = new EntityBlaze(world); + blaze.setLocationAndAngles(x + 0.5D, y - 1.95D, z + 0.5D, 0.0F, 0.0F); blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true); - p_149726_1_.spawnEntityInWorld(blaze); - p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0)); - p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0)); - p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0)); + world.spawnEntityInWorld(blaze); + world.notifyBlockChange(x, y, z, getBlockById(0)); + world.notifyBlockChange(x, y - 1, z, getBlockById(0)); + world.notifyBlockChange(x, y - 2, z, getBlockById(0)); } } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 2.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, l, 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 2.5D) & 3; + world.setBlockMetadataWithNotify(x, y, z, l, 2); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) { - face = IconHelper.forBlock(p_149651_1_, this); + public void registerBlockIcons(IIconRegister register) { + face = IconHelper.forBlock(register, this); top = Blocks.pumpkin.getIcon(0, 0); blockIcon = Blocks.pumpkin.getIcon(2, 0); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 2b49a3703..e9eaff31b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -87,7 +87,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { + public void randomDisplayTick(World world, int x, int y, int z, Random random) { // NO-OP } @@ -107,10 +107,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); - ((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if(!player.capabilities.isCreativeMode) { + dropBlockAsItem(world, x, y, z, meta, 0); + ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockHarvested(world, x, y, z, meta, player); } } @@ -129,10 +129,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventData) { + super.onBlockEventReceived(world, x, y, z, eventId, eventData); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null ? tileentity.receiveClientEvent(eventId, eventData) : false; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 0434b85cf..b1be0d59e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -37,15 +37,15 @@ public class BlockForestEye extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[6]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(icons.length - 1, side)]; } @Override @@ -64,8 +64,8 @@ public class BlockForestEye extends BlockModContainer implements } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileForestEye eye = (TileForestEye) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileForestEye eye = (TileForestEye) world.getTileEntity(x, y, z); return Math.min(15, Math.max(0, eye.entities - 1)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 6200f9e1c..cf87362fb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -39,29 +39,29 @@ public class BlockGaiaHead extends BlockSkull { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + return super.setBlockName(name); } @Override @SideOnly(Side.CLIENT) - public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) { + public Item getItem(World world, int x, int y, int z) { return ModItems.gaiaHead; } @Override - public void registerBlockIcons(IIconRegister p_149651_1_) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public ArrayList getDrops(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, int p_149749_6_, int fortune) { + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { ArrayList ret = new ArrayList<>(); - if((p_149749_6_ & 8) == 0) { + if((meta & 8) == 0) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); - TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(x, y, z); if(tileentityskull == null) return ret; @@ -72,29 +72,29 @@ public class BlockGaiaHead extends BlockSkull { } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return ModItems.gaiaHead; } @Override - public int getDamageValue(World p_149643_1_, int p_149643_2_, int p_149643_3_, int p_149643_4_) { + public int getDamageValue(World world, int x, int y, int z) { return 0; } @Override - public int damageDropped(int p_149692_1_) { + public int damageDropped(int meta) { return 0; } @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + public TileEntity createNewTileEntity(World world, int meta) { return new TileGaiaHead(); } @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - return Blocks.coal_block.getBlockTextureFromSide(p_149691_1_); + public IIcon getIcon(int side, int meta) { + return Blocks.coal_block.getBlockTextureFromSide(side); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index a8e168323..3042adc7c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -43,15 +43,15 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + return super.setBlockName(name); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); + public void registerBlockIcons(IIconRegister register) { + blockIcon = IconHelper.forBlock(register, this); } public void onMinecartUpdate(MinecartUpdateEvent event) { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 9c16f4811..f7b024918 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -109,8 +109,8 @@ public class BlockHourglass extends BlockModContainer implements } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -121,14 +121,14 @@ public class BlockHourglass extends BlockModContainer implements float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -140,19 +140,19 @@ public class BlockHourglass extends BlockModContainer implements } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + public IIcon getIcon(int side, int meta) { return ModBlocks.manaGlass.getIcon(0, 0); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 0b27be55f..3c4dec184 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -79,9 +79,9 @@ public class BlockIncensePlate extends BlockModContainer imple } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2); } @Override @@ -116,12 +116,12 @@ public class BlockIncensePlate extends BlockModContainer imple } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { + public IIcon getIcon(int side, int meta) { return ModBlocks.livingwood.getIcon(0, 0); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index a7bca40f6..19d3d451b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -53,7 +53,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { 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 6300b09d9..62e4c1432 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -47,9 +47,9 @@ public class BlockLightRelay extends BlockModContainer implement } @Override - public Block setBlockName(String par1Str) { - register(par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + register(name); + return super.setBlockName(name); } void register(String name) { @@ -73,7 +73,7 @@ public class BlockLightRelay extends BlockModContainer implement } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { return false; } @@ -84,12 +84,12 @@ public class BlockLightRelay extends BlockModContainer implement } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @Override - public int tickRate(World p_149738_1_) { + public int tickRate(World world) { return 2; } @@ -110,11 +110,11 @@ public class BlockLightRelay extends BlockModContainer implement } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forBlock(par1IconRegister, this, 0); - worldIcon = IconHelper.forBlock(par1IconRegister, this, 1); - invIconRed = IconHelper.forBlock(par1IconRegister, this, 2); - worldIconRed = IconHelper.forBlock(par1IconRegister, this, 3); + public void registerBlockIcons(IIconRegister register) { + invIcon = IconHelper.forBlock(register, this, 0); + worldIcon = IconHelper.forBlock(register, this, 1); + invIconRed = IconHelper.forBlock(register, this, 2); + worldIconRed = IconHelper.forBlock(register, this, 3); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index bfd414102..fadb89922 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -49,14 +49,14 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -66,15 +66,15 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[TYPES]; for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(TYPES - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index a6889635b..1cac239a8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -53,14 +53,14 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - register(par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + register(name); + return super.setBlockName(name); } void register(String name) { @@ -74,15 +74,15 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[TYPES]; for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(TYPES - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 89efdab64..d5d254493 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -29,17 +29,17 @@ public class BlockMod extends Block { public int originalLight; - public BlockMod(Material par2Material) { - super(par2Material); + public BlockMod(Material material) { + super(material); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } @Override - public Block setBlockName(String par1Str) { + public Block setBlockName(String name) { if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemCubeMod.class, par1Str); - return super.setBlockName(par1Str); + GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemCubeMod.class, name); + return super.setBlockName(name); } protected boolean shouldRegisterInNameSet() { @@ -47,15 +47,15 @@ public class BlockMod extends Block { } @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); + public Block setLightLevel(float value) { + originalLight = (int) (value * 15); + return super.setLightLevel(value); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); + public void registerBlockIcons(IIconRegister register) { + blockIcon = IconHelper.forBlock(register, this); } boolean registerInCreative() { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index d8085a654..ab0461b5b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -30,17 +30,17 @@ public abstract class BlockModContainer extends BlockConta public int originalLight; - protected BlockModContainer(Material par2Material) { - super(par2Material); + protected BlockModContainer(Material material) { + super(material); if(registerInCreative()) setCreativeTab(BotaniaCreativeTab.INSTANCE); } @Override - public Block setBlockName(String par1Str) { + public Block setBlockName(String name) { if(shouldRegisterInNameSet()) - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + return super.setBlockName(name); } protected boolean shouldRegisterInNameSet() { @@ -48,15 +48,15 @@ public abstract class BlockModContainer extends BlockConta } @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); + public Block setLightLevel(float value) { + originalLight = (int) (value * 15); + return super.setLightLevel(value); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this); + public void registerBlockIcons(IIconRegister register) { + blockIcon = IconHelper.forBlock(register, this); } public boolean registerInCreative() { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 4c42c2f73..d177b074e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -64,20 +64,20 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public Block setBlockName(String par1Str) { - if(!par1Str.equals("doublePlant")) - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + if(!name.equals("doublePlant")) + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return null; } @Override - public int damageDropped(int p_149692_1_) { - return p_149692_1_ & 7; + public int damageDropped(int meta) { + return meta & 7; } @Override @@ -87,74 +87,74 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) { - p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_); - p_149889_1_.setBlock(p_149889_2_, p_149889_3_ + 1, p_149889_4_, this, p_149889_5_ | 8, p_149889_6_); + public void func_149889_c(World world, int x, int y, int z, int baseMeta, int flags) { + world.setBlock(x, y, z, this, baseMeta, flags); + world.setBlock(x, y + 1, z, this, baseMeta | 8, flags); } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, p_149689_6_.getItemDamage() | 8, 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + world.setBlock(x, y + 1, z, this, itemIn.getItemDamage() | 8, 2); } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { return false; } @Override - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) { - if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(p_149636_6_)) - harvestBlockCopy(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_); + public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { + if(world.isRemote || player.getCurrentEquippedItem() == null || player.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(meta)) + harvestBlockCopy(world, player, x, y, z, meta); } // This is how I get around encapsulation - public void harvestBlockCopy(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) { - p_149636_2_.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1); - p_149636_2_.addExhaustion(0.025F); + public void harvestBlockCopy(World world, EntityPlayer player, int x, int y, int z, int meta) { + player.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1); + player.addExhaustion(0.025F); - if(this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) { + if(this.canSilkHarvest(world, player, x, y, z, meta) && EnchantmentHelper.getSilkTouchModifier(player)) { ArrayList items = new ArrayList<>(); - ItemStack itemstack = createStackedBlock(p_149636_6_); + ItemStack itemstack = createStackedBlock(meta); if(itemstack != null) items.add(itemstack); - ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_); + ForgeEventFactory.fireBlockHarvesting(items, world, this, x, y, z, meta, 0, 1.0f, true, player); for(ItemStack is : items) - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is); + this.dropBlockAsItem(world, x, y, z, is); } else { - harvesters.set(p_149636_2_); - int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_); - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1); + harvesters.set(player); + int i1 = EnchantmentHelper.getFortuneModifier(player); + this.dropBlockAsItem(world, x, y, z, meta, i1); harvesters.set(null); } } @Override - public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) { - if(func_149887_c(p_149681_5_)) { - if(p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) { - if(!p_149681_6_.capabilities.isCreativeMode) { - int i1 = p_149681_1_.getBlockMetadata(p_149681_2_, p_149681_3_ - 1, p_149681_4_); + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if(func_149887_c(meta)) { + if(world.getBlock(x, y - 1, z) == this) { + if(!player.capabilities.isCreativeMode) { + int i1 = world.getBlockMetadata(x, y - 1, z); int j1 = func_149890_d(i1); if(j1 != 3 && j1 != 2); - //p_149681_1_.func_147480_a(p_149681_2_, p_149681_3_ - 1, p_149681_4_, true); + //world.func_147480_a(x, y - 1, z, true); else { - /*if (!p_149681_1_.isRemote && p_149681_6_.getCurrentEquippedItem() != null && p_149681_6_.getCurrentEquippedItem().getItem() == Items.shears) + /*if (!world.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears) { - this.func_149886_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, i1, p_149681_6_); + this.func_149886_b(world, x, y, z, i1, player); }*/ - p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); + world.setBlockToAir(x, y - 1, z); } - } else p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_); + } else world.setBlockToAir(x, y - 1, z); } - } else if(p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_) == this) - p_149681_1_.setBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_, Blocks.air, 0, 2); + } else if(player.capabilities.isCreativeMode && world.getBlock(x, y + 1, z) == this) + world.setBlock(x, y + 1, z, Blocks.air, 0, 2); - //super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_); + //super.onBlockHarvested(world, x, y, z, meta, player); } @Override @@ -175,9 +175,9 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public IIcon getIcon(int p_149691_1_, int p_149691_2_) { - boolean top = func_149887_c(p_149691_2_); - return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[p_149691_2_ & 7]; + public IIcon getIcon(int side, int meta) { + boolean top = func_149887_c(meta); + return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[meta & 7]; } @Override @@ -222,12 +222,12 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + int meta = world.getBlockMetadata(x, y, z); float[] color = EntitySheep.fleeceColorTable[offset(meta & 7)]; - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + if(random.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 1e6528749..a4beb21b3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -76,32 +76,32 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[17]; iconsAlt = new IIcon[17]; for(int i = 0; i < icons.length; i++) { - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - iconsAlt[i] = IconHelper.forBlock(par1IconRegister, this, i, ALT_DIR); + icons[i] = IconHelper.forBlock(register, this, i); + iconsAlt[i] = IconHelper.forBlock(register, this, i, ALT_DIR); } } @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); + public Block setLightLevel(float value) { + originalLight = (int) (value * 15); + return super.setLightLevel(value); } @Override - public IIcon getIcon(int par1, int par2) { - return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, meta)]; } @Override @@ -110,17 +110,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + int meta = world.getBlockMetadata(x, y, z); float[] color = EntitySheep.fleeceColorTable[meta]; - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + if(random.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5); } @Override @@ -134,7 +134,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { return world.isAirBlock(x, y + 1, z); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 88247c5ba..cb336d7db 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -75,9 +75,9 @@ public class BlockOpenCrate extends BlockModContainer implements } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -98,14 +98,14 @@ public class BlockOpenCrate extends BlockModContainer implements } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(x, y, z); return crate.getSignal(); } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -116,14 +116,14 @@ public class BlockOpenCrate extends BlockModContainer implements float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -135,22 +135,22 @@ public class BlockOpenCrate extends BlockModContainer implements } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconSide = IconHelper.forBlock(par1IconRegister, this, 0); - iconBottom = IconHelper.forBlock(par1IconRegister, this, 1); - iconSideCraft = IconHelper.forBlock(par1IconRegister, this, 2); - iconBottomCraft = IconHelper.forBlock(par1IconRegister, this, 3); + public void registerBlockIcons(IIconRegister register) { + iconSide = IconHelper.forBlock(register, this, 0); + iconBottom = IconHelper.forBlock(register, this, 1); + iconSideCraft = IconHelper.forBlock(register, this, 2); + iconBottomCraft = IconHelper.forBlock(register, this, 3); sidePatternIcons = new IIcon[TileCraftCrate.PATTERNS.length]; for(int i = 0; i < sidePatternIcons.length; i++) - sidePatternIcons[i] = IconHelper.forName(par1IconRegister, "ocPattern" + i); + sidePatternIcons[i] = IconHelper.forName(register, "ocPattern" + i); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 916a63c37..884b2bcb0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -76,8 +76,8 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - mapCoords(par1World.provider.dimensionId, par2, par3, par4, 2); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + mapCoords(world.provider.dimensionId, x, y, z, 2); } public static String getCoordsAsString(int world, int x, int y, int z) { diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 505a96727..7cfeeee8a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -53,14 +53,14 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -70,15 +70,15 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(SUBTYPES - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(SUBTYPES - 1, meta)]; } @Override @@ -89,9 +89,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public float getBlockHardness(World par1World, int par2, int par3, int par4) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - return meta == 2 ? -1F : super.getBlockHardness(par1World, par2, par3, par4); + public float getBlockHardness(World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + return meta == 2 ? -1F : super.getBlockHardness(world, x, y, z); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 4b4fa1ecc..a148f0c3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -53,19 +53,19 @@ public class BlockPylon extends BlockModContainer implements ILexicon } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override @@ -75,8 +75,8 @@ public class BlockPylon extends BlockModContainer implements ILexicon } @Override - public IIcon getIcon(int par1, int par2) { - return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, par2); + public IIcon getIcon(int side, int meta) { + return meta == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, meta); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 4a5810bfe..5c0313152 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -34,12 +34,12 @@ public class BlockRoot extends BlockMod implements ILexiconable { @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return ModItems.manaResource; } @Override - public int damageDropped(int p_149692_1_) { + public int damageDropped(int meta) { 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 f75af748e..82a17bd98 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -45,14 +45,14 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + public void updateTick(World world, int x, int y, int z, Random random) { // NO-OP } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + return super.setBlockName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 9af5b9853..f39f6e3df 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -58,20 +58,20 @@ public class BlockSparkChanger extends BlockModContainer imple } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { return false; } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[3]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(2, side)]; } @Override @@ -115,8 +115,8 @@ public class BlockSparkChanger extends BlockModContainer imple } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -127,14 +127,14 @@ public class BlockSparkChanger extends BlockModContainer imple float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -146,10 +146,10 @@ public class BlockSparkChanger extends BlockModContainer imple } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index ed8c87dcd..87c1e9e3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -154,9 +154,9 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, name); + return super.setBlockName(name); } @Override @@ -169,10 +169,10 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { for(String s : BotaniaAPI.getAllSubTiles()) if(!s.isEmpty()) - BotaniaAPI.getSignatureForName(s).registerIcons(par1IconRegister); + BotaniaAPI.getSignatureForName(s).registerIcons(register); } @Override @@ -198,10 +198,10 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) { - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); - ((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if(!player.capabilities.isCreativeMode) { + dropBlockAsItem(world, x, y, z, meta, 0); + ((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockHarvested(world, x, y, z, meta, player); } } @@ -220,10 +220,10 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { - super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); - TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); - return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; + public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventData) { + super.onBlockEventReceived(world, x, y, z, eventId, eventData); + TileEntity tileentity = world.getTileEntity(x, y, z); + return tileentity != null ? tileentity.receiveClientEvent(eventId, eventData) : false; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 911975772..74fefa2ba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -53,9 +53,9 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockStorage.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockStorage.class, name); + return super.setBlockName(name); } @Override @@ -70,15 +70,15 @@ public class BlockStorage extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index f8fb0e677..80a365db2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -96,7 +96,7 @@ public class BlockTeruTeruBozu extends BlockModContainer imple } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 4be814d28..3657ce6f7 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -39,8 +39,8 @@ public abstract class BlockCorporeaBase extends BlockModContainer 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -70,10 +70,10 @@ public abstract class BlockCorporeaBase extends BlockModContainer 1 ? 1 : 0]; + public IIcon getIcon(int side, int meta) { + return icons[side > 1 ? 1 : 0]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index f2f604cc5..8ad6c53f1 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -44,7 +44,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index b8c18f027..d49437449 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -38,15 +38,15 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 > 1 ? 1 : 0]; + public IIcon getIcon(int side, int meta) { + return icons[side > 1 ? 1 : 0]; } @Override @@ -65,7 +65,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/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 4dab0fd68..46db57d26 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -44,8 +44,9 @@ public class BlockCorporeaRetainer extends BlockModContainer implements I } @Override - public Block setBlockName(String par1Str) { - register(par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + register(name); + return super.setBlockName(name); } protected void register(String name) { @@ -85,16 +85,16 @@ public class BlockFloatingFlower extends BlockModContainer implements I } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + int meta = world.getBlockMetadata(x, y, z); float[] color = EntitySheep.fleeceColorTable[meta]; - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + if(random.nextDouble() < ConfigHandler.flowerParticleFrequency) + Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -105,8 +105,8 @@ public class BlockFloatingFlower extends BlockModContainer implements I } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override @@ -120,8 +120,8 @@ public class BlockFloatingFlower extends BlockModContainer implements I } @Override - public IIcon getIcon(int par1, int par2) { - return Blocks.dirt.getIcon(par1, par2); + public IIcon getIcon(int side, int meta) { + return Blocks.dirt.getIcon(side, meta); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 423b9883e..6941c8769 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -49,15 +49,15 @@ public class BlockManaBeacon extends BlockModContainer implement } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < 2; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par1 == 1 ? 1 : 0]; + public IIcon getIcon(int side, int meta) { + return icons[side == 1 ? 1 : 0]; } @Override @@ -67,9 +67,9 @@ public class BlockManaBeacon extends BlockModContainer implement } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -88,19 +88,19 @@ public class BlockManaBeacon extends BlockModContainer implement } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; + public int getRenderColor(int meta) { + float[] color = EntitySheep.fleeceColorTable[meta]; return new Color(color[0], color[1], color[2]).getRGB(); } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) { + return getRenderColor(worldIn.getBlockMetadata(x, y, z)); } @Override 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 148b028e1..e0794273d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -55,7 +55,7 @@ public class BlockManaFlame extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -75,17 +75,17 @@ public class BlockManaFlame extends BlockModContainer implements } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { return true; } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float subX, float subY, float subZ) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index b38cc8e33..bd0c835c7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -41,15 +41,15 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { return false; } - public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) { + Block block = worldIn.getBlock(x, y, z); - return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side); } @Override - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) { - return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); + public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) { + return shouldSideBeRendered1(worldIn, x, y, z, 1 - side); } @Override 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 ecc6c7c5c..c3024dea7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -60,15 +60,15 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { + public void updateTick(World world, int x, int y, int z, Random random) { // NO-OP, to prevent spreading } @Override - public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) { - if(p_149718_3_ >= 0 && p_149718_3_ < 256) { - Block block = p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_); - return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockMetadata(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this); + public boolean canBlockStay(World world, int x, int y, int z) { + if(y >= 0 && y < 256) { + Block block = world.getBlock(x, y - 1, z); + return block == Blocks.mycelium || block == Blocks.dirt && world.getBlockMetadata(x, y - 1, z) == 2 || block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); } return false; @@ -81,24 +81,24 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[16]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public Block setLightLevel(float p_149715_1_) { - originalLight = (int) (p_149715_1_ * 15); - return super.setLightLevel(p_149715_1_); + public Block setLightLevel(float value) { + originalLight = (int) (value * 15); + return super.setLightLevel(value); } @Override @@ -108,22 +108,22 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public IIcon getIcon(int par1, int par2) { - return icons[par2]; + public IIcon getIcon(int side, int meta) { + return icons[meta]; } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int meta = par1World.getBlockMetadata(par2, par3, par4); + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + int meta = world.getBlockMetadata(x, y, z); float[] color = EntitySheep.fleeceColorTable[meta]; - if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) - Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5); + if(random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F) + Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 000ce1e52..bfe51a10b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -48,14 +48,14 @@ public class BlockPavement extends BlockMod { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -66,15 +66,15 @@ public class BlockPavement extends BlockMod { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[TYPES]; for(int i = 0; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(TYPES - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 275894956..718337295 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -51,9 +51,9 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 6b26bf560..0c981eb48 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -58,14 +58,14 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -76,10 +76,10 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[TYPES]; for(int i = 1; i < TYPES; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @SideOnly(Side.CLIENT) @@ -92,8 +92,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(TYPES - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(TYPES - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java index 4bc2d8c72..f99c1319b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockReeds.java @@ -43,16 +43,16 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable { @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeMod.class, name); + return super.setBlockName(name); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - topIcon = IconHelper.forBlock(par1IconRegister, this, 1); + public void registerBlockIcons(IIconRegister register) { + blockIcon = IconHelper.forBlock(register, this, 0); + topIcon = IconHelper.forBlock(register, this, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java index 47d5fd30c..5f16f9a1e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java @@ -50,7 +50,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java index f13935a5c..45da6911c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java @@ -49,7 +49,7 @@ public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 7ec379792..ef39a82bc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -55,8 +55,8 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public IIcon getIcon(int par1, int par2) { - return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, meta)]; } @Override @@ -65,7 +65,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { + public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index 21f071cdf..32e0fb674 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -39,15 +39,15 @@ public class BlockStarfield extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[3]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(2, side)]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index cabc92766..8b48a3ff1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -45,9 +45,9 @@ public class BlockTinyPotato extends BlockModContainer implement } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, name); + return super.setBlockName(name); } @Override @@ -56,7 +56,7 @@ public class BlockTinyPotato extends BlockModContainer implement } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -66,29 +66,29 @@ public class BlockTinyPotato extends BlockModContainer implement } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileEntity tile = world.getTileEntity(x, y, z); if(tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(); - par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1); - par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); + player.addStat(ModAchievements.tinyPotatoPet, 1); + world.spawnParticle("heart", x + minX + Math.random() * (maxX - minX), y + maxY, z + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0); } return true; } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) { - int l1 = MathHelper.floor_double(par5EntityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l1 = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - par1World.setBlockMetadataWithNotify(par2, par3, par4, l1, 2); - if (par6ItemStack.hasDisplayName()) - ((TileTinyPotato) par1World.getTileEntity(par2, par3, par4)).name = par6ItemStack.getDisplayName(); + world.setBlockMetadataWithNotify(x, y, z, l1, 2); + if (itemIn.hasDisplayName()) + ((TileTinyPotato) world.getTileEntity(x, y, z)).name = itemIn.getDisplayName(); } @Override - public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { - if(!par6EntityPlayer.capabilities.isCreativeMode) - dropBlockAsItem(par1World, par2, par3, par4, par5, 0); + public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) { + if(!player.capabilities.isCreativeMode) + dropBlockAsItem(world, x, y, z, meta, 0); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 39a01c2ad..f2615c850 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -51,9 +51,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -72,30 +72,30 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - int color = getRenderColor(par1World.getBlockMetadata(par2, par3, par4)); + public void randomDisplayTick(World world, int x, int y, int z, Random random) { + int color = getRenderColor(world.getBlockMetadata(x, y, z)); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); - Vector3 origVector = new Vector3(par2 + 0.5, par3 + 0.5, par4 + 0.5); - Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1); - Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright); + Vector3 origVector = new Vector3(x + 0.5, y + 0.5, z + 0.5); + Vector3 endVector = origVector.copy().add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1); + Botania.proxy.lightningFX(world, origVector, endVector, 5F, colorDark, colorBright); } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public int getRenderColor(int par1) { - float[] color = EntitySheep.fleeceColorTable[par1]; + public int getRenderColor(int meta) { + float[] color = EntitySheep.fleeceColorTable[meta]; return new Color(color[0], color[1], color[2]).getRGB(); } @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { - return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); + public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) { + return getRenderColor(worldIn.getBlockMetadata(x, y, z)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index ae74f396e..fbefe46e0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -69,17 +69,18 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override + @SuppressWarnings("deprecation") // Necessary for backwards compatibility with WAILA & some other mods. public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); return new ItemStack(this, 1, meta); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 2a9928204..9ed5e5fe0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -19,8 +19,8 @@ public class BlockBiomeStoneA extends BlockBiomeStone { } @Override - public int damageDropped(int par1) { - return par1 % 8 + 8; + public int damageDropped(int meta) { + return meta % 8 + 8; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 206ba158d..eeef23193 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -42,9 +42,9 @@ public class BlockModPane extends BlockPane { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockMod.class, name); + return super.setBlockName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 974e82ffe..6607bb5bf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -51,9 +51,9 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, name); + return super.setBlockName(name); } @Override @@ -71,51 +71,51 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - if (par2 != 2 && par2 != 3 && par2 != 4) { - if (par1 != 1 && (par1 != 0 || par2 != 1)) { - if (par1 == 0) + public IIcon getIcon(int side, int meta) { + if (meta != 2 && meta != 3 && meta != 4) { + if (side != 1 && (side != 0 || meta != 1)) { + if (side == 0) return specialQuartzTopIcon; else { - if (par2 < 0 || par2 >= specialQuartzIcons.length) - par2 = 0; + if (meta < 0 || meta >= specialQuartzIcons.length) + meta = 0; - return specialQuartzIcons[par2]; + return specialQuartzIcons[meta]; } - } else return par2 == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon; + } else return meta == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon; } else - return par2 == 2 && (par1 == 1 || par1 == 0) ? pillarSpecialQuartzIcon : par2 == 3 && (par1 == 5 || par1 == 4) ? pillarSpecialQuartzIcon : par2 == 4 && (par1 == 2 || par1 == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[par2]; + return meta == 2 && (side == 1 || side == 0) ? pillarSpecialQuartzIcon : meta == 3 && (side == 5 || side == 4) ? pillarSpecialQuartzIcon : meta == 4 && (side == 2 || side == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[meta]; } @Override - public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) { - if (par9 == 2) { - switch (par5) { + public int onBlockPlaced(World world, int x, int y, int z, int side, float subX, float subY, float subZ, int meta) { + if (meta == 2) { + switch (side) { case 0: case 1: - par9 = 2; + meta = 2; break; case 2: case 3: - par9 = 4; + meta = 4; break; case 4: case 5: - par9 = 3; + meta = 3; } } - return par9; + return meta; } @Override - public int damageDropped(int par1) { - return par1 != 3 && par1 != 4 ? par1 : 2; + public int damageDropped(int meta) { + return meta != 3 && meta != 4 ? meta : 2; } @Override - public ItemStack createStackedBlock(int par1) { - return par1 != 3 && par1 != 4 ? super.createStackedBlock(par1) : new ItemStack(this, 1, 2); + public ItemStack createStackedBlock(int meta) { + return meta != 3 && meta != 4 ? super.createStackedBlock(meta) : new ItemStack(this, 1, 2); } @Override @@ -133,18 +133,18 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { specialQuartzIcons = new IIcon[iconNames.length]; for (int i = 0; i < specialQuartzIcons.length; ++i) { if (iconNames[i] == null) specialQuartzIcons[i] = specialQuartzIcons[i - 1]; - else specialQuartzIcons[i] = IconHelper.forName(par1IconRegister, iconNames[i]); + else specialQuartzIcons[i] = IconHelper.forName(register, iconNames[i]); } - specialQuartzTopIcon = IconHelper.forName(par1IconRegister, "block" + type + "Quartz1"); - chiseledSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "chiseled" + type + "Quartz1"); - pillarSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "pillar" + type + "Quartz1"); + specialQuartzTopIcon = IconHelper.forName(register, "block" + type + "Quartz1"); + chiseledSpecialQuartzIcon = IconHelper.forName(register, "chiseled" + type + "Quartz1"); + pillarSpecialQuartzIcon = IconHelper.forName(register, "pillar" + type + "Quartz1"); } @Override 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 c26bbc8c1..3655c9fa2 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 @@ -33,8 +33,8 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { Block source; - public BlockSpecialQuartzSlab(Block source, boolean par2) { - super(par2, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half")); + public BlockSpecialQuartzSlab(Block source, boolean full) { + super(full, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (full ? "Full" : "Half")); setHardness(0.8F); setResistance(10F); this.source = source; @@ -87,23 +87,23 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - return source.getBlockTextureFromSide(par1); + public IIcon getIcon(int side, int meta) { + return source.getBlockTextureFromSide(side); } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } @Override - public ItemStack createStackedBlock(int par1) { + public ItemStack createStackedBlock(int meta) { return new ItemStack(getSingleBlock()); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 573774843..8b66b7030 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -19,8 +19,8 @@ public abstract class BlockLivingSlab extends BlockModSlab { @Override @SideOnly(Side.CLIENT) - public IIcon getIcon(int par1, int par2) { - return source.getIcon(par1, meta); + public IIcon getIcon(int side, int meta) { + return source.getIcon(side, this.meta); } } 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 8376b284a..ecd11d3cc 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 @@ -46,7 +46,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } @@ -56,13 +56,13 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { } @Override - public ItemStack createStackedBlock(int par1) { + public ItemStack createStackedBlock(int meta) { return new ItemStack(getSingleBlock()); } @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 0ab767923..6aa65f963 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -22,9 +22,9 @@ public class BlockModStairs extends BlockStairs implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemCubeMod.class, name); + return super.setBlockName(name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 926d0ca6c..e7e9e5289 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -45,9 +45,9 @@ public class BlockModWall extends BlockWall implements ILexiconable { } @Override - public Block setBlockName(String par1Str) { - register(par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + register(name); + return super.setBlockName(name); } public void register(String name) { @@ -70,7 +70,7 @@ public class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void registerBlockIcons(IIconRegister p_149651_1_) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } 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 5639c9386..679b08137 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -25,15 +25,15 @@ import vazkii.botania.common.entity.EntityPoolMinecart; public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Override - public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) { - EnumFacing enumfacing = BlockDispenser.func_149937_b(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; - int i = p_82487_1_.getXInt() + enumfacing.getFrontOffsetX(); - int j = p_82487_1_.getYInt() + enumfacing.getFrontOffsetY(); - int k = p_82487_1_.getZInt() + enumfacing.getFrontOffsetZ(); + public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata()); + World world = source.getWorld(); + double d0 = source.getX() + facing.getFrontOffsetX() * 1.125F; + double d1 = source.getY() + facing.getFrontOffsetY() * 1.125F; + double d2 = source.getZ() + facing.getFrontOffsetZ() * 1.125F; + int i = source.getXInt() + facing.getFrontOffsetX(); + int j = source.getYInt() + facing.getFrontOffsetY(); + int k = source.getZInt() + facing.getFrontOffsetZ(); Block block = world.getBlock(i, j, k); double d3; @@ -41,24 +41,24 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { d3 = 0.0D; else { if(block.getMaterial() != Material.air || !BlockRailBase.func_150051_a(world.getBlock(i, j - 1, k))) - 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.setMinecartName(p_82487_2_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setMinecartName(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().playAuxSFX(1000, p_82485_1_.getXInt(), p_82485_1_.getYInt(), p_82485_1_.getZInt(), 0); + protected void playDispenseSound(IBlockSource source) { + source.getWorld().playAuxSFX(1000, source.getXInt(), source.getYInt(), source.getZInt(), 0); } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index bd679c72b..6c49eecc5 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -27,20 +27,20 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { } @Override - public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()); - int x = par1IBlockSource.getXInt() + facing.getFrontOffsetX(); - int y = par1IBlockSource.getYInt() + facing.getFrontOffsetY(); - int z = par1IBlockSource.getZInt() + facing.getFrontOffsetZ(); - World world = par1IBlockSource.getWorld(); + public ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata()); + int x = source.getXInt() + facing.getFrontOffsetX(); + int y = source.getYInt() + facing.getFrontOffsetY(); + int z = source.getZInt() + facing.getFrontOffsetZ(); + World world = source.getWorld(); if(world.getBlock(x, y, z).isAir(world, x, y, z) && block.canBlockStay(world, x, y, z)) { world.setBlock(x, y, z, block); - par2ItemStack.stackSize--; - return par2ItemStack; + stack.stackSize--; + return stack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, stack); } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index b50b971f7..4533b1e68 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -22,19 +22,19 @@ import vazkii.botania.api.wand.IWandable; public class BehaviourWand extends BehaviorDefaultDispenseItem { @Override - protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - ForgeDirection facing = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()).ordinal()); - int x = par1IBlockSource.getXInt() + facing.offsetX; - int y = par1IBlockSource.getYInt() + facing.offsetY; - int z = par1IBlockSource.getZInt() + facing.offsetZ; - World world = par1IBlockSource.getWorld(); + protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) { + ForgeDirection facing = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(source.getBlockMetadata()).ordinal()); + int x = source.getXInt() + facing.offsetX; + int y = source.getYInt() + facing.offsetY; + int z = source.getZInt() + facing.offsetZ; + World world = source.getWorld(); Block block = world.getBlock(x, y, z); if(block instanceof IWandable) { - ((IWandable) block).onUsedByWand(null, par2ItemStack, world, x, y, z, facing.getOpposite().ordinal()); - return par2ItemStack; + ((IWandable) block).onUsedByWand(null, stack, world, x, y, z, facing.getOpposite().ordinal()); + return stack; } - return super.dispenseStack(par1IBlockSource, par2ItemStack); + return super.dispenseStack(source, stack); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java index 0c60b1635..61af089da 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java @@ -42,15 +42,15 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[4]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(2, side)]; } @Override 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 e26dbf736..cea349721 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -43,13 +43,13 @@ public class BlockBellows extends BlockModContainer implements ILex } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -71,8 +71,8 @@ public class BlockBellows extends BlockModContainer implements ILex } @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingwood.getIcon(par1, 0); + public IIcon getIcon(int side, int meta) { + return ModBlocks.livingwood.getIcon(side, 0); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 1d3d892a5..ca96a9464 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -56,33 +56,33 @@ public class BlockBrewery extends BlockModContainer implements ILex } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileBrewery brew = (TileBrewery) world.getTileEntity(x, y, z); - if(par5EntityPlayer.isSneaking()) { - if(brew.recipe == null && par1World.getBlockMetadata(par2, par3, par4) == 0) + if(player.isSneaking()) { + if(brew.recipe == null && world.getBlockMetadata(x, y, z) == 0) for(int i = brew.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = brew.getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + if(!player.inventory.addItemStackToInventory(copy)) + player.dropPlayerItemWithRandomChoice(copy, false); brew.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); break; } } } else { - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); + ItemStack stack = player.getCurrentEquippedItem(); if(stack != null) - return brew.addItem(par5EntityPlayer, stack); + return brew.addItem(player, stack); } return false; } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -93,14 +93,14 @@ public class BlockBrewery extends BlockModContainer implements ILex float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -112,10 +112,10 @@ public class BlockBrewery extends BlockModContainer implements ILex } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override @@ -124,13 +124,13 @@ public class BlockBrewery extends BlockModContainer implements ILex } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileBrewery brew = (TileBrewery) world.getTileEntity(x, y, z); return brew.signal; } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index ac83af660..fc5e6aa3b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -38,14 +38,14 @@ public class BlockDistributor extends BlockModContainer impleme } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconTop = IconHelper.forBlock(par1IconRegister, this, 0); - iconSide = IconHelper.forBlock(par1IconRegister, this, 1); + public void registerBlockIcons(IIconRegister register) { + iconTop = IconHelper.forBlock(register, this, 0); + iconSide = IconHelper.forBlock(register, this, 1); } @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 0 ? ModBlocks.livingrock.getIcon(0, 0) : par1 == 1 ? iconTop : iconSide; + public IIcon getIcon(int side, int meta) { + return side == 0 ? ModBlocks.livingrock.getIcon(0, 0) : side == 1 ? iconTop : iconSide; } @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 83ddca6f2..e7e4f5787 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -60,9 +60,9 @@ public class BlockEnchanter extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - super.registerBlockIcons(par1IconRegister); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); + public void registerBlockIcons(IIconRegister register) { + super.registerBlockIcons(register); + overlay = IconHelper.forBlock(register, this, "Overlay"); } @Override @@ -71,7 +71,7 @@ public class BlockEnchanter extends BlockModContainer implements } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int meta, Random random, int fortune) { return Item.getItemFromBlock(Blocks.lapis_block); } @@ -81,9 +81,9 @@ public class BlockEnchanter extends BlockModContainer implements } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(x, y, z); + ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() == ModItems.twigWand) return false; @@ -92,22 +92,22 @@ public class BlockEnchanter extends BlockModContainer implements if(enchanter.itemToEnchant == null) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); enchanter.sync(); } } else if(enchanter.stage == 0) { - if(par5EntityPlayer.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { + if(player.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) { enchanter.itemToEnchant = null; enchanter.sync(); - } else par5EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.invFull")); + } else player.addChatMessage(new ChatComponentTranslation("botaniamisc.invFull")); } return true; } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(x, y, z); ItemStack itemstack = enchanter.itemToEnchant; @@ -116,14 +116,14 @@ public class BlockEnchanter extends BlockModContainer implements float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3 * 0.5; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -134,9 +134,9 @@ public class BlockEnchanter extends BlockModContainer implements } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 681e653b4..94bcfa8e7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -63,9 +63,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override @@ -84,13 +84,13 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - iconBases = IconHelper.forBlock(par1IconRegister, this, 0); - iconFaces = IconHelper.forBlock(par1IconRegister, this, 1); - iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2); - iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3); - iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4); - iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5); + public void registerBlockIcons(IIconRegister register) { + iconBases = IconHelper.forBlock(register, this, 0); + iconFaces = IconHelper.forBlock(register, this, 1); + iconBasesA = IconHelper.forBlock(register, this, 2); + iconFacesA = IconHelper.forBlock(register, this, 3); + iconBasesB = IconHelper.forBlock(register, this, 4); + iconFacesB = IconHelper.forBlock(register, this, 5); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 52a9c2228..cd4a70d3b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -44,15 +44,15 @@ public class BlockManaDetector extends BlockModContainer imple } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(icons.length - 1, par2)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override @@ -61,8 +61,8 @@ public class BlockManaDetector extends BlockModContainer imple } @Override - public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) { - return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0; + public int isProvidingWeakPower(IBlockAccess worldIn, int x, int y, int z, int side) { + return worldIn.getBlockMetadata(x, y, z) != 0 ? 15 : 0; } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index abae526ea..8b9000523 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -39,9 +39,9 @@ public class BlockManaVoid extends BlockModContainer implements IL } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - blockIcon = IconHelper.forBlock(par1IconRegister, this, 0); - overlay = IconHelper.forBlock(par1IconRegister, this, 1); + public void registerBlockIcons(IIconRegister register) { + blockIcon = IconHelper.forBlock(register, this, 0); + overlay = IconHelper.forBlock(register, this, 1); } @Override 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 57552fef6..899bd9b6d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -74,14 +74,14 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockPool.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockPool.class, name); + return super.setBlockName(name); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - manaIcon = IconHelper.forName(par1IconRegister, "manaWater"); + public void registerBlockIcons(IIconRegister register) { + manaIcon = IconHelper.forName(register, "manaWater"); } @Override @@ -90,12 +90,12 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TilePool pool = (TilePool) world.getTileEntity(x, y, z); if (pool != null) { lastFragile = pool.fragile; } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override @@ -122,11 +122,11 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { - if(par5Entity instanceof EntityItem) { - TilePool tile = (TilePool) par1World.getTileEntity(par2, par3, par4); - if(tile.collideEntityItem((EntityItem) par5Entity)) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, par2, par3, par4); + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity collider) { + if(collider instanceof EntityItem) { + TilePool tile = (TilePool) world.getTileEntity(x, y, z); + if(tile.collideEntityItem((EntityItem) collider)) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z); } } @@ -162,8 +162,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public IIcon getIcon(int par1, int par2) { - return ModBlocks.livingrock.getIcon(par1, 0); + public IIcon getIcon(int side, int meta) { + return ModBlocks.livingrock.getIcon(side, 0); } @Override @@ -177,8 +177,8 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TilePool pool = (TilePool) world.getTileEntity(x, y, z); int val = (int) ((double) pool.getCurrentMana() / (double) pool.manaCap * 15.0); if(pool.getCurrentMana() > 0) val = Math.max(val, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 162b2cd1e..7ff692aac 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -53,10 +53,10 @@ public class BlockPrism extends BlockModContainer implements IManaTri } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override @@ -70,7 +70,7 @@ public class BlockPrism extends BlockModContainer implements IManaTri } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return null; } @@ -85,31 +85,31 @@ public class BlockPrism extends BlockModContainer implements IManaTri } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileEntity tile = world.getTileEntity(x, y, z); if(!(tile instanceof TilePrism)) return false; TilePrism prism = (TilePrism) tile; ItemStack lens = prism.getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); + ItemStack heldItem = player.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; - int meta = par1World.getBlockMetadata(par2, par3, par4); + int meta = world.getBlockMetadata(x, y, z); if(lens == null && isHeldItemLens) { - if(!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); prism.setInventorySlotContents(0, heldItem.copy()); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta | 1, 1 | 2); + world.setBlockMetadataWithNotify(x, y, z, meta | 1, 1 | 2); } else if(lens != null) { ItemStack add = lens.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); + if(!player.inventory.addItemStackToInventory(add)) + player.dropPlayerItemWithRandomChoice(add, false); prism.setInventorySlotContents(0, null); prism.markDirty(); - par1World.setBlockMetadataWithNotify(par2, par3, par4, meta & 14, 1 | 2); + world.setBlockMetadataWithNotify(x, y, z, meta & 14, 1 | 2); } return true; @@ -130,8 +130,8 @@ public class BlockPrism extends BlockModContainer implements IManaTri } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileEntity tile = world.getTileEntity(x, y, z); if(!(tile instanceof TileSimpleInventory)) return; @@ -146,14 +146,14 @@ public class BlockPrism extends BlockModContainer implements IManaTri float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -165,10 +165,10 @@ public class BlockPrism extends BlockModContainer implements IManaTri } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override 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 7cade9be1..cd7e116d2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -45,9 +45,9 @@ public class BlockPump extends BlockModContainer implements ILexiconab } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2); } @Override @@ -67,12 +67,12 @@ public class BlockPump extends BlockModContainer implements ILexiconab } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @Override - public IIcon getIcon(int par1, int par2) { + public IIcon getIcon(int side, int meta) { return ModBlocks.livingrock.getIcon(0, 0); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 22d96c5a9..853c8042b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -61,40 +61,40 @@ public class BlockRuneAltar extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[3]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(par2, par3, par4); - ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(x, y, z); + ItemStack stack = player.getCurrentEquippedItem(); - if(par5EntityPlayer.isSneaking()) { + if(player.isSneaking()) { if(altar.manaToGet == 0) for(int i = altar.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = altar.getStackInSlot(i); if(stackAt != null) { ItemStack copy = stackAt.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(copy)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false); + if(!player.inventory.addItemStackToInventory(copy)) + player.dropPlayerItemWithRandomChoice(copy, false); altar.setInventorySlotContents(i, null); - par1World.func_147453_f(par2, par3, par4, this); + world.func_147453_f(x, y, z, this); break; } } } else if(altar.isEmpty() && stack == null) - altar.trySetLastRecipe(par5EntityPlayer); + altar.trySetLastRecipe(player); else if(stack != null) - return altar.addItem(par5EntityPlayer, stack); + return altar.addItem(player, stack); return false; } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z); if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { @@ -105,14 +105,14 @@ public class BlockRuneAltar extends BlockModContainer implements float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -124,15 +124,15 @@ public class BlockRuneAltar extends BlockModContainer implements } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(2, side)]; } @Override @@ -146,8 +146,8 @@ public class BlockRuneAltar extends BlockModContainer implements } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(x, y, z); return altar.signal; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index ba218be5b..adce4feee 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -47,7 +47,7 @@ public class BlockSpawnerClaw extends BlockModContainer impleme } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { //NO-OP } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 247570580..99618854e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -66,13 +66,13 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public Block setBlockName(String par1Str) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); - return super.setBlockName(par1Str); + public Block setBlockName(String name) { + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + return super.setBlockName(name); } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { // NO-OP } @@ -83,10 +83,10 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); - TileSpreader spreader = (TileSpreader) par1World.getTileEntity(par2, par3, par4); - par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 1 | 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int orientation = BlockPistonBase.determineOrientation(world, x, y, z, placer); + TileSpreader spreader = (TileSpreader) world.getTileEntity(x, y, z); + world.setBlockMetadataWithNotify(x, y, z, itemIn.getItemDamage(), 1 | 2); switch(orientation) { case 0: @@ -110,8 +110,8 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public int damageDropped(int par1) { - return par1; + public int damageDropped(int meta) { + return meta; } @Override @@ -125,8 +125,8 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public IIcon getIcon(int par1, int par2) { - return par2 >= 2 ? ModBlocks.dreamwood.getIcon(par1, 0) : ModBlocks.livingwood.getIcon(par1, 0); + public IIcon getIcon(int side, int meta) { + return meta >= 2 ? ModBlocks.dreamwood.getIcon(side, 0) : ModBlocks.livingwood.getIcon(side, 0); } @Override @@ -135,14 +135,14 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) { + TileEntity tile = world.getTileEntity(x, y, z); if(!(tile instanceof TileSpreader)) return false; TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getStackInSlot(0); - ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); + ItemStack heldItem = player.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.wool); @@ -151,15 +151,15 @@ public class BlockSpreader extends BlockModContainer implements IW return false; if(lens == null && isHeldItemLens) { - if (!par5EntityPlayer.capabilities.isCreativeMode) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + if (!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); spreader.setInventorySlotContents(0, heldItem.copy()); spreader.markDirty(); } else if(lens != null && !wool) { ItemStack add = lens.copy(); - if(!par5EntityPlayer.inventory.addItemStackToInventory(add)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(add, false); + if(!player.inventory.addItemStackToInventory(add)) + player.dropPlayerItemWithRandomChoice(add, false); spreader.setInventorySlotContents(0, null); spreader.markDirty(); } @@ -168,11 +168,11 @@ public class BlockSpreader extends BlockModContainer implements IW spreader.paddingColor = heldItem.getItemDamage(); heldItem.stackSize--; if(heldItem.stackSize == 0) - par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { ItemStack pad = new ItemStack(Blocks.wool, 1, spreader.paddingColor); - if(!par5EntityPlayer.inventory.addItemStackToInventory(pad)) - par5EntityPlayer.dropPlayerItemWithRandomChoice(pad, false); + if(!player.inventory.addItemStackToInventory(pad)) + player.dropPlayerItemWithRandomChoice(pad, false); spreader.paddingColor = -1; spreader.markDirty(); } @@ -181,8 +181,8 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileEntity tile = par1World.getTileEntity(par2, par3, par4); + public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) { + TileEntity tile = world.getTileEntity(x, y, z); if(!(tile instanceof TileSpreader)) return; @@ -197,14 +197,14 @@ public class BlockSpreader extends BlockModContainer implements IW float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { int k1 = random.nextInt(21) + 10; if (k1 > itemstack.stackSize) k1 = itemstack.stackSize; itemstack.stackSize -= k1; - entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); + entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3; entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; @@ -216,10 +216,10 @@ public class BlockSpreader extends BlockModContainer implements IW } } - par1World.func_147453_f(par2, par3, par4, par5); + world.func_147453_f(x, y, z, blockBroken); } - super.breakBlock(par1World, par2, par3, par4, par5, par6); + super.breakBlock(world, x, y, z, blockBroken, meta); } @Override 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 c9d979663..ecbe58dc6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -79,21 +79,21 @@ public class BlockTerraPlate extends BlockModContainer implement } @Override - public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { + public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) { return false; } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[3]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); - overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); + icons[i] = IconHelper.forBlock(register, this, i); + overlay = IconHelper.forBlock(register, this, "Overlay"); } @Override - public IIcon getIcon(int par1, int par2) { - return icons[Math.min(2, par1)]; + public IIcon getIcon(int side, int meta) { + return icons[Math.min(2, side)]; } @Override @@ -112,8 +112,8 @@ public class BlockTerraPlate extends BlockModContainer implement } @Override - public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) { - TileTerraPlate plate = (TileTerraPlate) par1World.getTileEntity(par2, par3, par4); + public int getComparatorInputOverride(World world, int x, int y, int z, int side) { + TileTerraPlate plate = (TileTerraPlate) world.getTileEntity(x, y, z); int val = (int) ((double) plate.getCurrentMana() / (double) TileTerraPlate.MAX_MANA * 15.0); if(plate.getCurrentMana() > 0) val = Math.max(val, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 03ab0e220..b36414b92 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -40,15 +40,15 @@ public class BlockTurntable extends BlockModContainer implements } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + icons[i] = IconHelper.forBlock(register, this, i); } @Override - public IIcon getIcon(int par1, int par2) { - return par1 == 1 ? icons[0] : icons[1]; + public IIcon getIcon(int side, int meta) { + return side == 1 ? icons[0] : icons[1]; } @Override diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index d87199730..d222dcd85 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -44,9 +44,9 @@ public abstract class BlockRedString extends BlockModContainer im } @Override - public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); - par1World.setBlockMetadataWithNotify(par2, par3, par4, orientation, 1 | 2); + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) { + int orientation = BlockPistonBase.determineOrientation(world, x, y, z, placer); + world.setBlockMetadataWithNotify(x, y, z, orientation, 1 | 2); } @Override @@ -56,9 +56,9 @@ public abstract class BlockRedString extends BlockModContainer im @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister par1IconRegister) { - senderIcon = IconHelper.forName(par1IconRegister, "redStringSender"); - sideIcon = registerSideIcon(par1IconRegister); + public void registerBlockIcons(IIconRegister register) { + senderIcon = IconHelper.forName(register, "redStringSender"); + sideIcon = registerSideIcon(register); } @SideOnly(Side.CLIENT) 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 2fe1ace31..d79c8f628 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -50,7 +50,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/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 65d4a3273..ecc50f9d5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -165,8 +165,8 @@ public class SubTileOrechid extends SubTileFunctional { public String s; - public StringRandomItem(int par1, String s) { - super(par1); + public StringRandomItem(int weight, String s) { + super(weight); this.s = s; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index b70c3ba54..598e41d1c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -323,44 +323,44 @@ public class TileAlfPortal extends TileMod { } @Override - public void writeToNBT(NBTTagCompound cmp) { - super.writeToNBT(cmp); + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); - cmp.setInteger(TAG_STACK_COUNT, stacksIn.size()); + compound.setInteger(TAG_STACK_COUNT, stacksIn.size()); int i = 0; for(ItemStack stack : stacksIn) { NBTTagCompound stackcmp = new NBTTagCompound(); stack.writeToNBT(stackcmp); - cmp.setTag(TAG_STACK + i, stackcmp); + compound.setTag(TAG_STACK + i, stackcmp); i++; } - cmp.setInteger(TAG_OUTPUT_COUNT, stacksOut.size()); + compound.setInteger(TAG_OUTPUT_COUNT, stacksOut.size()); i = 0; for(ItemStack stack : stacksOut) { NBTTagCompound stackcmp = new NBTTagCompound(); stack.writeToNBT(stackcmp); - cmp.setTag(TAG_OUTPUT_STACK + i, stackcmp); + compound.setTag(TAG_OUTPUT_STACK + i, stackcmp); i++; } } @Override - public void readFromNBT(NBTTagCompound cmp) { - super.readFromNBT(cmp); + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); - int count = cmp.getInteger(TAG_STACK_COUNT); + int count = compound.getInteger(TAG_STACK_COUNT); stacksIn.clear(); for(int i = 0; i < count; i++) { - NBTTagCompound stackcmp = cmp.getCompoundTag(TAG_STACK + i); + NBTTagCompound stackcmp = compound.getCompoundTag(TAG_STACK + i); ItemStack stack = ItemStack.loadItemStackFromNBT(stackcmp); stacksIn.add(stack); } - count = cmp.getInteger(TAG_OUTPUT_COUNT); + count = compound.getInteger(TAG_OUTPUT_COUNT); stacksOut.clear(); for(int i = 0; i < count; i++) { - NBTTagCompound stackcmp = cmp.getCompoundTag(TAG_OUTPUT_STACK + i); + NBTTagCompound stackcmp = compound.getCompoundTag(TAG_OUTPUT_STACK + i); ItemStack stack = ItemStack.loadItemStackFromNBT(stackcmp); stacksOut.addLast(stack); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index d50595a88..5d983b711 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -274,21 +274,21 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); - cmp.setBoolean(TAG_HAS_WATER, hasWater()); - cmp.setBoolean(TAG_HAS_LAVA, hasLava()); - cmp.setBoolean(TAG_IS_MOSSY, isMossy); + compound.setBoolean(TAG_HAS_WATER, hasWater()); + compound.setBoolean(TAG_HAS_LAVA, hasLava()); + compound.setBoolean(TAG_IS_MOSSY, isMossy); } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); - hasWater = cmp.getBoolean(TAG_HAS_WATER); - hasLava = cmp.getBoolean(TAG_HAS_LAVA); - isMossy = cmp.getBoolean(TAG_IS_MOSSY); + hasWater = compound.getBoolean(TAG_HAS_WATER); + hasLava = compound.getBoolean(TAG_HAS_LAVA); + isMossy = compound.getBoolean(TAG_IS_MOSSY); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 1e0e62b28..39147ba31 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -44,9 +44,8 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } ItemStack stack = getStackInSlot(0); - if(stack != null && stack.getItem() instanceof IAvatarWieldable) { - IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); - wieldable.onAvatarUpdate(this, stack); + if(stack != null && stack.getItem() instanceof IAvatarWieldable wieldable) { + wieldable.onAvatarUpdate(this, stack); } if(enabled) @@ -54,19 +53,19 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); - par1nbtTagCompound.setBoolean(TAG_ENABLED, enabled); - par1nbtTagCompound.setInteger(TAG_TICKS_ELAPSED, ticksElapsed); - par1nbtTagCompound.setInteger(TAG_MANA, mana); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + compound.setBoolean(TAG_ENABLED, enabled); + compound.setInteger(TAG_TICKS_ELAPSED, ticksElapsed); + compound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - enabled = par1nbtTagCompound.getBoolean(TAG_ENABLED); - ticksElapsed = par1nbtTagCompound.getInteger(TAG_TICKS_ELAPSED); - mana = par1nbtTagCompound.getInteger(TAG_MANA); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + enabled = compound.getBoolean(TAG_ENABLED); + ticksElapsed = compound.getInteger(TAG_TICKS_ELAPSED); + mana = compound.getInteger(TAG_MANA); } @Override @@ -85,17 +84,17 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ISid } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + public int[] getAccessibleSlotsFromSide(int side) { return new int[0]; } @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { + public boolean canInsertItem(int slot, ItemStack item, int side) { return false; } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int slot, ItemStack item, int side) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index acefc2ffd..29447c8d0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -30,15 +30,15 @@ public class TileBifrost extends TileMod { } @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_TICKS, ticks); + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + compound.setInteger(TAG_TICKS, ticks); } @Override - public void readFromNBT(NBTTagCompound par1nbtTagCompound) { - super.readFromNBT(par1nbtTagCompound); - ticks = par1nbtTagCompound.getInteger(TAG_TICKS); + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + ticks = compound.getInteger(TAG_TICKS); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 2a4961a9c..598ae597f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -173,17 +173,17 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); - par1nbtTagCompound.setInteger(TAG_MANA, mana); + compound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); - mana = par1nbtTagCompound.getInteger(TAG_MANA); + mana = compound.getInteger(TAG_MANA); } @Override 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 1926ad0da..284329a2d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -109,7 +109,7 @@ public class TileCraftCrate extends TileOpenCrate { InventoryCrafting craft = new InventoryCrafting(new Container() { @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) { + public boolean canInteractWith(EntityPlayer player) { return false; } }, 3, 3); @@ -157,15 +157,15 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_PATTERN, pattern); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + compound.setInteger(TAG_PATTERN, pattern); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - pattern = par1nbtTagCompound.getInteger(TAG_PATTERN); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + pattern = compound.getInteger(TAG_PATTERN); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 237b29ee0..49ed05a17 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -494,14 +494,14 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public Block setBlockName(String par1Str) { + public Block setBlockName(String name) { GameRegistry.registerBlock(this, ItemBlockMod.class, "flower_structurelib"); return this; } @Override - public IIcon getIcon(int par1, int par2) { - return super.getIcon(par1, (int) (BotaniaAPI.internalHandler.getWorldElapsedTicks() / 20) % 16); + public IIcon getIcon(int side, int meta) { + return super.getIcon(side, (int) (BotaniaAPI.internalHandler.getWorldElapsedTicks() / 20) % 16); } @Override @@ -510,7 +510,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { + public void registerBlockIcons(IIconRegister register) { //has to be empty } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index cc82c9619..7c104b707 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -38,19 +38,19 @@ public class TileFakeAir extends TileMod { } @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_FLOWER_X, flowerX); - par1nbtTagCompound.setInteger(TAG_FLOWER_Y, flowerY); - par1nbtTagCompound.setInteger(TAG_FLOWER_Z, flowerZ); + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); + compound.setInteger(TAG_FLOWER_X, flowerX); + compound.setInteger(TAG_FLOWER_Y, flowerY); + compound.setInteger(TAG_FLOWER_Z, flowerZ); } @Override - public void readFromNBT(NBTTagCompound par1nbtTagCompound) { - super.readFromNBT(par1nbtTagCompound); - flowerX = par1nbtTagCompound.getInteger(TAG_FLOWER_X); - flowerY = par1nbtTagCompound.getInteger(TAG_FLOWER_Y); - flowerZ = par1nbtTagCompound.getInteger(TAG_FLOWER_Z); + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); + flowerX = compound.getInteger(TAG_FLOWER_X); + flowerY = compound.getInteger(TAG_FLOWER_Y); + flowerZ = compound.getInteger(TAG_FLOWER_Z); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index f18207621..ce536d2b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -106,25 +106,25 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_TIME, time); - par1nbtTagCompound.setFloat(TAG_TIME_FRACTION, timeFraction); - par1nbtTagCompound.setBoolean(TAG_FLIP, flip); - par1nbtTagCompound.setInteger(TAG_FLIP_TICKS, flipTicks); - par1nbtTagCompound.setBoolean(TAG_MOVE, move); - par1nbtTagCompound.setBoolean(TAG_LOCK, lock); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + compound.setInteger(TAG_TIME, time); + compound.setFloat(TAG_TIME_FRACTION, timeFraction); + compound.setBoolean(TAG_FLIP, flip); + compound.setInteger(TAG_FLIP_TICKS, flipTicks); + compound.setBoolean(TAG_MOVE, move); + compound.setBoolean(TAG_LOCK, lock); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - time = par1nbtTagCompound.getInteger(TAG_TIME); - timeFraction = par1nbtTagCompound.getFloat(TAG_TIME_FRACTION); - flip = par1nbtTagCompound.getBoolean(TAG_FLIP); - flipTicks = par1nbtTagCompound.getInteger(TAG_FLIP_TICKS); - move = par1nbtTagCompound.getBoolean(TAG_MOVE); - lock = par1nbtTagCompound.getBoolean(TAG_LOCK); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + time = compound.getInteger(TAG_TIME); + timeFraction = compound.getFloat(TAG_TIME_FRACTION); + flip = compound.getBoolean(TAG_FLIP); + flipTicks = compound.getInteger(TAG_FLIP_TICKS); + move = compound.getBoolean(TAG_MOVE); + lock = compound.getBoolean(TAG_LOCK); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 133ad72ad..6019e17de 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -110,17 +110,17 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); - par1nbtTagCompound.setInteger(TAG_TIME_LEFT, timeLeft); - par1nbtTagCompound.setBoolean(TAG_BURNING, burning); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + compound.setInteger(TAG_TIME_LEFT, timeLeft); + compound.setBoolean(TAG_BURNING, burning); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - timeLeft = par1nbtTagCompound.getInteger(TAG_TIME_LEFT); - burning = par1nbtTagCompound.getBoolean(TAG_BURNING); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + timeLeft = compound.getInteger(TAG_TIME_LEFT); + burning = compound.getBoolean(TAG_BURNING); } @Override @@ -139,7 +139,7 @@ public class TileIncensePlate extends TileSimpleInventory implements ISidedInven } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int slot, ItemStack stack, int side) { return false; } 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 7a4d33afe..8d6cdf701 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(DamageSource p_70097_1_, float p_70097_2_) { + public boolean attackEntityFrom(DamageSource source, float amount) { return false; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index b1deaf483..ce049316b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -19,17 +19,17 @@ import net.minecraft.tileentity.TileEntity; public class TileMod extends TileEntity { @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); + public void writeToNBT(NBTTagCompound compound) { + super.writeToNBT(compound); - writeCustomNBT(par1nbtTagCompound); + writeCustomNBT(compound); } @Override - public void readFromNBT(NBTTagCompound par1nbtTagCompound) { - super.readFromNBT(par1nbtTagCompound); + public void readFromNBT(NBTTagCompound compound) { + super.readFromNBT(compound); - readCustomNBT(par1nbtTagCompound); + readCustomNBT(compound); } public void writeCustomNBT(NBTTagCompound cmp) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index d6f9db195..d0ef08b2f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -275,19 +275,19 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); - par1nbtTagCompound.setInteger(TAG_MANA, mana); - par1nbtTagCompound.setInteger(TAG_MANA_TO_GET, manaToGet); + compound.setInteger(TAG_MANA, mana); + compound.setInteger(TAG_MANA_TO_GET, manaToGet); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); - mana = par1nbtTagCompound.getInteger(TAG_MANA); - manaToGet = par1nbtTagCompound.getInteger(TAG_MANA_TO_GET); + mana = compound.getInteger(TAG_MANA); + manaToGet = compound.getInteger(TAG_MANA_TO_GET); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 15a9f4144..3a7018400 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -21,8 +21,8 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory ItemStack[] inventorySlots = new ItemStack[getSizeInventory()]; @Override - public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { - NBTTagList var2 = par1NBTTagCompound.getTagList("Items", 10); + public void readCustomNBT(NBTTagCompound compound) { + NBTTagList var2 = compound.getTagList("Items", 10); inventorySlots = new ItemStack[getSizeInventory()]; for (int var3 = 0; var3 < var2.tagCount(); ++var3) { NBTTagCompound var4 = var2.getCompoundTagAt(var3); @@ -33,7 +33,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory } @Override - public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) { + public void writeCustomNBT(NBTTagCompound compound) { NBTTagList var2 = new NBTTagList(); for (int var3 = 0; var3 < inventorySlots.length; ++var3) { if (inventorySlots[var3] != null) { @@ -43,7 +43,7 @@ public abstract class TileSimpleInventory extends TileMod implements IInventory var2.appendTag(var4); } } - par1NBTTagCompound.setTag("Items", var2); + compound.setTag("Items", var2); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 0c8b71c2e..6cb5c51a8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -96,21 +96,21 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); NBTTagCompound cmp = new NBTTagCompound(); if(requestTarget != null) requestTarget.writeToNBT(cmp); - par1nbtTagCompound.setTag(TAG_REQUEST_TARGET, cmp); - par1nbtTagCompound.setInteger(TAG_ITEM_COUNT, itemCount); + compound.setTag(TAG_REQUEST_TARGET, cmp); + compound.setInteger(TAG_ITEM_COUNT, itemCount); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); - NBTTagCompound cmp = par1nbtTagCompound.getCompoundTag(TAG_REQUEST_TARGET); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); + NBTTagCompound cmp = compound.getCompoundTag(TAG_REQUEST_TARGET); requestTarget = ItemStack.loadItemStackFromNBT(cmp); - itemCount = par1nbtTagCompound.getInteger(TAG_ITEM_COUNT); + itemCount = compound.getInteger(TAG_ITEM_COUNT); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 974315976..6a5f82032 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -65,17 +65,17 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos } @Override - public int[] getAccessibleSlotsFromSide(int p_94128_1_) { + public int[] getAccessibleSlotsFromSide(int side) { return new int[] { 0 }; } @Override - public boolean canInsertItem(int p_102007_1_, ItemStack p_102007_2_, int p_102007_3_) { - return p_102007_2_.getItem() instanceof ILens; + public boolean canInsertItem(int slot, ItemStack stack, int side) { + return stack.getItem() instanceof ILens; } @Override - public boolean canExtractItem(int p_102008_1_, ItemStack p_102008_2_, int p_102008_3_) { + public boolean canExtractItem(int slot, ItemStack stack, int side) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index dff35de37..0917fea9a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -255,90 +255,90 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); UUID identity = getIdentifier(); - cmp.setBoolean(TAG_HAS_IDENTITY, true); - cmp.setLong(TAG_UUID_MOST, identity.getMostSignificantBits()); - cmp.setLong(TAG_UUID_LEAST, identity.getLeastSignificantBits()); + compound.setBoolean(TAG_HAS_IDENTITY, true); + compound.setLong(TAG_UUID_MOST, identity.getMostSignificantBits()); + compound.setLong(TAG_UUID_LEAST, identity.getLeastSignificantBits()); - cmp.setInteger(TAG_MANA, mana); - cmp.setFloat(TAG_ROTATION_X, rotationX); - cmp.setFloat(TAG_ROTATION_Y, rotationY); - cmp.setBoolean(TAG_REQUEST_UPDATE, requestsClientUpdate); - cmp.setInteger(TAG_PADDING_COLOR, paddingColor); - cmp.setBoolean(TAG_CAN_SHOOT_BURST, canShootBurst); + compound.setInteger(TAG_MANA, mana); + compound.setFloat(TAG_ROTATION_X, rotationX); + compound.setFloat(TAG_ROTATION_Y, rotationY); + compound.setBoolean(TAG_REQUEST_UPDATE, requestsClientUpdate); + compound.setInteger(TAG_PADDING_COLOR, paddingColor); + compound.setBoolean(TAG_CAN_SHOOT_BURST, canShootBurst); - cmp.setInteger(TAG_PINGBACK_TICKS, pingbackTicks); - cmp.setDouble(TAG_LAST_PINGBACK_X, lastPingbackX); - cmp.setDouble(TAG_LAST_PINGBACK_Y, lastPingbackY); - cmp.setDouble(TAG_LAST_PINGBACK_Z, lastPingbackZ); + compound.setInteger(TAG_PINGBACK_TICKS, pingbackTicks); + compound.setDouble(TAG_LAST_PINGBACK_X, lastPingbackX); + compound.setDouble(TAG_LAST_PINGBACK_Y, lastPingbackY); + compound.setDouble(TAG_LAST_PINGBACK_Z, lastPingbackZ); - cmp.setString(TAG_INPUT_KEY, inputKey); - cmp.setString(TAG_OUTPUT_KEY, outputKey); + compound.setString(TAG_INPUT_KEY, inputKey); + compound.setString(TAG_OUTPUT_KEY, outputKey); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_X, receiver == null ? 0 : ((TileEntity) receiver).xCoord); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Y, receiver == null ? -1 : ((TileEntity) receiver).yCoord); - cmp.setInteger(TAG_FORCE_CLIENT_BINDING_Z, receiver == null ? 0 : ((TileEntity) receiver).zCoord); + compound.setInteger(TAG_FORCE_CLIENT_BINDING_X, receiver == null ? 0 : ((TileEntity) receiver).xCoord); + compound.setInteger(TAG_FORCE_CLIENT_BINDING_Y, receiver == null ? -1 : ((TileEntity) receiver).yCoord); + compound.setInteger(TAG_FORCE_CLIENT_BINDING_Z, receiver == null ? 0 : ((TileEntity) receiver).zCoord); - cmp.setBoolean(TAG_MAPMAKER_OVERRIDE, mapmakerOverride); - cmp.setInteger(TAG_FORCED_COLOR, mmForcedColor); - cmp.setInteger(TAG_FORCED_MANA_PAYLOAD, mmForcedManaPayload); - cmp.setInteger(TAG_FORCED_TICKS_BEFORE_MANA_LOSS, mmForcedTicksBeforeManaLoss); - cmp.setFloat(TAG_FORCED_MANA_LOSS_PER_TICK, mmForcedManaLossPerTick); - cmp.setFloat(TAG_FORCED_GRAVITY, mmForcedGravity); - cmp.setFloat(TAG_FORCED_VELOCITY_MULTIPLIER, mmForcedVelocityMultiplier); + compound.setBoolean(TAG_MAPMAKER_OVERRIDE, mapmakerOverride); + compound.setInteger(TAG_FORCED_COLOR, mmForcedColor); + compound.setInteger(TAG_FORCED_MANA_PAYLOAD, mmForcedManaPayload); + compound.setInteger(TAG_FORCED_TICKS_BEFORE_MANA_LOSS, mmForcedTicksBeforeManaLoss); + compound.setFloat(TAG_FORCED_MANA_LOSS_PER_TICK, mmForcedManaLossPerTick); + compound.setFloat(TAG_FORCED_GRAVITY, mmForcedGravity); + compound.setFloat(TAG_FORCED_VELOCITY_MULTIPLIER, mmForcedVelocityMultiplier); requestsClientUpdate = false; } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); - if(cmp.getBoolean(TAG_HAS_IDENTITY)) { - long most = cmp.getLong(TAG_UUID_MOST); - long least = cmp.getLong(TAG_UUID_LEAST); + if(compound.getBoolean(TAG_HAS_IDENTITY)) { + long most = compound.getLong(TAG_UUID_MOST); + long least = compound.getLong(TAG_UUID_LEAST); UUID identity = getIdentifierUnsafe(); if(identity == null || most != identity.getMostSignificantBits() || least != identity.getLeastSignificantBits()) identity = new UUID(most, least); } else getIdentifier(); - mana = cmp.getInteger(TAG_MANA); - rotationX = cmp.getFloat(TAG_ROTATION_X); - rotationY = cmp.getFloat(TAG_ROTATION_Y); - requestsClientUpdate = cmp.getBoolean(TAG_REQUEST_UPDATE); + mana = compound.getInteger(TAG_MANA); + rotationX = compound.getFloat(TAG_ROTATION_X); + rotationY = compound.getFloat(TAG_ROTATION_Y); + requestsClientUpdate = compound.getBoolean(TAG_REQUEST_UPDATE); - if(cmp.hasKey(TAG_INPUT_KEY)) - inputKey = cmp.getString(TAG_INPUT_KEY); - if(cmp.hasKey(TAG_OUTPUT_KEY)) - inputKey = cmp.getString(TAG_OUTPUT_KEY); + if(compound.hasKey(TAG_INPUT_KEY)) + inputKey = compound.getString(TAG_INPUT_KEY); + if(compound.hasKey(TAG_OUTPUT_KEY)) + inputKey = compound.getString(TAG_OUTPUT_KEY); - mapmakerOverride = cmp.getBoolean(TAG_MAPMAKER_OVERRIDE); - mmForcedColor = cmp.getInteger(TAG_FORCED_COLOR); - mmForcedManaPayload = cmp.getInteger(TAG_FORCED_MANA_PAYLOAD); - mmForcedTicksBeforeManaLoss = cmp.getInteger(TAG_FORCED_TICKS_BEFORE_MANA_LOSS); - mmForcedManaLossPerTick = cmp.getFloat(TAG_FORCED_MANA_LOSS_PER_TICK); - mmForcedGravity = cmp.getFloat(TAG_FORCED_GRAVITY); - mmForcedVelocityMultiplier = cmp.getFloat(TAG_FORCED_VELOCITY_MULTIPLIER); + mapmakerOverride = compound.getBoolean(TAG_MAPMAKER_OVERRIDE); + mmForcedColor = compound.getInteger(TAG_FORCED_COLOR); + mmForcedManaPayload = compound.getInteger(TAG_FORCED_MANA_PAYLOAD); + mmForcedTicksBeforeManaLoss = compound.getInteger(TAG_FORCED_TICKS_BEFORE_MANA_LOSS); + mmForcedManaLossPerTick = compound.getFloat(TAG_FORCED_MANA_LOSS_PER_TICK); + mmForcedGravity = compound.getFloat(TAG_FORCED_GRAVITY); + mmForcedVelocityMultiplier = compound.getFloat(TAG_FORCED_VELOCITY_MULTIPLIER); - if(cmp.hasKey(TAG_KNOWN_MANA)) - knownMana = cmp.getInteger(TAG_KNOWN_MANA); - if(cmp.hasKey(TAG_PADDING_COLOR)) - paddingColor = cmp.getInteger(TAG_PADDING_COLOR); - if(cmp.hasKey(TAG_CAN_SHOOT_BURST)) - canShootBurst = cmp.getBoolean(TAG_CAN_SHOOT_BURST); + if(compound.hasKey(TAG_KNOWN_MANA)) + knownMana = compound.getInteger(TAG_KNOWN_MANA); + if(compound.hasKey(TAG_PADDING_COLOR)) + paddingColor = compound.getInteger(TAG_PADDING_COLOR); + if(compound.hasKey(TAG_CAN_SHOOT_BURST)) + canShootBurst = compound.getBoolean(TAG_CAN_SHOOT_BURST); - pingbackTicks = cmp.getInteger(TAG_PINGBACK_TICKS); - lastPingbackX = cmp.getDouble(TAG_LAST_PINGBACK_X); - lastPingbackY = cmp.getDouble(TAG_LAST_PINGBACK_Y); - lastPingbackZ = cmp.getDouble(TAG_LAST_PINGBACK_Z); + pingbackTicks = compound.getInteger(TAG_PINGBACK_TICKS); + lastPingbackX = compound.getDouble(TAG_LAST_PINGBACK_X); + lastPingbackY = compound.getDouble(TAG_LAST_PINGBACK_Y); + lastPingbackZ = compound.getDouble(TAG_LAST_PINGBACK_Z); if(requestsClientUpdate && worldObj != null) { - int x = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_X); - int y = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Y); - int z = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Z); + int x = compound.getInteger(TAG_FORCE_CLIENT_BINDING_X); + int y = compound.getInteger(TAG_FORCE_CLIENT_BINDING_Y); + int z = compound.getInteger(TAG_FORCE_CLIENT_BINDING_Z); if(y != -1) { TileEntity tile = worldObj.getTileEntity(x, y, z); if(tile instanceof IManaReceiver) 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 463a37805..a7620508c 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 net.minecraft.world.World; public class TileRedStringFertilizer extends TileRedString { - public boolean func_149851_a(World p_149851_1_, boolean p_149851_5_) { + public boolean func_149851_a(World world, boolean isClient) { ChunkCoordinates binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(p_149851_1_, binding.posX, binding.posY, binding.posZ, p_149851_5_) : false; + return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(world, binding.posX, binding.posY, binding.posZ, isClient) : false; } - public boolean func_149852_a(World p_149852_1_, Random p_149852_2_) { + public boolean func_149852_a(World world, Random random) { ChunkCoordinates binding = getBinding(); Block block = getBlockAtBinding(); - return block instanceof IGrowable ? ((IGrowable) block).func_149852_a(p_149852_1_, p_149852_2_, binding.posX, binding.posY, binding.posZ) : false; + return block instanceof IGrowable ? ((IGrowable) block).func_149852_a(world, random, binding.posX, binding.posY, binding.posZ) : false; } - public void func_149853_b(World p_149853_1_, Random p_149853_2_) { + public void func_149853_b(World world, Random random) { ChunkCoordinates binding = getBinding(); Block block = getBlockAtBinding(); if(block instanceof IGrowable) - ((IGrowable) block).func_149853_b(p_149853_1_, p_149853_2_, binding.posX, binding.posY, binding.posZ); + ((IGrowable) block).func_149853_b(world, random, binding.posX, binding.posY, binding.posZ); } @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 6e6b3b2bc..7f58535e0 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -27,7 +27,7 @@ public class CommandOpen extends CommandBase { } @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(ICommandSender sender) { return ""; } @@ -50,8 +50,8 @@ public class CommandOpen extends CommandBase { } @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return p_71519_1_ instanceof EntityPlayer; + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return sender instanceof EntityPlayer; } } 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 ef9001966..7fa77d61a 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -25,7 +25,7 @@ public class CommandShare extends CommandBase { } @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(ICommandSender sender) { return ""; } @@ -47,7 +47,7 @@ public class CommandShare extends CommandBase { } @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return p_71519_1_ instanceof EntityPlayer; + public boolean canCommandSenderUseCommand(ICommandSender sender) { + return sender instanceof EntityPlayer; } } 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 3be7ca074..1e7076312 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -27,7 +27,7 @@ public class CommandSkyblockSpread extends CommandBase { } @Override - public String getCommandUsage(ICommandSender p_71518_1_) { + public String getCommandUsage(ICommandSender sender) { return " []"; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 709639076..40d582d7d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -398,9 +398,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_) { - setPosition(p_70056_1_, p_70056_3_, p_70056_5_); - setRotation(p_70056_7_, p_70056_8_); + public void setPositionAndRotation2(double x, double y, double z, float yaw, float pitch, int rotationIncrements) { + 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 4343aad6c..e5638c850 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -31,8 +31,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 worldIn) { + super(worldIn); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1c5c260d8..01e1f8f7c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -136,15 +136,15 @@ public class EntityPoolMinecart extends EntityMinecart { } @Override - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { - super.writeEntityToNBT(p_70014_1_); - p_70014_1_.setInteger(TAG_MANA, getMana()); + protected void writeEntityToNBT(NBTTagCompound tagCompound) { + super.writeEntityToNBT(tagCompound); + tagCompound.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 tagCompund) { + super.readEntityFromNBT(tagCompund); + setMana(tagCompund.getInteger(TAG_MANA)); } public int getMana() { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 9c947fafd..abd948709 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -57,11 +57,11 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile */ @Override @SideOnly(Side.CLIENT) - public boolean isInRangeToRenderDist(double p_70112_1_) + public boolean isInRangeToRenderDist(double distance) { double d1 = boundingBox.getAverageEdgeLength() * 4.0D; d1 *= 64.0D; - return p_70112_1_ < d1 * d1; + return distance < d1 * d1; } public EntityThrowableCopy(World p_i1777_1_, EntityLivingBase p_i1777_2_) @@ -131,17 +131,17 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile */ @Override @SideOnly(Side.CLIENT) - public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) + public void setVelocity(double x, double y, double z) { - motionX = p_70016_1_; - motionY = p_70016_3_; - motionZ = p_70016_5_; + motionX = x; + motionY = y; + motionZ = z; if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_); - prevRotationYaw = rotationYaw = (float)(Math.atan2(p_70016_1_, p_70016_5_) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float)(Math.atan2(p_70016_3_, f) * 180.0D / Math.PI); + float f = MathHelper.sqrt_double(x * x + z * z); + prevRotationYaw = rotationYaw = (float)(Math.atan2(x, z) * 180.0D / Math.PI); + prevRotationPitch = rotationPitch = (float)(Math.atan2(y, f) * 180.0D / Math.PI); } } @@ -312,36 +312,36 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile * (abstract) Protected helper method to write subclass entity data to NBT. */ @Override - public void writeEntityToNBT(NBTTagCompound p_70014_1_) + public void writeEntityToNBT(NBTTagCompound tagCompound) { - p_70014_1_.setShort("xTile", (short)field_145788_c); - p_70014_1_.setShort("yTile", (short)field_145786_d); - p_70014_1_.setShort("zTile", (short)field_145787_e); - p_70014_1_.setByte("inTile", (byte)Block.getIdFromBlock(field_145785_f)); - p_70014_1_.setByte("shake", (byte)throwableShake); - p_70014_1_.setByte("inGround", (byte)(inGround ? 1 : 0)); + tagCompound.setShort("xTile", (short)field_145788_c); + tagCompound.setShort("yTile", (short)field_145786_d); + tagCompound.setShort("zTile", (short)field_145787_e); + tagCompound.setByte("inTile", (byte)Block.getIdFromBlock(field_145785_f)); + tagCompound.setByte("shake", (byte)throwableShake); + tagCompound.setByte("inGround", (byte)(inGround ? 1 : 0)); if ((throwerName == null || throwerName.length() == 0) && thrower != null && thrower instanceof EntityPlayer) { throwerName = thrower.getCommandSenderName(); } - p_70014_1_.setString("ownerName", throwerName == null ? "" : throwerName); + tagCompound.setString("ownerName", throwerName == null ? "" : throwerName); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ @Override - public void readEntityFromNBT(NBTTagCompound p_70037_1_) + public void readEntityFromNBT(NBTTagCompound tagCompund) { - field_145788_c = p_70037_1_.getShort("xTile"); - field_145786_d = p_70037_1_.getShort("yTile"); - field_145787_e = p_70037_1_.getShort("zTile"); - field_145785_f = Block.getBlockById(p_70037_1_.getByte("inTile") & 255); - throwableShake = p_70037_1_.getByte("shake") & 255; - inGround = p_70037_1_.getByte("inGround") == 1; - throwerName = p_70037_1_.getString("ownerName"); + field_145788_c = tagCompund.getShort("xTile"); + field_145786_d = tagCompund.getShort("yTile"); + field_145787_e = tagCompund.getShort("zTile"); + field_145785_f = Block.getBlockById(tagCompund.getByte("inTile") & 255); + throwableShake = tagCompund.getByte("shake") & 255; + inGround = tagCompund.getByte("inGround") == 1; + throwerName = tagCompund.getString("ownerName"); if (throwerName != null && throwerName.length() == 0) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 9224c806d..bba68628f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -29,9 +29,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 worldIn, double x, + double y, double z, EntityItem item) { + super(worldIn, x, y, z, item.getEntityItem()); delayBeforeCanPickup = item.delayBeforeCanPickup; motionX = item.motionX; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 46adc3a4c..ee211cec2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -130,7 +130,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 worldIn, Entity entity, int p_77663_4_, boolean p_77663_5_) { 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/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 88a036695..d7fffb1f1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -59,19 +59,19 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - --p_77659_1_.stackSize; + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { + --itemStackIn.stackSize; - p_77659_2_.playSoundAtEntity(p_77659_3_, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + worldIn.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if(!p_77659_2_.isRemote) { - EntityThornChakram c = new EntityThornChakram(p_77659_2_, p_77659_3_); - c.setFire(p_77659_1_.getItemDamage() != 0); - p_77659_2_.spawnEntityInWorld(c); + if(!worldIn.isRemote) { + EntityThornChakram c = new EntityThornChakram(worldIn, player); + c.setFire(itemStackIn.getItemDamage() != 0); + worldIn.spawnEntityInWorld(c); } - return p_77659_1_; + return itemStackIn; } @Override 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 dc64b4db3..6467904b8 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -68,14 +68,14 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public EnumAction getItemUseAction(ItemStack p_77661_1_) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.drink; } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); - return p_77659_1_; + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { + player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); + return itemStackIn; } @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 44b8bd2e3..ec064a9c5 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 @@ -66,8 +66,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @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/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index c5ea853b9..21f84fd86 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -66,16 +66,16 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - ArrowNockEvent event = new ArrowNockEvent(p_77659_3_, p_77659_1_); + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { + ArrowNockEvent event = new ArrowNockEvent(player, itemStackIn); MinecraftForge.EVENT_BUS.post(event); if(event.isCanceled()) return event.result; - if(canFire(p_77659_1_, p_77659_2_, p_77659_3_, 0)) - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); + if(canFire(itemStackIn, worldIn, player, 0)) + player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); - return p_77659_1_; + return itemStackIn; } @Override 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 fb5d02d55..188dd3f87 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -52,14 +52,14 @@ public class ItemDye extends Item16Colors { } @Override - public boolean itemInteractionForEntity(ItemStack p_111207_1_, EntityPlayer p_111207_2_, EntityLivingBase p_111207_3_) { - if(p_111207_3_ instanceof EntitySheep) { - EntitySheep entitysheep = (EntitySheep)p_111207_3_; - int i = p_111207_1_.getItemDamage(); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target) { + if(target instanceof EntitySheep) { + EntitySheep entitysheep = (EntitySheep)target; + int i = 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 1e24a9fc5..1b848871b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -39,15 +39,15 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @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; } @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if(p_77659_3_.canEat(false) && isRightPlayer(p_77659_3_, p_77659_1_)) - p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); - return p_77659_1_; + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { + if(player.canEat(false) && isRightPlayer(player, itemStackIn)) + player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); + return itemStackIn; } @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 79cb207a2..98bd7abd1 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -40,9 +40,9 @@ public class ItemRelic extends ItemMod 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) - updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int p_77663_4_, boolean p_77663_5_) { + if(entityIn instanceof EntityPlayer) + updateRelic(stack, (EntityPlayer) entityIn); } @Override 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 aeecf1a66..e4e1c1b69 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -32,9 +32,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) - ItemRelic.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); + public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int p_77663_4_, boolean p_77663_5_) { + if(entityIn instanceof EntityPlayer) + ItemRelic.updateRelic(stack, (EntityPlayer) entityIn); } @Override