update

Changed VALUES array to public for external access.

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.28:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.11.19:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.11:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.45:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.105-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.81-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.61:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.57:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle/gradle-daemon-jvm.properties

@@ -1,12 +1,12 @@
 #This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3689d0bcdd77ac01674ba3c9dbbe94d0/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect
 toolchainVersion=25

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
 }

src/main/java/binnie/core/block/ItemMetadata.java

@@ -17,8 +17,6 @@ public class ItemMetadata extends ItemBlock {
 
     public ItemMetadata(Block block) {
         super(block);
-        setMaxDamage(0);
-        setHasSubtypes(true);
     }
 
     @Override

src/main/java/binnie/core/craftgui/WindowFieldKit.java

@@ -188,9 +188,7 @@ public class WindowFieldKit extends Window {
         glassOffsetX *= 1.0f - analyseProgress;
         glassOffsetY += glassVY;
         glassOffsetY *= 1.0f - analyseProgress;
-        if (GlassControl != null) {
-            GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
-        }
+        GlassControl.setOffset(new IPoint(glassOffsetX, glassOffsetY));
     }
 
     private void refreshSpecies() {

src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java

@@ -240,16 +240,12 @@ public class GuiCraftGUI extends GuiContainer {
 
     @Override
     protected void keyTyped(char c, int key) {
-        boolean noFocusedWidget = window.getFocusedWidget() == null;
+        NEIHook.lastKeyTyped(key, c);
 
-        if (noFocusedWidget) {
-            NEIHook.lastKeyTyped(key, c);
-        }
-
-        if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && noFocusedWidget)) {
+        if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
             mc.thePlayer.closeScreen();
         }
-        IWidget origin = noFocusedWidget ? window : window.getFocusedWidget();
+        IWidget origin = (window.getFocusedWidget() == null) ? window : window.getFocusedWidget();
         window.callEvent(new EventKey.Down(origin, c, key));
     }
 

src/main/java/binnie/core/craftgui/minecraft/Window.java

@@ -53,7 +53,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
     protected float titleButtonLeft;
     protected float titleButtonRight;
     private GuiCraftGUI gui;
-    private Renderer renderer;
     private final ContainerCraftGUI container;
     private final WindowInventory windowInventory;
     private ControlText title;
@@ -84,8 +83,8 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
             ControlSlot.highlighting.put(h, new ArrayList<>());
         }
 
-        renderer = new Renderer(gui);
-        renderer.stylesheet(StyleSheetManager.getDefault());
+        CraftGUI.render = new Renderer(gui);
+        CraftGUI.render.stylesheet(StyleSheetManager.getDefault());
         titleButtonLeft = -14.0f;
 
         if (showHelpButton()) {
@@ -196,9 +195,6 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
     }
 
     public void initGui() {
-
-        CraftGUI.render = renderer;
-
         if (hasBeenInitialised) {
             return;
         }
@@ -271,9 +267,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
         entityInventory = inventory;
     }
 
-    public void onClose() {
-        CraftGUI.render = null;
-    }
+    public void onClose() {}
 
     public boolean isServer() {
         return !isClient();

src/main/java/binnie/core/liquid/ManagerLiquid.java

@@ -1,9 +1,7 @@
 package binnie.core.liquid;
 
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraftforge.fluids.Fluid;
@@ -11,62 +9,32 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import binnie.core.ManagerBase;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class ManagerLiquid extends ManagerBase {
 
-    private static final Set<String> EXTERNAL_FLUIDS = new HashSet<>();
-
-    static {
-        EXTERNAL_FLUIDS.add("liquidnitrogen");
-    }
-
-    private static boolean isExternalFluid(String identifier) {
-        return EXTERNAL_FLUIDS.contains(identifier) && Loader.isModLoaded("gregtech");
-    }
-
     public Map<String, IFluidType> fluids;
-    private final Set<String> ownedFluids;
 
     public ManagerLiquid() {
         fluids = new LinkedHashMap<>();
-        ownedFluids = new HashSet<>();
     }
 
     public void createLiquids(IFluidType[] liquids, int startID) {
         for (IFluidType liquid : liquids) {
-            String identifier = liquid.getIdentifier().toLowerCase();
-            Fluid fluid = createOrGetLiquid(liquid, startID++);
-            if (fluid == null && !isExternalFluid(identifier)) {
+            BinnieFluid fluid = createLiquid(liquid, startID++);
+            if (fluid == null) {
                 throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier());
             }
         }
     }
 
     public BinnieFluid createLiquid(IFluidType fluid, int id) {
-        Fluid registeredFluid = createOrGetLiquid(fluid, id);
-        return (registeredFluid instanceof BinnieFluid) ? (BinnieFluid) registeredFluid : null;
-    }
-
-    private Fluid createOrGetLiquid(IFluidType fluid, int id) {
-        String identifier = fluid.getIdentifier().toLowerCase();
-        fluids.put(identifier, fluid);
-        Fluid registeredFluid = FluidRegistry.getFluid(identifier);
-        if (registeredFluid == null && !isExternalFluid(identifier)) {
-            BinnieFluid binnieFluid = new BinnieFluid(fluid);
-            FluidRegistry.registerFluid(binnieFluid);
-            registeredFluid = FluidRegistry.getFluid(identifier);
-            ownedFluids.add(identifier);
-        } else if (registeredFluid == null) {
-            FMLLog.warning(
-                    "[Binnie] External liquid %s is not registered yet. Waiting for the owning mod to register it before postInit.",
-                    identifier);
-        }
+        fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
+        BinnieFluid binnieFluid = new BinnieFluid(fluid);
+        FluidRegistry.registerFluid(binnieFluid);
         ItemFluidContainer.registerFluid(fluid, id);
-        return registeredFluid;
+        return binnieFluid;
     }
 
     public FluidStack getLiquidStack(String name, int amount) {
@@ -76,26 +44,18 @@ public class ManagerLiquid extends ManagerBase {
     @SideOnly(Side.CLIENT)
     public void reloadIcons(IIconRegister register) {
         for (IFluidType type : fluids.values()) {
-            String identifier = type.getIdentifier().toLowerCase();
-            FluidStack stack = getLiquidStack(identifier, 1);
-            Fluid fluid = stack == null ? null : stack.getFluid();
+            Fluid fluid = getLiquidStack(type.getIdentifier(), 1).getFluid();
             type.registerIcon(register);
             if (fluid == null) {
                 throw new RuntimeException("[Binnie] Liquid not registered properly - " + type.getIdentifier());
             }
-            if (ownedFluids.contains(identifier)) {
-                fluid.setIcons(type.getIcon());
-            }
+            fluid.setIcons(type.getIcon());
         }
     }
 
     @Override
     public void postInit() {
         for (IFluidType fluid : fluids.values()) {
-            String identifier = fluid.getIdentifier().toLowerCase();
-            if (isExternalFluid(identifier) && FluidRegistry.getFluid(identifier) == null) {
-                throw new RuntimeException("[Binnie] External liquid not registered - " + identifier);
-            }
             for (FluidContainer container : FluidContainer.values()) {
                 if (container.isActive() && fluid.canPlaceIn(container)) {
                     container.registerContainerData(fluid);

src/main/java/binnie/core/machines/MachinePackage.java

@@ -1,5 +1,6 @@
 package binnie.core.machines;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
 
 import binnie.core.util.I18N;
@@ -52,7 +53,8 @@ public abstract class MachinePackage {
         this.group = group;
     }
 
-    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick);
+    public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+            RenderBlocks renderer);
 
     public boolean isActive() {
         return active;

src/main/java/binnie/core/machines/RendererMachine.java

@@ -5,6 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 import binnie.Binnie;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -12,27 +13,30 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 // Hmm. It's used class
 public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler {
 
+    RenderBlocks blockRenderer;
+
     @Override
     public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) {
-        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick);
+        renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer);
     }
 
-    private void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick) {
+    public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick,
+            RenderBlocks renderer) {
         if (entity != null && entity.getMachine() != null) {
             MachinePackage machinePackage = entity.getMachine().getPackage();
-            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick);
+            machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer);
         }
     }
 
-    private void renderInvBlock(Block block, int i, int j) {
+    public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) {
         TileEntity entity = block.createTileEntity(null, i);
-        renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f);
+        renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks);
     }
 
     @Override
     public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {
         if (modelID == Binnie.Machine.getMachineRenderID()) {
-            renderInvBlock(block, metadata, modelID);
+            renderInvBlock(renderer, block, metadata, modelID);
         }
     }
 
@@ -44,7 +48,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
                 && tile.getMachine().getPackage() != null
                 && tile.getMachine().getPackage().getGroup() != null
                 && !tile.getMachine().getPackage().getGroup().customRenderer) {
-            renderTileEntity(tile, x, y, z, 1.0f);
+            renderTileEntity(tile, x, y, z, 1.0f, renderer);
         }
         return true;
     }
@@ -58,4 +62,9 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl
     public int getRenderId() {
         return Binnie.Machine.getMachineRenderID();
     }
+
+    @Override
+    public void func_147496_a(World par1World) {
+        blockRenderer = new RenderBlocks(par1World);
+    }
 }

src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java

@@ -164,7 +164,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac
 
     @Override
     public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
-        int index = getTankIndexToDrain(from, resource);
+        int index = getTankIndexToDrain(from, null);
         if (!tanks.containsKey(index)) {
             return null;
         }

src/main/java/binnie/core/machines/storage/Compartment.java

@@ -1,5 +1,6 @@
 package binnie.core.machines.storage;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -50,7 +51,8 @@ enum Compartment implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererCompartment.instance.renderMachine(machine, renderTexture, x, y, z);
         }
     }

src/main/java/binnie/core/machines/storage/WindowCompartment.java

@@ -256,8 +256,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
         ControlSlide slide = new ControlSlide(this, 0.0f, 134.0f, 136.0f, 92.0f, Position.LEFT);
         slide.setLabel(I18N.localise("binniecore.machine.storage.tab.properties"));
         slide.setSlide(false);
-        slide.addHelp(I18N.localise("binniecore.machine.storage.tab.properties"));
-        slide.addHelp(I18N.localise("binniecore.machine.storage.tab.properties.desc"));
+        slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties"));
+        slide.addHelp(I18N.localise("binniecore.machine.storage.tooltip.properties.desc"));
         Panel tabPropertyPanel = new Panel(slide, 16.0f, 8.0f, 112.0f, 76.0f, MinecraftGUI.PanelType.Gray);
         int y2 = 4;
         new ControlText(tabPropertyPanel, new IPoint(4.0f, y2), I18N.localise("binniecore.machine.storage.tab.name"));

src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java

@@ -1,5 +1,6 @@
 package binnie.extrabees.apiary.machine;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
@@ -65,7 +66,8 @@ public enum AlvearyMachine implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick);
         }
     }

src/main/java/binnie/extrabees/config/EBConfigMachines.java

@@ -1,11 +1,11 @@
-package binnie.genetics.config;
+package binnie.extrabees.config;
 
-import static binnie.genetics.Genetics.GENETICS_MODID;
+import static binnie.extrabees.ExtraBees.EB_MODID;
 
 import com.gtnewhorizon.gtnhlib.config.Config;
 
-@Config(modid = GENETICS_MODID)
-public class GeneticsConfig {
+@Config(modid = EB_MODID)
+public class EBConfigMachines {
 
     @Config.Comment("Percentage chance of Isolator consuming bee. 0 never consumes, 1 always does.")
     @Config.RangeFloat(min = 0f, max = 1f)

src/main/java/binnie/extratrees/block/ILogType.java

@@ -58,7 +58,7 @@ public interface ILogType {
         Rosewood("rosewood", 0x998666, PlankType.ExtraTreePlanks.Rosewood),
         Purpleheart("purpleheart", 0x9392a2, PlankType.ExtraTreePlanks.Purpleheart),
         Iroko("iroko", 0x605c5b, PlankType.ExtraTreePlanks.Iroko),
-        Ginkgo("ginkgo", 0xadae9c, PlankType.ExtraTreePlanks.Ginkgo),
+        Gingko("gingko", 0xadae9c, PlankType.ExtraTreePlanks.Gingko),
         Eucalyptus("eucalyptus", 0xeadeda, PlankType.ExtraTreePlanks.Eucalyptus),
         Eucalyptus2("eucalyptus", 0x867e65, PlankType.ExtraTreePlanks.Eucalyptus),
         Box("box", 0xab6f57, PlankType.ExtraTreePlanks.Box),

src/main/java/binnie/extratrees/block/ItemETSlab.java

@@ -22,6 +22,8 @@ public class ItemETSlab extends ItemMetadata {
         theHalfSlab = (BlockETSlab) ExtraTrees.blockSlab;
         doubleSlab = (BlockETSlab) ExtraTrees.blockDoubleSlab;
         isFullBlock = (block != theHalfSlab);
+        setMaxDamage(0);
+        setHasSubtypes(true);
     }
 
     @Override

src/main/java/binnie/extratrees/block/ItemETStairs.java

@@ -19,8 +19,6 @@ public class ItemETStairs extends ItemBlock {
         super(block);
         setCreativeTab(CreativeTabs.tabBlock);
         setUnlocalizedName("stairs");
-        setMaxDamage(0);
-        setHasSubtypes(true);
     }
 
     @Override

src/main/java/binnie/extratrees/block/PlankType.java

@@ -67,7 +67,7 @@ public class PlankType {
         Olive(0xb0ad88),
         Sweetgum(0xd59658),
         Rosewood(0x761500),
-        Ginkgo(0xf4e7ba),
+        Gingko(0xf4e7ba),
         PinkIvory(0xec8ca0);
 
         /**

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -69,7 +69,7 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
     Acorn(6, 0x72b226, 0xad6a1d, FruitSprite.Tiny),
     Elderberry(9, 0x71975d, 0x515b43, FruitSprite.Tiny),
     Olive(9, 0x879e35, 0x62572a, FruitSprite.Small),
-    GinkgoNut(7, 0x8c975b, 0xe5daad, FruitSprite.Tiny),
+    GingkoNut(7, 0x8c975b, 0xe5daad, FruitSprite.Tiny),
     Coffee(8, 0x716d1d, 0xf84f66, FruitSprite.Tiny),
     Pear(10, 0x9f8f51, 0x9fd551, FruitSprite.Pear),
     OsangeOsange(10, 0x979752, 0xa2bf27, FruitSprite.Larger),
@@ -205,8 +205,8 @@ public enum ExtraTreeFruitGene implements IAlleleFruit, IFruitProvider {
         ExtraTreeFruitGene.Elderberry.setFamily(familyPrune);
         ExtraTreeFruitGene.Olive.addProduct(Food.Olive.get(1), 1.0f);
         ExtraTreeFruitGene.Olive.setFamily(familyPrune);
-        ExtraTreeFruitGene.GinkgoNut.addProduct(Food.GinkgoNut.get(1), 1.0f);
-        ExtraTreeFruitGene.GinkgoNut.setFamily(familyNuts);
+        ExtraTreeFruitGene.GingkoNut.addProduct(Food.GingkoNut.get(1), 1.0f);
+        ExtraTreeFruitGene.GingkoNut.setFamily(familyNuts);
         ExtraTreeFruitGene.Coffee.addProduct(Food.Coffee.get(1), 1.0f);
         ExtraTreeFruitGene.Coffee.setFamily(familyJungle);
         ExtraTreeFruitGene.Pear.addProduct(Food.Pear.get(1), 1.0f);

src/main/java/binnie/extratrees/genetics/ExtraTreeMutation.java

@@ -125,7 +125,7 @@ public class ExtraTreeMutation implements ITreeMutation {
         new ExtraTreeMutation(ExtraTreeSpecies.Brazilwood, getVanilla("Kapok"), ExtraTreeSpecies.Purpleheart, 10);
         new ExtraTreeMutation(getVanilla("Ebony"), getVanilla("Teak"), ExtraTreeSpecies.Rosewood, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Rosewood, getVanilla("Kapok"), ExtraTreeSpecies.Logwood, 10);
-        new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ExtraTreeSpecies.Ginkgo, 10);
+        new ExtraTreeMutation(getVanilla("Wenge"), getVanilla("Lime"), ExtraTreeSpecies.Gingko, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Beech, getVanilla("Jungle"), ExtraTreeSpecies.Brazilnut, 10);
         new ExtraTreeMutation(getVanilla("Balsa"), getVanilla("Jungle"), ExtraTreeSpecies.RoseGum, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.RoseGum, getVanilla("Mahogony"), ExtraTreeSpecies.SwampGum, 10);
@@ -165,8 +165,8 @@ public class ExtraTreeMutation implements ITreeMutation {
         new ExtraTreeMutation(ExtraTreeSpecies.Allspice, ExtraTreeSpecies.Clove, ExtraTreeSpecies.StarAnise, 10);
         new ExtraTreeMutation(getVanilla("Jungle"), ExtraTreeSpecies.Orange, ExtraTreeSpecies.Mango, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.StarAnise, ExtraTreeSpecies.Mango, ExtraTreeSpecies.Starfruit, 10);
-        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Candlenut, 10);
-        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Ginkgo, ExtraTreeSpecies.Chilli, 10);
+        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Gingko, ExtraTreeSpecies.Candlenut, 10);
+        new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Gingko, ExtraTreeSpecies.Chilli, 10);
         new ExtraTreeMutation(ExtraTreeSpecies.Hazel, ExtraTreeSpecies.Alder, ExtraTreeSpecies.DwarfHazel, 10);
     }
 

src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java

@@ -187,7 +187,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
     Rosewood("dalbergia", "latifolia", 0x879b22, ILogType.ExtraTreeLog.Rosewood, null, WorldGenRosewood.class),
     Purpleheart("peltogyne", "spp.", 0x778f55, ILogType.ExtraTreeLog.Purpleheart, null, WorldGenPurpleheart.class),
     Iroko("milicia", "excelsa", 0xafc86c, ILogType.ExtraTreeLog.Iroko, null, WorldGenIroko.class),
-    Ginkgo("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Ginkgo, ExtraTreeFruitGene.GinkgoNut,
+    Gingko("ginkgo", "biloba", 0x719651, ILogType.ExtraTreeLog.Gingko, ExtraTreeFruitGene.GingkoNut,
             WorldGenGingko.class),
     Brazilnut("bertholletia", "excelsa", 0x7c8f7b, ILogType.VanillaLog.Jungle, ExtraTreeFruitGene.BrazilNut,
             WorldGenBrazilNut.class),
@@ -548,7 +548,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
         ExtraTreeSpecies.Iroko.addFamily(familyNuts).addFamily(familyJungle).setHeight(EnumAllele.Height.AVERAGE)
                 .setFertility(EnumAllele.Saplings.LOW);
 
-        ExtraTreeSpecies.Ginkgo.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE)
+        ExtraTreeSpecies.Gingko.addFamily(familyNuts).addFamily(familyJungle).setLeafType(LeafType.JUNGLE)
                 .setHeight(EnumAllele.Height.LARGE).setYield(EnumAllele.Yield.LOWER)
                 .setSappiness(EnumAllele.Sappiness.LOW);
 

src/main/java/binnie/extratrees/item/Food.java

@@ -54,7 +54,7 @@ public enum Food implements IItemMisc {
     Acorn(0),
     Elderberry(1),
     Olive(1),
-    GinkgoNut(1),
+    GingkoNut(1),
     Coffee(0),
     OsangeOrange(1),
     Clove(0),
@@ -129,7 +129,7 @@ public enum Food implements IItemMisc {
         Food.Acorn.ore("Acorn");
         Food.Elderberry.ore("Elderberry");
         Food.Olive.ore("Olive");
-        Food.GinkgoNut.ore("GinkgoNut");
+        Food.GingkoNut.ore("GingkoNut");
         Food.Coffee.ore("Coffee");
         Food.OsangeOrange.ore("OsangeOrange");
         Food.Clove.ore("Clove");

src/main/java/binnie/extratrees/item/ModuleItems.java

@@ -84,7 +84,7 @@ public class ModuleItems implements IInitializable {
         Food.Acorn.addOil(20, 50, 3);
         Food.Elderberry.addJuice(10, 100, 5);
         Food.Olive.addOil(20, 50, 3);
-        Food.GinkgoNut.addOil(20, 50, 5);
+        Food.GingkoNut.addOil(20, 50, 5);
         Food.Coffee.addOil(15, 20, 2);
         Food.OsangeOrange.addJuice(10, 300, 15);
         Food.Clove.addOil(10, 25, 2);

src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java

@@ -1,5 +1,6 @@
 package binnie.extratrees.machines;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -80,7 +81,8 @@ public enum ExtraTreeMachine implements IMachineType {
         }
 
         @Override
-        public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+        public void renderMachine(Machine machine, double x, double y, double z, float partialTick,
+                RenderBlocks renderer) {
             MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z);
         }
     }

src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java

@@ -54,8 +54,7 @@ public class Lumbermill {
 
     private static Collection<ItemStack> getRecipeResult(ItemStack output) {
         List<ItemStack> list = new ArrayList<>();
-        List<IRecipe> iRecipes = new ArrayList<>(CraftingManager.getInstance().getRecipeList());
-        for (IRecipe iRecipe : iRecipes) {
+        for (IRecipe iRecipe : CraftingManager.getInstance().getRecipeList()) {
             if (iRecipe instanceof ShapelessRecipes shapeless) {
                 if (shapeless.recipeItems.size() != 1 || !(shapeless.recipeItems.get(0) instanceof ItemStack)) {
                     continue;

src/main/java/binnie/genetics/Genetics.java

@@ -1,8 +1,5 @@
 package binnie.genetics;
 
-import com.gtnewhorizon.gtnhlib.config.ConfigException;
-import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
-
 import binnie.core.AbstractMod;
 import binnie.core.Tags;
 import binnie.core.gui.IBinnieGUID;
@@ -11,7 +8,6 @@ import binnie.core.machines.MachineGroup;
 import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.proxy.IProxyCore;
-import binnie.genetics.config.GeneticsConfig;
 import binnie.genetics.core.GeneticsGUI;
 import binnie.genetics.core.GeneticsPacket;
 import binnie.genetics.item.ItemAnalyst;
@@ -32,29 +28,19 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
 @Mod(
-        modid = Genetics.GENETICS_MODID,
+        modid = "Genetics",
         name = "Genetics",
         version = Tags.VERSION,
         useMetadata = true,
         dependencies = "after:BinnieCore")
 public class Genetics extends AbstractMod {
 
-    public static final String GENETICS_MODID = "Genetics";
-
     @Mod.Instance("Genetics")
     public static Genetics instance;
 
     @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
     public static Proxy proxy;
 
-    static {
-        try {
-            ConfigurationManager.registerConfig(GeneticsConfig.class);
-        } catch (ConfigException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public static final String CHANNEL = "GEN";
 
     public static ItemSerumArray itemSerumArray = null;

src/main/java/binnie/genetics/machine/PackageGeneticBase.java

@@ -1,5 +1,6 @@
 package binnie.genetics.machine;
 
+import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.tileentity.TileEntity;
 
 import binnie.core.machines.Machine;
@@ -25,7 +26,7 @@ public abstract class PackageGeneticBase extends MachinePackage {
     }
 
     @Override
-    public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+    public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
         MachineRendererGenetics.instance.renderMachine(machine, renderTexture, x, y, z);
     }
 }

src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java

@@ -13,7 +13,7 @@ import binnie.core.machines.power.ComponentProcessSetCost;
 import binnie.core.machines.power.ErrorState;
 import binnie.core.machines.power.IProcess;
 import binnie.core.util.I18N;
-import binnie.genetics.config.GeneticsConfig;
+import binnie.extrabees.config.EBConfigMachines;
 import binnie.genetics.item.ItemSequence;
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
@@ -100,7 +100,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I
         ItemStack serum = ItemSequence.create(gene);
         getUtil().setStack(Isolator.SLOT_RESULT, serum);
         getUtil().decreaseStack(Isolator.SLOT_SEQUENCER_VIAL, 1);
-        if (rand.nextFloat() < GeneticsConfig.isolatorConsumptionChance) {
+        if (rand.nextFloat() < EBConfigMachines.isolatorConsumptionChance) {
             getUtil().decreaseStack(Isolator.SLOT_TARGET, 1);
         }
         getUtil().drainTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess);

src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java

@@ -1,5 +1,7 @@
 package binnie.genetics.machine.lab;
 
+import net.minecraft.client.renderer.RenderBlocks;
+
 import binnie.core.machines.Machine;
 import binnie.genetics.core.GeneticsTexture;
 import binnie.genetics.machine.ComponentGUIHolder;
@@ -18,7 +20,7 @@ public class LabMachinePackage extends PackageGeneticBase {
     }
 
     @Override
-    public void renderMachine(Machine machine, double x, double y, double z, float partialTick) {
+    public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) {
         MachineRendererLab.instance.renderMachine(machine, renderTexture, x, y, z);
     }
 }

src/main/resources/assets/extratrees/lang/en_GB.lang

@@ -68,7 +68,7 @@ extratrees.block.planks.holly=Holly
 extratrees.block.planks.olive=Olive
 extratrees.block.planks.sweetgum=Sweetgum
 extratrees.block.planks.rosewood=Rosewood
-extratrees.block.planks.ginkgo=Ginkgo
+extratrees.block.planks.gingko=Gingko
 extratrees.block.planks.pinkivory=Pink Ivory
 extratrees.block.planks.cherry=Cherry
 extratrees.block.planks.banana=Banana
@@ -147,7 +147,7 @@ extratrees.block.planks.holly.desc=The whitest wood available, just avoid the po
 extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack
 extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack
 extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack
-extratrees.block.planks.ginkgo.desc=Similar to Boxwood, Ginkgo wood is very pale.|Lumber Jack
+extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack
 extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack
 
 extratrees.block.tooltip.twoColors=%s and %s
@@ -244,7 +244,7 @@ extratrees.species.logwood.name=Logwood
 extratrees.species.rosewood.name=Rosewood
 extratrees.species.purpleheart.name=Purpleheart
 extratrees.species.iroko.name=Iroko
-extratrees.species.ginkgo.name=Ginkgo
+extratrees.species.gingko.name=Ginkgo
 extratrees.species.brazilnut.name=Brazil Nut
 extratrees.species.rosegum.name=Rose Gum
 extratrees.species.swampgum.name=Swamp Gum
@@ -349,7 +349,7 @@ for.extratrees.item.food.fig=Fig
 for.extratrees.item.food.acorn=Acorn
 for.extratrees.item.food.elderberry=Elderberry
 for.extratrees.item.food.olive=Olive
-for.extratrees.item.food.ginkgonut=Ginkgo Nut
+for.extratrees.item.food.gingkonut=Gingko Nut
 for.extratrees.item.food.coffee=Coffee
 for.extratrees.item.food.osangeosange=Osange Orange
 for.extratrees.item.food.osangeorange=Osange Orange

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

@@ -72,7 +72,7 @@ extratrees.block.planks.holly=Holly
 extratrees.block.planks.olive=Olive
 extratrees.block.planks.sweetgum=Sweetgum
 extratrees.block.planks.rosewood=Rosewood
-extratrees.block.planks.ginkgo=Ginkgo
+extratrees.block.planks.gingko=Gingko
 extratrees.block.planks.pinkivory=Pink Ivory
 extratrees.block.planks.cherry=Cherry
 extratrees.block.planks.banana=Banana
@@ -151,7 +151,7 @@ extratrees.block.planks.holly.desc=The whitest wood available, just avoid the po
 extratrees.block.planks.olive.desc=Coloured in the same way as its fruits, an attractive subdued green.|Lumber Jack
 extratrees.block.planks.sweetgum.desc=Yet another average wood, but has a certain character.|Lumber Jack
 extratrees.block.planks.rosewood.desc=Used to make chess pieces, this is another strongly hued wood.|Lumber Jack
-extratrees.block.planks.ginkgo.desc=Similar to Boxwood, Ginkgo wood is very pale.|Lumber Jack
+extratrees.block.planks.gingko.desc=Similar to Boxwood, Gingko wood is very pale.|Lumber Jack
 extratrees.block.planks.pinkivory.desc=What can I say. It's very pink.|Lumber Jack
 
 extratrees.block.tooltip.twoColors=%s and %s
@@ -260,7 +260,7 @@ extratrees.species.logwood.name=Logwood
 extratrees.species.rosewood.name=Rosewood
 extratrees.species.purpleheart.name=Purpleheart
 extratrees.species.iroko.name=Iroko
-extratrees.species.ginkgo.name=Ginkgo
+extratrees.species.gingko.name=Ginkgo
 extratrees.species.brazilnut.name=Brazil Nut
 extratrees.species.rosegum.name=Rose Gum
 extratrees.species.swampgum.name=Swamp Gum
@@ -369,7 +369,7 @@ for.extratrees.item.food.fig=Fig
 for.extratrees.item.food.acorn=Acorn
 for.extratrees.item.food.elderberry=Elderberry
 for.extratrees.item.food.olive=Olive
-for.extratrees.item.food.ginkgonut=Ginkgo Nut
+for.extratrees.item.food.gingkonut=Gingko Nut
 for.extratrees.item.food.coffee=Coffee
 for.extratrees.item.food.osangeosange=Osange Orange
 for.extratrees.item.food.osangeorange=Osange Orange

src/main/resources/assets/extratrees/lang/ru_RU.lang

@@ -69,7 +69,7 @@ extratrees.block.planks.holly=остролиста
 extratrees.block.planks.olive=оливы
 extratrees.block.planks.sweetgum=ликвидамбара смолоносного
 extratrees.block.planks.rosewood=розового дерева
-extratrees.block.planks.ginkgo=гинкго двулопастного
+extratrees.block.planks.gingko=гинкго двулопастного
 extratrees.block.planks.pinkivory=умнини
 extratrees.block.planks.cherry=вишни
 extratrees.block.planks.banana=банана
@@ -151,7 +151,7 @@ extratrees.block.planks.holly.desc=Белейшее дерево доступн
 extratrees.block.planks.olive.desc=Древесина, как и плоды оливы имеют привлекательный зелёный цвет.|Лесоруб
 extratrees.block.planks.sweetgum.desc=Ещё одна средняя древесина, но имеет определенные особенности.|Лесоруб
 extratrees.block.planks.rosewood.desc=Используется для шахматных фигур, из-за сильных оттенков дерева.|Лесоруб
-extratrees.block.planks.ginkgo.desc=Подобно Самшиту, древесина Гингко очень бледна.|Лесоруб
+extratrees.block.planks.gingko.desc=Подобно Самшиту, древесина Гингко очень бледна.|Лесоруб
 extratrees.block.planks.pinkivory.desc=Что я могу сказать, она очень розовая.|Лесоруб
 
 extratrees.block.tooltip.twoColors=%s и %s
@@ -249,7 +249,7 @@ extratrees.species.logwood.name=Кампешевое дерево
 extratrees.species.rosewood.name=Розовое дерево
 extratrees.species.purpleheart.name=Амарант
 extratrees.species.iroko.name=Ироко
-extratrees.species.ginkgo.name=Гинкго двулопастный
+extratrees.species.gingko.name=Гинкго двулопастный
 extratrees.species.brazilnut.name=Бразильский орех
 extratrees.species.rosegum.name=Эвкалипт гигантский
 extratrees.species.swampgum.name=Эвкалипт болотный
@@ -354,7 +354,7 @@ for.extratrees.item.food.fig=Инжир
 for.extratrees.item.food.acorn=Жёлудь
 for.extratrees.item.food.elderberry=Бузина
 for.extratrees.item.food.olive=Олива
-for.extratrees.item.food.ginkgonut=Семена Гинкго
+for.extratrees.item.food.gingkonut=Семена Гинкго
 for.extratrees.item.food.coffee=Кофейные зёрна
 # ПРОДУКТЫ САДОВОДСТВА
 for.extratrees.item.food.osangeosange=Плод маклюра

src/main/resources/assets/extratrees/lang/zh_CN.lang

@@ -70,7 +70,7 @@ extratrees.block.planks.holly=冬青
 extratrees.block.planks.olive=橄榄树
 extratrees.block.planks.sweetgum=枫香树
 extratrees.block.planks.rosewood=蔷薇木
-extratrees.block.planks.ginkgo=银杏
+extratrees.block.planks.gingko=银杏
 extratrees.block.planks.pinkivory=象牙粉红木
 extratrees.block.planks.cherry=樱树
 extratrees.block.planks.banana=香蕉
@@ -149,7 +149,7 @@ extratrees.block.planks.holly.desc=这是最白的木材，记得不要让有尖
 extratrees.block.planks.olive.desc=那引人注目的柔和的绿色也正是其果实的色彩。|伐木工
 extratrees.block.planks.sweetgum.desc=又是一种质地均匀的木材，但它有一些用途。|伐木工
 extratrees.block.planks.rosewood.desc=这又是一种颜色颇深的木材，用于制作国际象棋棋子。|伐木工
-extratrees.block.planks.ginkgo.desc=和黄杨类似，银杏木颜色很淡。|伐木工
+extratrees.block.planks.gingko.desc=和黄杨类似，银杏木颜色很淡。|伐木工
 extratrees.block.planks.pinkivory.desc=我能说些什么呢.它的粉色太浓厚了。|伐木工
 
 extratrees.block.tooltip.twoColors=%s - %s
@@ -252,7 +252,7 @@ extratrees.species.logwood.name=墨水树
 extratrees.species.rosewood.name=蔷薇木
 extratrees.species.purpleheart.name=紫心檀木
 extratrees.species.iroko.name=大绿柄桑木
-extratrees.species.ginkgo.name=银杏
+extratrees.species.gingko.name=银杏
 extratrees.species.brazilnut.name=巴西栗
 extratrees.species.rosegum.name=大桉
 extratrees.species.swampgum.name= 沼泽桉
@@ -357,7 +357,7 @@ for.extratrees.item.food.fig=无花果
 for.extratrees.item.food.acorn=橡果
 for.extratrees.item.food.elderberry=接骨木浆果
 for.extratrees.item.food.olive=橄榄
-for.extratrees.item.food.ginkgonut=白果
+for.extratrees.item.food.gingkonut=白果
 for.extratrees.item.food.coffee=咖啡
 for.extratrees.item.food.osangeosange=桑橙
 for.extratrees.item.food.osangeorange=桑橙