From fbdbb388c369fae549cfde3eed38b536f7461d90 Mon Sep 17 00:00:00 2001 From: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:03:23 +0100 Subject: Cleaning up (#767) * Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso --- src/main/java/gtPlusPlus/core/item/ModItems.java | 62 ++-------- .../core/item/base/BaseItemBurnable.java | 2 +- .../core/item/base/BaseItemComponent.java | 10 +- .../java/gtPlusPlus/core/item/base/CoreItem.java | 2 - .../core/item/base/cell/BaseItemCell.java | 2 - .../core/item/base/dusts/BaseItemDustUnique.java | 2 +- .../core/item/base/ingots/BaseItemIngotHot.java | 2 - .../core/item/base/itemblock/ItemBlockGtBlock.java | 10 +- .../core/item/base/itemblock/ItemBlockMeta.java | 5 +- .../core/item/base/itemblock/ItemBlockOre.java | 6 +- .../base/itemblock/ItemBlockRoundRobinator.java | 105 ---------------- .../core/item/base/misc/BaseItemMisc.java | 6 +- .../core/item/base/misc/BaseItemParticle.java | 2 +- .../core/item/base/ore/BaseOreComponent.java | 10 +- .../gtPlusPlus/core/item/bauble/BaseBauble.java | 5 +- .../core/item/bauble/ElectricBaseBauble.java | 10 +- .../core/item/bauble/FireProtectionBauble.java | 14 +-- .../core/item/chemistry/AgriculturalChem.java | 33 +++-- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 4 - .../core/item/chemistry/GenericChem.java | 18 +-- .../core/item/chemistry/IonParticles.java | 4 +- .../core/item/chemistry/MilledOreProcessing.java | 28 ++--- .../core/item/chemistry/RocketFuels.java | 6 +- .../core/item/chemistry/StandardBaseParticles.java | 4 +- .../core/item/crafting/ItemDummyResearch.java | 6 +- .../core/item/food/BaseItemMetaFood.java | 40 +++--- .../core/item/general/ItemBlueprint.java | 27 ++-- .../core/item/general/ItemCloakingDevice.java | 31 ++--- .../core/item/general/ItemGenericToken.java | 12 +- .../core/item/general/ItemHealingDevice.java | 70 ++++++----- .../core/item/general/ItemLavaFilter.java | 2 +- .../core/item/general/ItemMagicFeather.java | 6 +- .../core/item/general/ItemSlowBuildingRing.java | 136 --------------------- .../item/general/spawn/ItemCustomSpawnEgg.java | 35 ++---- .../throwables/ItemHydrofluoricAcidPotion.java | 40 ------ .../general/throwables/ItemSulfuricAcidPotion.java | 40 ------ .../item/general/throwables/ItemThrowableBomb.java | 129 ------------------- .../core/item/tool/misc/DebugScanner.java | 9 +- .../core/item/tool/misc/GregtechPump.java | 14 +-- .../core/item/tool/staballoy/StaballoySpade.java | 45 ++++--- 40 files changed, 223 insertions(+), 771 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java delete mode 100644 src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java (limited to 'src/main/java/gtPlusPlus/core/item') diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index ef18d4dd5b..d8dc72d700 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -61,16 +61,12 @@ import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; -import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; -import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; -import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; import gtPlusPlus.core.item.tool.misc.DebugScanner; import gtPlusPlus.core.item.tool.misc.GregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; @@ -100,7 +96,7 @@ public final class ModItems { public static ItemCustomSpawnEgg itemCustomSpawnEgg; public static Item itemIngotBatteryAlloy; - public static Item itemPlateBatteryAlloy; + public static Item itemHydrogenBlob; public static Item itemBedLocator_Base; @@ -109,7 +105,6 @@ public final class ModItems { public static Item itemPersonalCloakingDevice; public static Item itemPersonalHealingDevice; public static Item itemSupremePizzaGloves; - public static Item itemSlowBuildingRing; public static ItemBlueprint itemBlueprintBase; @@ -180,9 +175,6 @@ public final class ModItems { public static Item itemHalfCompleteCasings; - public static Item itemSulfuricPotion; - public static Item itemHydrofluoricPotion; - public static Item itemCustomBook; // Unstable Elements & Related Content @@ -223,11 +215,6 @@ public final class ModItems { public static ItemDummyResearch itemDummyResearch; - public static CoreItem itemBombCasing; - public static CoreItem itemBombUnf; - public static CoreItem itemDetCable; - public static ItemThrowableBomb itemBomb; - public static BaseItemMetaFood itemMetaFood; public static ItemMagicFeather itemMagicFeather; @@ -287,14 +274,7 @@ public final class ModItems { EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); - itemSulfuricPotion = new ItemSulfuricAcidPotion( - "itemSulfuricPotion", - "Throwable Vial of Sulfuric Acid", - "Burn your foes alive!").setTextureName(GTPlusPlus.ID + ":itemSulfuricAcidPotion"); - itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion( - "itemHydrofluoricPotion", - "Throwable Vial of Hydrofluoric Acid", - "They won't see this coming, nor anything after!").setTextureName(GTPlusPlus.ID + ":itemPotion"); + // Start meta Item Generation ItemsFoods.load(); @@ -378,9 +358,6 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); // LFTR Fuel components - // MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component - // MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component - // MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component @@ -613,12 +590,6 @@ public final class ModItems { // fluidLftrCore4 = FluidUtils.addGTFluidNoPrefix("LiFBeF2UF4", "LiFBeF2UF4", new short[]{50, 255, 100, 100}, 0, // 800, null, CI.emptyCells(1), 1000, true); // LFTR Blanket Fluid Processing - // fluidLftrBlanket1 = FluidUtils.addGTFluidNoPrefix("LiFThF4", "LiFThF4", new short[]{50, 150, 255, 50}, 0, - // 500, null, CI.emptyCells(1), 1000, true); - // fluidLftrBlanket2 = FluidUtils.addGTFluidNoPrefix("LiFBeF2ThF4", "LiFBeF2ThF4", new short[]{100, 150, 100, - // 100}, 0, 500, null, CI.emptyCells(1), 1000, true); - // fluidLftrBlanket3 = FluidUtils.addGTFluidNoPrefix("UF6F2", "UF6F2", new short[]{10, 150, 10, 100}, 0, 500, - // null, CI.emptyCells(1), 1000, true); fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix( "nuclear.waste", "Nuclear Waste", @@ -666,10 +637,6 @@ public final class ModItems { * GT_OreDictUnificator.registerOre("dustZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); */ - // GT_OreDictUnificator.registerOre("cellZrF4", - // ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); - // GT_OreDictUnificator.registerOre("dustZrF4", - // ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); fluidZrF4 = FluidUtils.generateFluidNoPrefix( "ZirconiumTetrafluoride", "Zirconium Tetrafluoride", @@ -761,7 +728,7 @@ public final class ModItems { "dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, - new String[] { "" + StringUtils.superscript("238Np"), + new String[] { StringUtils.superscript("238Np"), "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); @@ -774,7 +741,7 @@ public final class ModItems { "dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, - new String[] { "" + StringUtils.superscript("226Ra"), + new String[] { StringUtils.superscript("226Ra"), "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); @@ -782,7 +749,7 @@ public final class ModItems { "dustProtactinium233", ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, - new String[] { "" + StringUtils.superscript("233Pa"), + new String[] { StringUtils.superscript("233Pa"), "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6); @@ -790,7 +757,7 @@ public final class ModItems { "dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, - new String[] { "" + StringUtils.superscript("99Mo"), + new String[] { StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, dustTechnetium99M, 4); @@ -824,15 +791,6 @@ public final class ModItems { // Milled Ore Processing new MilledOreProcessing(); - // Bombs - itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc); - itemBombCasing.setTextureName(GTPlusPlus.ID + ":bomb_casing"); - itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc); - itemBombUnf.setTextureName(GTPlusPlus.ID + ":bomb_casing"); - itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc); - itemDetCable.setTextureName("string"); - itemBomb = new ItemThrowableBomb(); - // IC2 Exp Logger.INFO("IndustrialCraft2 Found - Loading Resources."); @@ -848,12 +806,6 @@ public final class ModItems { Logger.INFO("Baubles Not Found - Skipping Resources."); } - // Special Item Handling Case - if (ConfigSwitches.enableAlternativeBatteryAlloy) { - ModItems.itemPlateBatteryAlloy = ItemUtils - .generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[] { 35, 228, 141 }, 0); - } - // Buffer Cores! Item itemBufferCore; for (int i = 1; i <= 10; i++) { @@ -877,7 +829,7 @@ public final class ModItems { // Custom GT++ Crafting Components /* - * Try generate dusts for missing rare earth materials if they don't exist + * Try to generate dusts for missing rare earth materials if they don't exist */ if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))) { ItemUtils.generateSpecialUseDusts( diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index a0f7c9b34f..3b22db5b6f 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -23,7 +23,7 @@ public class BaseItemBurnable extends CoreItem { } public void registerFuel(int burn) { - CORE.burnables.add(new Pair(burn, ItemUtils.getSimpleStack(this, 1))); + CORE.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); } public final void registerOrdictionary(String name) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 485e508805..dea21a97c4 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -127,7 +127,7 @@ public class BaseItemComponent extends Item { // Register Component Map aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap(); + aMap = new HashMap<>(); } String aKey = componentType.getGtOrePrefix().name(); ItemStack x = aMap.get(aKey); @@ -417,10 +417,10 @@ public class BaseItemComponent extends Item { FINEWIRE("FineWire", "Fine @ Wire", "wireFine", OrePrefixes.wireFine), PLATEDENSE("PlateDense", "Dense @ Plate", "plateDense", OrePrefixes.plateDense),; - private String COMPONENT_NAME; - private String DISPLAY_NAME; - private String OREDICT_NAME; - private OrePrefixes a_GT_EQUAL; + private final String COMPONENT_NAME; + private final String DISPLAY_NAME; + private final String OREDICT_NAME; + private final OrePrefixes a_GT_EQUAL; private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName, final OrePrefixes aPrefix) { diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index b1b9e05b9e..f328479b70 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -221,8 +221,6 @@ public class CoreItem extends Item { list.add(tooltip); } else break; } - // list.add(this.descColour+this.itemDescription); - // super.addInformation(stack, aPlayer, list, bool); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index cd1331be55..99b6407249 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -24,8 +24,6 @@ public class BaseItemCell extends BaseItemComponent { public BaseItemCell(final Material material) { super(material, BaseItemComponent.ComponentTypes.CELL); this.fluidColour = (short[]) material.getRGBA(); - // FluidContainerRegistry.registerFluidContainer(material.getFluid(1000), ItemUtils.getSimpleStack(this), - // Ic2Items.cell.copy()); } public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) { diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index ba2b48b363..08df349d66 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -93,7 +93,7 @@ public class BaseItemDustUnique extends Item { // Register Component Map aMap = Material.mComponentMap.get(aName); if (aMap == null) { - aMap = new HashMap(); + aMap = new HashMap<>(); } String aKey = OrePrefixes.dust.name(); ItemStack x = aMap.get(aKey); diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 99fef5e19e..40ecd9d3e7 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -91,8 +91,6 @@ public class BaseItemIngotHot extends BaseItemIngot { } else { this.base = i.registerIcon( GTPlusPlus.ID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); - // this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + - // "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index cde5ec3f24..e13136d87e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -22,7 +22,7 @@ import gtPlusPlus.core.util.sys.KeyboardUtils; public class ItemBlockGtBlock extends ItemBlock { - public static HashMap sNameCache = new HashMap(); + public static HashMap sNameCache = new HashMap<>(); protected final int blockColour; private int sRadiation; @@ -51,8 +51,7 @@ public class ItemBlockGtBlock extends ItemBlock { this.blockColour = block.getBlockColor(); } - if (block instanceof BlockBaseModular) { - BlockBaseModular g = (BlockBaseModular) block; + if (block instanceof BlockBaseModular g) { this.mMaterial = g.getMaterialEx(); this.thisBlockType = g.thisBlock; } else { @@ -87,11 +86,6 @@ public class ItemBlockGtBlock extends ItemBlock { @Override public String getItemStackDisplayName(ItemStack stack) { return this.thisBlock.getLocalizedName(); - // Logger.INFO("Unlocal Name: "+this.getUnlocalizedName()); - // String aFormattedLangName = GetProperName(); - // return - // GT_LanguageManager.addStringLocalization("block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase()+".name", - // aFormattedLangName); } public int getRenderColor(final int aMeta) { diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index 8c1555a73a..54cfefbac2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -18,15 +18,14 @@ import gtPlusPlus.api.objects.data.AutoMap; public class ItemBlockMeta extends ItemBlockWithMetadata { private final Block mBlock; - private HashMap> aTooltips = new LinkedHashMap>(); + private HashMap> aTooltips = new LinkedHashMap<>(); public ItemBlockMeta(final Block aBlock) { super(aBlock, aBlock); this.mBlock = aBlock; this.setMaxDamage(0); this.setHasSubtypes(true); - if (aBlock instanceof ITileTooltip) { - ITileTooltip aTooltip = (ITileTooltip) aBlock; + if (aBlock instanceof ITileTooltip aTooltip) { // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap()); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index c8c6f01232..cdb2934a40 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -49,9 +49,9 @@ public class ItemBlockOre extends ItemBlock { return this.mThisColour; } - private static Map> mMapOreBlockItemToDimName = new LinkedHashMap>(); + private static Map> mMapOreBlockItemToDimName = new LinkedHashMap<>(); private static boolean mInitOres_Everglades = false; - private AutoMap mDimsForThisOre = new AutoMap(); + private AutoMap mDimsForThisOre = new AutoMap<>(); @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { @@ -62,7 +62,7 @@ public class ItemBlockOre extends ItemBlock { for (Material m1 : m2) { AutoMap aMap = mMapOreBlockItemToDimName.get(m1.getUnlocalizedName().toLowerCase()); if (aMap == null) { - aMap = new AutoMap(); + aMap = new AutoMap<>(); } String aDimName = "Everglades"; if (!aMap.containsValue(aDimName)) { diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java deleted file mode 100644 index 9a128655c7..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java +++ /dev/null @@ -1,105 +0,0 @@ -package gtPlusPlus.core.item.base.itemblock; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlockWithMetadata; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemBlockRoundRobinator extends ItemBlockWithMetadata { - - private final Block mBlock; - - public ItemBlockRoundRobinator(final Block aBlock) { - super(aBlock, aBlock); - this.mBlock = aBlock; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add("Attempts to output items evenly on all four horizontal planes"); - if (stack.getItemDamage() == 0) { - list.add("1 Item per enabled side every 400 ticks"); - } else if (stack.getItemDamage() == 1) { - list.add("1 Item per enabled side every 100 ticks"); - } else if (stack.getItemDamage() == 2) { - list.add("1 Item per enabled side every 20 ticks"); - } else if (stack.getItemDamage() == 3) { - list.add("1 Item per enabled side every 10 ticks"); - } else if (stack.getItemDamage() == 4) { - list.add("1 Item per enabled side every tick"); - } - list.add("Top and bottom do not pull, so you must push items in"); - list.add("Sides can also be disabled with a screwdriver"); - list.add("Shift+RMB with empty hand to view inventory contents"); - super.addInformation(stack, aPlayer, list, bool); - } - - /** - * Gets an icon index based on an item's damage value - */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(final int p_77617_1_) { - return this.mBlock.getIcon(0, p_77617_1_); - } - - /** - * Returns the metadata of the block which this Item (ItemBlock) can place - */ - @Override - public int getMetadata(final int p_77647_1_) { - return p_77647_1_; - } - - @Override - public String getUnlocalizedName(final ItemStack stack) { - return this.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @Override - public boolean isDamageable() { - return false; - } - - @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) { - return false; - } - - @Override - public boolean isBookEnchantable(ItemStack stack, ItemStack book) { - return false; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return 0; - } - - @Override - public int getItemEnchantability(ItemStack stack) { - return 0; - } - - @Override - public boolean getHasSubtypes() { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 64c5f76109..6560ac5ff2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -130,9 +130,9 @@ public class BaseItemMisc extends Item { DROP("Droplet", " Droplet", "droplet"), MUSHROOM("Mushroom", " Mushroom", "mushroom"); - private String TYPE; - private String DISPLAY_NAME_SUFFIX; - private String OREDICT_PREFIX; + private final String TYPE; + private final String DISPLAY_NAME_SUFFIX; + private final String OREDICT_PREFIX; private MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) { this.TYPE = LocalName; diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index 56ecf59274..8c1efb96c2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java @@ -17,7 +17,7 @@ import gtPlusPlus.core.item.base.CoreItem; public abstract class BaseItemParticle extends CoreItem { - protected static final Map aColourMap = new LinkedHashMap(); + protected static final Map aColourMap = new LinkedHashMap<>(); private final int aMaxCount; public BaseItemParticle(String aType, int aCount, EnumRarity aRarity) { diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 6b4d3ab4a3..13c8986a78 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -68,7 +68,7 @@ public class BaseOreComponent extends Item { // Register Component Map aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap(); + aMap = new HashMap<>(); } String aKey = "Invalid"; if (componentType == ComponentTypes.CRUSHED) { @@ -243,10 +243,10 @@ public class BaseOreComponent extends Item { CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true), MILLED("milled", "Milled ", " Ore", true); - private String COMPONENT_NAME; - private String PREFIX; - private String DISPLAY_NAME; - private boolean HAS_OVERLAY; + private final String COMPONENT_NAME; + private final String PREFIX; + private final String DISPLAY_NAME; + private final boolean HAS_OVERLAY; private ComponentTypes(final String LocalName, final String prefix, final String DisplayName, final boolean overlay) { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 0ac31ef30b..7b017fb093 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -40,7 +40,7 @@ public class BaseBauble extends Item implements IBauble { */ private BaubleType mThisBauble; - private List damageNegations = new ArrayList(); + private List damageNegations = new ArrayList<>(); Multimap attributes = HashMultimap.create(); public BaseBauble(BaubleType type, String displayName) { @@ -71,8 +71,7 @@ public class BaseBauble extends Item implements IBauble { @SubscribeEvent public void onPlayerAttacked(LivingAttackEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if (event.entityLiving instanceof EntityPlayer player) { if (getCorrectBauble(player) != null && damageNegations.contains(event.source.damageType)) event.setCanceled(true); } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index 4dcca46145..0b8ce24974 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -22,6 +22,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Mods; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; @@ -140,13 +141,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + this.getTier(stack) + + GT_Utility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + this.getTransferLimit(stack) + + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -154,12 +155,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + (long) this.getCharge(stack) + + GT_Utility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + + GT_Utility.formatNumbers( + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); super.addInformation(stack, aPlayer, list, bool); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index ca4ec308f6..5e31b2ad89 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -18,7 +18,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; public class FireProtectionBauble extends BaseBauble { @@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble { static { isImmuneToFire = ReflectionUtils - .getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire"); + .getField(Entity.class, !CORE_Preloader.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); } public static boolean fireImmune(Entity aEntity) { @@ -89,17 +89,14 @@ public class FireProtectionBauble extends BaseBauble { @Override public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; - } + if (aPlayer instanceof EntityPlayer bPlayer) {} } } @Override public void onUnequipped(final ItemStack arg0, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; + if (aPlayer instanceof EntityPlayer bPlayer) { if (bPlayer.isPotionActive(Potion.fireResistance)) { bPlayer.removePotionEffect(Potion.fireResistance.id); } @@ -111,8 +108,7 @@ public class FireProtectionBauble extends BaseBauble { @Override public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; + if (aPlayer instanceof EntityPlayer bPlayer) { if (!fireImmune(bPlayer)) { setEntityImmuneToFire(bPlayer, true); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 2dcb726171..b914730ee2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -46,7 +46,7 @@ public class AgriculturalChem extends ItemPackage { private static boolean aBOP; private static boolean aTiCon; - private static AutoMap mBloodFluids = new AutoMap(); + private static AutoMap mBloodFluids = new AutoMap<>(); /** * Fluids @@ -336,20 +336,20 @@ public class AgriculturalChem extends ItemPackage { } } - private static final AutoMap mMeats = new AutoMap(); - private static final AutoMap mFish = new AutoMap(); - private static final AutoMap mFruits = new AutoMap(); - private static final AutoMap mVege = new AutoMap(); - private static final AutoMap mNuts = new AutoMap(); - private static final AutoMap mSeeds = new AutoMap(); - private static final AutoMap mPeat = new AutoMap(); - private static final AutoMap mBones = new AutoMap(); - private static final AutoMap mBoneMeal = new AutoMap(); - - private static final AutoMap mList_Master_Meats = new AutoMap(); - private static final AutoMap mList_Master_FruitVege = new AutoMap(); - private static final AutoMap mList_Master_Seeds = new AutoMap(); - private static final AutoMap mList_Master_Bones = new AutoMap(); + private static final AutoMap mMeats = new AutoMap<>(); + private static final AutoMap mFish = new AutoMap<>(); + private static final AutoMap mFruits = new AutoMap<>(); + private static final AutoMap mVege = new AutoMap<>(); + private static final AutoMap mNuts = new AutoMap<>(); + private static final AutoMap mSeeds = new AutoMap<>(); + private static final AutoMap mPeat = new AutoMap<>(); + private static final AutoMap mBones = new AutoMap<>(); + private static final AutoMap mBoneMeal = new AutoMap<>(); + + private static final AutoMap mList_Master_Meats = new AutoMap<>(); + private static final AutoMap mList_Master_FruitVege = new AutoMap<>(); + private static final AutoMap mList_Master_Seeds = new AutoMap<>(); + private static final AutoMap mList_Master_Bones = new AutoMap<>(); private static void processAllOreDict() { processOreDict("listAllmeatraw", mMeats); @@ -520,9 +520,8 @@ public class AgriculturalChem extends ItemPackage { if (aItemRegInstance != null) { Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound"); Object aItemInstance = aFertField.get(aItemRegInstance); - if (aItemInstance instanceof Item) { + if (aItemInstance instanceof Item aForestryFert) { aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance); - Item aForestryFert = (Item) aItemInstance; CORE.RA.addDehydratorRecipe( new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index a6047efab8..7bbd78d3f5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -156,8 +156,6 @@ public class CoalTar extends ItemPackage { private static void recipeCoalTarToCoalTarOil() { // v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene) // Create Coal Tar Oil - // FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, - // null); GT_Values.RA.addDistilleryRecipe( CI.getNumberedCircuit(1), // Circuit FluidUtils.getFluidStack("fluid.coaltar", 1000), // aInput @@ -299,8 +297,6 @@ public class CoalTar extends ItemPackage { Utils.rgbtoHexValue(125, 125, 125)); // v - Dehydrate // Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O - // Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new - // short[]{135, 135, 135, 100}, null, null); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index cf80e40522..81eed041c6 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -37,7 +37,6 @@ import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; @@ -95,7 +94,6 @@ public class GenericChem extends ItemPackage { */ // Phenol Byproducts - public Item PhenolicResins; // https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin public static ItemGenericChemBase mGenericChemItem1; public static Item mAdvancedCircuit; @@ -143,13 +141,7 @@ public class GenericChem extends ItemPackage { @Override public void items() { - PhenolicResins = ItemUtils.generateSpecialUseDusts( - "phenolicresins", - "Phenolic Resin", - "HOC6H4CH2OH", - Utils.rgbtoHexValue(80, 40, 40))[0]; - // MaterialGenerator.generate(BAKELITE, false); - // MaterialGenerator.generate(NYLON, false); + MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); @@ -805,19 +797,19 @@ public class GenericChem extends ItemPackage { } - private static final ItemStack getTierOneChip() { + private static ItemStack getTierOneChip() { return CI.getNumberedAdvancedCircuit(4); } - private static final ItemStack getTierTwoChip() { + private static ItemStack getTierTwoChip() { return CI.getNumberedAdvancedCircuit(8); } - private static final ItemStack getTierThreeChip() { + private static ItemStack getTierThreeChip() { return CI.getNumberedAdvancedCircuit(12); } - private static final ItemStack getTierFourChip() { + private static ItemStack getTierFourChip() { return CI.getNumberedAdvancedCircuit(16); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index db495f3955..46a595e756 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -20,8 +20,8 @@ import gtPlusPlus.core.util.Utils; public class IonParticles extends BaseItemParticle { - public static HashMap NameToMetaMap = new HashMap(); - public static HashMap MetaToNameMap = new HashMap(); + public static HashMap NameToMetaMap = new HashMap<>(); + public static HashMap MetaToNameMap = new HashMap<>(); public IonParticles() { super("Ion", ELEMENT.NAMES.length, EnumRarity.rare); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index b3b40f339c..1eacad3e49 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -551,10 +551,10 @@ public class MilledOreProcessing extends ItemPackage { } private void addPineOilExtraction() { - AutoMap aLogs = new AutoMap(); - AutoMap aLeaves = new AutoMap(); - AutoMap aSaplings = new AutoMap(); - AutoMap aPinecones = new AutoMap(); + AutoMap aLogs = new AutoMap<>(); + AutoMap aLeaves = new AutoMap<>(); + AutoMap aSaplings = new AutoMap<>(); + AutoMap aPinecones = new AutoMap<>(); ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1); @@ -652,7 +652,7 @@ public class MilledOreProcessing extends ItemPackage { public static ItemStack[] cleanArray(ItemStack[] input) { int aArraySize = input.length; - AutoMap aCleanedItems = new AutoMap(); + AutoMap aCleanedItems = new AutoMap<>(); for (ItemStack checkStack : input) { if (ItemUtils.checkForInvalidItems(checkStack)) { aCleanedItems.put(checkStack); @@ -668,7 +668,7 @@ public class MilledOreProcessing extends ItemPackage { return aOutput; } - private static final HashMap, Pair, Pair, Pair>> aMilledFluidMap = new HashMap, Pair, Pair, Pair>>(); + private static final HashMap, Pair, Pair, Pair>> aMilledFluidMap = new HashMap<>(); public static void registerOreDataForMilledType(Fluid aMilledFluid, Materials aOutput1, int aPerc1, Materials aOutput2, int aPerc2, Materials aOutput3, int aPerc3, Materials aOutput4, int aPerc4) { @@ -687,11 +687,11 @@ public class MilledOreProcessing extends ItemPackage { public static void registerOreDataForMilledType(Fluid aMilledFluid, Material aOutput1, int aPerc1, Material aOutput2, int aPerc2, Material aOutput3, int aPerc3, Material aOutput4, int aPerc4) { - Pair aFluidOutput1 = new Pair(aOutput1, aPerc1); - Pair aFluidOutput2 = new Pair(aOutput2, aPerc2); - Pair aFluidOutput3 = new Pair(aOutput3, aPerc3); - Pair aFluidOutput4 = new Pair(aOutput4, aPerc4); - Quad, Pair, Pair, Pair> aDataQuad = new Quad, Pair, Pair, Pair>( + Pair aFluidOutput1 = new Pair<>(aOutput1, aPerc1); + Pair aFluidOutput2 = new Pair<>(aOutput2, aPerc2); + Pair aFluidOutput3 = new Pair<>(aOutput3, aPerc3); + Pair aFluidOutput4 = new Pair<>(aOutput4, aPerc4); + Quad, Pair, Pair, Pair> aDataQuad = new Quad<>( aFluidOutput1, aFluidOutput2, aFluidOutput3, @@ -706,7 +706,7 @@ public class MilledOreProcessing extends ItemPackage { private static ItemStack[] getArrayFromQuad( Quad, Pair, Pair, Pair> aData) { - AutoMap aOutputs = new AutoMap(); + AutoMap aOutputs = new AutoMap<>(); for (Object aPair : aData.values()) { if (aPair != null && Pair.class.isInstance(aPair)) { Pair aObj = (Pair) aPair; @@ -724,7 +724,7 @@ public class MilledOreProcessing extends ItemPackage { } private static AutoMap getItemStackFromPair(Material aMat, Integer aCount) { - AutoMap aOutputs = new AutoMap(); + AutoMap aOutputs = new AutoMap<>(); if (aCount > 64) { AutoMap sizes = getStackSizes(aCount); for (int aSplitSize : sizes) { @@ -739,7 +739,7 @@ public class MilledOreProcessing extends ItemPackage { } private static AutoMap getStackSizes(int aBigSize) { - AutoMap aSizes = new AutoMap(); + AutoMap aSizes = new AutoMap<>(); if (aBigSize <= 64) { aSizes.add(aBigSize); } else { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index d50a59b8e5..07b2913434 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -33,8 +33,8 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public class RocketFuels extends ItemPackage { - public static HashSet mValidRocketFuelNames = new HashSet(); - public static HashMap mValidRocketFuels = new HashMap(); + public static HashSet mValidRocketFuelNames = new HashSet<>(); + public static HashMap mValidRocketFuels = new HashMap<>(); public static Fluid Oil_Heavy; public static Fluid Diesel; @@ -215,7 +215,7 @@ public class RocketFuels extends ItemPackage { } private static void addRocketFuelsToMap() { - HashMap mRocketFuels = new LinkedHashMap(); + HashMap mRocketFuels = new LinkedHashMap<>(); mRocketFuels.put( 0, new GTPP_Recipe( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 9212c995e2..0202c1c54e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -20,8 +20,8 @@ import gtPlusPlus.core.util.Utils; public class StandardBaseParticles extends BaseItemParticle { - public static HashMap NameToMetaMap = new HashMap(); - public static HashMap MetaToNameMap = new HashMap(); + public static HashMap NameToMetaMap = new HashMap<>(); + public static HashMap MetaToNameMap = new HashMap<>(); public StandardBaseParticles() { super("Base", aTypes.length, EnumRarity.rare); diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index cce12371b0..9da7de5578 100644 --- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -33,8 +33,8 @@ public class ItemDummyResearch extends ItemGenericToken { RESEARCH_10_SPARGING("Gas Sparging", "Blowing gas for results"), RESEARCH_11_MOLECULAR_TRANSFORMER("Molecular Transformation", "Turning things into something better"); - private String mName; - private String mDesc; + private final String mName; + private final String mDesc; private ASSEMBLY_LINE_RESEARCH(String aName, String aDesc) { mName = aName; @@ -43,7 +43,7 @@ public class ItemDummyResearch extends ItemGenericToken { } } - private static Map mInternalNameToIdMap = new LinkedHashMap(); + private static Map mInternalNameToIdMap = new LinkedHashMap<>(); public static ItemStack getResearchStack(ASSEMBLY_LINE_RESEARCH aResearchName, int aStacksize) { Integer aMeta = mInternalNameToIdMap.get(Utils.sanitizeString(aResearchName.mName)); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 0b1c8eeadd..7aaa5ffc53 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -29,7 +29,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemMetaFood extends ItemFood { - private static final HashMap mIconMap = new HashMap(); + private static final HashMap mIconMap = new HashMap<>(); private static int mTotalMetaItems = 0; /* @@ -91,20 +91,20 @@ public class BaseItemMetaFood extends ItemFood { 4, 1, 64, - new AutoMap(), + new AutoMap<>(), new setOnFire(), getOreDictNamesAsArrayList("listAllmeatcooked")); } - private static final HashMap mMaxStackSizeMap = new HashMap(); - private static final HashMap mTooltipMap = new HashMap(); - private static final HashMap mRarityMap = new HashMap(); - private static final HashMap mHealAmountMap = new HashMap(); - private static final HashMap mSaturationAmountMap = new HashMap(); - private static final HashMap> mPotionEffectsMap = new HashMap>(); - private static final HashMap mHasSpecialBehaviourMap = new HashMap(); - private static final HashMap mSpecialBehaviourMap = new HashMap(); - private static final HashMap> mOreDictNames = new HashMap>(); + private static final HashMap mMaxStackSizeMap = new HashMap<>(); + private static final HashMap mTooltipMap = new HashMap<>(); + private static final HashMap mRarityMap = new HashMap<>(); + private static final HashMap mHealAmountMap = new HashMap<>(); + private static final HashMap mSaturationAmountMap = new HashMap<>(); + private static final HashMap> mPotionEffectsMap = new HashMap<>(); + private static final HashMap mHasSpecialBehaviourMap = new HashMap<>(); + private static final HashMap mSpecialBehaviourMap = new HashMap<>(); + private static final HashMap> mOreDictNames = new HashMap<>(); public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize) { @@ -115,9 +115,9 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap(), + new AutoMap<>(), null, - new ArrayList()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, @@ -129,7 +129,7 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap(), + new AutoMap<>(), null, aOreDictNames); } @@ -144,9 +144,9 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap(), + new AutoMap<>(), null, - new ArrayList()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, @@ -176,7 +176,7 @@ public class BaseItemMetaFood extends ItemFood { aMaxStacksize, aPotionEffects, null, - new ArrayList()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity, @@ -221,7 +221,7 @@ public class BaseItemMetaFood extends ItemFood { BaseItemMetaFood.registerMetaFoods(); } - private static final int getMetaKey(ItemStack aStack) { + private static int getMetaKey(ItemStack aStack) { return aStack.getItemDamage(); } @@ -416,7 +416,7 @@ public class BaseItemMetaFood extends ItemFood { } private static AutoMap getPotionEffectPackage(PotionEffectPackage... aEffects) { - AutoMap aPackage = new AutoMap(); + AutoMap aPackage = new AutoMap<>(); if (aEffects != null && aEffects.length > 0) { for (PotionEffectPackage aEffect : aEffects) { aPackage.put(aEffect); @@ -426,7 +426,7 @@ public class BaseItemMetaFood extends ItemFood { } private static ArrayList getOreDictNamesAsArrayList(String... aOreDictNames) { - ArrayList aPackage = new ArrayList(); + ArrayList aPackage = new ArrayList<>(); if (aOreDictNames != null && aOreDictNames.length > 0) { for (String aEffect : aOreDictNames) { aPackage.add(aEffect); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index 9407f5c5ad..61bdfe6705 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -235,16 +235,12 @@ public class ItemBlueprint extends Item implements IItemBlueprint { && !itemStack.stackTagCompound.getString("mName").equals("")) { // Has Blueprint but invalid name set Logger.WARNING("Has Blueprint but invalid name set"); - // itemStack.stackTagCompound = null; - // createNBT(itemStack); return false; } else if (!itemStack.stackTagCompound.getBoolean("mBlueprint") && itemStack.stackTagCompound.getString("mName").equals("")) { // Has no Blueprint, but strangely has a name Logger.WARNING("Has no Blueprint, but strangely has a name"); - // itemStack.stackTagCompound = null; - // createNBT(itemStack); return false; } return false; @@ -276,15 +272,20 @@ public class ItemBlueprint extends Item implements IItemBlueprint { return null; } Object o = null; - if (tagNBT.equals("mID")) { - o = itemStack.stackTagCompound.getInteger(tagNBT); - } else if (tagNBT.equals("mBlueprint")) { - o = itemStack.stackTagCompound.getBoolean(tagNBT); - } else if (tagNBT.equals("mName")) { - o = itemStack.stackTagCompound.getString(tagNBT); - } else if (tagNBT.equals("")) { - // For More Tag Support - // o = itemStack.stackTagCompound.getInteger(tagNBT); + switch (tagNBT) { + case "mID": + o = itemStack.stackTagCompound.getInteger(tagNBT); + break; + case "mBlueprint": + o = itemStack.stackTagCompound.getBoolean(tagNBT); + break; + case "mName": + o = itemStack.stackTagCompound.getString(tagNBT); + break; + case "": + // For More Tag Support + // o = itemStack.stackTagCompound.getInteger(tagNBT); + break; } if (o != null) { return o; diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index e0949f830a..3193262859 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -19,6 +19,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -63,8 +64,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric continue; } if (is != null) { - if (is.getItem() instanceof IElectricItem) { - final IElectricItem electricItem = (IElectricItem) is.getItem(); + if (is.getItem() instanceof final IElectricItem electricItem) { this.chargeEU = ElectricItem.manager.getCharge(is); } } @@ -120,7 +120,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric } public int secondsLeft(final ItemStack stack) { - double r = 0; + double r; r = this.getCharge(stack) / (10000 * 20); return (int) MathUtils.decimalRounding(r); } @@ -135,33 +135,20 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.3", - this.getTier(this.thisStack), - this.getTransferLimit(this.thisStack))); + GT_Utility.formatNumbers(this.getTier(this.thisStack)), + GT_Utility.formatNumbers(this.getTransferLimit(this.thisStack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.4", - (long) this.getCharge(stack), + GT_Utility.formatNumbers(this.getCharge(stack)), MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))); list.add( - StatCollector - .translateToLocalFormatted("item.personalCloakingDevice.tooltip.5", this.secondsLeft(stack))); + StatCollector.translateToLocalFormatted( + "item.personalCloakingDevice.tooltip.5", + GT_Utility.formatNumbers(this.secondsLeft(stack)))); super.addInformation(stack, aPlayer, list, bool); } - /* - * @Override public ItemStack getContainerItem(ItemStack itemStack) { ItemStack newItem = itemStack.copy(); - * newItem.stackSize = 1; extractEnergy(newItem, 150000, false); return newItem; } - */ - - /* - * @Override public boolean hasContainerItem(ItemStack stack) { return true; } - */ - - /* - * @Override public int getBurnTime(ItemStack fuel) { if ((fuel == null) || (fuel.getItem() != this)) { return 0; } - * return extractEnergy(fuel, 150000, true) / 50 / 100; } - */ - @Override public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit, final boolean simulate) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index e413c0933a..d457369a4c 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -46,12 +46,12 @@ public class ItemGenericToken extends CoreItem { EnumChatFormatting.RESET,