Merge remote-tracking branch 'origin/speed-up' into dev

dependencies.gradle

@@ -1,24 +1,24 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.5.0:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.11-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
+    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.14:dev')
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.64-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.6.38:dev")
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.14.4-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.13.40-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.9.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-714-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.8.12:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-660-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.32:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.1-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.0:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.0-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.17.0-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.0-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.395:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.16-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.30:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.5-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.16.5-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,6 +26,5 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta60:api') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.2:dev")
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta50:api') {transitive = false}
 }

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41'
 }
 
 

src/main/java/crazypants/enderio/EnderIO.java

@@ -213,7 +213,6 @@ public class EnderIO {
 
     public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify");
     public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi");
-    public static final boolean hasHP = Loader.isModLoaded("hodgepodge");
 
     // Materials
     public static ItemCapacitor itemBasicCapacitor;
@@ -487,9 +486,7 @@ public class EnderIO {
         itemGrindingBall = ItemGrindingBall.create();
         itemAlloyEndergy = ItemAlloyEndergy.create();
         itemGrindingBallEndergy = ItemGrindingBallEndergy.create();
-        if (!hasGT5) {
-            itemPowderIngot = ItemPowderIngot.create();
-        }
+        itemPowderIngot = ItemPowderIngot.create();
 
         registerFluids();
 
@@ -729,9 +726,7 @@ public class EnderIO {
             SkeletonHandler.registerSkeleton(this);
         }
 
-        if (!hasGT5) {
-            MaterialRecipes.registerDependantOresInDictionary();
-        }
+        MaterialRecipes.registerDependantOresInDictionary();
 
         EnderfaceRecipes.addRecipes();
         MaterialRecipes.addRecipes();

src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java

@@ -160,6 +160,7 @@ public class BlockConduitBundle extends BlockEio
 
         BlockConduitBundle result = new BlockConduitBundle();
         result.init();
+        MinecraftForge.EVENT_BUS.register(result.handler);
         return result;
     }
 
@@ -170,6 +171,7 @@ public class BlockConduitBundle extends BlockEio
     private IIcon lastRemovedComponetIcon = null;
 
     private final Random rand = new Random();
+    public EventHandler handler;
 
     protected BlockConduitBundle() {
         super(ModObject.blockConduitBundle.unlocalisedName, TileConduitBundle.class);
@@ -189,6 +191,8 @@ public class BlockConduitBundle extends BlockEio
                 return "EnderIO:" + soundName + ".step";
             }
         };
+
+        handler = new EventHandler();
     }
 
     @SideOnly(Side.CLIENT)
@@ -298,7 +302,6 @@ public class BlockConduitBundle extends BlockEio
             EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), this);
         }
         EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_EXTERNAL_CONNECTION_SELECTOR, this);
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -1231,7 +1234,6 @@ public class BlockConduitBundle extends BlockEio
             if ("silence.step".equals(path)) {
                 ISound snd = event.sound;
                 World world = EnderIO.proxy.getClientWorld();
-                if (world == null) return;
                 BlockCoord bc = new BlockCoord(snd.getXPosF(), snd.getYPosF(), snd.getZPosF());
                 TileEntity te = bc.getTileEntity(world);
                 if (te instanceof TileConduitBundle && ((TileConduitBundle) te).hasFacade()) {

src/main/java/crazypants/enderio/item/KeyTracker.java

@@ -11,14 +11,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentTranslation;
 
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
 
 import com.enderio.core.common.util.ChatUtil;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
-import cpw.mods.fml.common.gameevent.InputEvent.MouseInputEvent;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.api.teleport.IItemOfTravel;
 import crazypants.enderio.api.tool.IConduitControl;
@@ -136,18 +134,6 @@ public class KeyTracker {
 
     @SubscribeEvent
     public void onKeyInput(KeyInputEvent event) {
-        handleInput();
-    }
-
-    // mouse button presses arrive on a separate event
-    @SubscribeEvent
-    public void onMouseInput(MouseInputEvent event) {
-        if (Mouse.getEventButton() >= 0) {
-            handleInput();
-        }
-    }
-
-    private void handleInput() {
         handleGlide();
         handleSoundDetector();
         handleNightVision();

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java

@@ -43,6 +43,8 @@ import crazypants.enderio.machine.farm.farmers.TreeHarvestUtil;
 public class ItemDarkSteelAxe extends ItemAxe
         implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
 
+    public EventHandler handler;
+
     public static boolean isEquipped(EntityPlayer player) {
         if (player == null) {
             return false;
@@ -67,6 +69,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     public static ItemDarkSteelAxe create() {
         ItemDarkSteelAxe res = new ItemDarkSteelAxe();
+        MinecraftForge.EVENT_BUS.register(res.handler);
         res.init();
         return res;
     }
@@ -77,6 +80,7 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     protected ItemDarkSteelAxe() {
         this("darkSteel", ItemDarkSteelSword.MATERIAL);
+        handler = new EventHandler();
     }
 
     protected ItemDarkSteelAxe(String name, ToolMaterial mat) {
@@ -86,6 +90,7 @@ public class ItemDarkSteelAxe extends ItemAxe
         String str = name + "_axe";
         setUnlocalizedName(str);
         setTextureName(EnderIO.DOMAIN + ":" + str);
+        handler = new EventHandler();
     }
 
     @Override
@@ -245,7 +250,6 @@ public class ItemDarkSteelAxe extends ItemAxe
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java

@@ -38,6 +38,8 @@ import crazypants.enderio.machine.farm.farmers.HarvestResult;
 public class ItemDarkSteelShears extends ItemShears
         implements IEnergyContainerItem, IAdvancedTooltipProvider, IDarkSteelItem {
 
+    public EventHandler handler;
+
     public static boolean isEquipped(EntityPlayer player) {
         if (player == null) {
             return false;
@@ -62,12 +64,13 @@ public class ItemDarkSteelShears extends ItemShears
 
     public static ItemDarkSteelShears create() {
         ItemDarkSteelShears res = new ItemDarkSteelShears();
+        MinecraftForge.EVENT_BUS.register(res.handler);
         res.init();
         return res;
     }
 
-    private final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
-    private final EntityComparator entityComparator = new EntityComparator();
+    protected final MultiHarvestComparator harvestComparator = new MultiHarvestComparator();
+    protected final EntityComparator entityComparator = new EntityComparator();
     protected String name;
 
     protected ItemDarkSteelShears(String name) {
@@ -82,6 +85,7 @@ public class ItemDarkSteelShears extends ItemShears
 
     protected ItemDarkSteelShears() {
         this("darkSteel");
+        handler = new EventHandler();
     }
 
     @Override
@@ -222,7 +226,6 @@ public class ItemDarkSteelShears extends ItemShears
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -323,7 +326,7 @@ public class ItemDarkSteelShears extends ItemShears
         }
     }
 
-    public static class EventHandler {
+    public class EventHandler {
 
         @SubscribeEvent
         public void onBreakSpeedEvent(PlayerEvent.BreakSpeed evt) {

src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java

@@ -72,12 +72,14 @@ public class ItemDarkSteelSword extends ItemSword
     public static ItemDarkSteelSword create() {
         ItemDarkSteelSword res = new ItemDarkSteelSword();
         res.init();
+        MinecraftForge.EVENT_BUS.register(res.handler);
         return res;
     }
 
     protected final int powerPerDamagePoint = Config.darkSteelPowerStorageBase / MATERIAL.getMaxUses();
     protected long lastBlickTick = -1;
     protected String name;
+    public EventHandler handler;
 
     public ItemDarkSteelSword(String name, ToolMaterial mat) {
         super(mat);
@@ -87,10 +89,12 @@ public class ItemDarkSteelSword extends ItemSword
         String str = name + "_sword";
         setUnlocalizedName(str);
         setTextureName(EnderIO.DOMAIN + ":" + str);
+        handler = new EventHandler();
     }
 
     public ItemDarkSteelSword() {
         this("darkSteel", MATERIAL);
+        handler = new EventHandler();
     }
 
     @Override
@@ -226,7 +230,6 @@ public class ItemDarkSteelSword extends ItemSword
 
     protected void init() {
         GameRegistry.registerItem(this, getUnlocalizedName());
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override

src/main/java/crazypants/enderio/machine/capbank/ContainerCapBank.java

@@ -89,9 +89,7 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         }
 
         if (hasBaublesSlots()) {
-            // for (int i = 0; i < baubles.getSizeInventory(); i++) {
-            // Capped since the sprite only has 4 slots
-            for (int i = 0; i < Math.min(baubles.getSizeInventory(), 4); i++) {
+            for (int i = 0; i < baubles.getSizeInventory(); i++) {
                 addSlotToContainer(new Slot(baubles, i, -15 + armorOffset, 84 + i * 18) {
 
                     @Override
@@ -124,9 +122,7 @@ public class ContainerCapBank extends ContainerEnderTileEntity<TileCapBank> {
         int startHotBarSlot = endPlayerSlot + 1;
         int endHotBarSlot = startHotBarSlot + 9;
         int startBaublesSlot = endHotBarSlot + 1;
-        // int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
-        // Capped since the sprite only has 4 slots
-        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + Math.min(baubles.getSizeInventory(), 4);
+        int endBaublesSlot = baubles == null ? 0 : startBaublesSlot + baubles.getSizeInventory();
 
         ItemStack copystack = null;
         Slot slot = (Slot) inventorySlots.get(slotIndex);

src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java

@@ -17,9 +17,7 @@ import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import com.enderio.core.common.util.BlockCoord;
-import com.mitchej123.hodgepodge.mixins.interfaces.INetherSeed;
 
-import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.farm.TileFarmStation;
 
 public class PlantableFarmer implements IFarmerJoe {
@@ -111,13 +109,7 @@ public class PlantableFarmer implements IFarmerJoe {
 
     protected boolean plant(TileFarmStation farm, World worldObj, BlockCoord bc, IPlantable plantable) {
         worldObj.setBlock(bc.x, bc.y, bc.z, Blocks.air, 0, 1 | 2);
-        Block target;
-        // needed for Pam's nether seeds
-        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
-            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
-        } else {
-            target = plantable.getPlant(null, 0, 0, 0);
-        }
+        Block target = plantable.getPlant(null, 0, 0, 0);
         int meta = plantable.getPlantMetadata(null, 0, 0, 0);
         worldObj.setBlock(bc.x, bc.y, bc.z, target, meta, 1 | 2);
         farm.actionPerformed(false);
@@ -125,13 +117,7 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     protected boolean canPlant(World worldObj, BlockCoord bc, IPlantable plantable) {
-        Block target;
-        // needed for Pam's nether seeds
-        if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
-            target = netherSeed.hodgepodge$getPlant(null, 0, 0, 0);
-        } else {
-            target = plantable.getPlant(null, 0, 0, 0);
-        }
+        Block target = plantable.getPlant(null, 0, 0, 0);
         Block ground = worldObj.getBlock(bc.x, bc.y - 1, bc.z);
         if (target != null && target.canPlaceBlockAt(worldObj, bc.x, bc.y, bc.z)
                 && target.canBlockStay(worldObj, bc.x, bc.y, bc.z)
@@ -196,14 +182,10 @@ public class PlantableFarmer implements IFarmerJoe {
     }
 
     private boolean isPlantableForBlock(ItemStack stack, Block block) {
-        if (stack.getItem() instanceof IPlantable plantable) {
-            // needed for Pam's nether seeds
-            if (EnderIO.hasHP && plantable instanceof INetherSeed netherSeed) {
-                return netherSeed.hodgepodge$getPlant(null, 0, 0, 0) == block;
-            } else {
-                return plantable.getPlant(null, 0, 0, 0) == block;
-            }
+        if (!(stack.getItem() instanceof IPlantable)) {
+            return false;
         }
-        return false;
+        IPlantable plantable = (IPlantable) stack.getItem();
+        return plantable.getPlant(null, 0, 0, 0) == block;
     }
 }

src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java

@@ -22,13 +22,16 @@ import crazypants.enderio.xp.PacketGivePlayerXP;
 public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
 
     static final String USERNAME = "KillerJoe";
+    public EventHandler handler;
 
     public static BlockKillerJoe create() {
         PacketHandler.INSTANCE
                 .registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT);
         PacketGivePlayerXP.register();
         PacketExperianceContainer.register();
+
         BlockKillerJoe res = new BlockKillerJoe();
+        MinecraftForge.EVENT_BUS.register(res.handler);
         res.init();
         return res;
     }
@@ -36,12 +39,7 @@ public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
     protected BlockKillerJoe() {
         super(ModObject.blockKillerJoe, TileKillerJoe.class);
         setStepSound(Block.soundTypeGlass);
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
+        handler = new EventHandler();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/obelisk/inhibitor/BlockInhibitorObelisk.java

@@ -21,21 +21,18 @@ import crazypants.enderio.machine.obelisk.BlockObeliskAbstract;
 public class BlockInhibitorObelisk extends BlockObeliskAbstract<TileInhibitorObelisk> {
 
     public static BlockInhibitorObelisk instance;
+    public EventHandler handler;
 
     public static BlockInhibitorObelisk create() {
         BlockInhibitorObelisk res = new BlockInhibitorObelisk();
         res.init();
+        MinecraftForge.EVENT_BUS.register(res.handler);
         return instance = res;
     }
 
     protected BlockInhibitorObelisk() {
         super(ModObject.blockInhibitorObelisk, TileInhibitorObelisk.class);
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        MinecraftForge.EVENT_BUS.register(new EventHandler());
+        handler = new EventHandler();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java

@@ -199,7 +199,7 @@ public class BlockPaintedGlowstone extends BlockEio
     @SideOnly(Side.CLIENT)
     @Override
     public void registerBlockIcons(IIconRegister IIconRegister) {
-        blockIcon = IIconRegister.registerIcon("glowstone");
+        blockIcon = IIconRegister.registerIcon("enderio:conduitConnector");
     }
 
     @Override
@@ -231,12 +231,10 @@ public class BlockPaintedGlowstone extends BlockEio
 
     @Override
     protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) {
-        if (te instanceof TileEntityPaintedBlock tef) {
+        TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
+        if (tef != null) {
             ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
-            NBTTagCompound tag = itemStack.stackTagCompound;
-            if (tag != null) {
-                drop.stackTagCompound = (NBTTagCompound) tag.copy();
-            }
+            drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy();
         }
     }
 

src/main/java/crazypants/enderio/machine/painter/PainterUtil.java

@@ -63,8 +63,7 @@ public final class PainterUtil {
                 sourceName = is.getDisplayName();
             }
         }
-        return EnderIO.lang.localize("blockPainter.paintedWith") + " "
-                + (sourceName.isEmpty() ? EnderIO.lang.localize("blockPainter.paintedWith.none") : sourceName);
+        return EnderIO.lang.localize("blockPainter.paintedWith") + " " + sourceName;
     }
 
     public static void setSourceBlock(ItemStack item, Block source, int meta) {

src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java

@@ -89,6 +89,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
         PoweredSpawnerConfig.getInstance();
 
         BlockPoweredSpawner res = new BlockPoweredSpawner();
+        MinecraftForge.EVENT_BUS.register(res.handler);
+        FMLCommonHandler.instance().bus().register(res.handler);
         res.init();
         return res;
     }
@@ -97,6 +99,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
 
     private Field fieldpersistenceRequired;
 
+    public EventHandler handler;
+
     protected BlockPoweredSpawner() {
         super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class);
 
@@ -111,14 +115,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
         } catch (Exception e) {
             Log.error("BlockPoweredSpawner: Could not find field: persistenceRequired");
         }
-    }
-
-    @Override
-    protected void init() {
-        super.init();
-        EventHandler handler = new EventHandler();
-        MinecraftForge.EVENT_BUS.register(handler);
-        FMLCommonHandler.instance().bus().register(handler);
+        handler = new EventHandler();
     }
 
     private final Map<BlockCoord, ItemStack> dropCache = new HashMap<BlockCoord, ItemStack>();

src/main/java/crazypants/enderio/material/MaterialRecipes.java

@@ -1,6 +1,5 @@
 package crazypants.enderio.material;
 
-import static crazypants.enderio.EnderIO.hasGT5;
 import static crazypants.enderio.material.Alloy.DARK_STEEL;
 import static crazypants.enderio.material.Alloy.END_STEEL;
 import static crazypants.enderio.material.Alloy.ENERGETIC_ALLOY;
@@ -59,13 +58,10 @@ public class MaterialRecipes {
 
     public static void registerOresInDictionary() {
         // Ore Dictionary Registration
-        if (!hasGT5) {
-            for (PowderIngot powder : PowderIngot.values()) {
-                if (!powder.hasDependancy()) {
-                    OreDictionary.registerOre(
-                            powder.oreDictName,
-                            new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal()));
-                }
+        for (PowderIngot powder : PowderIngot.values()) {
+            if (!powder.hasDependancy()) {
+                OreDictionary
+                        .registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal()));
             }
         }
 
@@ -435,19 +431,17 @@ public class MaterialRecipes {
         RecipeUtil.addShaped(vibCry, "nnn", "ngn", "nnn", 'n', vibrantNugget, 'g', "gemEmerald");
 
         // Smelting
-        if (!hasGT5) {
-            ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
-            ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
-            ItemStack ingotIron = new ItemStack(Items.iron_ingot);
-            ItemStack ingotGold = new ItemStack(Items.gold_ingot);
+        ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
+        ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
+        ItemStack ingotIron = new ItemStack(Items.iron_ingot);
+        ItemStack ingotGold = new ItemStack(Items.gold_ingot);
 
-            GameRegistry.addSmelting(dustIron, ingotIron, 0);
-            GameRegistry.addSmelting(dustGold, ingotGold, 0);
+        GameRegistry.addSmelting(dustIron, ingotIron, 0);
+        GameRegistry.addSmelting(dustGold, ingotGold, 0);
 
-            // Ender Dusts
-            ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
-            RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
-        }
+        // Ender Dusts
+        ItemStack enderDust = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
+        RecipeUtil.addShaped(new ItemStack(Items.ender_pearl), "eee", "eee", "eee", 'e', enderDust);
 
         // Dark Iron Bars
         ItemStack diBars = new ItemStack(EnderIO.blockDarkIronBars, 16, 0);
@@ -570,29 +564,24 @@ public class MaterialRecipes {
         ItemStack darkRod = new ItemStack(EnderIO.itemMaterial, 1, Material.DARK_STEEL_ROD.ordinal());
         RecipeUtil.addShaped(darkRod, " ns", "nsn", "sn ", 's', darkSteel, 'n', endSteelNugget);
 
-        if (!hasGT5) {
-            // Food
-            ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
-            ItemStack bread = new ItemStack(Items.bread, 1, 0);
+        // Food
+        ItemStack flour = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.FLOUR.ordinal());
+        ItemStack bread = new ItemStack(Items.bread, 1, 0);
 
-            GameRegistry.addSmelting(flour, bread, 0.35f);
-        }
+        GameRegistry.addSmelting(flour, bread, 0.35f);
 
         ItemStack enderios = EnderFood.ENDERIOS.getStack();
         RecipeUtil.addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");
 
-        if (!hasGT5) {
-            if (OreDictionaryHelper.hasCopper()) {
-                ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
-                ItemStack ingotCoppper = OreDictionaryPreferences.instance
-                        .getPreferred(OreDictionaryHelper.INGOT_COPPER);
-                GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
-            }
-            if (OreDictionaryHelper.hasTin()) {
-                ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
-                ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
-                GameRegistry.addSmelting(dustTin, ingotTin, 0);
-            }
+        if (OreDictionaryHelper.hasCopper()) {
+            ItemStack dustCopper = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COPPER.ordinal());
+            ItemStack ingotCoppper = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_COPPER);
+            GameRegistry.addSmelting(dustCopper, ingotCoppper, 0);
+        }
+        if (OreDictionaryHelper.hasTin()) {
+            ItemStack dustTin = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal());
+            ItemStack ingotTin = OreDictionaryPreferences.instance.getPreferred(OreDictionaryHelper.INGOT_TIN);
+            GameRegistry.addSmelting(dustTin, ingotTin, 0);
         }
     }
 }

src/main/java/crazypants/util/EE3Util.java

@@ -1,6 +1,5 @@
 package crazypants.util;
 
-import static crazypants.enderio.EnderIO.hasGT5;
 import static crazypants.enderio.material.Material.BINDER_COMPOSITE;
 import static crazypants.enderio.material.Material.CONDUIT_BINDER;
 import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET;
@@ -10,7 +9,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -22,7 +20,6 @@ import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy;
 import com.pahimar.ee3.api.exchange.RecipeRegistryProxy;
 
 import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.registry.GameRegistry;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.item.ItemEnderFood.EnderFood;
@@ -96,59 +93,47 @@ public class EE3Util {
      */
     public static void registerMiscRecipes() {
         if (IS_EE3_LOADED) {
-            if (!hasGT5) {
-                ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
-                ItemStack stick4 = new ItemStack(Items.stick, 4);
-                ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4);
-                registerRecipe(basicGear, stick4, cobble4);
-                ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal());
-                ItemStack wheat5 = new ItemStack(Items.wheat, 5);
-                ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1);
-                registerRecipe(flour10, wheat5, seeds1);
-            }
+            ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
+            ItemStack stick4 = new ItemStack(Items.stick, 4);
+            ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4);
+            registerRecipe(basicGear, stick4, cobble4);
+
+            ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal());
+            ItemStack wheat5 = new ItemStack(Items.wheat, 5);
+            ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1);
+            registerRecipe(flour10, wheat5, seeds1);
 
             ItemStack enderios = EnderFood.ENDERIOS.getStack();
             ItemStack bowl = new ItemStack(Items.bowl, 1);
             ItemStack wheat = new ItemStack(Items.wheat, 1);
             ItemStack milkb = new ItemStack(Items.milk_bucket, 1);
             FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb);
-            ItemStack dustEnderPearl;
-            if (hasGT5) {
-                dustEnderPearl = GameRegistry.findItemStack("gregtech", "gt.metaitem.01", 1);
-                Items.feather.setDamage(Objects.requireNonNull(dustEnderPearl), 2532);
-            } else {
-                dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
-            }
+            ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal());
             if (milk != null) {
                 registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl);
             } else {
                 registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl);
             }
 
-            if (!hasGT5) {
-                ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal());
-                ItemStack coal = new ItemStack(Items.coal, 1);
-                registerRecipe(dustCoal, coal);
+            ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal());
+            ItemStack coal = new ItemStack(Items.coal, 1);
+            registerRecipe(dustCoal, coal);
 
-                ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
-                ItemStack iron = new ItemStack(Items.iron_ingot, 1);
-                registerRecipe(dustIron, iron);
+            ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
+            ItemStack iron = new ItemStack(Items.iron_ingot, 1);
+            registerRecipe(dustIron, iron);
 
-                ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
-                ItemStack gold = new ItemStack(Items.gold_ingot, 1);
-                registerRecipe(dustGold, gold);
+            ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal());
+            ItemStack gold = new ItemStack(Items.gold_ingot, 1);
+            registerRecipe(dustGold, gold);
 
-                ItemStack dustObsidian4 = new ItemStack(
-                        EnderIO.itemPowderIngot,
-                        4,
-                        PowderIngot.POWDER_OBSIDIAN.ordinal());
-                ItemStack obsidian = new ItemStack(Blocks.obsidian, 1);
-                registerRecipe(dustObsidian4, obsidian);
+            ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal());
+            ItemStack obsidian = new ItemStack(Blocks.obsidian, 1);
+            registerRecipe(dustObsidian4, obsidian);
 
-                ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal());
-                ItemStack enderPearl = new ItemStack(Items.ender_pearl);
-                registerRecipe(enderDust9, enderPearl);
-            }
+            ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal());
+            ItemStack enderPearl = new ItemStack(Items.ender_pearl);
+            registerRecipe(enderDust9, enderPearl);
 
             ItemStack cbc8 = BINDER_COMPOSITE.getStack(8);
             ItemStack sand2 = new ItemStack(Blocks.sand, 2);

src/main/resources/assets/enderio/lang/en_US.lang

@@ -777,7 +777,6 @@ enderio.itemCoordSelector.chat.setDimension=Set Dimension: %s%s
 #Painter
 tile.blockPainter.name=Painting Machine
 enderio.blockPainter.paintedWith=Painted with:
-enderio.blockPainter.paintedWith.none=§onothing§r
 tile.blockPaintedFence.name=Painted Fence
 tile.blockPaintedFenceGate.name=Painted Gate
 tile.blockPaintedWall.name=Painted Wall