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 <colen@CONNORSPC>

40 files changed, 223 insertions, 771 deletions

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<Integer, ItemStack>(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<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName());
         if (aMap == null) {
-            aMap = new HashMap<String, ItemStack>();
+            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<String, ItemStack> aMap = Material.mComponentMap.get(aName);
         if (aMap == null) {
-            aMap = new HashMap<String, ItemStack>();
+            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<String, String> sNameCache = new HashMap<String, String>();
+    public static HashMap<String, String> 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<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<Integer, AutoMap<String>>();
+    private HashMap<Integer, AutoMap<String>> 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<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<String, AutoMap<String>>();
+    private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<>();
     private static boolean mInitOres_Everglades = false;
-    private AutoMap<String> mDimsForThisOre = new AutoMap<String>();
+    private AutoMap<String> 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<String> aMap = mMapOreBlockItemToDimName.get(m1.getUnlocalizedName().toLowerCase());
                     if (aMap == null) {
-                        aMap = new AutoMap<String>();
+                        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");
 
-        priva