From 27c6fe3b2cf0aabffdc57722baae79336f379585 Mon Sep 17 00:00:00 2001 From: "Nikolay S." Date: Sun, 28 Sep 2025 06:54:57 -0500 Subject: [PATCH] Activate Generic Injection (#100) Co-authored-by: Martin Robertz --- gradle.properties | 2 +- .../java/vazkii/botania/api/BotaniaAPI.java | 24 ++++++------ .../botania/api/mana/spark/SparkHelper.java | 5 +-- .../botania/common/block/BlockAltGrass.java | 2 +- .../botania/common/block/BlockAltar.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 6 +-- .../common/block/BlockLightLauncher.java | 8 ++-- .../botania/common/block/BlockLightRelay.java | 2 +- .../botania/common/block/BlockLivingrock.java | 4 +- .../botania/common/block/BlockLivingwood.java | 4 +- .../common/block/BlockModDoubleFlower.java | 4 +- .../botania/common/block/BlockModFlower.java | 4 +- .../botania/common/block/BlockOpenCrate.java | 4 +- .../botania/common/block/BlockPlatform.java | 12 +++--- .../botania/common/block/BlockPylon.java | 4 +- .../common/block/BlockSpecialFlower.java | 6 +-- .../botania/common/block/BlockStorage.java | 4 +- .../botania/common/block/ModBlocks.java | 4 +- .../common/block/decor/Block18Stone.java | 2 +- .../common/block/decor/BlockCustomBrick.java | 4 +- .../block/decor/BlockEndStoneBrick.java | 2 +- .../block/decor/BlockFloatingFlower.java | 4 +- .../common/block/decor/BlockManaBeacon.java | 4 +- .../common/block/decor/BlockModMushroom.java | 4 +- .../common/block/decor/BlockPavement.java | 4 +- .../common/block/decor/BlockPetalBlock.java | 2 +- .../common/block/decor/BlockPrismarine.java | 4 +- .../common/block/decor/BlockUnstable.java | 4 +- .../decor/biomestone/BlockBiomeStone.java | 2 +- .../decor/quartz/BlockSpecialQuartz.java | 8 ++-- .../block/decor/walls/BlockModWall.java | 2 +- .../block/decor/walls/BlockVariantWall.java | 2 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../common/block/mana/BlockManaDetector.java | 6 +-- .../botania/common/block/mana/BlockPool.java | 22 +++++------ .../common/block/mana/BlockSpawnerClaw.java | 2 +- .../common/block/mana/BlockSpreader.java | 4 +- .../common/block/tile/TileEnchanter.java | 2 +- .../common/block/tile/TileRuneAltar.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 7 ++-- .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/SheddingHandler.java | 4 +- .../common/core/helper/ItemNBTHelper.java | 3 +- .../common/entity/EntityMagicMissile.java | 15 ++++--- .../botania/common/item/Item16Colors.java | 4 +- .../botania/common/item/ItemAncientWill.java | 8 ++-- .../common/item/ItemBlackHoleTalisman.java | 14 +++---- .../botania/common/item/ItemBlackLotus.java | 6 +-- .../botania/common/item/ItemBottledMana.java | 4 +- .../botania/common/item/ItemCacophonium.java | 6 +-- .../common/item/ItemCorporeaSpark.java | 2 +- .../botania/common/item/ItemCraftPattern.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 2 +- .../botania/common/item/ItemGrassSeeds.java | 4 +- .../botania/common/item/ItemLaputaShard.java | 6 +-- .../botania/common/item/ItemLexicon.java | 14 +++---- .../botania/common/item/ItemManaGun.java | 20 +++++----- .../botania/common/item/ItemManaTablet.java | 18 ++++----- .../botania/common/item/ItemPinkinator.java | 4 +- .../botania/common/item/ItemSignalFlare.java | 8 ++-- .../botania/common/item/ItemSparkUpgrade.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../common/item/ItemTemperanceStone.java | 8 ++-- .../botania/common/item/ItemThornChakram.java | 2 +- .../botania/common/item/ItemTwigWand.java | 6 +-- .../vazkii/botania/common/item/ItemVirus.java | 2 +- .../common/item/block/ItemBlockElven.java | 4 +- .../common/item/block/ItemBlockModSlab.java | 4 +- .../common/item/block/ItemBlockPool.java | 6 +-- .../item/block/ItemBlockSpecialFlower.java | 12 +++--- .../item/block/ItemBlockSpecialQuartz.java | 4 +- .../common/item/block/ItemCubeMod.java | 4 +- .../block/ItemCubeWithMetadataAndName.java | 4 +- .../common/item/brew/ItemBrewBase.java | 6 +-- .../common/item/brew/ItemIncenseStick.java | 10 ++--- .../botania/common/item/brew/ItemVial.java | 2 +- .../armor/manasteel/ItemManasteelArmor.java | 8 ++-- .../armor/manaweave/ItemManaweaveArmor.java | 8 ++-- .../armor/terrasteel/ItemTerrasteelArmor.java | 2 +- .../item/equipment/bauble/ItemBauble.java | 22 +++++------ .../equipment/bauble/ItemBaubleCosmetic.java | 8 ++-- .../equipment/bauble/ItemBloodPendant.java | 12 +++--- .../equipment/bauble/ItemFlightTiara.java | 8 ++-- .../item/equipment/bauble/ItemItemFinder.java | 39 ++++++++----------- .../item/equipment/bauble/ItemManaRing.java | 4 +- .../item/equipment/bauble/ItemTinyPlanet.java | 6 ++- .../item/equipment/tool/ItemThunderSword.java | 13 ++----- .../tool/terrasteel/ItemTerraPick.java | 12 +++--- .../thaumcraft/ItemManaInkwell.java | 2 +- .../botania/common/item/lens/ItemLens.java | 10 ++--- .../common/item/lens/LensInfluence.java | 17 ++++---- .../item/material/ItemManaResource.java | 4 +- .../common/item/material/ItemQuartz.java | 2 +- .../common/item/material/ItemRune.java | 2 +- .../common/item/relic/ItemLokiRing.java | 24 ++++++------ .../botania/common/item/relic/ItemRelic.java | 6 +-- .../common/item/relic/ItemRelicBauble.java | 6 +-- 97 files changed, 311 insertions(+), 324 deletions(-) diff --git a/gradle.properties b/gradle.properties index 94b748637..3cc9ced38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -45,7 +45,7 @@ enableModernJavaSyntax = true # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. -enableGenericInjection = false +enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 11cfd8d29..6bbdca1b7 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -60,8 +60,8 @@ import cpw.mods.fml.common.Loader; public final class BotaniaAPI { - private static List categories = new ArrayList<>(); - private static List allEntries = new ArrayList<>(); + private static final List categories = new ArrayList<>(); + private static final List allEntries = new ArrayList<>(); public static Map knowledgeTypes = new HashMap<>(); @@ -78,11 +78,11 @@ public final class BotaniaAPI { public static List brewRecipes = new ArrayList<>(); public static List miniFlowerRecipes = new ArrayList<>(); - private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); + private static final BiMap> subTiles = HashBiMap.create(); + private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); public static Map subTileMods = new HashMap<>(); - public static BiMap miniFlowers = HashBiMap. create(); + public static BiMap miniFlowers = HashBiMap.create(); public static Map oreWeights = new HashMap<>(); public static Map oreWeightsNether = new HashMap<>(); @@ -108,7 +108,7 @@ public final class BotaniaAPI { public static KnowledgeType basicKnowledge; public static KnowledgeType elvenKnowledge; - // This is here for completeness sake, but you shouldn't use it + // This is here for completeness’s sake, but you shouldn't use it public static KnowledgeType relicKnowledge; // All of these categories are initialized during botania's PreInit stage. @@ -290,14 +290,14 @@ public final class BotaniaAPI { return fallbackBrew; } - /* + /** * Registers a Block as disposable using its Ore Dictionary Name. */ public static void registerDisposableBlock(String oreDictName) { disposableBlocks.add(oreDictName); } - /* + /** * Registers a Block as semi disposable using its Ore Dictionary Name. * This means it will not be trashed when sneaking. */ @@ -313,7 +313,7 @@ public final class BotaniaAPI { return paintable; } - /* + /** * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. * Pass in the class for the Entity, e.g. EntityCow.class */ @@ -321,7 +321,7 @@ public final class BotaniaAPI { gravityRodBlacklist.add(entity); } - /* + /** * Checks if the provided Entity is contained in the Blacklist. * Pass in the class for the Entity, e.g. entity.getClass() */ @@ -476,7 +476,7 @@ public final class BotaniaAPI { /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. - * @inputs The items used in the recipe, no more than 6. + * @param inputs The items used in the recipe, no more than 6. */ public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) { RecipeBrew recipe = new RecipeBrew(brew, inputs); @@ -592,7 +592,7 @@ public final class BotaniaAPI { * https://gist.github.com/Vazkii/9493322 */ public static void addOreWeightNether(String ore, int weight) { - if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).size() == 0) + if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).isEmpty()) return; oreWeightsNether.put(ore, weight); diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 7351036cf..c50ffb601 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -23,10 +23,9 @@ public final class SparkHelper { return SparkHelper.getEntitiesAround(ISparkEntity.class, world, x, y, z); } - public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { + public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; - List entities = world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r)); - return entities; + return world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r)); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 14ed7fadc..9c11f5df1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -67,7 +67,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 5512b2597..9893f9b60 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -81,7 +81,7 @@ public class BlockAltar extends BlockModContainer implements ILexicon } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index b9105a43b..2b49a3703 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -92,11 +92,11 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { - par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); + list.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) - par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), BotaniaAPI.miniFlowers.get(s))); + list.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), BotaniaAPI.miniFlowers.get(s))); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index db8bc7c9c..a7bca40f6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -74,17 +74,15 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { List relays = new ArrayList<>(); for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = world.getTileEntity(x + dir.offsetX, y, z + dir.offsetZ); - if(tile instanceof TileLightRelay) { - TileLightRelay relay = (TileLightRelay) tile; - if(relay.getBinding() != null) + if(tile instanceof TileLightRelay relay) { + if(relay.getBinding() != null) relays.add(relay); } } if(!relays.isEmpty()) { AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); - entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); + List entities = world.selectEntitiesWithinAABB(Entity.class, aabb, e -> e instanceof EntityLivingBase || e instanceof EntityItem); if(!entities.isEmpty()) { for(Entity entity : entities) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 0cfe5dc2a..6300b09d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -57,7 +57,7 @@ public class BlockLightRelay extends BlockModContainer implement } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index da9710595..bfd414102 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -60,9 +60,9 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 70a75d007..a6889635b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -68,9 +68,9 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index ab972c242..4c42c2f73 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -211,9 +211,9 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < COUNT; ++i) - p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 084e217c7..1e6528749 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -70,9 +70,9 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(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 diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index b7f35cb95..88247c5ba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -81,9 +81,9 @@ public class BlockOpenCrate extends BlockModContainer implements } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 26ee783db..505a96727 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -64,9 +64,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override @@ -82,10 +82,10 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - int meta = par1World.getBlockMetadata(par2, par3, par4); - if(meta == 2 || meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity collider) { + int meta = world.getBlockMetadata(x, y, z); + if(meta == 2 || meta == 0 && collider != null && collider.posY > y + (collider instanceof EntityPlayer ? 2 : 0) && (!(collider instanceof EntityPlayer) || !collider.isSneaking())) + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index a6b00e550..4b4fa1ecc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -69,9 +69,9 @@ public class BlockPylon extends BlockModContainer implements ILexicon } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) - par3.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 023194f98..ed8c87dcd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -160,11 +160,11 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { - par3List.add(ItemBlockSpecialFlower.ofType(s)); + list.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) - par3List.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s))); + list.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s))); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bf35e1173..911975772 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -47,9 +47,9 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) - par3.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 249906124..a8c363631 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -525,9 +525,9 @@ public final class ModBlocks { private static void registerSubTileWithMini(String key, Class clazz) { BotaniaAPI.registerSubTile(key, clazz); - for(Class innerClazz : clazz.getDeclaredClasses()) + for(final var innerClazz : clazz.getDeclaredClasses()) if(innerClazz.getSimpleName().equals("Mini")) - BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz, key); + BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz.asSubclass(SubTileEntity.class), key); } private static void registerSubTileWithDecor(String key, Class clazz, Class decor) { diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index e75dcbf9c..3f2494f2a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -50,7 +50,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index a3686cd47..8b0ec6b32 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -61,9 +61,9 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 971b9cb26..1df2a0bdd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -51,7 +51,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 5d05a1158..bc1cb1db6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -99,9 +99,9 @@ public class BlockFloatingFlower extends BlockModContainer implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) - par3.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 6d51bc462..423b9883e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -61,9 +61,9 @@ public class BlockManaBeacon extends BlockModContainer implement } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index e66816ebc..ecc6c7c5c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -75,9 +75,9 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(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 diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index e7a66c0db..000ce1e52 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -59,9 +59,9 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 96f42c709..275894956 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -40,7 +40,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 0c5e61355..6b26bf560 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -69,9 +69,9 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 32bc04b1e..39a01c2ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -45,9 +45,9 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(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 diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 1bb73482a..ae74f396e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -53,7 +53,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 7773404ad..974e82ffe 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -125,10 +125,10 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { - par3List.add(new ItemStack(this, 1, 0)); - par3List.add(new ItemStack(this, 1, 1)); - par3List.add(new ItemStack(this, 1, 2)); + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); + list.add(new ItemStack(this, 1, 2)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index c967f464b..926d0ca6c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -55,7 +55,7 @@ public class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java index 9542aa0ba..e29996489 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java @@ -41,7 +41,7 @@ public class BlockVariantWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for(int i = 0; i < metaStates; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 778e6c99d..681e653b4 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -94,7 +94,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index c90a6f1b0..52a9c2228 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -66,9 +66,9 @@ public class BlockManaDetector extends BlockModContainer imple } @Override - public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { - if(par7Entity != null && !(par7Entity instanceof IManaBurst)) - super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity collider) { + if(collider != null && !(collider instanceof IManaBurst)) + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 3fe81922f..57552fef6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -109,11 +109,11 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { - par3.add(new ItemStack(par1, 1, 0)); - par3.add(new ItemStack(par1, 1, 2)); - par3.add(new ItemStack(par1, 1, 3)); - par3.add(new ItemStack(par1, 1, 1)); + public void getSubBlocks(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 0)); + list.add(new ItemStack(item, 1, 2)); + list.add(new ItemStack(item, 1, 3)); + list.add(new ItemStack(item, 1, 1)); } @Override @@ -131,18 +131,18 @@ public class BlockPool extends BlockModContainer implements IWandHUD, } @Override - public void addCollisionBoxesToList(World p_149743_1_, int p_149743_2_, int p_149743_3_, int p_149743_4_, AxisAlignedBB p_149743_5_, List p_149743_6_, Entity p_149743_7_) { + public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity collider) { float f = 1F / 16F; setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, f, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); setBlockBounds(0.0F, 0.0F, 0.0F, f, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, f); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); setBlockBounds(1.0F - f, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); setBlockBounds(0.0F, 0.0F, 1.0F - f, 1.0F, 0.5F, 1.0F); - super.addCollisionBoxesToList(p_149743_1_, p_149743_2_, p_149743_3_, p_149743_4_, p_149743_5_, p_149743_6_, p_149743_7_); + super.addCollisionBoxesToList(world, x, y, z, mask, list, collider); setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index bc4ef40ff..ba218be5b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -41,7 +41,7 @@ public class BlockSpawnerClaw extends BlockModContainer impleme } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.mob_spawner)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index de03e3525..247570580 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -77,9 +77,9 @@ public class BlockSpreader extends BlockModContainer implements IW } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 4; i++) - par3.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index fb2fdde57..237b29ee0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -515,7 +515,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { //has to be empty } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 0ac4be2be..d6f9db195 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -175,7 +175,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void saveLastRecipe() { - lastRecipe = new ArrayList(); + lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = getStackInSlot(i); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index b8117924e..ae50d6342 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -35,9 +35,8 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { @Override public void updateEntity() { TileEntity tileBelow = worldObj.getTileEntity(xCoord, yCoord - 1, zCoord); - if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { - TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; - MobSpawnerBaseLogic logic = spawner.func_145881_a(); + if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner spawner) { + MobSpawnerBaseLogic logic = spawner.func_145881_a(); if(!logic.isActivated()) { if(!worldObj.isRemote) @@ -106,7 +105,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { private void resetTimer(MobSpawnerBaseLogic logic) { int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); - List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); if(maxSpawnDelay <= minSpawnDelay) logic.spawnDelay = minSpawnDelay; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 966ea1b5a..2787ae62c 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -52,7 +52,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllReleventItems(List list) { + public void displayAllReleventItems(List list) { this.list = list; addItem(ModItems.lexicon); diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index 28336443e..766d334eb 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -92,9 +92,7 @@ public final class SheddingHandler { defaultNames.add(pattern.getEntityString()); } - for(Object o : EntityList.stringToClassMapping.entrySet()) { - Entry> entry = (Entry>) o; - + for(final var entry : EntityList.stringToClassMapping.entrySet()) { if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); if(!defaultNames.contains(name)) diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index 5a0f33421..b0d64059c 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -195,8 +195,7 @@ public final class ItemNBTHelper { private static boolean matchTagCompound(NBTTagCompound template, NBTTagCompound target) { if (template.tagMap.size() > target.tagMap.size()) return false; - //noinspection unchecked - for (String key : (Set) template.func_150296_c()) { + for (String key : template.func_150296_c()) { if (!matchTag(template.getTag(key), target.getTag(key))) return false; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index b12adf2ee..a42662f18 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -69,7 +69,7 @@ public class EntityMagicMissile extends EntityThrowable { public EntityLivingBase getTargetEntity() { int id = dataWatcher.getWatchableObjectInt(26); Entity e = worldObj.getEntityByID(id); - if(e != null && e instanceof EntityLivingBase) + if(e instanceof EntityLivingBase) return (EntityLivingBase) e; return null; @@ -106,7 +106,7 @@ public class EntityMagicMissile extends EntityThrowable { } Botania.proxy.setSparkleFXCorrupt(false); - EntityLivingBase target = getTargetEntity(); + final EntityLivingBase target = getTargetEntity(); if(target != null) { if(lockY == -1) { lockX = target.posX; @@ -124,7 +124,7 @@ public class EntityMagicMissile extends EntityThrowable { motionZ = motionVec.z; List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); - if(targetList.contains(target) && target != null) { + if(targetList.contains(target)) { EntityLivingBase thrower = getThrower(); if(thrower != null) { EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; @@ -162,9 +162,14 @@ public class EntityMagicMissile extends EntityThrowable { setTarget(null); double range = 12; - List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + AxisAlignedBB boundingBox = AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range); + + // The list from getEntitiesWithinAABB is guaranteed to only contain Entities, even though we don't use + // a subclass of Entity. + @SuppressWarnings({"rawtypes", "unchecked"}) + List entities = (List) worldObj.getEntitiesWithinAABB((Class) (isEvil() ? EntityPlayer.class : IMob.class), boundingBox); while(entities.size() > 0) { - Entity e = (Entity) entities.get(worldObj.rand.nextInt(entities.size())); + Entity e = entities.get(worldObj.rand.nextInt(entities.size())); if(!(e instanceof EntityLivingBase) || e.isDead) { // Just in case... entities.remove(e); continue; diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 5abafdc6c..7250fdb62 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -36,9 +36,9 @@ public class Item16Colors extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) - par3List.add(new ItemStack(item, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 5001267df..566aff75e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -42,7 +42,7 @@ public class ItemAncientWill extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -60,9 +60,9 @@ public class ItemAncientWill extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), infoList); + addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), infoList); } public void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 98cd2cd1c..46adc3a4c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -251,16 +251,16 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - Block block = getBlock(par1ItemStack); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + Block block = getBlock(stack); if(block != null && block != Blocks.air) { - int count = getBlockCount(par1ItemStack); - par3List.add(count + " " + StatCollector.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); + int count = getBlockCount(stack); + infoList.add(count + " " + StatCollector.translateToLocal(new ItemStack(block, 1, getBlockMeta(stack)).getUnlocalizedName() + ".name")); } - if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); + if(stack.getItemDamage() == 1) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), infoList); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), infoList); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 69002fd3d..e256eafbb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -36,7 +36,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -82,8 +82,8 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + 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 a2bec1876..44a736cb9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -204,8 +204,8 @@ public class ItemBottledMana extends ItemMod { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + infoList.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index e5c52b05e..05d425c74 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -105,11 +105,11 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if(isDOIT(stack)) - list.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); + infoList.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) - list.add(StatCollector.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); + infoList.add(StatCollector.translateToLocal(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, ""))); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 2efd3a7e7..cc2c247a9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -36,7 +36,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index d799748f6..9d5223f69 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -46,7 +46,7 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 7e38c1451..583e26f9f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -51,7 +51,7 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 5b048cd22..70eafad89 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -66,9 +66,9 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(Item par1, CreativeTabs par2, List par3) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) - par3.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index fa7504baf..f14ec6ea5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -59,15 +59,15 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - list.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 77cc61cfd..3bc07d5dc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -80,7 +80,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -91,26 +91,26 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if(GuiScreen.isShiftKeyDown()) { String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) - par3List.add(edition); + infoList.add(edition); List typesKnown = new ArrayList<>(); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); - if(isKnowledgeUnlocked(par1ItemStack, type)) + if(isKnowledgeUnlocked(stack, type)) typesKnown.add(type); } String format = typesKnown.size() == 1 ? "botaniamisc.knowledgeTypesSingular" : "botaniamisc.knowledgeTypesPlural"; - addStringToTooltip(String.format(StatCollector.translateToLocal(format), typesKnown.size()), par3List); + addStringToTooltip(String.format(StatCollector.translateToLocal(format), typesKnown.size()), infoList); for(KnowledgeType type : typesKnown) - addStringToTooltip(" \u2022 " + StatCollector.translateToLocal(type.getUnlocalizedName()), par3List); + addStringToTooltip(" \u2022 " + StatCollector.translateToLocal(type.getUnlocalizedName()), infoList); - } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); } private void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 30a8c2ef3..437c36d5b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -216,31 +216,31 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - boolean clip = hasClip(par1ItemStack); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + boolean clip = hasClip(stack); if(clip && !GuiScreen.isShiftKeyDown()) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); return; } - ItemStack lens = getLens(par1ItemStack); + ItemStack lens = getLens(stack); if(lens != null) { - List tooltip = lens.getTooltip(par2EntityPlayer, false); + List tooltip = lens.getTooltip(player, false); if(tooltip.size() > 1) - par3List.addAll(tooltip.subList(1, tooltip.size())); + infoList.addAll(tooltip.subList(1, tooltip.size())); } if(clip) { - int pos = getClipPos(par1ItemStack); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasClip"), par3List); + int pos = getClipPos(stack); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasClip"), infoList); for(int i = 0; i < CLIP_SLOTS; i++) { String name = ""; EnumChatFormatting formatting = i == pos ? EnumChatFormatting.GREEN : EnumChatFormatting.GRAY; - ItemStack lensAt = getLensAtPos(par1ItemStack, i); + ItemStack lensAt = getLensAtPos(stack, i); if(lensAt == null) name = StatCollector.translateToLocal("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); - addStringToTooltip(formatting + " - " + name, par3List); + addStringToTooltip(formatting + " - " + name, infoList); } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index f66cab2a8..4a1dcb473 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -48,20 +48,20 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { // Empty tablet - par3List.add(new ItemStack(par1, 1)); + list.add(new ItemStack(item, 1)); // Full tablet - ItemStack fullPower = new ItemStack(par1, 1); + ItemStack fullPower = new ItemStack(item, 1); setMana(fullPower, MAX_MANA); - par3List.add(fullPower); + list.add(fullPower); // Creative Tablet - ItemStack creative = new ItemStack(par1, 1); + ItemStack creative = new ItemStack(item, 1); setMana(creative, MAX_MANA); setStackCreative(creative); - par3List.add(creative); + list.add(creative); } @Override @@ -93,9 +93,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(isStackCreative(par1ItemStack)) - par3List.add(StatCollector.translateToLocal("botaniamisc.creative")); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + if(isStackCreative(stack)) + infoList.add(StatCollector.translateToLocal("botaniamisc.creative")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index d684432db..490d3706c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -54,8 +54,8 @@ public class ItemPinkinator extends ItemMod { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - p_77624_3_.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + infoList.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index c7a86d197..516d9cdf5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -116,7 +116,7 @@ public class ItemSignalFlare extends ItemMod { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColor(i)); } @@ -127,9 +127,9 @@ public class ItemSignalFlare extends ItemMod { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - int storedColor = getColor(par1ItemStack); - par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); + public void addInformation(ItemStack stack, EntityPlayer p, List infoList, boolean adv) { + int storedColor = getColor(stack); + infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); } public static ItemStack forColor(int color) { diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 20b3f1e81..7b3345ef6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -48,7 +48,7 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 981d009a4..2202cca63 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -90,7 +90,7 @@ 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 advancedTooltips) { String id = getEntityId(stack); if (id != null) infoList.add(StatCollector.translateToLocal("entity." + id + ".name")); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 371d5a089..4594eeeda 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -58,10 +58,10 @@ public class ItemTemperanceStone extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); + public void addInformation(ItemStack stack, EntityPlayer p, List infoList, boolean adv) { + if(stack.getItemDamage() == 1) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), infoList); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), infoList); } void addStringToTooltip(String s, List tooltip) { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 1d790d9ae..88a036695 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -37,7 +37,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index de32dd143..11ecce9b0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -232,9 +232,9 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @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(forColors(i, i)); + list.add(forColors(i, i)); } @Override @@ -243,7 +243,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { list.add(StatCollector.translateToLocal(getModeString(stack))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index f15e2faef..ba19066b0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -84,7 +84,7 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 b44572c61..b21a028c7 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java @@ -31,8 +31,8 @@ public class ItemBlockElven extends ItemBlockMod implements IElvenItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if (ConfigHandler.noMobSpawnOnBlocks) - list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } } 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 f4442d7d8..1595cb86f 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -31,8 +31,8 @@ public class ItemBlockModSlab extends ItemSlab { return field_150939_a.getUnlocalizedName().replaceAll("tile.", "tile.botania:"); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if (ConfigHandler.noMobSpawnOnBlocks) - list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + 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 7c399f962..b72d98813 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -24,10 +24,10 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if(par1ItemStack.getItemDamage() == 1) + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + if(stack.getItemDamage() == 1) for(int i = 0; i < 2; i++) - par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + 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 7c3074bfc..d7f5301c8 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -80,22 +80,22 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - String type = getType(par1ItemStack); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + String type = getType(stack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); - sig.addTooltip(par1ItemStack, par2EntityPlayer, par3List); + sig.addTooltip(stack, player, infoList); if(ConfigHandler.referencesEnabled) { - String refUnlocalized = sig.getUnlocalizedLoreTextForStack(par1ItemStack); + String refUnlocalized = sig.getUnlocalizedLoreTextForStack(stack); String refLocalized = StatCollector.translateToLocal(refUnlocalized); if(!refLocalized.equals(refUnlocalized)) - par3List.add(EnumChatFormatting.ITALIC + refLocalized); + infoList.add(EnumChatFormatting.ITALIC + refLocalized); } String mod = BotaniaAPI.subTileMods.get(type); if(!mod.equals(LibMisc.MOD_ID)) - par3List.add(EnumChatFormatting.ITALIC + "[" + mod + "]"); + infoList.add(EnumChatFormatting.ITALIC + "[" + mod + "]"); } public static String getType(ItemStack stack) { 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 167240981..0ffa53e3b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -33,8 +33,8 @@ public class ItemBlockSpecialQuartz extends ItemMultiTexture { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if (ConfigHandler.noMobSpawnOnBlocks) - list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); } } \ No newline at end of file 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 f7d237ad5..f5beafbf4 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java @@ -14,9 +14,9 @@ public class ItemCubeMod extends ItemBlockMod{ } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { if (ConfigHandler.noMobSpawnOnBlocks) - list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + 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 a75a7c560..10b5e4193 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java @@ -15,8 +15,8 @@ public class ItemCubeWithMetadataAndName extends ItemBlockWithMetadataAndName { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { if (ConfigHandler.noMobSpawnOnBlocks) - list.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip")); + 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 8c565500e..dc64b4db3 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -110,7 +110,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); @@ -158,12 +158,12 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); + infoList.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); } } 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 42c1eafd3..19919f291 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -46,7 +46,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -92,19 +92,19 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), infoList); return; } - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), infoList); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; PotionEffect longEffect = new PotionEffect(effect.getPotionID(), effect.getDuration() * TIME_MULTIPLIER, effect.getAmplifier(), false); - addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), list); + addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(longEffect) + ")"), 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 81e3aed7a..10dd80f88 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -49,7 +49,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } 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 b73a63f8e..a4a797e11 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 @@ -160,13 +160,13 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if(GuiScreen.isShiftKeyDown()) - addInformationAfterShift(stack, player, list, adv); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); + addInformationAfterShift(stack, player, infoList, adv); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); } - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(getArmorSetTitle(player), list); addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); 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 97fec9a4d..44b8bd2e3 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 @@ -115,13 +115,13 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if(ClientProxy.jingleTheBells) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list); - addStringToTooltip("", list); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), infoList); + addStringToTooltip("", infoList); } - super.addInformationAfterShift(stack, player, list, adv); + super.addInformationAfterShift(stack, player, infoList, adv); } @Override 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 6b2d73232..818f08008 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 @@ -56,7 +56,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public Multimap getItemAttributeModifiers() { + public Multimap getItemAttributeModifiers() { Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); 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 3314fc6e5..ef703a587 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 @@ -87,28 +87,28 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { if(GuiScreen.isShiftKeyDown()) - addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); + addHiddenTooltip(stack, player, infoList, adv); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList); } - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - BaubleType type = getBaubleType(par1ItemStack); - addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + BaubleType type = getBaubleType(stack); + addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), infoList); String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("Baubles Inventory"); if(key != null && !key.equals("NONE")) { - addStringToTooltip(StatCollector.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), par3List); + addStringToTooltip(StatCollector.translateToLocal("botania.baubletooltip").replaceAll("%key%", key), infoList); } - ItemStack cosmetic = getCosmeticItem(par1ItemStack); + ItemStack cosmetic = getCosmeticItem(stack); if(cosmetic != null) - addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), par3List); + addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.hasCosmetic"), cosmetic.getDisplayName()), infoList); - if(hasPhantomInk(par1ItemStack)) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), par3List); + if(hasPhantomInk(stack)) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), infoList); } public void addStringToTooltip(String s, List tooltip) { 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 2bc108fb6..162e72c83 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 @@ -63,7 +63,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -79,9 +79,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.cosmeticBauble"), par3List); - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.cosmeticBauble"), infoList); + super.addHiddenTooltip(stack, player, infoList, adv); } @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 a618223de..68fe8af36 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 @@ -60,7 +60,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -107,20 +107,20 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { - super.addHiddenTooltip(stack, player, list, adv); + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + super.addHiddenTooltip(stack, player, infoList, adv); Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); + addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), infoList); return; } - addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); + addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), infoList); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); + addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), infoList); } } 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 ffc2e5e72..43ed7f6b9 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 @@ -110,15 +110,15 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + super.addHiddenTooltip(stack, player, infoList, adv); + infoList.add(StatCollector.translateToLocal("botania.wings" + stack.getItemDamage())); } @Override 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 4ff8c7b08..c33b86c1f 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 @@ -124,41 +124,35 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(e == player) continue; - if(e instanceof EntityItem) { - EntityItem item = (EntityItem) e; - ItemStack istack = item.getEntityItem(); + if(e instanceof EntityItem item) { + ItemStack istack = item.getEntityItem(); if(player.isSneaking() || istack.isItemEqual(pstack) && ItemStack.areItemStackTagsEqual(istack, pstack)) positionsBuilder.append(item.getEntityId()).append(";"); - } else if(e instanceof IInventory) { - IInventory inv = (IInventory) e; - if(scanInventory(inv, pstack)) + } else if(e instanceof IInventory inv) { + if(scanInventory(inv, pstack)) positionsBuilder.append(e.getEntityId()).append(";"); - } else if(e instanceof EntityHorse) { - EntityHorse horse = (EntityHorse) e; - AnimalChest chest = ReflectionHelper.getPrivateValue(EntityHorse.class, horse, LibObfuscation.HORSE_CHEST); + } else if(e instanceof EntityHorse horse) { + AnimalChest chest = ReflectionHelper.getPrivateValue(EntityHorse.class, horse, LibObfuscation.HORSE_CHEST); if(scanInventory(chest, pstack)) positionsBuilder.append(horse.getEntityId()).append(";"); - } else if(e instanceof EntityPlayer) { - EntityPlayer player_ = (EntityPlayer) e; - InventoryPlayer inv = player_.inventory; - InventoryBaubles binv = PlayerHandler.getPlayerBaubles(player_); + } else if(e instanceof EntityPlayer otherPlayer) { + InventoryPlayer inv = otherPlayer.inventory; + InventoryBaubles binv = PlayerHandler.getPlayerBaubles(otherPlayer); if(scanInventory(inv, pstack) || scanInventory(binv, pstack)) - positionsBuilder.append(player_.getEntityId()).append(";"); + positionsBuilder.append(otherPlayer.getEntityId()).append(";"); - } else if(e instanceof EntityVillager) { - EntityVillager villager = (EntityVillager) e; - ArrayList recipes = villager.getRecipes(player); + } else if(e instanceof EntityVillager villager) { + ArrayList recipes = villager.getRecipes(player); if(pstack != null && recipes != null) for(MerchantRecipe recipe : recipes) if(recipe != null && !recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) positionsBuilder.append(villager.getEntityId()).append(";"); - } else if(e instanceof EntityLivingBase) { - EntityLivingBase living = (EntityLivingBase) e; - ItemStack estack = living.getEquipmentInSlot(0); + } else if(e instanceof EntityLivingBase living) { + ItemStack estack = living.getEquipmentInSlot(0); if(pstack != null && estack != null && equalStacks(estack, pstack)) positionsBuilder.append(living.getEntityId()).append(";"); } @@ -176,9 +170,8 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { int yp = y + j; int zp = z + k; TileEntity tile = player.worldObj.getTileEntity(xp, yp, zp); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - if(scanInventory(inv, pstack)) + if(tile instanceof IInventory inv) { + if(scanInventory(inv, pstack)) positionsBuilder.append(xp).append(",").append(yp).append(",").append(zp).append(";"); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index b5f3665e8..cf55b9e5e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -46,8 +46,8 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { - par3List.add(new ItemStack(par1, 1, 10000)); + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, 10000)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 7b03ea5dc..b27f36cbd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -61,7 +61,11 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public static void applyEffect(World world, double x, double y, double z) { int range = 8; - List entities = world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); + + // The list from getEntitiesWithinAABB is guaranteed to only contain Entities, even though we don't use + // a subclass of Entity. + @SuppressWarnings({"rawtypes", "unchecked"}) + List entities = (List) world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); for(Entity entity : entities) { IManaBurst burst = (IManaBurst) entity; ItemStack lens = burst.getSourceLens(); 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 619c82221..d23b34ddb 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 @@ -49,23 +49,16 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); - IEntitySelector selector = new IEntitySelector() { - - @Override - public boolean isEntityApplicable(Entity e) { - return e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); - } - - }; + IEntitySelector selector = e -> e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; 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 = 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); if(entities.isEmpty()) break; - EntityLivingBase target = entities.get(rand.nextInt(entities.size())); + EntityLivingBase target = (EntityLivingBase) entities.get(rand.nextInt(entities.size())); if(attacker instanceof EntityPlayer) target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg); else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg); 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 618fb1252..5bcd13df2 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 @@ -77,7 +77,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -86,12 +86,12 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); - String rank = StatCollector.translateToLocal("botania.rank" + getLevel(par1ItemStack)); - par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); - if(getMana(par1ItemStack) == Integer.MAX_VALUE) - par3List.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); + String rank = StatCollector.translateToLocal("botania.rank" + getLevel(stack)); + list.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); + if(getMana(stack) == Integer.MAX_VALUE) + list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife")); } @Override diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index b7c1cea9f..5bd5f95cd 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -41,7 +41,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } 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 5c58ed735..dcfe5889b 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -161,9 +161,9 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override @@ -192,10 +192,10 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - int storedColor = getStoredColor(par1ItemStack); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + int storedColor = getStoredColor(stack); if(storedColor != -1) - par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.color"), StatCollector.translateToLocal("botania.color" + storedColor))); + infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.color"), StatCollector.translateToLocal("botania.color" + storedColor))); } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 43c4fa01c..25fad3f0f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.lens; import java.util.List; +import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; @@ -25,27 +26,25 @@ import vazkii.botania.common.item.ModItems; public class LensInfluence extends Lens { + private static final IEntitySelector MOVABLE_ENTITIES = e -> (e instanceof EntityItem || e instanceof EntityXPOrb || e instanceof EntityArrow || e instanceof EntityFallingBlock || e instanceof IManaBurst); + @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + AxisAlignedBB rangeBox = AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range); + List movables = entity.worldObj.selectEntitiesWithinAABB(Entity.class, rangeBox, MOVABLE_ENTITIES); for(Entity movable : movables) { if(movable == burst) continue; - if(movable instanceof IManaBurst) { - IManaBurst otherBurst = (IManaBurst) movable; - ItemStack lens = otherBurst.getSourceLens(); + if(movable instanceof IManaBurst otherBurst) { + ItemStack lens = otherBurst.getSourceLens(); if(lens != null && lens.getItem() == ModItems.lens && lens.getItemDamage() == ItemLens.INFLUENCE) continue; - ((IManaBurst) movable).setMotion(entity.motionX, entity.motionY, entity.motionZ); + otherBurst.setMotion(entity.motionX, entity.motionY, entity.motionZ); } else { movable.motionX = entity.motionX; movable.motionY = entity.motionY; 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 03675ff42..3d6f44bd5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -121,10 +121,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) - par3List.add(new ItemStack(par1, 1, i)); + list.add(new ItemStack(item, 1, i)); } @Override 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 0ab289299..18afbe2d3 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -34,7 +34,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 e678f3676..4f3506616 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -51,7 +51,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 b858bf9cc..fdab4e3cf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -432,18 +432,18 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription"), list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription2"), list); - addStringToTooltip("", list); - addStringToTooltip(EnumChatFormatting.WHITE +StatCollector.translateToLocal("botaniamisc.lokiCurrent"), list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiState") + ": " + getOnOffString(isRingEnabled(stack)), list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.breaking") + ": " + getOnOffString(isRingBreakingEnabled(stack)), list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiMirror") + getAxisString(getRingMirrorMode(stack)), list); - addStringToTooltip("", list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiToggleDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET + "/"+ getOnOffString(false), list); - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiBreakingDescription") + " " + getOnOffString(true) + EnumChatFormatting.RESET+"/" + getOnOffString(false), list); - super.addInformation(stack, player, list, adv); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription"), infoList); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiDescription2"), infoList); + addStringToTooltip("", infoList); + addStringToTooltip(EnumChatFormatting.WHITE +StatCollector.translateToLocal("botaniamisc.lokiCurrent"), infoList); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiState") + ": " + getOnOffString(isRingEnabled(stack)), infoList); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.breaking") + ": " + getOnOffString(isRingBreakingEnabled(stack)), infoList); + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.lokiMirror") + getAxisString(getRingMirrorMode(stack)), infoList); + 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); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 0285c8f7a..79cb207a2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -46,11 +46,11 @@ public class ItemRelic extends ItemMod implements IRelic { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + addBindInfo(infoList, stack, player); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { String bind = getSoulbindUsernameS(stack); if(bind.isEmpty()) 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 6d735743b..aeecf1a66 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -49,9 +49,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); - ItemRelic.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List infoList, boolean adv) { + super.addHiddenTooltip(stack, player, infoList, adv); + ItemRelic.addBindInfo(infoList, stack, player); } public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) {