diff --git a/dependencies.gradle b/dependencies.gradle index 6e62588a1..a0665c499 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,18 +1,18 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH:dev') - api('com.github.GTNewHorizons:GTNHLib:0.7.0:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev') + api('com.github.GTNewHorizons:GTNHLib:0.7.7:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev') {transitive=false} - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev') - compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.0-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.0:dev') {transitive=false} + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Railcraft:9.17.6:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.1-GTNH:api') {transitive=false} compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly("com.github.GTNewHorizons:StructureLib:1.4.23:dev") + compileOnly("com.github.GTNewHorizons:StructureLib:1.4.24:dev") } diff --git a/gradle.properties b/gradle.properties index 3cc9ced38..03e4bc036 100644 --- a/gradle.properties +++ b/gradle.properties @@ -87,7 +87,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -163,6 +165,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. # customArchiveBaseName = +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c7..1b33c55ba 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1c..d4081da47 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008b..23d15a936 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a2183..db3a6ac20 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index 9f80246c2..e883289be 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48' } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 08b5701c2..fac468295 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -11,9 +11,18 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; +import java.util.Map; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; @@ -22,22 +31,114 @@ import vazkii.botania.common.lexicon.LexiconData; public class SubTileArcaneRose extends SubTileGenerating { + private static final int MANA_PER_XP = 50; private static final int RANGE = 1; @Override public void onUpdate() { super.onUpdate(); - if(mana >= getMaxMana()) - return; + World world = supertile.getWorldObj(); - List players = supertile.getWorldObj().getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1)); - for(EntityPlayer player : players) - if(ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { - ExperienceHelper.drainPlayerXP(player, 1); - mana += 50; - return; + if (mana >= getMaxMana() || world.isRemote) { + return; + } + + AxisAlignedBB effectBounds = AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, effectBounds); + for (EntityPlayer player : players) { + if (ExperienceHelper.getPlayerXP(player) <= 0 || !player.onGround) continue; + ExperienceHelper.drainPlayerXP(player, 1); + addMana(MANA_PER_XP); + return; + } + + List orbs = world.getEntitiesWithinAABB(EntityXPOrb.class, effectBounds); + for (EntityXPOrb orb : orbs) { + if (orb.isDead) continue; + addMana(orb.getXpValue() * MANA_PER_XP); + orb.setDead(); + float pitch = (world.rand.nextFloat() - world.rand.nextFloat()) * 0.35F + 0.9F; + world.playSoundAtEntity(orb, "random.orb", 0.1F, pitch); + return; + } + + List items = world.getEntitiesWithinAABB(EntityItem.class, effectBounds); + for (EntityItem entity : items) { + ItemStack oldStack = entity.getEntityItem(); + if (entity.isDead || oldStack == null) continue; + if (oldStack.getItem() != Items.enchanted_book && !oldStack.isItemEnchanted()) { + continue; + } + int xp = getEnchantmentXpValue(oldStack); + if (xp <= 0) continue; + ItemStack newStack = disenchantAndSplit(oldStack); + if (oldStack.stackSize <= 0) entity.setDead(); + + EntityItem newEntity = new EntityItem(world, entity.posX, entity.posY, entity.posZ, newStack); + newEntity.motionX = entity.motionX; + newEntity.motionY = entity.motionY; + newEntity.motionZ = entity.motionZ; + newEntity.age = entity.age; + newEntity.delayBeforeCanPickup = entity.delayBeforeCanPickup; + world.spawnEntityInWorld(newEntity); + + while (xp > 0) { + int i = EntityXPOrb.getXPSplit(xp); + xp -= i; + world.spawnEntityInWorld(new EntityXPOrb(world, newEntity.posX, newEntity.posY, newEntity.posZ, i)); + } + return; + } + } + + /** + * Modified method from GrindstoneMenu + * Removed check for curses since they don't exist in this version + */ + private static int getEnchantmentXpValue(ItemStack stack) { + if (stack.hasTagCompound()) { + NBTTagCompound tag = stack.getTagCompound(); + // Don't remove "enchants" from Tinkers' Construct tools + if (tag.hasKey("InfiTool")) return 0; + } + + int ret = 0; + Map map = EnchantmentHelper.getEnchantments(stack); + + for (Map.Entry entry : map.entrySet()) { + Enchantment enchantment = Enchantment.enchantmentsList[entry.getKey()]; + Integer integer = entry.getValue(); + ret += enchantment.getMinEnchantability(integer); + } + + return ret; + } + + /** + * Modified method from GrindstoneMenu, no damage and count setting + * Removed check for curses since they don't exist in this version + */ + private static ItemStack disenchantAndSplit(ItemStack stack) { + ItemStack newStack = stack.splitStack(1); + + if (newStack.hasTagCompound()) { + NBTTagCompound tag = newStack.getTagCompound(); + tag.removeTag("ench"); + tag.removeTag("RepairCost"); + if (tag.hasNoTags()) { + newStack.setTagCompound(null); } + } + + if (stack.getItem() == Items.enchanted_book) { + newStack = new ItemStack(Items.book); + if (stack.hasDisplayName()) { + newStack.setStackDisplayName(stack.getDisplayName()); + } + } + + return newStack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 7250fdb62..16980df94 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -27,11 +27,11 @@ public class Item16Colors extends ItemMod { } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() >= EntitySheep.fleeceColorTable.length) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(stack.getItemDamage() >= EntitySheep.fleeceColorTable.length) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par1ItemStack.getItemDamage()]; + float[] color = EntitySheep.fleeceColorTable[stack.getItemDamage()]; return new Color(color[0], color[1], color[2]).getRGB(); } @@ -42,12 +42,12 @@ public class Item16Colors extends ItemMod { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 566aff75e..ab4a4de35 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -48,19 +48,19 @@ public class ItemAncientWill extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(icons.length - 1, dmg)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), infoList); addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), infoList); } @@ -70,8 +70,8 @@ public class ItemAncientWill extends ItemMod { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index abafbe8c7..0475912b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -28,12 +28,11 @@ public class ItemAutocraftingHalo extends ItemCraftingHalo { } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { - super.onUpdate(stack, world, entity, pos, equipped); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + super.onUpdate(stack, world, entity, invSlot, isHeld); - if(entity instanceof EntityPlayer && !equipped) { - EntityPlayer player = (EntityPlayer) entity; - IInventory inv = getFakeInv(player); + if(entity instanceof EntityPlayer player && !isHeld) { + IInventory inv = getFakeInv(player); for(int i = 1; i < SEGMENTS; i++) tryCraft(player, stack, i, false, inv, false); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index ee211cec2..7e8711665 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -61,39 +61,38 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); - par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(getBlock(stack) != Blocks.air && player.isSneaking()) { + int dmg = stack.getItemDamage(); + stack.setItemDamage(~dmg & 1); + world.playSoundAtEntity(player, "random.orb", 0.3F, 0.1F); } - return par1ItemStack; + return stack; } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int meta = par3World.getBlockMetadata(par4, par5, par6); - boolean set = setBlock(par1ItemStack, block, meta); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + boolean set = setBlock(stack, block, meta); if(!set) { - Block bBlock = getBlock(par1ItemStack); - int bmeta = getBlockMeta(par1ItemStack); + Block bBlock = getBlock(stack); + int bmeta = getBlockMeta(stack); - TileEntity tile = par3World.getTileEntity(par4, par5, par6); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(par7) : InventoryHelper.buildSlotsForLinearInventory(inv); + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof IInventory inv) { + int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(side) : InventoryHelper.buildSlotsForLinearInventory(inv); for(int slot : slots) { ItemStack stackInSlot = inv.getStackInSlot(slot); if(stackInSlot == null) { - ItemStack stack = new ItemStack(bBlock, 1, bmeta); - int maxSize = stack.getMaxStackSize(); - stack.stackSize = remove(par1ItemStack, maxSize); - if(stack.stackSize != 0) { - if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, par7))) { - inv.setInventorySlotContents(slot, stack); + ItemStack blockStack = new ItemStack(bBlock, 1, bmeta); + int maxSize = blockStack.getMaxStackSize(); + blockStack.stackSize = remove(stack, maxSize); + if(blockStack.stackSize != 0) { + if(inv.isItemValidForSlot(slot, blockStack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, blockStack, side))) { + inv.setInventorySlotContents(slot, blockStack); inv.markDirty(); set = true; } @@ -101,40 +100,39 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) { int maxSize = stackInSlot.getMaxStackSize(); int missing = maxSize - stackInSlot.stackSize; - if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, par7))) { - stackInSlot.stackSize += remove(par1ItemStack, missing); + if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, side))) { + stackInSlot.stackSize += remove(stack, missing); inv.markDirty(); set = true; } } } } else { - ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + ForgeDirection dir = ForgeDirection.getOrientation(side); + int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1)).size(); if(entities == 0) { - int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1); + int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1); if(remove > 0) { - ItemStack stack = new ItemStack(bBlock, 1, bmeta); - ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack)); + ItemStack blockStack = new ItemStack(bBlock, 1, bmeta); + ItemsRemainingRenderHandler.set(blockStack, getBlockCount(stack)); - Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + Item.getItemFromBlock(bBlock).onItemUse(blockStack, player, world, x, y, z, side, subX, subY, subZ); set = true; } } } } - par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); + player.setCurrentItemOrArmor(0, stack); return set; } @Override - public void onUpdate(ItemStack itemstack, World worldIn, Entity entity, int p_77663_4_, boolean p_77663_5_) { + public void onUpdate(ItemStack itemstack, World world, Entity entity, int invSlot, boolean isHeld) { Block block = getBlock(itemstack); - if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; - int meta = getBlockMeta(itemstack); + if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer player) { + int meta = getBlockMeta(itemstack); int highest = -1; int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length]; @@ -187,12 +185,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { - Block block = getBlock(par1ItemStack); - int meta = getBlockMeta(par1ItemStack); - ItemStack stack = new ItemStack(block, 1, meta); + public String getItemStackDisplayName(ItemStack stack) { + Block block = getBlock(stack); + int meta = getBlockMeta(stack); + ItemStack blockStack = new ItemStack(block, 1, meta); - return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + EnumChatFormatting.GREEN + stack.getDisplayName() + EnumChatFormatting.RESET + ")"); + return super.getItemStackDisplayName(stack) + (blockStack == null || blockStack.getItem() == null ? "" : " (" + EnumChatFormatting.GREEN + blockStack.getDisplayName() + EnumChatFormatting.RESET + ")"); } @Override @@ -218,7 +216,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } @@ -238,20 +236,20 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); + enabledIcon = IconHelper.forItem(register, this, 1); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return par1 == 1 ? enabledIcon : itemIcon; + public IIcon getIconFromDamage(int meta) { + return meta == 1 ? enabledIcon : itemIcon; } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { Block block = getBlock(stack); if(block != null && block != Blocks.air) { int count = getBlockCount(stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index e256eafbb..d925d214b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -42,13 +42,13 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public boolean hasEffect(ItemStack par1ItemStack, int pass) { - return par1ItemStack.getItemDamage() > 0; + public boolean hasEffect(ItemStack stack, int pass) { + return stack.getItemDamage() > 0; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } @Override @@ -82,7 +82,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { infoList.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 44a736cb9..86876dd4f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -115,9 +115,8 @@ public class ItemBottledMana extends ItemMod { for(int i = 256; i > 0; i--) { Block block = player.worldObj.getBlock(x, i, z); if(!block.isAir(player.worldObj, x, i, z)) { - if(player instanceof EntityPlayerMP) { - EntityPlayerMP mp = (EntityPlayerMP) player; - mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); + if(player instanceof EntityPlayerMP mp) { + mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch); } break; } @@ -182,8 +181,8 @@ public class ItemBottledMana extends ItemMod { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - getSeed(par1ItemStack); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + getSeed(stack); } public void randomEffect(EntityPlayer player, ItemStack stack) { @@ -204,46 +203,46 @@ public class ItemBottledMana extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { infoList.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[6]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - randomEffect(par3EntityPlayer, par1ItemStack); - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); - randomSeed(par1ItemStack); + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + randomEffect(player, stack); + stack.setItemDamage(stack.getItemDamage() + 1); + randomSeed(stack); - if(par1ItemStack.getItemDamage() == 6) + if(stack.getItemDamage() == 6) return new ItemStack(Items.glass_bottle); - return par1ItemStack; + return stack; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 20; } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.drink; } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 05d425c74..840bb6126 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -48,9 +48,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) { - if(entity instanceof EntityLiving) { - EntityLiving living = (EntityLiving) entity; - String sound = null; + if(entity instanceof EntityLiving living) { + String sound = null; try { if(living instanceof EntityCreeper) sound = "creeper.primed"; @@ -82,7 +81,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { boolean can = isDOIT(stack); if(!can) { String sound = ItemNBTHelper.getString(stack, TAG_SOUND, ""); @@ -105,7 +104,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(isDOIT(stack)) infoList.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) @@ -113,20 +112,20 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.block; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack)) - par3EntityPlayer.setItemInUse(par1ItemStack, 72000); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false) || isDOIT(stack)) + player.setItemInUse(stack, 72000); + return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index cc2c247a9..ae304e834 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -42,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { TileEntity tile = world.getTileEntity(x, y, z); if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, x, y, z)) { stack.stackSize--; @@ -60,17 +60,17 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forItem(par1IconRegister, this, 0); - worldIcon = IconHelper.forItem(par1IconRegister, this, 1); - invIconMaster = IconHelper.forItem(par1IconRegister, this, 2); - worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3); - iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star"); + public void registerIcons(IIconRegister register) { + invIcon = IconHelper.forItem(register, this, 0); + worldIcon = IconHelper.forItem(register, this, 1); + invIconMaster = IconHelper.forItem(register, this, 2); + worldIconMaster = IconHelper.forItem(register, this, 3); + iconColorStar = IconHelper.forItem(register, this, "Star"); } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 9d5223f69..740bf4a8b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -35,11 +35,10 @@ public class ItemCraftPattern extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer p, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile != null && tile instanceof TileCraftCrate && !world.isRemote) { - TileCraftCrate crate = (TileCraftCrate) tile; - crate.pattern = stack.getItemDamage(); + if(tile instanceof TileCraftCrate crate && !world.isRemote) { + crate.pattern = stack.getItemDamage(); world.markBlockForUpdate(x, y, z); } return false; @@ -52,20 +51,20 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[TileCraftCrate.PATTERNS.length]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(icons.length - 1, dmg)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index f978aafe9..3e3be7287 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -114,12 +114,12 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) { + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { boolean eqLastTick = wasEquipped(stack); - if(eqLastTick != equipped) - setEquipped(stack, equipped); + if(eqLastTick != isHeld) + setEquipped(stack, isHeld); - if(!equipped && entity instanceof EntityLivingBase) { + if(!isHeld && entity instanceof EntityLivingBase) { int angles = 360; int segAngles = angles / SEGMENTS; float shift = segAngles / 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index e7912fff3..8a314729f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -29,38 +29,38 @@ public class ItemFertilizer extends ItemMod { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { final int range = 3; - if(!par3World.isRemote) { + if(!world.isRemote) { List validCoords = new ArrayList<>(); for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { for(int k = 2; k >= -2; k--) { - int x = par4 + i + 1; - int y = par5 + k + 1; - int z = par6 + j + 1; - if(par3World.isAirBlock(x, y, z) && (!par3World.provider.hasNoSky || y < 255) && ModBlocks.flower.canBlockStay(par3World, x, y, z)) - validCoords.add(new ChunkCoordinates(x, y, z)); + int tryX = x + i + 1; + int tryY = y + k + 1; + int tryZ = z + j + 1; + if(world.isAirBlock(tryX, tryY, tryZ) && (!world.provider.hasNoSky || tryY < 255) && ModBlocks.flower.canBlockStay(world, tryX, tryY, tryZ)) + validCoords.add(new ChunkCoordinates(tryX, tryY, tryZ)); } } - int flowerCount = Math.min(validCoords.size(), par3World.rand.nextBoolean() ? 3 : 4); + int flowerCount = Math.min(validCoords.size(), world.rand.nextBoolean() ? 3 : 4); for(int i = 0; i < flowerCount; i++) { - ChunkCoordinates coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); + ChunkCoordinates coords = validCoords.get(world.rand.nextInt(validCoords.size())); validCoords.remove(coords); - par3World.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); + world.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, world.rand.nextInt(16), 1 | 2); } - par1ItemStack.stackSize--; + stack.stackSize--; } else { for(int i = 0; i < 15; i++) { - double x = par4 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); - double y = par5 + 1; - double z = par6 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double px = x - range + world.rand.nextInt(range * 2 + 1) + Math.random(); + double py = y + 1; + double pz = z - range + world.rand.nextInt(range * 2 + 1) + Math.random(); float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - Botania.proxy.wispFX(par3World, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); + Botania.proxy.wispFX(world, px, py, pz, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index ec8205310..2ba8110d0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -30,7 +30,7 @@ public class ItemGaiaHead extends ItemMod { // I couldn't deal with it. @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float sideX, float sideY, float sideZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { // The side of the wall the head is being used on. ForgeDirection sideDir = ForgeDirection.getOrientation(side); @@ -80,7 +80,7 @@ public class ItemGaiaHead extends ItemMod { // Update the skull's orientation if it lets us. TileEntity tileentity = world.getTileEntity(x, y, z); - if (tileentity != null && tileentity instanceof TileEntitySkull) { + if (tileentity instanceof TileEntitySkull) { ((TileEntitySkull) tileentity).func_145903_a(headAngle); ((BlockSkull) Blocks.skull).func_149965_a(world, x, y, z, (TileEntitySkull) tileentity); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 583e26f9f..67de21ac9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -57,16 +57,16 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - vuvuzelaIcon = IconHelper.forName(par1IconRegister, "vuvuzela"); + icons[i] = IconHelper.forItem(register, this, i); + vuvuzelaIcon = IconHelper.forName(register, "vuvuzela"); } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack); + public IIcon getIconIndex(ItemStack stack) { + return stack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(stack); } @Override @@ -75,33 +75,33 @@ public class ItemGrassHorn extends ItemMod { } @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 70eafad89..6c3341089 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Random; @@ -73,16 +72,16 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override @@ -91,19 +90,19 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int bmeta = par3World.getBlockMetadata(par4, par5, par6); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + Block block = world.getBlock(x, y, z); + int bmeta = world.getBlockMetadata(x, y, z); - if((block == Blocks.dirt || block == Blocks.grass && par1ItemStack.getItemDamage() != 0) && bmeta == 0) { - int meta = par1ItemStack.getItemDamage(); + if((block == Blocks.dirt || block == Blocks.grass && stack.getItemDamage() != 0) && bmeta == 0) { + int meta = stack.getItemDamage(); - BlockSwapper swapper = addBlockSwapper(par3World, par4, par5, par6, meta); - par3World.setBlock(par4, par5, par6, swapper.blockToSet, swapper.metaToSet, 1 | 2); + BlockSwapper swapper = addBlockSwapper(world, x, y, z, meta); + world.setBlock(x, y, z, swapper.blockToSet, swapper.metaToSet, 1 | 2); for(int i = 0; i < 50; i++) { - double x = (Math.random() - 0.5) * 3; - double y = Math.random() - 0.5 + 1; - double z = (Math.random() - 0.5) * 3; + double dx = (Math.random() - 0.5) * 3; + double dy = Math.random() - 0.5 + 1; + double dz = (Math.random() - 0.5) * 3; float r = 0F; float g = 0.4F; @@ -161,10 +160,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { float velMul = 0.025F; - Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(world, x + 0.5 + dx, y + 0.5 + dy, z + 0.5 + dz, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -dx * velMul, (float) -dy * velMul, (float) -dz * velMul); } - par1ItemStack.stackSize--; + stack.stackSize--; } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index f14ec6ea5..72969b5f0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -66,18 +66,18 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(par5 < 160 && !par3World.provider.isHellWorld) { - par3World.playSound(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false); - spawnBurstFirst(par3World, par4, par5, par6, par1ItemStack); - par1ItemStack.stackSize--; - if(par1ItemStack.getItemDamage() == 19) - par2EntityPlayer.addStat(ModAchievements.l20ShardUse, 1); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(y < 160 && !world.provider.isHellWorld) { + world.playSound(x + 0.5D, y + 0.5D, z + 0.5D, "botania:laputaStart", 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F, false); + spawnBurstFirst(world, x, y, z, stack); + stack.stackSize--; + if(stack.getItemDamage() == 19) + player.addStat(ModAchievements.l20ShardUse, 1); } return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3bc07d5dc..ca228ed0d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -55,23 +55,23 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(par2EntityPlayer.isSneaking()) { - Block block = par3World.getBlock(par4, par5, par6); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(player.isSneaking()) { + Block block = world.getBlock(x, y, z); if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, par4, par5, par6, par2EntityPlayer, par1ItemStack); - if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { + LexiconEntry entry = ((ILexiconable) block).getEntry(world, x, y, z, player, stack); + if(entry != null && isKnowledgeUnlocked(stack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); - Botania.proxy.setLexiconStack(par1ItemStack); + Botania.proxy.setLexiconStack(stack); - openBook(par2EntityPlayer, par1ItemStack, par3World, false); + openBook(player, stack, world, false); return true; } - } else if(par3World.isRemote) { - MovingObjectPosition pos = new MovingObjectPosition(par4, par5, par6, par7, Vec3.createVectorHelper(par8, par9, par10)); - return Botania.proxy.openWikiPage(par3World, block, pos); + } else if(world.isRemote) { + MovingObjectPosition pos = new MovingObjectPosition(x, y, z, side, Vec3.createVectorHelper(subX, subY, subZ)); + return Botania.proxy.openWikiPage(world, block, pos); } } } @@ -91,7 +91,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(GuiScreen.isShiftKeyDown()) { String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) @@ -122,20 +122,20 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - String force = getForcedPage(par1ItemStack); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + String force = getForcedPage(stack); if(force != null && !force.isEmpty()) { - LexiconEntry entry = getEntryFromForce(par1ItemStack); + LexiconEntry entry = getEntryFromForce(stack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else par3EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); - setForcedPage(par1ItemStack, ""); + else player.addChatMessage(new ChatComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); + setForcedPage(stack, ""); } - openBook(par3EntityPlayer, par1ItemStack, par2World, skipSound); + openBook(player, stack, world, skipSound); skipSound = false; - return par1ItemStack; + return stack; } public static void openBook(EntityPlayer player, ItemStack stack, World world, boolean skipSound) { @@ -160,7 +160,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int idk, boolean something) { + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { int ticks = getQueueTicks(stack); if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; @@ -172,7 +172,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public EnumRarity getRarity(ItemStack par1ItemStack) { + public EnumRarity getRarity(ItemStack stack) { return EnumRarity.uncommon; } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 04aa14620..905c0be58 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -39,20 +39,20 @@ public class ItemManaCookie extends ItemFood { } @Override - protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, EntityPlayer p_77849_3_) { - super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_); - p_77849_3_.addStat(ModAchievements.manaCookieEat, 1); + protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) { + super.onFoodEaten(stack, world, player); + player.addStat(ModAchievements.manaCookieEat, 1); } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @@ -67,9 +67,9 @@ public class ItemManaCookie extends ItemFood { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit"); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); + totalBiscuitIcon = IconHelper.forName(register, "totalBiscuit"); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 437c36d5b..87cb6eca9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -73,51 +73,51 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { int effCd = COOLDOWN; - PotionEffect effect = par3EntityPlayer.getActivePotionEffect(Potion.digSpeed); + PotionEffect effect = player.getActivePotionEffect(Potion.digSpeed); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; - if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) { - rotatePos(par1ItemStack); - par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); - if(par2World.isRemote) - par3EntityPlayer.swingItem(); - ItemStack lens = getLens(par1ItemStack); + if(player.isSneaking() && hasClip(stack)) { + rotatePos(stack); + world.playSoundAtEntity(player, "random.click", 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + if(world.isRemote) + player.swingItem(); + ItemStack lens = getLens(stack); ItemsRemainingRenderHandler.set(lens, -2); - par1ItemStack.setItemDamage(effCd); - } else if(par1ItemStack.getItemDamage() == 0) { - EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true); - if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) { - if(!par2World.isRemote) { - par2World.playSoundAtEntity(par3EntityPlayer, "botania:manaBlaster", 0.6F, 1F); - par3EntityPlayer.addStat(ModAchievements.manaBlasterShoot, 1); - if(isSugoiKawaiiDesuNe(par1ItemStack)) - par3EntityPlayer.addStat(ModAchievements.desuGun, 1); - par2World.spawnEntityInWorld(burst); + stack.setItemDamage(effCd); + } else if(stack.getItemDamage() == 0) { + EntityManaBurst burst = getBurst(player, stack, true); + if(burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) { + if(!world.isRemote) { + world.playSoundAtEntity(player, "botania:manaBlaster", 0.6F, 1F); + player.addStat(ModAchievements.manaBlasterShoot, 1); + if(isSugoiKawaiiDesuNe(stack)) + player.addStat(ModAchievements.desuGun, 1); + world.spawnEntityInWorld(burst); } else { - par3EntityPlayer.swingItem(); - par3EntityPlayer.motionX -= burst.motionX * 0.1; - par3EntityPlayer.motionY -= burst.motionY * 0.3; - par3EntityPlayer.motionZ -= burst.motionZ * 0.1; + player.swingItem(); + player.motionX -= burst.motionX * 0.1; + player.motionY -= burst.motionY * 0.3; + player.motionZ -= burst.motionZ * 0.1; } - par1ItemStack.setItemDamage(effCd); - } else if(!par2World.isRemote) - par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); + stack.setItemDamage(effCd); + } else if(!world.isRemote) + world.playSoundAtEntity(player, "random.click", 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } - return par1ItemStack; + return stack; } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { int states = 3; icons = new IIcon[states * 2]; for(int i = 0; i < states; i++) { - icons[i] = IconHelper.forItem(par1IconRegister, this, i); - icons[states + i] = IconHelper.forName(par1IconRegister, "desuGun" + i); + icons[i] = IconHelper.forItem(register, this, i); + icons[states + i] = IconHelper.forName(register, "desuGun" + i); } } @@ -156,11 +156,11 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; - EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false); + EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false); Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); @@ -180,7 +180,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } @@ -216,7 +216,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { boolean clip = hasClip(stack); if(clip && !GuiScreen.isShiftKeyDown()) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); @@ -250,9 +250,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { - ItemStack lens = getLens(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + EnumChatFormatting.GREEN + lens.getDisplayName() + EnumChatFormatting.RESET + ")"); + public String getItemStackDisplayName(ItemStack stack) { + ItemStack lens = getLens(stack); + return super.getItemStackDisplayName(stack) + (lens == null ? "" : " (" + EnumChatFormatting.GREEN + lens.getDisplayName() + EnumChatFormatting.RESET + ")"); } public static boolean hasClip(ItemStack stack) { @@ -335,9 +335,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(stack.isItemDamaged()) + stack.setItemDamage(stack.getItemDamage() - 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 27d99c709..1489c01c5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -53,9 +53,9 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - float mana = getMana(par1ItemStack); - return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF; + public int getColorFromItemStack(ItemStack stack, int renderPass) { + float mana = getMana(stack); + return renderPass == 1 ? Color.HSBtoRGB(0.528F, mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF; } @Override @@ -70,10 +70,10 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -87,29 +87,29 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par2World.isRemote) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(world.isRemote) return; - IManaPool pool = getManaPool(par1ItemStack); + IManaPool pool = getManaPool(stack); if(!(pool instanceof DummyPool)) { if(pool == null) - setMana(par1ItemStack, 0); + setMana(stack, 0); else { - pool.recieveMana(getManaBacklog(par1ItemStack)); - setManaBacklog(par1ItemStack, 0); - setMana(par1ItemStack, pool.getCurrentMana()); + pool.recieveMana(getManaBacklog(stack)); + setManaBacklog(stack, 0); + setMana(stack, pool.getCurrentMana()); } } } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(par2EntityPlayer.isSneaking() && !par3World.isRemote) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); - if(tile != null && tile instanceof IManaPool) { - bindPool(par1ItemStack, tile); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(player.isSneaking() && !world.isRemote) { + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof IManaPool) { + bindPool(stack, tile); + world.playSoundAtEntity(player, "botania:ding", 1F, 1F); return true; } } @@ -201,7 +201,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte if(world != null) { TileEntity tile = world.getTileEntity(coords.posX, coords.posY, coords.posZ); - if(tile != null && tile instanceof IManaPool) + if(tile instanceof IManaPool) return (IManaPool) tile; } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 4a1dcb473..f9b69336d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -65,9 +65,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - float mana = getMana(par1ItemStack); - return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / MAX_MANA, 1F) : 0xFFFFFF; + public int getColorFromItemStack(ItemStack stack, int renderPass) { + float mana = getMana(stack); + return renderPass == 1 ? Color.HSBtoRGB(0.528F, mana / MAX_MANA, 1F) : 0xFFFFFF; } @Override @@ -81,10 +81,10 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -93,7 +93,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(isStackCreative(stack)) infoList.add(StatCollector.translateToLocal("botaniamisc.creative")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index 4e20174df..ce0807e08 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -28,19 +28,19 @@ public class ItemMod extends Item { } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index acce895e6..63ebcaf44 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -32,9 +32,9 @@ public class ItemObedienceStick extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { TileEntity tileAt = world.getTileEntity(x, y, z); - if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { + if((tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { boolean pool = tileAt instanceof IManaPool; Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator; int range = pool ? SubTileFunctional.RANGE : SubTileGenerating.RANGE; diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 5388f1bba..f254a3223 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -25,37 +25,37 @@ public class ItemOpenBucket extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(world, player, true); if(movingobjectposition == null) - return par1ItemStack; + return stack; else { if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { int i = movingobjectposition.blockX; int j = movingobjectposition.blockY; int k = movingobjectposition.blockZ; - if(!par2World.canMineBlock(par3EntityPlayer, i, j, k)) - return par1ItemStack; + if(!world.canMineBlock(player, i, j, k)) + return stack; - if(!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack)) - return par1ItemStack; + if(!player.canPlayerEdit(i, j, k, movingobjectposition.sideHit, stack)) + return stack; - Material material = par2World.getBlock(i, j, k).getMaterial(); - int l = par2World.getBlockMetadata(i, j, k); + Material material = world.getBlock(i, j, k).getMaterial(); + int l = world.getBlockMetadata(i, j, k); if((material == Material.lava || material == Material.water) && l == 0) { - par2World.setBlockToAir(i, j, k); + world.setBlockToAir(i, j, k); for(int x = 0; x < 5; x++) - par2World.spawnParticle("explode", i + Math.random(), j + Math.random(), k + Math.random(), 0, 0, 0); + world.spawnParticle("explode", i + Math.random(), j + Math.random(), k + Math.random(), 0, 0, 0); - return par1ItemStack; + return stack; } } - return par1ItemStack; + return stack; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index fd9c25a08..58946b36b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -25,7 +25,7 @@ public class ItemOvergrowthSeed extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { Block block = world.getBlock(x, y, z); ItemStack blockStack = new ItemStack(block); int[] ids = OreDictionary.getOreIDs(blockStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 490d3706c..edbe21a77 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -54,7 +54,7 @@ public class ItemPinkinator extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { infoList.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 248d72917..1d1e938dc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -36,18 +36,18 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(BlockRailBase.func_150051_a(p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_))) { - if(!p_77648_3_.isRemote) { - EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, p_77648_4_ + 0.5, p_77648_5_ + 0.5, p_77648_6_ + 0.5); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(BlockRailBase.func_150051_a(world.getBlock(x, y, z))) { + if(!world.isRemote) { + EntityMinecart entityminecart = new EntityPoolMinecart(world, x + 0.5, y + 0.5, z + 0.5); - if(p_77648_1_.hasDisplayName()) - entityminecart.setMinecartName(p_77648_1_.getDisplayName()); + if(stack.hasDisplayName()) + entityminecart.setMinecartName(stack.getDisplayName()); - p_77648_3_.spawnEntityInWorld(entityminecart); + world.spawnEntityInWorld(entityminecart); } - --p_77648_1_.stackSize; + --stack.stackSize; return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index fff78921f..d6ae5ef2a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -44,12 +44,12 @@ public class ItemSextant extends ItemMod { } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @@ -90,23 +90,23 @@ public class ItemSextant extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { Botania.proxy.removeSextantMultiblock(); - if(!par3EntityPlayer.isSneaking()) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128); + if(!player.isSneaking()) { + MovingObjectPosition pos = ToolCommons.raytraceFromEntity(world, player, false, 128); if(pos != null && pos.entityHit == null) { - if(!par2World.isRemote) { - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.blockX); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.blockY); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.blockZ); + if(!world.isRemote) { + ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.blockX); + ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.blockY); + ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.blockZ); } - } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); + } else ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, -1); - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + player.setItemInUse(stack, getMaxItemUseDuration(stack)); } - return par1ItemStack; + return stack; } public static double calculateRadius(ItemStack stack, EntityPlayer player) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 516d9cdf5..e4f57a393 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -54,47 +54,47 @@ public class ItemSignalFlare extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(par1ItemStack.getItemDamage() == 0) { - if(par2World.isRemote) - par3EntityPlayer.swingItem(); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(stack.getItemDamage() == 0) { + if(world.isRemote) + player.swingItem(); else { - EntitySignalFlare flare = new EntitySignalFlare(par2World); - flare.setPosition(par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ); - flare.setColor(getColor(par1ItemStack)); - par2World.playSoundAtEntity(par3EntityPlayer, "random.explode", 40F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F); + EntitySignalFlare flare = new EntitySignalFlare(world); + flare.setPosition(player.posX, player.posY, player.posZ); + flare.setColor(getColor(stack)); + world.playSoundAtEntity(player, "random.explode", 40F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - par2World.spawnEntityInWorld(flare); + world.spawnEntityInWorld(flare); int stunned = 0; int range = 5; - List entities = par2World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par3EntityPlayer.posX - range, par3EntityPlayer.posY - range, par3EntityPlayer.posZ - range, par3EntityPlayer.posX + range, par3EntityPlayer.posY + range, par3EntityPlayer.posZ + range)); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityLivingBase entity : entities) - if(entity != par3EntityPlayer && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) { + if(entity != player && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) { entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5)); stunned++; } if(stunned >= 100) - par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1); + player.addStat(ModAchievements.signalFlareStun, 1); } - par1ItemStack.damageItem(200, par3EntityPlayer); + stack.damageItem(200, player); } - return par1ItemStack; + return stack; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(stack.isItemDamaged()) + stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -103,22 +103,22 @@ public class ItemSignalFlare extends ItemMod { } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; - int colorv = getColor(par1ItemStack); + int colorv = getColor(stack); if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)]; + float[] color = EntitySheep.fleeceColorTable[getColor(stack)]; return new Color(color[0], color[1], color[2]).getRGB(); } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) - par3List.add(forColor(i)); + list.add(forColor(i)); } @Override @@ -127,7 +127,7 @@ public class ItemSignalFlare extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { int storedColor = getColor(stack); infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 3a9b37420..3d1069d42 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -31,18 +31,18 @@ public class ItemSlimeBottle extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - activeIcon = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); + activeIcon = IconHelper.forItem(register, this, 1); } @Override - public IIcon getIconFromDamage(int dmg) { - return dmg == 0 ? itemIcon : activeIcon; + public IIcon getIconFromDamage(int meta) { + return meta == 0 ? itemIcon : activeIcon; } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { if(!world.isRemote) { int x = MathHelper.floor_double(entity.posX); int z = MathHelper.floor_double(entity.posZ); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index cd52a80f4..f2f4d7f1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -25,50 +25,50 @@ public class ItemSlingshot extends ItemMod { } @Override - public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) { - int j = getMaxItemUseDuration(par1ItemStack) - par4; + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) { + int j = getMaxItemUseDuration(stack) - itemInUseCount; - if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) { + if(player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.vineBall)) { float f = j / 20.0F; f = (f * f + f * 2.0F) / 3.0F; if(f < 1F) return; - if(!par3EntityPlayer.capabilities.isCreativeMode) - par3EntityPlayer.inventory.consumeInventoryItem(ModItems.vineBall); + if(!player.capabilities.isCreativeMode) + player.inventory.consumeInventoryItem(ModItems.vineBall); - if(!par2World.isRemote) { - EntityVineBall ball = new EntityVineBall(par3EntityPlayer, false); + if(!world.isRemote) { + EntityVineBall ball = new EntityVineBall(player, false); ball.motionX *= 1.6; ball.motionY *= 1.6; ball.motionZ *= 1.6; - par2World.spawnEntityInWorld(ball); + world.spawnEntityInWorld(ball); } } } @Override - public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - return par1ItemStack; + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + return stack; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.vineBall)) + player.setItemInUse(stack, getMaxItemUseDuration(stack)); - return par1ItemStack; + return stack; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index c017efc98..049dd807f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -36,11 +36,10 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof ISparkAttachable) { - ISparkAttachable attach = (ISparkAttachable) tile; - if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) { + if(tile instanceof ISparkAttachable attach) { + if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) { stack.stackSize--; if(!world.isRemote) { EntitySpark spark = new EntitySpark(world); @@ -56,13 +55,13 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving } @Override - public void registerIcons(IIconRegister par1IconRegister) { - invIcon = IconHelper.forItem(par1IconRegister, this, 0); - worldIcon = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + invIcon = IconHelper.forItem(register, this, 0); + worldIcon = IconHelper.forItem(register, this, 1); } @Override - public IIcon getIconFromDamage(int p_77617_1_) { + public IIcon getIconFromDamage(int meta) { return invIcon; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 7b3345ef6..a0cdca149 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -33,12 +33,12 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { worldIcons = new IIcon[VARIANTS]; invIcons = new IIcon[VARIANTS]; for(int i = 0; i < VARIANTS; i++) { - worldIcons[i] = IconHelper.forItem(par1IconRegister, this, "L" + i); - invIcons[i] = IconHelper.forItem(par1IconRegister, this, i); + worldIcons[i] = IconHelper.forItem(register, this, "L" + i); + invIcons[i] = IconHelper.forItem(register, this, i); } } @@ -54,11 +54,11 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 2202cca63..6b9a4bf43 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -42,9 +42,9 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconNormal = IconHelper.forItem(par1IconRegister, this, 0); - iconSpawner = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + iconNormal = IconHelper.forItem(register, this, 0); + iconSpawner = IconHelper.forItem(register, this, 1); } @Override @@ -53,8 +53,8 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return hasData(par1ItemStack) ? iconSpawner : iconNormal; + public IIcon getIconIndex(ItemStack stack) { + return hasData(stack) ? iconSpawner : iconNormal; } public static NBTTagCompound getSpawnerTag(ItemStack stack) { @@ -90,31 +90,31 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { String id = getEntityId(stack); if (id != null) infoList.add(StatCollector.translateToLocal("entity." + id + ".name")); } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { NBTTagCompound tag = stack.getTagCompound(); if(tag != null && tag.hasKey(TAG_PLACE_DELAY) && tag.getInteger(TAG_PLACE_DELAY) > 0) tag.setInteger(TAG_PLACE_DELAY, tag.getInteger(TAG_PLACE_DELAY) - 1); } @Override - public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { - if(getEntityId(itemstack) == null) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(getEntityId(stack) == null) { if(world.getBlock(x, y, z).equals(Blocks.mob_spawner)) { TileEntity te = world.getTileEntity(x, y, z); NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TAG_SPAWNER, new NBTTagCompound()); te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER)); tag.setInteger(TAG_PLACE_DELAY, 20); - itemstack.setTagCompound(tag); + stack.setTagCompound(tag); world.setBlockToAir(x, y, z); - player.renderBrokenItemStack(itemstack); + player.renderBrokenItemStack(stack); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); @@ -124,7 +124,7 @@ public class ItemSpawnerMover extends ItemMod { return true; } else return false; } else { - if(getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, x, y, z, side, xOffset, yOffset, zOffset)) + if(getDelay(stack) <= 0 && placeBlock(stack, player, world, x, y, z, side, subX, subY, subZ)) return true; return false; } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index d8782f5d5..3161d6cad 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -35,8 +35,8 @@ public class ItemSpellCloth extends ItemMod { @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - return Color.HSBtoRGB(0.55F, ((float) par1ItemStack.getMaxDamage() - (float) par1ItemStack.getItemDamage()) / par1ItemStack.getMaxDamage() * 0.5F, 1F); + public int getColorFromItemStack(ItemStack stack, int renderPass) { + return Color.HSBtoRGB(0.55F, ((float) stack.getMaxDamage() - (float) stack.getItemDamage()) / stack.getMaxDamage() * 0.5F, 1F); } @Override @@ -52,7 +52,7 @@ public class ItemSpellCloth extends ItemMod { } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 4594eeeda..bf66d8a88 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -35,30 +35,30 @@ public class ItemTemperanceStone extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); - par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + int dmg = stack.getItemDamage(); + stack.setItemDamage(~dmg & 1); + world.playSoundAtEntity(player, "random.orb", 0.3F, 0.1F); - return par1ItemStack; + return stack; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); + enabledIcon = IconHelper.forItem(register, this, 1); } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return par1 == 1 ? enabledIcon : itemIcon; + public IIcon getIconFromDamage(int meta) { + return meta == 1 ? enabledIcon : itemIcon; } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer p, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(stack.getItemDamage() == 1) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), infoList); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), infoList); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index d7fffb1f1..b7c96355e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -43,14 +43,14 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - iconFire = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); + iconFire = IconHelper.forItem(register, this, 1); } @Override - public IIcon getIconFromDamage(int dmg) { - return dmg == 0 ? itemIcon : iconFire; + public IIcon getIconFromDamage(int meta) { + return meta == 0 ? itemIcon : iconFire; } @Override @@ -59,19 +59,19 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { - --itemStackIn.stackSize; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + --stack.stackSize; - worldIn.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if(!worldIn.isRemote) { - EntityThornChakram c = new EntityThornChakram(worldIn, player); - c.setFire(itemStackIn.getItemDamage() != 0); - worldIn.spawnEntityInWorld(c); + if(!world.isRemote) { + EntityThornChakram c = new EntityThornChakram(world, player); + c.setFire(stack.getItemDamage() != 0); + world.spawnEntityInWorld(c); } - return itemStackIn; + return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 11ecce9b0..7b62f8460 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -64,86 +64,86 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - ChunkCoordinates boundTile = getBoundTile(par1ItemStack); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + Block block = world.getBlock(x, y, z); + ChunkCoordinates boundTile = getBoundTile(stack); - if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) { - TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); + if(boundTile.posY != -1 && player.isSneaking() && (boundTile.posX != x || boundTile.posY != y || boundTile.posZ != z)) { + TileEntity tile = world.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { + if(((IWandBindable) tile).bindTo(player, stack, x, y, z, side)) { Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5); - Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5); - doParticleBeam(par3World, orig, end); + Vector3 end = new Vector3(x + 0.5, y + 0.5, z + 0.5); + doParticleBeam(world, orig, end); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ); - setBoundTile(par1ItemStack, 0, -1, 0); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, boundTile.posX, boundTile.posY, boundTile.posZ); + setBoundTile(stack, 0, -1, 0); } return true; - } else setBoundTile(par1ItemStack, 0, -1, 0); - } else if(par2EntityPlayer.isSneaking()) { - block.rotateBlock(par3World, par4, par5, par6, ForgeDirection.getOrientation(par7)); - if(par3World.isRemote) - par2EntityPlayer.swingItem(); + } else setBoundTile(stack, 0, -1, 0); + } else if(player.isSneaking()) { + block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side)); + if(world.isRemote) + player.swingItem(); } if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) { int meta = -1; - if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 0)) + if(TileEnchanter.canEnchanterExist(world, x, y, z, 0)) meta = 0; - else if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 1)) + else if(TileEnchanter.canEnchanterExist(world, x, y, z, 1)) meta = 1; - if(meta != -1 && !par3World.isRemote) { - par3World.setBlock(par4, par5, par6, ModBlocks.enchanter, meta, 1 | 2); - par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1); - par3World.playSoundEffect(par4, par5, par6, "botania:enchanterBlock", 0.5F, 0.6F); + if(meta != -1 && !world.isRemote) { + world.setBlock(x, y, z, ModBlocks.enchanter, meta, 1 | 2); + player.addStat(ModAchievements.enchanterMake, 1); + world.playSoundEffect(x, y, z, "botania:enchanterBlock", 0.5F, 0.6F); for(int i = 0; i < 50; i++) { float red = (float) Math.random(); float green = (float) Math.random(); float blue = (float) Math.random(); - double x = (Math.random() - 0.5) * 6; - double y = (Math.random() - 0.5) * 6; - double z = (Math.random() - 0.5) * 6; + double dx = (Math.random() - 0.5) * 6; + double dy = (Math.random() - 0.5) * 6; + double dz = (Math.random() - 0.5) * 6; float velMul = 0.07F; - Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(world, x + 0.5 + dx, y + 0.5 + dy, z + 0.5 + dz, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -dx * velMul, (float) -dy * velMul, (float) -dz * velMul); } } } else if(block instanceof IWandable) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + TileEntity tile = world.getTileEntity(x, y, z); boolean bindable = tile instanceof IWandBindable; boolean wanded = false; - if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) { - if(boundTile.posX == par4 && boundTile.posY == par5 && boundTile.posZ == par6) - setBoundTile(par1ItemStack, 0, -1, 0); - else setBoundTile(par1ItemStack, par4, par5, par6); + if(getBindMode(stack) && bindable && player.isSneaking() && ((IWandBindable) tile).canSelect(player, stack, x, y, z, side)) { + if(boundTile.posX == x && boundTile.posY == y && boundTile.posZ == z) + setBoundTile(stack, 0, -1, 0); + else setBoundTile(stack, x, y, z); - if(par3World.isRemote) - par2EntityPlayer.swingItem(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 0.1F, 1F); + if(world.isRemote) + player.swingItem(); + world.playSoundAtEntity(player, "botania:ding", 0.1F, 1F); wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par7); - if(wanded && par3World.isRemote) - par2EntityPlayer.swingItem(); + wanded = ((IWandable) block).onUsedByWand(player, stack, world, x, y, z, side); + if(wanded && world.isRemote) + player.swingItem(); } return wanded; - } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { - String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); - String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.dimensionId, par4, par5, par6); + } else if(BlockPistonRelay.playerPositions.containsKey(player.getCommandSenderName()) && !world.isRemote) { + String bindPos = BlockPistonRelay.playerPositions.get(player.getCommandSenderName()); + String currentPos = BlockPistonRelay.getCoordsAsString(world.provider.dimensionId, x, y, z); - BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); + BlockPistonRelay.playerPositions.remove(player.getCommandSenderName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); - BlockPistonRelay.WorldData.get(par3World).markDirty(); + BlockPistonRelay.WorldData.get(world).markDirty(); - par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); + world.playSoundAtEntity(player, "botania:ding", 1F, 1F); } return false; @@ -175,11 +175,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - ChunkCoordinates coords = getBoundTile(par1ItemStack); - TileEntity tile = par2World.getTileEntity(coords.posX, coords.posY, coords.posZ); - if(tile == null || !(tile instanceof IWandBindable)) - setBoundTile(par1ItemStack, 0, -1, 0); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + ChunkCoordinates coords = getBoundTile(stack); + TileEntity tile = world.getTileEntity(coords.posX, coords.posY, coords.posZ); + if(!(tile instanceof IWandBindable)) + setBoundTile(stack, 0, -1, 0); } @Override @@ -198,10 +198,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[4]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -213,11 +213,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0 || par2 == 3) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0 || renderPass == 3) return 0xFFFFFF; - float[] color = EntitySheep.fleeceColorTable[par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)]; + float[] color = EntitySheep.fleeceColorTable[renderPass == 1 ? getColor1(stack) : getColor2(stack)]; return new Color(color[0], color[1], color[2]).getRGB(); } @@ -238,17 +238,17 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack); } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { - list.add(StatCollector.translateToLocal(getModeString(stack))); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { + infoList.add(StatCollector.translateToLocal(getModeString(stack))); } @Override - public EnumRarity getRarity(ItemStack par1ItemStack) { + public EnumRarity getRarity(ItemStack stack) { return EnumRarity.rare; } @@ -302,7 +302,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); - if(tile != null && tile instanceof ITileBound) { + if(tile instanceof ITileBound) { ChunkCoordinates coords = ((ITileBound) tile).getBinding(); return coords; } diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 0c871586e..863a35a3b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -23,16 +23,16 @@ public class ItemVineBall extends ItemMod { } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(!par3EntityPlayer.capabilities.isCreativeMode) - --par1ItemStack.stackSize; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(!player.capabilities.isCreativeMode) + --stack.stackSize; - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (par2World.rand.nextFloat() * 0.4F + 0.8F)); + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); - if(!par2World.isRemote) - par2World.spawnEntityInWorld(new EntityVineBall(par3EntityPlayer, true)); + if(!world.isRemote) + world.spawnEntityInWorld(new EntityVineBall(player, true)); - return par1ItemStack; + return stack; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index ba19066b0..b297c3e15 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -49,11 +49,10 @@ public class ItemVirus extends ItemMod { } @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) { - if(par3EntityLivingBase instanceof EntityHorse) { - EntityHorse horse = (EntityHorse) par3EntityLivingBase; - if(horse.getHorseType() != 3 && horse.getHorseType() != 4 && horse.isTame()) { - horse.setHorseType(3 + par1ItemStack.getItemDamage()); + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) { + if(entity instanceof EntityHorse horse) { + if(horse.getHorseType() != 3 && horse.getHorseType() != 4 && horse.isTame()) { + horse.setHorseType(3 + stack.getItemDamage()); BaseAttributeMap attributes = horse.getAttributeMap(); IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.movementSpeed); IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.maxHealth); @@ -61,9 +60,9 @@ public class ItemVirus extends ItemMod { movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0)); IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.getPrivateValue(EntityHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH)); jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, 0)); - par2EntityPlayer.worldObj.playSound(par3EntityLivingBase.posX + 0.5D, par3EntityLivingBase.posY + 0.5D, par3EntityLivingBase.posZ + 0.5D, "mob.zombie.remedy", 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F, false); + player.worldObj.playSound(entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, "mob.zombie.remedy", 1.0F + entity.worldObj.rand.nextFloat(), entity.worldObj.rand.nextFloat() * 0.7F + 1.3F, false); - par1ItemStack.stackSize--; + stack.stackSize--; return true; } } @@ -75,9 +74,8 @@ public class ItemVirus extends ItemMod { if(entity.ridingEntity instanceof EntityLivingBase) entity = (EntityLivingBase) entity.ridingEntity; - if(entity instanceof EntityHorse && event.source == DamageSource.fall) { - EntityHorse horse = (EntityHorse) entity; - if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame()) + if(entity instanceof EntityHorse horse && event.source == DamageSource.fall) { + if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame()) event.setCanceled(true); } } @@ -91,25 +89,25 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } public class EventHandler{ diff --git a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java index deefef71e..4d3300935 100644 --- a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java +++ b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java @@ -79,12 +79,11 @@ public abstract class ItemBagBase extends ItemMod { } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float subX, float subY, float subZ) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile != null && tile instanceof IInventory) { + if(tile instanceof IInventory inv) { if(!world.isRemote) { ForgeDirection side = ForgeDirection.getOrientation(s); - IInventory inv = (IInventory) tile; ItemStack[] stacks = loadStacks(stack); ItemStack[] newStacks = new ItemStack[stacks.length]; boolean putAny = false; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java index b21a028c7..685af501d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -31,7 +31,7 @@ public class ItemBlockElven extends ItemBlockMod implements IElvenItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if (ConfigHandler.noMobSpawnOnBlocks) infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index a3491afb0..1b2869cd6 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -28,8 +28,8 @@ public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraf } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return getUnlocalizedNameInefficiently_(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return getUnlocalizedNameInefficiently_(stack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } public String getUnlocalizedNameInefficiently_(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index 1595cb86f..0925b7109 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -22,16 +22,16 @@ import java.util.List; public class ItemBlockModSlab extends ItemSlab { - public ItemBlockModSlab(Block par1) { - super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock(), false); + public ItemBlockModSlab(Block blockSlab) { + super(blockSlab, ((BlockModSlab)blockSlab).getSingleBlock(), ((BlockModSlab)blockSlab).getFullBlock(), false); } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { + public String getUnlocalizedName(ItemStack stack) { return field_150939_a.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if (ConfigHandler.noMobSpawnOnBlocks) infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index b72d98813..5ab270850 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -19,12 +19,12 @@ import net.minecraft.util.StatCollector; public class ItemBlockPool extends ItemBlockWithMetadataAndName { - public ItemBlockPool(Block par2Block) { - super(par2Block); + public ItemBlockPool(Block block) { + super(block); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(stack.getItemDamage() == 1) for(int i = 0; i < 2; i++) infoList.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index d7f5301c8..337b080f6 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -56,9 +56,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr if(placed) { String type = getType(stack); TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileSpecialFlower) { - TileSpecialFlower tile = (TileSpecialFlower) te; - tile.setSubTile(type); + if(te instanceof TileSpecialFlower tile) { + tile.setSubTile(type); tile.onBlockAdded(world, x, y, z); tile.onBlockPlacedBy(world, x, y, z, player, stack); if(!world.isRemote) @@ -75,12 +74,12 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return getUnlocalizedNameInefficiently_(par1ItemStack); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return getUnlocalizedNameInefficiently_(stack); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { String type = getType(stack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index 0ffa53e3b..c768ff1d1 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -22,18 +22,18 @@ import java.util.List; public class ItemBlockSpecialQuartz extends ItemMultiTexture { - public ItemBlockSpecialQuartz(Block par1) { - super(par1, par1, new String[]{ "" }); + public ItemBlockSpecialQuartz(Block block) { + super(block, block, new String[]{ "" }); } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { + public String getUnlocalizedName(ItemStack stack) { String[] names = ((BlockSpecialQuartz) field_150939_a).getNames(); - return par1ItemStack.getItemDamage() >= names.length ? names[names.length - 1] : names[par1ItemStack.getItemDamage()]; + return stack.getItemDamage() >= names.length ? names[names.length - 1] : names[stack.getItemDamage()]; } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if (ConfigHandler.noMobSpawnOnBlocks) infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 0484dc766..3062674e0 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -55,10 +55,9 @@ public class ItemBlockTinyPotato extends ItemBlockMod { } @Override - public void onUpdate(ItemStack stack, World world, Entity e, int t, boolean idunno) { - if(!world.isRemote && e instanceof EntityPlayer && e.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().toLowerCase())) { - EntityPlayer player = (EntityPlayer) e; - int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer player && entity.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().toLowerCase())) { + int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); if(ticks < NOT_MY_NAME.length) { player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + NOT_MY_NAME[ticks])); ItemNBTHelper.setInt(stack, TAG_TICKS, ticks + 1); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index e9bad65fd..74a912bd9 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -23,18 +23,18 @@ import vazkii.botania.common.achievement.IPickupAchievement; public class ItemBlockWithMetadataAndName extends ItemBlockWithMetadata implements IPickupAchievement, ICraftAchievement { - public ItemBlockWithMetadataAndName(Block par2Block) { - super(par2Block, par2Block); + public ItemBlockWithMetadataAndName(Block block) { + super(block, block); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD); } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java b/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java index f5beafbf4..05900dfcb 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java @@ -14,7 +14,7 @@ public class ItemCubeMod extends ItemBlockMod{ } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if (ConfigHandler.noMobSpawnOnBlocks) infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java index 10b5e4193..b49beadda 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java @@ -10,12 +10,12 @@ import java.util.List; public class ItemCubeWithMetadataAndName extends ItemBlockWithMetadataAndName { - public ItemCubeWithMetadataAndName(Block par2Block) { - super(par2Block); + public ItemCubeWithMetadataAndName(Block block) { + super(block); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if (ConfigHandler.noMobSpawnOnBlocks) infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } 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 6467904b8..710d1be04 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -63,7 +63,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return drinkSpeed; } @@ -73,9 +73,9 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { - player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); - return itemStackIn; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override @@ -119,12 +119,12 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forName(par1IconRegister, texName + "0"); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forName(register, texName + "0"); icons = new IIcon[swigs]; for(int i = 0; i < swigs; i++) - icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i); + icons[i] = IconHelper.forName(register, texName + "1_" + i); } @Override @@ -138,8 +138,8 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; Color color = new Color(getBrew(stack).getColor(stack)); @@ -158,7 +158,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 19919f291..3dc336a23 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -56,10 +56,10 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[2]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -73,8 +73,8 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; Brew brew = getBrew(stack); @@ -92,7 +92,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), infoList); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 10dd80f88..82c8f9c33 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -38,14 +38,14 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0"); - flaskIcon = IconHelper.forName(par1IconRegister, LibItemNames.FLASK + "0"); + public void registerIcons(IIconRegister register) { + vialIcon = IconHelper.forName(register, LibItemNames.VIAL + "0"); + flaskIcon = IconHelper.forName(register, LibItemNames.FLASK + "0"); } @Override - public IIcon getIconFromDamage(int i) { - return i == 0 ? vialIcon : flaskIcon; + public IIcon getIconFromDamage(int meta) { + return meta == 0 ? vialIcon : flaskIcon; } @Override @@ -55,8 +55,8 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 96980869c..868cceaa0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -35,8 +35,8 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 7 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 7 ? true : super.getIsRepairable(stack, repairMaterial); } static ItemStack[] armorset; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index a4a797e11..ca935a0bf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -66,20 +66,20 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override @@ -95,9 +95,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(player instanceof EntityPlayer) - onArmorTick(world, (EntityPlayer) player, stack); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(entity instanceof EntityPlayer) + onArmorTick(world, (EntityPlayer) entity, stack); } @Override @@ -150,8 +150,8 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override @@ -160,9 +160,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(GuiScreen.isShiftKeyDown()) - addInformationAfterShift(stack, player, infoList, adv); + addInformationAfterShift(stack, player, infoList, advanced); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); } 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 ec064a9c5..adacafee5 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 @@ -49,9 +49,9 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + iconChristmas = IconHelper.forItem(register, this, "Holiday"); } @Override @@ -60,8 +60,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public IIcon getIconFromDamage(int dmg) { - return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); + public IIcon getIconFromDamage(int meta) { + return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(meta); } @Override @@ -74,8 +74,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 22 ? true : super.getIsRepairable(stack, repairMaterial); } static ItemStack[] armorset; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 818f08008..2e465c8cb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -51,8 +51,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 3bee65979..d179d56bc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -59,9 +59,9 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - willIcon = IconHelper.forName(par1IconRegister, "willFlame"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + willIcon = IconHelper.forName(register, "willFlame"); } @Override @@ -132,9 +132,8 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc public void onEntityAttacked(LivingHurtEvent event) { Entity attacker = event.source.getEntity(); - if (attacker instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) attacker; - if (hasArmorSet(player)) { + if (attacker instanceof EntityPlayer player) { + if (hasArmorSet(player)) { boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null; ItemStack stack = player.inventory.armorItemInSlot(3); if (crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 54c992baf..d8d9b7726 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -13,11 +13,9 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import java.util.UUID; -import baubles.api.BaublesApi; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; @@ -53,24 +51,24 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer)) - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(!EntityDoppleganger.isTruePlayer(player)) + return stack; - if(canEquip(par1ItemStack, par3EntityPlayer)) { - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer); + if(canEquip(stack, player)) { + InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); for(int i = 0; i < baubles.getSizeInventory(); i++) { - if(baubles.isItemValidForSlot(i, par1ItemStack)) { + if(baubles.isItemValidForSlot(i, stack)) { ItemStack stackInSlot = baubles.getStackInSlot(i); - if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) { - if(!par2World.isRemote) { - baubles.setInventorySlotContents(i, par1ItemStack.copy()); - if(!par3EntityPlayer.capabilities.isCreativeMode) - par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null); + if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { + if(!world.isRemote) { + baubles.setInventorySlotContents(i, stack.copy()); + if(!player.capabilities.isCreativeMode) + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); } if(stackInSlot != null) { - ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer); + ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); return stackInSlot.copy(); } break; @@ -79,14 +77,14 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - return par1ItemStack; + return stack; } @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { if(GuiScreen.isShiftKeyDown()) - addHiddenTooltip(stack, player, infoList, adv); + addHiddenTooltip(stack, player, infoList, advanced); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); } @@ -181,7 +179,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 162e72c83..d1e8cf858 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -56,10 +56,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < SUBTYPES; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -69,13 +69,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public IIcon getIconFromDamage(int dmg) { - return icons[Math.min(SUBTYPES - 1, dmg)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(SUBTYPES - 1, meta)]; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return super.getUnlocalizedName(stack) + stack.getItemDamage(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 68fe8af36..539129e64 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -71,10 +71,10 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[4]; for(int i = 0; i < 4; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override @@ -88,8 +88,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public int getColorFromItemStack(ItemStack stack, int pass) { - if(pass == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; Brew brew = getBrew(stack); @@ -132,9 +132,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { Brew brew = getBrew(stack); - if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer && !player.worldObj.isRemote) { - EntityPlayer eplayer = (EntityPlayer) player; - PotionEffect effect = brew.getPotionEffects(stack).get(0); + if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer eplayer && !player.worldObj.isRemote) { + PotionEffect effect = brew.getPotionEffects(stack).get(0); float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; boolean doRand = cost < 1; if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 59feb5d73..9cd70878e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -50,9 +50,8 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble } public void onEntityDamaged(LivingHurtEvent event) { - if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { - EntityPlayer player = (EntityPlayer) event.source.getEntity(); - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + if(event.source.getEntity() instanceof EntityPlayer player && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) { + ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == this) { final int cost = 250; if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 43ed7f6b9..a81027f49 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -102,11 +102,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); wingIcons = new IIcon[WING_TYPES]; for(int i = 0; i < WING_TYPES; i++) - wingIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1); + wingIcons[i] = IconHelper.forItem(register, this, i + 1); } @Override @@ -165,9 +165,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); - if(player instanceof EntityPlayer) { - EntityPlayer p = (EntityPlayer) player; - boolean flying = p.capabilities.isFlying; + if(player instanceof EntityPlayer p) { + boolean flying = p.capabilities.isFlying; boolean wasSprting = ItemNBTHelper.getBoolean(stack, TAG_IS_SPRINTING, false); boolean isSprinting = p.isSprinting(); @@ -220,9 +219,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } public void updatePlayerFlyStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + if(event.entityLiving instanceof EntityPlayer player) { + ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); if(playersWithFlight.contains(playerStr(player))) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index c2f977645..130fcceb0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -42,9 +42,8 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { } public void onPlayerDeath(LivingDeathEvent event) { - if(event.entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entity; - ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); + if(event.entity instanceof EntityPlayer player) { + ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0); if(amulet != null && amulet.getItem() == ItemGoldenLaurel.this) { event.setCanceled(true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index d2829b6a8..67f1c1461 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -53,13 +53,11 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } public void onPlayerDamage(LivingHurtEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); + if(event.entityLiving instanceof EntityPlayer player) { + InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack belt = baubles.getStackInSlot(3); - if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { - ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); - int cooldown = getCooldown(belt); + if(belt != null && belt.getItem() instanceof ItemHolyCloak cloak && !isInEffect(belt)) { + int cooldown = getCooldown(belt); // Used to prevent StackOverflows with mobs that deal damage when damaged setInEffect(belt, true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 52454eeff..cfab85556 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -56,19 +56,18 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + gemIcon = IconHelper.forItem(register, this, "Gem"); } @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { super.onWornTick(stack, entity); - if(entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; + if(entity instanceof EntityPlayer player) { - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote) tickIceRemovers(player); if(!player.isSneaking() && !player.isInsideOfMaterial(Material.water) && !player.worldObj.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index c33b86c1f..028bd102c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -63,9 +63,9 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + gemIcon = IconHelper.forItem(register, this, "Gem"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 72090edbf..8199bad25 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -50,9 +50,9 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + gemIcon = IconHelper.forItem(register, this, "Gem"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index fd727a2f1..911e9d839 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -64,9 +64,9 @@ public class ItemMagnetRing extends ItemBauble { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - iconOff = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); + iconOff = IconHelper.forItem(register, this, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index f2af5e85e..33dbbfdbe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -111,9 +111,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm if(item instanceof IBurstViewerBauble) return true; - if(item instanceof ICosmeticAttachable) { - ICosmeticAttachable attach = (ICosmeticAttachable) item; - ItemStack cosmetic = attach.getCosmeticItem(stack); + if(item instanceof ICosmeticAttachable attach) { + ItemStack cosmetic = attach.getCosmeticItem(stack); if(cosmetic != null && cosmetic.getItem() instanceof IBurstViewerBauble) return true; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index ac4d2dc2f..e1c574f0c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -61,9 +61,9 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + gemIcon = IconHelper.forItem(register, this, "Gem"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 423b2feeb..18cb49e4b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -30,17 +30,14 @@ public class ItemSwapRing extends ItemBauble { @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { - if(!(entity instanceof EntityPlayer)) + if(!(entity instanceof EntityPlayer player)) return; - EntityPlayer player = (EntityPlayer) entity; - ItemStack currentStack = player.getCurrentEquippedItem(); - if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool)) + ItemStack currentStack = player.getCurrentEquippedItem(); + if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool tool)) return; - ISortableTool tool = (ISortableTool) currentStack.getItem(); - - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F); + MovingObjectPosition pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F); ToolType typeToFind = null; if(player.isSwingInProgress && pos != null) { @@ -66,9 +63,8 @@ public class ItemSwapRing extends ItemBauble { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if (stackInSlot != null && stackInSlot.getItem() instanceof ISortableTool && stackInSlot != currentStack) { - ISortableTool toolInSlot = (ISortableTool) stackInSlot.getItem(); - if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) { + if (stackInSlot != null && stackInSlot.getItem() instanceof ISortableTool toolInSlot && stackInSlot != currentStack) { + if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) { int priority = toolInSlot.getSortingPriority(stackInSlot); if(priority > bestToolPriority) { bestTool = stackInSlot; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index de424bead..ed773aeb8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -71,9 +71,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } public void updatePlayerStepStatus(LivingUpdateEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - String s = playerStr(player); + if(event.entityLiving instanceof EntityPlayer player) { + String s = playerStr(player); ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); if(playersWithStepup.contains(s)) { @@ -117,9 +116,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } public void onPlayerJump(LivingJumpEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); + if(event.entityLiving instanceof EntityPlayer player) { + ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { player.motionY += ((ItemTravelBelt) belt.getItem()).jump; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 1dbd14b56..9e88a8d7c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -38,9 +38,8 @@ public class ItemUnholyCloak extends ItemHolyCloak { int range = 6; List mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(IMob mob : mobs) - if(mob instanceof EntityLivingBase) { - EntityLivingBase entity = (EntityLivingBase) mob; - entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); + if(mob instanceof EntityLivingBase entity) { + entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); } player.worldObj.playSoundAtEntity(player, "botania:unholyCloak", 1F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index e7102c7f0..d6a8fd465 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -38,9 +38,9 @@ public class ItemEnderDagger extends ItemManasteelSword { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconFront = IconHelper.forItem(par1IconRegister, this, 0); - iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + iconFront = IconHelper.forItem(register, this, 0); + iconOverlay = IconHelper.forItem(register, this, 1); } @Override @@ -54,28 +54,28 @@ public class ItemEnderDagger extends ItemManasteelSword { } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0) return 0xFFFFFF; return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.none; } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if(par2EntityLivingBase instanceof EntityEnderman && par3EntityLivingBase instanceof EntityPlayer) - par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), 20); - par1ItemStack.damageItem(1, par3EntityLivingBase); + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + if(victim instanceof EntityEnderman && attacker instanceof EntityPlayer) + victim.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 20); + stack.damageItem(1, attacker); return true; } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index e1db8b391..8530071c5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -45,8 +45,8 @@ public class ItemGlassPick extends ItemManasteelPick { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.glass) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == Item.getItemFromBlock(Blocks.glass) ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index fa1e78b21..72b9834f0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -37,30 +37,29 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + super.onUpdate(stack, world, entity, invSlot, isHeld); + if(entity instanceof EntityPlayer player) { + PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { - MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48); + if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) { + MovingObjectPosition pos = ToolCommons.raytraceFromEntity(world, entity, true, 48); if(pos != null) { Vector3 posVec = new Vector3(pos.blockX, pos.blockY, pos.blockZ); Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18); posVec.add(motVec); motVec.normalize().negate().multiply(1.5); - EntityFallingStar star = new EntityFallingStar(par2World, player); + EntityFallingStar star = new EntityFallingStar(world, player); star.setPosition(posVec.x, posVec.y, posVec.z); star.motionX = motVec.x; star.motionY = motVec.y; star.motionZ = motVec.z; - par2World.spawnEntityInWorld(star); + world.spawnEntityInWorld(star); - ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); + world.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F); } } } @@ -72,8 +71,8 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index d23b34ddb..6a125b2b6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -42,8 +42,8 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev } @Override - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) { - if(!(entity instanceof EntityPlayer) && entity != null) { + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + if(!(victim instanceof EntityPlayer) && victim != null) { double range = 8; final List alreadyTargetedEntities = new ArrayList<>(); int dmg = 5; @@ -52,9 +52,9 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev IEntitySelector selector = e -> e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); Random rand = new Random(lightningSeed); - EntityLivingBase lightningSource = entity; + EntityLivingBase lightningSource = victim; for(int i = 0; i < 4; i++) { - List entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); + List entities = victim.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector); if(entities.isEmpty()) break; @@ -63,19 +63,19 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); - Botania.proxy.lightningFX(entity.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF); + Botania.proxy.lightningFX(victim.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF); alreadyTargetedEntities.add(target); lightningSource = target; dmg--; } - if(!entity.worldObj.isRemote) - ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, entity.worldObj.rand.nextLong()); + if(!victim.worldObj.isRemote) + ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, victim.worldObj.rand.nextLong()); } - return super.hitEntity(stack, entity, attacker); + return super.hitEntity(stack, victim, attacker); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 619047644..57da78a0f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -123,11 +123,10 @@ public final class ToolCommons { return 0; Item item = stack.getItem(); - if(!(item instanceof ItemTool)) + if(!(item instanceof ItemTool tool)) return 0; - ItemTool tool = (ItemTool) item; - ToolMaterial material = tool.func_150913_i(); + ToolMaterial material = tool.func_150913_i(); int materialLevel = 0; if(material == BotaniaAPI.manasteelToolMaterial) materialLevel = 10; @@ -147,7 +146,7 @@ public final class ToolCommons { /** * @author mDiyo */ - public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) { + public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean includeLiquids, double range) { float f = 1.0F; float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; @@ -165,7 +164,7 @@ public final class ToolCommons { float f8 = f3 * f5; double d3 = range; Vec3 vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); - return world.rayTraceBlocks(vec3, vec31, par3); + return world.rayTraceBlocks(vec3, vec31, includeLiquids); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 541b15fd4..650755763 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -38,15 +38,15 @@ public class ItemCrystalBow extends ItemLivingwoodBow { } @Override - boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_); - return ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity + 1), false); + boolean canFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) { + int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack); + return ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false); } @Override - void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) { + void onFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, boolean infinity, EntityArrow arrow) { arrow.canBePickedUp = 2; - ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false); + ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false); } } 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 21f84fd86..f406dc13f 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 @@ -55,41 +55,41 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { - ArrowNockEvent event = new ArrowNockEvent(player, itemStackIn); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + ArrowNockEvent event = new ArrowNockEvent(player, stack); MinecraftForge.EVENT_BUS.post(event); if(event.isCanceled()) return event.result; - if(canFire(itemStackIn, worldIn, player, 0)) - player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); + if(canFire(stack, world, player, 0)) + player.setItemInUse(stack, getMaxItemUseDuration(stack)); - return itemStackIn; + return stack; } @Override - public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - int j = (int) ((getMaxItemUseDuration(p_77615_1_) - p_77615_4_) * chargeVelocityMultiplier()); + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) { + int j = (int) ((getMaxItemUseDuration(stack) - itemInUseCount) * chargeVelocityMultiplier()); - ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j); + ArrowLooseEvent event = new ArrowLooseEvent(player, stack, j); MinecraftForge.EVENT_BUS.post(event); if(event.isCanceled()) return; j = event.charge; - boolean flag = canFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_); - boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0; + boolean flag = canFire(stack, world, player, itemInUseCount); + boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0; if(flag) { float f = j / 20.0F; @@ -101,31 +101,31 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { if(f > 1.0F) f = 1.0F; - EntityArrow entityarrow = makeArrow(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, f); + EntityArrow entityarrow = makeArrow(stack, world, player, itemInUseCount, f); if(f == 1.0F) entityarrow.setIsCritical(true); - int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, p_77615_1_); + int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack); if(k > 0) entityarrow.setDamage(entityarrow.getDamage() + k * 0.5D + 0.5D); - int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, p_77615_1_); + int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, stack); if(l > 0) entityarrow.setKnockbackStrength(l); - if(EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, p_77615_1_) > 0) + if(EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0) entityarrow.setFire(100); - ToolCommons.damageItem(p_77615_1_, 1, p_77615_3_, MANA_PER_DAMAGE); - p_77615_2_.playSoundAtEntity(p_77615_3_, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); + world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); - onFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, infinity, entityarrow); + onFire(stack, world, player, itemInUseCount, infinity, entityarrow); - if(!p_77615_2_.isRemote) - p_77615_2_.spawnEntityInWorld(entityarrow); + if(!world.isRemote) + world.spawnEntityInWorld(entityarrow); } } @@ -137,37 +137,37 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem { return true; } - EntityArrow makeArrow(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, float f) { - return new EntityArrow(p_77615_2_, p_77615_3_, f * 2.0F); + EntityArrow makeArrow(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, float f) { + return new EntityArrow(world, player, f * 2.0F); } - boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) { - return p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0 || p_77615_3_.inventory.hasItem(Items.arrow); + boolean canFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) { + return player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0 || player.inventory.hasItem(Items.arrow); } - void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) { + void onFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, boolean infinity, EntityArrow arrow) { if(infinity) arrow.canBePickedUp = 2; - else p_77615_3_.inventory.consumeInventoryItem(Items.arrow); + else player.inventory.consumeInventoryItem(Items.arrow); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this, 0); for(int i = 0; i < 3; i++) - pullIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1); + pullIcons[i] = IconHelper.forItem(register, this, i + 1); } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 3 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 3 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 00d373f29..c06011688 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -32,31 +32,31 @@ public class ItemElementiumShears extends ItemManasteelShears { } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - dammitReddit = IconHelper.forName(par1IconRegister, "dammitReddit"); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); + dammitReddit = IconHelper.forName(register, "dammitReddit"); } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack); + public IIcon getIconIndex(ItemStack stack) { + return stack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 6d673dd6d..01d21be4f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -54,25 +54,25 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + ToolCommons.damageItem(stack, 1, attacker, getManaPerDamage()); return true; } @@ -89,11 +89,11 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz); + boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, side, subX, subY, subZ); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); @@ -107,14 +107,14 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, getManaPerDamage() * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 0682455c1..029a1702c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -54,25 +54,25 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDmg()); + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + ToolCommons.damageItem(stack, 1, attacker, getManaPerDmg()); return true; } @@ -85,11 +85,11 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != null && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz); + boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, side, subX, subY, subZ); if(stackAt.stackSize == 0) player.inventory.setInventorySlotContents(i, null); @@ -106,14 +106,14 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 17a2c650e..79c60d8da 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -53,20 +53,20 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override @@ -74,9 +74,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { if(entity.worldObj.isRemote) return false; - if(entity instanceof IShearable) { - IShearable target = (IShearable)entity; - if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { + if(entity instanceof IShearable target) { + if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) { ArrayList drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); Random rand = new Random(); @@ -102,9 +101,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { return false; Block block = player.worldObj.getBlock(x, y, z); - if(block instanceof IShearable) { - IShearable target = (IShearable)block; - if(target.isShearable(itemstack, player.worldObj, x, y, z)) { + if(block instanceof IShearable target) { + if(target.isShearable(itemstack, player.worldObj, x, y, z)) { ArrayList drops = target.onSheared(itemstack, player.worldObj, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); Random rand = new Random(); @@ -128,14 +126,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 985a84a57..b6d8cd9fe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -52,25 +52,25 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE); + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + ToolCommons.damageItem(stack, 1, attacker, MANA_PER_DAMAGE); return true; } @@ -83,30 +83,30 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { - if(!p_77648_2_.canPlayerEdit(p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_1_)) + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(!player.canPlayerEdit(x, y, z, side, stack)) return false; else { - UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_); + UseHoeEvent event = new UseHoeEvent(player, stack, world, x, y, z); if(MinecraftForge.EVENT_BUS.post(event)) return false; if(event.getResult() == Result.ALLOW) { - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return true; } - Block block = p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_); + Block block = world.getBlock(x, y, z); - if(p_77648_7_ != 0 && p_77648_3_.getBlock(p_77648_4_, p_77648_5_ + 1, p_77648_6_).isAir(p_77648_3_, p_77648_4_, p_77648_5_ + 1, p_77648_6_) && (block == Blocks.grass || block == Blocks.dirt)) { + if(side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) { Block block1 = Blocks.farmland; - p_77648_3_.playSoundEffect(p_77648_4_ + 0.5F, p_77648_5_ + 0.5F, p_77648_6_ + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F); - if (p_77648_3_.isRemote) + if (world.isRemote) return true; else { - p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, block1); - ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE); + world.setBlock(x, y, z, block1); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); return true; } } @@ -116,14 +116,14 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index dc7a7d226..553a0f240 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -50,34 +50,34 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - elucidatorIcon = IconHelper.forName(par1IconRegister, "elucidator"); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); + elucidatorIcon = IconHelper.forName(register, "elucidator"); } @Override - public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - if(usesMana(par1ItemStack)) - ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage()); + public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) { + if(usesMana(stack)) + ToolCommons.damageItem(stack, 1, attacker, getManaPerDamage()); return true; } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - String name = par1ItemStack.getDisplayName().toLowerCase().trim(); - return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack); + public IIcon getIconIndex(ItemStack stack) { + String name = stack.getDisplayName().toLowerCase().trim(); + return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(stack); } @Override @@ -94,8 +94,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { - if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, getManaPerDamage() * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } @@ -104,8 +104,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 06d1a58cb..7ce1e73a3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -85,13 +85,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - iconOn = IconHelper.forItem(par1IconRegister, this, 0); - iconOff = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + iconOn = IconHelper.forItem(register, this, 0); + iconOff = IconHelper.forItem(register, this, 1); } @Override - public IIcon getIconFromDamage(int p_77617_1_) { + public IIcon getIconFromDamage(int meta) { return iconOn; } @@ -396,10 +396,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public boolean equals(Object other) { - if(!(other instanceof SwapCandidate)) return false; - - SwapCandidate cand = (SwapCandidate) other; - return coordinates.equals(cand.coordinates) && range == cand.range; + if(!(other instanceof SwapCandidate cand)) return false; + + return coordinates.equals(cand.coordinates) && range == cand.range; } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index c1be2ec6a..e61d92932 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -89,43 +89,43 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); String rank = StatCollector.translateToLocal("botania.rank" + getLevel(stack)); - list.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); + infoList.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); if(getMana(stack) == Integer.MAX_VALUE) - list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); + infoList.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - getMana(par1ItemStack); - int level = getLevel(par1ItemStack); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + getMana(stack); + int level = getLevel(stack); if(level != 0) { - setEnabled(par1ItemStack, !isEnabled(par1ItemStack)); - if(!par2World.isRemote) - par2World.playSoundAtEntity(par3EntityPlayer, "botania:terraPickMode", 0.5F, 0.4F); + setEnabled(stack, !isEnabled(stack)); + if(!world.isRemote) + world.playSoundAtEntity(player, "botania:terraPickMode", 0.5F, 0.4F); } - return par1ItemStack; + return stack; } @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) { - return player.isSneaking() && super.onItemUse(stack, player, world, x, y, z, s, sx, sy, sz); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + return player.isSneaking() && super.onItemUse(stack, player, world, x, y, z, side, subX, subY, subZ); } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); - if(isEnabled(par1ItemStack)) { - int level = getLevel(par1ItemStack); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + super.onUpdate(stack, world, entity, invSlot, isHeld); + if(isEnabled(stack)) { + int level = getLevel(stack); if(level == 0) - setEnabled(par1ItemStack, false); - else if(par3Entity instanceof EntityPlayer && !((EntityPlayer) par3Entity).isSwingInProgress) - addMana(par1ItemStack, -level); + setEnabled(stack, false); + else if(entity instanceof EntityPlayer && !((EntityPlayer) entity).isSwingInProgress) + addMana(stack, -level); } } @@ -189,10 +189,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconTool = IconHelper.forItem(par1IconRegister, this, 0); - iconOverlay = IconHelper.forItem(par1IconRegister, this, 1); - iconTipped = IconHelper.forItem(par1IconRegister, this, 2); + public void registerIcons(IIconRegister register) { + iconTool = IconHelper.forItem(register, this, 0); + iconOverlay = IconHelper.forItem(register, this, 1); + iconTipped = IconHelper.forItem(register, this, 2); } @Override @@ -224,8 +224,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par2 == 0 || !isEnabled(par1ItemStack)) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(renderPass == 0 || !isEnabled(stack)) return 0xFFFFFF; return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F); @@ -293,8 +293,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 4865193ec..df4c7c66b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -50,18 +50,17 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5); - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + super.onUpdate(stack, world, entity, invSlot, isHeld); + if(entity instanceof EntityPlayer player) { + PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) { - EntityManaBurst burst = getBurst(player, par1ItemStack); - par2World.spawnEntityInWorld(burst); - ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - par2World.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F); + if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) { + EntityManaBurst burst = getBurst(player, stack); + world.spawnEntityInWorld(burst); + ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); + world.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F); } } } @@ -134,8 +133,8 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { + return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial); } @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index dcfe5889b..89bda1bc7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -152,12 +152,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconGlass = IconHelper.forName(par1IconRegister, "lensInside"); + public void registerIcons(IIconRegister register) { + iconGlass = IconHelper.forName(register, "lensInside"); ringIcons = new IIcon[SUBTYPES]; for(int i = 0; i < ringIcons.length; i++) - ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); + ringIcons[i] = IconHelper.forName(register, LibItemNames.LENS_NAMES[i]); } @Override @@ -172,27 +172,27 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public IIcon getIconFromDamageForRenderPass(int par1, int par2) { - return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; + public IIcon getIconFromDamageForRenderPass(int meta, int renderPass) { + return renderPass == 1 ? ringIcons[Math.min(SUBTYPES - 1, meta)] : iconGlass; } @Override - public IIcon getIconFromDamage(int par1) { - return getIconFromDamageForRenderPass(par1, 0); + public IIcon getIconFromDamage(int meta) { + return getIconFromDamageForRenderPass(meta, 0); } @Override - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; + public int getColorFromItemStack(ItemStack stack, int renderPass) { + return renderPass == 0 ? getLensColor(stack) : 0xFFFFFF; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())]; + public String getUnlocalizedName(ItemStack stack) { + return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, stack.getItemDamage())]; } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { int storedColor = getStoredColor(stack); if(storedColor != -1) infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.color"), StatCollector.translateToLocal("botania.color" + storedColor))); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 7ba496332..8e625efb1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -31,7 +31,7 @@ public class LensPaint extends Lens { public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { int storedColor = ItemLens.getStoredColor(stack); if(!burst.isFake() && storedColor > -1 && storedColor < 17) { - if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { + if(pos.entityHit instanceof EntitySheep) { int r = 20; int sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); List sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, AxisAlignedBB.getBoundingBox(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index d4a37bb6a..5ef5de721 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -28,10 +28,9 @@ public class LensRedirect extends Lens { ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); if(!entity.worldObj.isRemote && pos.entityHit == null && coords.posY != -1 && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) { TileEntity tile = entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); - if(tile != null && tile instanceof IRedirectable) { + if(tile instanceof IRedirectable redir) { if(!burst.isFake()) { - IRedirectable redir = (IRedirectable) tile; - Vector3 tileVec = Vector3.fromTileEntityCenter(tile); + Vector3 tileVec = Vector3.fromTileEntityCenter(tile); Vector3 sourceVec = new Vector3(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5); AxisAlignedBB axis = entity.worldObj.getBlock(coords.posX, coords.posY, coords.posZ).getCollisionBoundingBoxFromPool(entity.worldObj, coords.posX, coords.posY, coords.posZ); 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 188dd3f87..da0f77a21 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -29,21 +29,20 @@ public class ItemDye extends Item16Colors { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int meta = par1ItemStack.getItemDamage(); - if(meta != par3World.getBlockMetadata(par4, par5, par6) && (block == Blocks.wool || block == Blocks.carpet)) { - par3World.setBlockMetadataWithNotify(par4, par5, par6, meta, 1 | 2); - par1ItemStack.stackSize--; + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + Block block = world.getBlock(x, y, z); + int meta = stack.getItemDamage(); + if(meta != world.getBlockMetadata(x, y, z) && (block == Blocks.wool || block == Blocks.carpet)) { + world.setBlockMetadataWithNotify(x, y, z, meta, 1 | 2); + stack.stackSize--; return true; } - TileEntity tile = par3World.getTileEntity(par4, par5, par6); - if(tile instanceof IDyablePool) { - IDyablePool dyable = (IDyablePool) tile; - if(meta != dyable.getColor()) { + TileEntity tile = world.getTileEntity(x, y, z); + if(tile instanceof IDyablePool dyable) { + if(meta != dyable.getColor()) { dyable.setColor(meta); - par1ItemStack.stackSize--; + stack.stackSize--; return true; } } @@ -53,9 +52,8 @@ public class ItemDye extends Item16Colors { @Override public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target) { - if(target instanceof EntitySheep) { - EntitySheep entitysheep = (EntitySheep)target; - int i = stack.getItemDamage(); + if(target instanceof EntitySheep entitysheep) { + int i = stack.getItemDamage(); if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { entitysheep.setFleeceColor(i); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 3d6f44bd5..3bab2435d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -90,33 +90,33 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par1ItemStack.getItemDamage() == 14); - else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) { - if(!par3World.isRemote) - par3World.playAuxSFX(2005, par4, par5, par6, 0); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14) + return EntityDoppleganger.spawn(player, stack, world, x, y, z, stack.getItemDamage() == 14); + else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, x, y, z, player)) { + if(!world.isRemote) + world.playAuxSFX(2005, x, y, z, 0); return true; } - return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + return super.onItemUse(stack, player, world, x, y, z, side, subX, subY, subZ); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer) { - if(par1ItemStack.getItemDamage() == 15) { - if(!par2EntityPlayer.capabilities.isCreativeMode) - --par1ItemStack.stackSize; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(stack.getItemDamage() == 15) { + if(!player.capabilities.isCreativeMode) + --stack.stackSize; - par3World.playSoundAtEntity(par2EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if(!par3World.isRemote) - par3World.spawnEntityInWorld(new EntityEnderAirBottle(par3World, par2EntityPlayer)); - else par2EntityPlayer.swingItem(); + if(!world.isRemote) + world.spawnEntityInWorld(new EntityEnderAirBottle(world, player)); + else player.swingItem(); } - return par1ItemStack; + return stack; } @Override @@ -129,35 +129,35 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[types]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forName(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]); + icons[i] = IconHelper.forName(register, LibItemNames.MANA_RESOURCE_NAMES[i]); - tailIcon = IconHelper.forName(par1IconRegister, "tail"); - phiFlowerIcon = IconHelper.forName(par1IconRegister, "phiFlower"); - goldfishIcon = IconHelper.forName(par1IconRegister, "goldfish"); - nerfBatIcon = IconHelper.forName(par1IconRegister, "nerfBat"); + tailIcon = IconHelper.forName(register, "tail"); + phiFlowerIcon = IconHelper.forName(register, "phiFlower"); + goldfishIcon = IconHelper.forName(register, "goldfish"); + nerfBatIcon = IconHelper.forName(register, "nerfBat"); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { - if(par1ItemStack.getItemDamage() == 5 || par1ItemStack.getItemDamage() == 14) + public int getColorFromItemStack(ItemStack stack, int renderPass) { + if(stack.getItemDamage() == 5 || stack.getItemDamage() == 14) return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F); return 0xFFFFFF; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())]; + public String getUnlocalizedName(ItemStack stack) { + return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, stack.getItemDamage())]; } @Override @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 23e836537..ac5ccb391 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -24,7 +24,7 @@ public class ItemPestleAndMortar extends ItemMod { } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 4f11fbec4..172936af6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -26,13 +26,13 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, par1ItemStack.getItemDamage()); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, stack.getItemDamage()); + stackToPlace.tryPlaceItemIntoWorld(player, world, x, y, z, side, subX, subY, subZ); if(stackToPlace.stackSize == 0) { - if(!par2EntityPlayer.capabilities.isCreativeMode) - par1ItemStack.stackSize--; + if(!player.capabilities.isCreativeMode) + stack.stackSize--; return true; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 18afbe2d3..7ae3a826f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -40,24 +40,24 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[SUBTYPES]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 4f3506616..2942c4db6 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -39,30 +39,30 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void registerIcons(IIconRegister par1IconRegister) { + public void registerIcons(IIconRegister register) { icons = new IIcon[16]; for(int i = 0; i < icons.length; i++) - icons[i] = IconHelper.forItem(par1IconRegister, this, i); + icons[i] = IconHelper.forItem(register, this, i); } @Override - public IIcon getIconFromDamage(int par1) { - return icons[Math.min(icons.length - 1, par1)]; + public IIcon getIconFromDamage(int meta) { + return icons[Math.min(icons.length - 1, meta)]; } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(ItemStack stack) { + return getUnlocalizedNameLazy(stack) + stack.getItemDamage(); } - String getUnlocalizedNameLazy(ItemStack par1ItemStack) { - return super.getUnlocalizedName(par1ItemStack); + String getUnlocalizedNameLazy(ItemStack stack) { + return super.getUnlocalizedName(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index 75bb242af..24199d8b8 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -35,20 +35,20 @@ public class ItemModRecord extends ItemRecord implements MusicRecordMetadataProv } @Override - public Item setUnlocalizedName(String par1Str) { - GameRegistry.registerItem(this, par1Str); - return super.setUnlocalizedName(par1Str); + public Item setUnlocalizedName(String name) { + GameRegistry.registerItem(this, name); + return super.setUnlocalizedName(name); } @Override - public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) { - return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); + public String getUnlocalizedNameInefficiently(ItemStack stack) { + return super.getUnlocalizedNameInefficiently(stack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD); } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index ce430ad27..fdc80ee1b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -87,11 +87,10 @@ public class ItemDice extends ItemRelic { } boolean hasRelicAlready(EntityPlayer player, int relic) { - if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP)) + if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP mpPlayer)) return true; - EntityPlayerMP mpPlayer = (EntityPlayerMP) player; - Item item = relicStacks[relic].getItem(); + Item item = relicStacks[relic].getItem(); IRelic irelic = (IRelic) item; Achievement achievement = irelic.getBindAchievement(); return mpPlayer.func_147099_x().hasAchievementUnlocked(achievement); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4c0907232..c73e5dce7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -37,7 +37,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs private static final String TAG_DIMENSION = "dim"; @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { if(player.isSneaking()) { if(world.isRemote) { player.swingItem(); @@ -68,9 +68,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override @@ -104,12 +104,12 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 40; } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.block; } 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 1b848871b..bf8092e17 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -34,7 +34,7 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @Override - public int getMaxItemUseDuration(ItemStack p_77626_1_) { + public int getMaxItemUseDuration(ItemStack stack) { return 32; } @@ -44,10 +44,10 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { } @Override - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) { - if(player.canEat(false) && isRightPlayer(player, itemStackIn)) - player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn)); - return itemStackIn; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(player.canEat(false) && isRightPlayer(player, stack)) + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override @@ -67,18 +67,18 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this); - dasBootIcon = IconHelper.forName(par1IconRegister, "dasBoot"); + public void registerIcons(IIconRegister register) { + itemIcon = IconHelper.forItem(register, this); + dasBootIcon = IconHelper.forName(register, "dasBoot"); } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack); + public IIcon getIconIndex(ItemStack stack) { + return isBoot(stack) ? dasBootIcon : super.getIconIndex(stack); } - private boolean isBoot(ItemStack par1ItemStack) { - String name = par1ItemStack.getDisplayName().toLowerCase().trim(); + private boolean isBoot(ItemStack stack) { + String name = stack.getDisplayName().toLowerCase().trim(); return name.equals("das boot"); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 2dc32c505..c5061388f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -40,19 +40,19 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } @Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); + public void registerIcons(IIconRegister register) { + super.registerIcons(register); weaponIcons = new IIcon[WEAPON_TYPES]; for(int i = 0; i < WEAPON_TYPES; i++) - weaponIcons[i] = IconHelper.forName(par1IconRegister, "gateWeapon" + i); + weaponIcons[i] = IconHelper.forName(register, "gateWeapon" + i); } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - setCharging(par1ItemStack, true); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + setCharging(stack, true); + return stack; } @Override @@ -105,12 +105,12 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index fdab4e3cf..5d7c2eedc 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -432,7 +432,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription"), infoList); addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription2"), infoList); addStringToTooltip("", infoList); @@ -443,7 +443,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC addStringToTooltip("", infoList); addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiToggleDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET + "/"+ getOnOffString(false), infoList); addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiBreakingDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET+"/" + getOnOffString(false), infoList); - super.addInformation(stack, player, infoList, adv); + super.addInformation(stack, player, infoList, advanced); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index be60d6cc6..d0db31d4e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -62,9 +62,8 @@ public class ItemOdinRing extends ItemRelicBauble { } public void onPlayerAttacked(LivingAttackEvent event) { - if(event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - if(getOdinRing(player) != null && damageNegations.contains(event.source.damageType)) + if(event.entityLiving instanceof EntityPlayer player) { + if(getOdinRing(player) != null && damageNegations.contains(event.source.damageType)) event.setCanceled(true); } } 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 98bd7abd1..995f9d02e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -40,13 +40,13 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - 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); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(entity instanceof EntityPlayer) + updateRelic(stack, (EntityPlayer) entity); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advanced) { addBindInfo(infoList, stack, player); } @@ -146,7 +146,7 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index e4e1c1b69..e89bf4c30 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -32,17 +32,16 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - 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); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(entity instanceof EntityPlayer) + ItemRelic.updateRelic(stack, (EntityPlayer) entity); } @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); - if(player instanceof EntityPlayer) { - EntityPlayer ePlayer = (EntityPlayer) player; - ItemRelic.updateRelic(stack, ePlayer); + if(player instanceof EntityPlayer ePlayer) { + ItemRelic.updateRelic(stack, ePlayer); if(ItemRelic.isRightPlayer(ePlayer, stack)) onValidPlayerWornTick(stack, ePlayer); } @@ -84,7 +83,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { + public EnumRarity getRarity(ItemStack stack) { return BotaniaAPI.rarityRelic; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 0a5df3c44..1ff6fdae1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -31,8 +31,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + return ItemDirtRod.place(stack, player, world, x, y, z, side, subX, subY, subZ, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index d09ca7b67..2a6335f07 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -44,23 +44,23 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - return place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + return place(stack, player, world, x, y, z, side, subX, subY, subZ, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); } - public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, false)) { - ForgeDirection dir = ForgeDirection.getOrientation(par7); - int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); + public static boolean place(ItemStack tool, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, Block block, int cost, float r, float g, float b) { + if(ManaItemHandler.requestManaExactForTool(tool, player, cost, false)) { + ForgeDirection dir = ForgeDirection.getOrientation(side); + int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1)).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + stackToPlace.tryPlaceItemIntoWorld(player, world, x, y, z, side, hitX, hitY, hitZ); if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, cost, true); + ManaItemHandler.requestManaExactForTool(tool, player, cost, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), r, g, b, 1F, 5); + Botania.proxy.sparkleFX(world, x + dir.offsetX + Math.random(), y + dir.offsetY + Math.random(), z + dir.offsetZ + Math.random(), r, g, b, 1F, 5); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index c8bfde267..a70583346 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -42,17 +42,17 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW } @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer p) { - if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { if(world.isRemote) { - int x = MathHelper.floor_double(p.posX); - int y = MathHelper.floor_double(p.posY); - int z = MathHelper.floor_double(p.posZ); - int range = IManaProficiencyArmor.Helper.hasProficiency(p) ? 20 : 15; + int x = MathHelper.floor_double(player.posX); + int y = MathHelper.floor_double(player.posY); + int z = MathHelper.floor_double(player.posZ); + int range = IManaProficiencyArmor.Helper.hasProficiency(player) ? 20 : 15; long seedxor = world.rand.nextLong(); doHighlight(world, x, y, z, range, seedxor); - p.swingItem(); - } else world.playSoundAtEntity(p, "botania:divinationRod", 1F, 1F); + player.swingItem(); + } else world.playSoundAtEntity(player, "botania:divinationRod", 1F, 1F); } return stack; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 8040fef3e..9feaa4481 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -68,37 +68,37 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block wblock = par3World.getBlock(par4, par5, par6); - int wmeta = par3World.getBlockMetadata(par4, par5, par6); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + Block wblock = world.getBlock(x, y, z); + int wmeta = world.getBlockMetadata(x, y, z); - if(par2EntityPlayer.isSneaking()) { - TileEntity tile = par3World.getTileEntity(par4, par5, par6); + if(player.isSneaking()) { + TileEntity tile = world.getTileEntity(x, y, z); if(tile == null) { if(BlockCamo.isValidBlock(wblock)) { Item item = Item.getItemFromBlock(wblock); if(!item.getHasSubtypes()) wmeta = 0; - boolean set = setBlock(par1ItemStack, wblock, wmeta); - par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); + boolean set = setBlock(stack, wblock, wmeta); + player.setCurrentItemOrArmor(0, stack); - displayRemainderCounter(par2EntityPlayer, par1ItemStack); + displayRemainderCounter(player, stack); return set; } } - } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { - Block block = getBlock(par1ItemStack); - int meta = getBlockMeta(par1ItemStack); - List swap = getBlocksToSwap(par3World, par1ItemStack, block, meta, par4, par5, par6, null, 0); + } else if(canExchange(stack) && !ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { + Block block = getBlock(stack); + int meta = getBlockMeta(stack); + List swap = getBlocksToSwap(world, stack, block, meta, x, y, z, null, 0); if(swap.size() > 0) { - ItemNBTHelper.setBoolean(par1ItemStack, TAG_SWAPPING, true); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, par4); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Y, par5); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, par6); - setTargetBlock(par1ItemStack, wblock, wmeta); - if(par3World.isRemote) - par2EntityPlayer.swingItem(); + ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, true); + ItemNBTHelper.setInt(stack, TAG_SELECT_X, x); + ItemNBTHelper.setInt(stack, TAG_SELECT_Y, y); + ItemNBTHelper.setInt(stack, TAG_SELECT_Z, z); + setTargetBlock(stack, wblock, wmeta); + if(world.isRemote) + player.swingItem(); } } @@ -116,13 +116,11 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { - if(!canExchange(stack) || !(entity instanceof EntityPlayer)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!canExchange(stack) || !(entity instanceof EntityPlayer player)) return; - EntityPlayer player = (EntityPlayer) entity; - - int extraRange = ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); + int extraRange = ItemNBTHelper.getInt(stack, TAG_EXTRA_RANGE, 1); int extraRangeNew = IManaProficiencyArmor.Helper.hasProficiency(player) ? 3 : 1; if(extraRange != extraRangeNew) ItemNBTHelper.setInt(stack, TAG_EXTRA_RANGE, extraRangeNew); @@ -312,9 +310,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(item == Item.getItemFromBlock(block) && invStack.getItemDamage() == meta) count += invStack.stackSize; - if(item instanceof IBlockProvider) { - IBlockProvider prov = (IBlockProvider) item; - int provCount = prov.getBlockCount(player, stack, invStack, block, meta); + if(item instanceof IBlockProvider prov) { + int provCount = prov.getBlockCount(player, stack, invStack, block, meta); if(provCount == -1) return -1; count += provCount; @@ -349,10 +346,10 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } @Override - public String getItemStackDisplayName(ItemStack par1ItemStack) { - Block block = getBlock(par1ItemStack); - int meta = getBlockMeta(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (block == null ? "" : " (" + EnumChatFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + EnumChatFormatting.RESET + ")"); + public String getItemStackDisplayName(ItemStack stack) { + Block block = getBlock(stack); + int meta = getBlockMeta(stack); + return super.getItemStackDisplayName(stack) + (block == null ? "" : " (" + EnumChatFormatting.GREEN + new ItemStack(block, 1, meta).getDisplayName() + EnumChatFormatting.RESET + ")"); } public static String getBlockName(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index 32f3b0ffd..c9b07ab23 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -40,24 +40,24 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer player, World par3World, int x, int y, int z, int par7, float par8, float par9, float par10) { - if(!par3World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(!world.isRemote && stack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { EntityFlameRing entity = new EntityFlameRing(player.worldObj); entity.setPosition(x + 0.5, y + 1, z + 0.5); player.worldObj.spawnEntityInWorld(entity); - par1ItemStack.setItemDamage(COOLDOWN); - ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); - par3World.playSoundAtEntity(player, "mob.blaze.breathe", 1F, 1F); + stack.setItemDamage(COOLDOWN); + ManaItemHandler.requestManaExactForTool(stack, player, COST, true); + world.playSoundAtEntity(player, "mob.blaze.breathe", 1F, 1F); } return true; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged() && par3Entity instanceof EntityPlayer) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) par3Entity) ? 2 : 1)); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(stack.isItemDamaged() && entity instanceof EntityPlayer) + stack.setItemDamage(stack.getItemDamage() - (IManaProficiencyArmor.Helper.hasProficiency((EntityPlayer) entity) ? 2 : 1)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 6d09db235..dd049153c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -50,8 +50,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity par3Entity, int p_77663_4_, boolean p_77663_5_) { - if(!(par3Entity instanceof EntityPlayer)) + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(!(entity instanceof EntityPlayer player)) return; int ticksTillExpire = ItemNBTHelper.getInt(stack, TAG_TICKS_TILL_EXPIRE, 0); @@ -69,8 +69,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { ItemNBTHelper.setInt(stack, TAG_TICKS_TILL_EXPIRE, ticksTillExpire); ItemNBTHelper.setInt(stack, TAG_TICKS_COOLDOWN, ticksCooldown); - EntityPlayer player = (EntityPlayer) par3Entity; - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); + PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote) leftClick(player); @@ -133,9 +132,8 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item instanceof EntityItem) ((EntityItem)item).delayBeforeCanPickup = 5; - if(item instanceof EntityLivingBase) { - EntityLivingBase targetEntity = (EntityLivingBase)item; - targetEntity.fallDistance = 0.0F; + if(item instanceof EntityLivingBase targetEntity) { + targetEntity.fallDistance = 0.0F; if(targetEntity.getActivePotionEffect(Potion.moveSlowdown) == null) targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true)); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index fd694ffda..b6bb09f6f 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -42,12 +42,12 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @@ -80,9 +80,9 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index 2c2ae87aa..45a439ed3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -50,36 +50,36 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(!par2World.isRemote && par1ItemStack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false)) { + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(!world.isRemote && stack.getItemDamage() == 0 && ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false)) { Block place = ModBlocks.bifrost; - Vector3 vector = new Vector3(par3EntityPlayer.getLookVec()).normalize(); + Vector3 vector = new Vector3(player.getLookVec()).normalize(); - double x = par3EntityPlayer.posX; - double y = par3EntityPlayer.posY; - double z = par3EntityPlayer.posZ; + double x = player.posX; + double y = player.posY; + double z = player.posZ; double lx = 0; double ly = -1; double lz = 0; int count = 0; - boolean prof = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer); + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; - while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || par2World.getBlock((int) x, (int) y, (int) z).isAir(par2World, (int) x, (int) y, (int) z) || par2World.getBlock((int) x, (int) y, (int) z) == place) { + while(count < maxlen && (int) lx == (int) x && (int) ly == (int) y && (int) lz == (int) z || count < 4 || world.getBlock((int) x, (int) y, (int) z).isAir(world, (int) x, (int) y, (int) z) || world.getBlock((int) x, (int) y, (int) z) == place) { if(y >= 256 || y <= 0) break; for(int i = -2; i < 1; i++) for(int j = -2; j < 1; j++) - if(par2World.getBlock((int) x + i, (int) y, (int) z + j).isAir(par2World, (int) x + i, (int) y, (int) z + j) || par2World.getBlock((int) x + i, (int) y, (int) z + j) == place) { - par2World.setBlock((int) x + i, (int) y, (int) z + j, place); - TileBifrost tile = (TileBifrost) par2World.getTileEntity((int) x + i, (int) y, (int) z + j); + if(world.getBlock((int) x + i, (int) y, (int) z + j).isAir(world, (int) x + i, (int) y, (int) z + j) || world.getBlock((int) x + i, (int) y, (int) z + j) == place) { + world.setBlock((int) x + i, (int) y, (int) z + j, place); + TileBifrost tile = (TileBifrost) world.getTileEntity((int) x + i, (int) y, (int) z + j); if(tile != null) { for(int k = 0; k < 4; k++) - Botania.proxy.sparkleFX(par2World, tile.xCoord + Math.random(), tile.yCoord + Math.random(), tile.zCoord + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); + Botania.proxy.sparkleFX(world, tile.xCoord + Math.random(), tile.yCoord + Math.random(), tile.zCoord + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); tile.ticks = time; } } @@ -95,13 +95,13 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } if(count > 0) { - par2World.playSoundAtEntity(par3EntityPlayer, "botania:bifrostRod", 0.5F, 0.25F); - ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, MANA_COST, false); - par1ItemStack.setItemDamage(TIME); + world.playSoundAtEntity(player, "botania:bifrostRod", 0.5F, 0.25F); + ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false); + stack.setItemDamage(TIME); } } - return par1ItemStack; + return stack; } @Override @@ -115,14 +115,14 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) { + public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { return false; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par1ItemStack.isItemDamaged()) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(stack.isItemDamaged()) + stack.setItemDamage(stack.getItemDamage() - 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index c3c5f02c2..92b0b8aee 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -43,19 +43,19 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index d475b1188..12a795ca0 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -74,12 +74,12 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 72000; } @@ -90,17 +90,17 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); - return par1ItemStack; + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); + return stack; } - public void terraform(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int range = IManaProficiencyArmor.Helper.hasProficiency(par3EntityPlayer) ? 22 : 16; + public void terraform(ItemStack stack, World world, EntityPlayer player) { + int range = IManaProficiencyArmor.Helper.hasProficiency(player) ? 22 : 16; - int xCenter = (int) par3EntityPlayer.posX; - int yCenter = (int) par3EntityPlayer.posY - (par2World.isRemote ? 2 : 1); - int zCenter = (int) par3EntityPlayer.posZ; + int xCenter = (int) player.posX; + int yCenter = (int) player.posY - (world.isRemote ? 2 : 1); + int zCenter = (int) player.posZ; if(yCenter < 62) // Not below sea level return; @@ -120,8 +120,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int y = yStart + k; int z = zCenter + j; - Block block = par2World.getBlock(x, y, z); - int meta = par2World.getBlockMetadata(x, y, z); + Block block = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); int[] ids = OreDictionary.getOreIDs(new ItemStack(block, 1, meta)); for(int id : ids) @@ -134,8 +134,8 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int y_ = y + dir.offsetY; int z_ = z + dir.offsetZ; - Block block_ = par2World.getBlock(x_, y_, z_); - if(block_.isAir(par2World, x_, y_, z_) || block_.isReplaceable(par2World, x_, y_, z_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { + Block block_ = world.getBlock(x_, y_, z_); + if(block_.isAir(world, x_, y_, z_) || block_.isReplaceable(world, x_, y_, z_) || block_ instanceof BlockFlower && !(block_ instanceof ISpecialFlower) || block_ == Blocks.double_plant) { airBlocks.add(new ChunkCoordinates(x_, y_, z_)); hasAir = true; } @@ -145,7 +145,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP if(y > yCenter) blocks.add(new CoordsWithBlock(x, y, z, Blocks.air)); else for(ChunkCoordinates coords : airBlocks) { - if(par2World.getBlock(coords.posX, coords.posY - 1, coords.posZ) != Blocks.air) + if(world.getBlock(coords.posX, coords.posY - 1, coords.posZ) != Blocks.air) blocks.add(new CoordsWithBlock(coords.posX, coords.posY, coords.posZ, Blocks.dirt)); } } @@ -157,16 +157,16 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int cost = COST_PER * blocks.size(); - if(par2World.isRemote || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, cost, true)) { - if(!par2World.isRemote) + if(world.isRemote || ManaItemHandler.requestManaExactForTool(stack, player, cost, true)) { + if(!world.isRemote) for(CoordsWithBlock block : blocks) - par2World.setBlock(block.posX, block.posY, block.posZ, block.block); + world.setBlock(block.posX, block.posY, block.posZ, block.block); if(!blocks.isEmpty()) { for(int i = 0; i < 10; i++) - par2World.playSoundAtEntity(par3EntityPlayer, "step.sand", 1F, 0.4F); + world.playSoundAtEntity(player, "step.sand", 1F, 0.4F); for(int i = 0; i < 120; i++) - Botania.proxy.sparkleFX(par2World, xCenter - range + range * 2 * Math.random(), yCenter + 2 + (Math.random() - 0.5) * 2, zCenter - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); + Botania.proxy.sparkleFX(world, xCenter - range + range * 2 * Math.random(), yCenter + 2 + (Math.random() - 0.5) * 2, zCenter - range + range * 2 * Math.random(), 0.35F, 0.2F, 0.05F, 2F, 5); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 35df27b53..6dbd439cf 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -56,21 +56,20 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean holding) { - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - player.getCurrentEquippedItem(); - boolean damaged = par1ItemStack.getItemDamage() > 0; + public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) { + if(entity instanceof EntityPlayer player) { + player.getCurrentEquippedItem(); + boolean damaged = stack.getItemDamage() > 0; - if(damaged && !isFlying(par1ItemStack)) - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); + if(damaged && !isFlying(stack)) + stack.setItemDamage(stack.getItemDamage() - 1); int max = FALL_MULTIPLIER * FLY_TIME; - if(par1ItemStack.getItemDamage() >= max) { - setFlying(par1ItemStack, false); + if(stack.getItemDamage() >= max) { + setFlying(stack, false); player.stopUsingItem(); - } else if(isFlying(par1ItemStack)) { - if(holding) { + } else if(isFlying(stack)) { + if(isHeld) { player.fallDistance = 0F; player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player) ? 1.6 : 1.25; @@ -79,9 +78,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi Botania.proxy.wispFX(player.worldObj, player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } - par1ItemStack.setItemDamage(Math.min(max, par1ItemStack.getItemDamage() + FALL_MULTIPLIER)); - if(par1ItemStack.getItemDamage() == MAX_DAMAGE) - setFlying(par1ItemStack, false); + stack.setItemDamage(Math.min(max, stack.getItemDamage() + FALL_MULTIPLIER)); + if(stack.getItemDamage() == MAX_DAMAGE) + setFlying(stack, false); } if(damaged) @@ -90,17 +89,17 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int meta = par1ItemStack.getItemDamage(); - if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, false)) { - par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack)); + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + int meta = stack.getItemDamage(); + if(meta != 0 || ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { + player.setItemInUse(stack, getMaxItemUseDuration(stack)); if(meta == 0) { - setFlying(par1ItemStack, true); - ManaItemHandler.requestManaExactForTool(par1ItemStack, par3EntityPlayer, COST, true); + setFlying(stack, true); + ManaItemHandler.requestManaExactForTool(stack, player, COST, true); } } - return par1ItemStack; + return stack; } @Override @@ -109,8 +108,8 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public IIcon getIconIndex(ItemStack par1ItemStack) { - return isFlying(par1ItemStack) ? iconFlying : iconIdle; + public IIcon getIconIndex(ItemStack stack) { + return isFlying(stack) ? iconFlying : iconIdle; } @Override @@ -119,19 +118,19 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi } @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { + public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.bow; } @Override - public int getMaxItemUseDuration(ItemStack par1ItemStack) { + public int getMaxItemUseDuration(ItemStack stack) { return 720000; } @Override - public void registerIcons(IIconRegister par1IconRegister) { - iconIdle = IconHelper.forItem(par1IconRegister, this, 0); - iconFlying = IconHelper.forItem(par1IconRegister, this, 1); + public void registerIcons(IIconRegister register) { + iconIdle = IconHelper.forItem(register, this, 0); + iconFlying = IconHelper.forItem(register, this, 1); } public boolean isFlying(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 3d8cf2183..d4b89862d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -22,17 +22,17 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { } @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, false) && !par3World.provider.isHellWorld) { - ForgeDirection dir = ForgeDirection.getOrientation(par7); + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) { + if(ManaItemHandler.requestManaExactForTool(stack, player, COST, false) && !world.provider.isHellWorld) { + ForgeDirection dir = ForgeDirection.getOrientation(side); ItemStack stackToPlace = new ItemStack(Blocks.flowing_water); - stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + stackToPlace.tryPlaceItemIntoWorld(player, world, x, y, z, side, subX, subY, subZ); if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, par2EntityPlayer, COST, true); + ManaItemHandler.requestManaExactForTool(stack, player, COST, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); + Botania.proxy.sparkleFX(world, x + dir.offsetX + Math.random(), y + dir.offsetY + Math.random(), z + dir.offsetZ + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); } } return true; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 7dfec5a3f..dc3bf4aa1 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3027,8 +3027,8 @@ botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=Rosa Arcana botania.tagline.arcanerose=Mana from experience -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0.
What the flower can not do, however, is absorb raw experience orbs from the floor. They must first be gathered by a player. -botania.page.arcanerose1=&oWhen this card is Summoned, toss a coin&r. +botania.page.arcanerose0=&4Experience Points&0 contain a magic of their own. The &1Rosa Arcana&0 can tap into this magic, absorbing the experience of nearby players and turning it into &4Mana&0.
It can also synthesize mana from experience orbs and enchanted items in the world. +botania.page.arcanerose1=&oWhen this flower is planted, toss a coin&r. # -- MUNCHDEW botania.entry.munchdew=Munchdew diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index a7cab9845..0fd0590e6 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -2006,8 +2006,8 @@ botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=Rosa Arcana -botania.page.arcanerose0=&4Experience Points&0 are a form of magic of sorts. The &1Rosa Arcana&0 can tap into it and absorb the experience of players on the ground around it, turning it into &1Mana&0. -botania.page.arcanerose1=&oWhen this card is Summoned, toss a coin&r. +botania.page.arcanerose0="Les &4orbes d'expérience&0 sont magiques elles aussi. La &1rosa arcana$(&0 se sert de cette magie pour la convertir en &1mana&0.
Les objets enchantés peuvent également être transformés en &1mana&0.", +botania.page.arcanerose1=&orosae, rosas, rosarum&r. # -- MUNCHDEW botania.entry.munchdew=Munchdew diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_BR.lang index 752924ae2..95fc44135 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_BR.lang @@ -2544,8 +2544,8 @@ botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=Rosa Arcana botania.tagline.arcanerose=Mana pela experiência -botania.page.arcanerose0=&4Pontos de Experiência&0 são uma forma de magia. A &1Rosa Arcana&0 pode aproveitar isso, absorvendo a experiência de jogadores ao redor dela, produzindo &1Mana&0.
A flor não consegue coletar orbes do chão, o jogador deve pegá-las antes. -botania.page.arcanerose1=&oQuando essa carta é ativada, jogue uma moeda&r. +botania.page.arcanerose0=&4Pontos de Experiência&0 possuem uma certa magia neles. A &1Rosa Arcana&0 pode fazer uso dessa magia, absorvendo a experiência de jogadores próximos e convertendo ela em &1Mana&0.$
Ela pode também sintetizar mana a partir de orbes de experiência e itens encantados no mundo. +botania.page.arcanerose1=&oQuando essa flor é plantada, jogue uma moeda&r. # -- MUNCHDEW botania.entry.munchdew=Munchdew diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 3f4824e4f..5f198050b 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -1247,7 +1247,7 @@ tile.botania:flower.nightshadePrime.name=Ночное начало tile.botania:flower.nightshadePrime.reference=Вы не должны держать это tile.botania:flower.nightshadeDecor.name=Декоративный Паслён tile.botania:flower.nightshadeDecor.reference=Призрачная подпись -tile.botania:flower.arcanerose.name=Тайная роза +tile.botania:flower.arcanerose.name=Роза тайн tile.botania:flower.arcanerose.reference=e=mc2 tile.botania:flower.munchdew.name=Жвачник крапчатый tile.botania:flower.munchdew.reference=Ом-ном-ном @@ -2557,10 +2557,10 @@ botania.page.thermalily3=Размещение &1Лавы&0 в мире, безу botania.page.thermalily1=&oОн мог бы съесть и солнце. # -- ROSA ARCANA -botania.entry.arcanerose=Тайная роза +botania.entry.arcanerose=Роза тайн botania.tagline.arcanerose=Мана из опыта -botania.page.arcanerose0=&4Очки опыта&0 - это своего рода форма магии. &1Тайная роза&0 может высасывать опыт из игроков находящихся рядом с цветком, превращая его в &1ману&0. Но этот цветок не может поглощать сферы опыта. -botania.page.arcanerose1=&oОсторожно! Этот цветок может стать умнее вас... +botania.page.arcanerose0=&4Очки опыта&0 — это своего рода форма магии. &1Роза тайн&0 может взаимодействовать с этой магией и поглощать опыт игроков поблизости, превращая его в &1ману&0.
Она также может синтезировать &1ману&0 из выпавших сфер опыта и зачарованных предметов. +botania.page.arcanerose1=&oОсторожно! Этот цветок может стать умнее вас&r... # -- MUNCHDEW botania.entry.munchdew=Жвачник крапчатый diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 8b57197ba..3562fae18 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -2562,8 +2562,8 @@ botania.page.thermalily1=&o0108款&r. # -- ROSA ARCANA botania.entry.arcanerose=阿卡纳蔷薇 botania.tagline.arcanerose=经验当魔力使 -botania.page.arcanerose0=&4经验点&0是一种形式的魔力. &1阿卡纳蔷薇&0能吸收附近玩家 的经验,并利用它产生&1魔力&0. -botania.page.arcanerose1=&o该卡被召唤时,投掷硬币&r. +botania.page.arcanerose0="&4经验点&0是一种形式的魔力.&1阿卡纳蔷薇&0能吸收附近玩家的经验,并利用它产生&1魔力&0。
它也可以吸收世界中掉落的经验球或利用附魔物品来产生魔力" +botania.page.arcanerose1=&o该花被种植时,投掷一枚硬币&r. # -- MUNCHDEW botania.entry.munchdew=咀叶花 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index aac992316..bc87105ec 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -2551,8 +2551,8 @@ botania.page.thermalily1=&o0108 Style&r. # -- ROSA ARCANA botania.entry.arcanerose=阿卡納薔薇 botania.tagline.arcanerose=經驗化作魔力 -botania.page.arcanerose0=&4經驗球&0是一種形式的瑪那. &1阿卡納薔薇&0能吸收附近玩家 的經驗,並利用它產生&1瑪那&0.
花不能從地面吸取經驗珠。他們必須由玩家來收集。 -botania.page.arcanerose1=&o該卡被召喚時,投擲硬幣&r. +botania.page.arcanerose0=&4經驗點&0是一種形式的瑪那。&1阿卡納薔薇&0能吸收附近玩家的經驗,並利用它產生&1瑪那&0。
它也可以吸收世界中掉落的經驗球或利用附魔物品來產生瑪那 +botania.page.arcanerose1=&o該花被種植時,投擲一枚硬幣&r. # -- MUNCHDEW botania.entry.munchdew=咀葉花