update +sa

Fix missing pixels in ceramic tiles

Fix rendering of ceramic tiles

Fix crashes of rendering ceramic tiles and breaking ceramic tiles

Add config option to disable compartments

dependencies.gradle

@@ -1,12 +1,12 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
+    api('com.github.GTNewHorizons:ForestryMC:4.11.4:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.9.20:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.68-GTNH:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.55:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly("curse.maven:extrabiomesxl-60041:2273301")
 }

gradle.properties

@@ -39,14 +39,34 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
 
 # If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
 # and should *not* be used in most situations. -1 disables this.
 # forceToolchainVersion = -1
 
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
+
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
 enableGenericInjection = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

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

src/main/java/binnie/botany/ceramic/BlockCeramicBrick.java

@@ -167,7 +167,16 @@ public class BlockCeramicBrick extends Block implements IBlockMetadata, IMultipa
     @Override
     @SideOnly(Side.CLIENT)
     public int getRenderColor(int meta) {
-        return colorMultiplier(meta);
+        final BlockType type = this.getType(meta);
+        if (!MultipassBlockRenderer.isRendering()) {
+            return type.color1.getColor(false);
+        }
+
+        final int layer = MultipassBlockRenderer.getLayer();
+        if (layer == 0) return 0xffffff;
+        if (layer == 1) return type.color1.getColor(false);
+        if (layer == 2) return type.color2.getColor(false);
+        return 0xffffff;
     }
 
     @Override

src/main/java/binnie/core/BinnieCore.java

@@ -12,6 +12,7 @@ import net.minecraftforge.common.MinecraftForge;
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
+import binnie.core.config.BCConfig;
 import binnie.core.craftgui.minecraft.ModuleCraftGUI;
 import binnie.core.gui.BinnieCoreGUI;
 import binnie.core.gui.BinnieGUIHandler;
@@ -78,7 +79,9 @@ public class BinnieCore extends AbstractMod {
         }
 
         addModule(new ModuleCraftGUI());
-        addModule(new ModuleStorage());
+        if (!BCConfig.disableCompartments) {
+            addModule(new ModuleStorage());
+        }
         addModule(new ModuleItems());
         if (Loader.isModLoaded("BuildCraft|Silicon")) {
             addModule(new ModuleTrigger());

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

@@ -14,6 +14,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
 
     public static MultipassBlockRenderer instance;
     private static int layer = 0;
+    private static boolean rendering = false;
 
     public MultipassBlockRenderer() {
         MultipassBlockRenderer.instance = this;
@@ -23,30 +24,67 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
         return MultipassBlockRenderer.layer;
     }
 
+    public static boolean isRendering() {
+        return MultipassBlockRenderer.rendering;
+    }
+
+    private static int getPassesSafe(Block block) {
+        try {
+            return ((IMultipassBlock) block).getNumberOfPasses();
+        } catch (Throwable t) {
+            return 1;
+        }
+    }
+
+    private static int getColorSafe(Block block, int meta) {
+        try {
+            if (block instanceof IMultipassBlock) {
+                try {
+                    java.lang.reflect.Method m = block.getClass().getMethod("colorMultiplier", int.class);
+                    Object out = m.invoke(block, Integer.valueOf(meta));
+                    if (out instanceof Integer) {
+                        return ((Integer) out).intValue();
+                    }
+                } catch (Throwable ignored) {}
+            }
+            return block.getRenderColor(meta);
+        } catch (Throwable t) {
+            return 16777215;
+        }
+    }
+
     @Override
     public void renderInventoryBlock(Block block, int meta, int modelID, RenderBlocks renderer) {
         block.setBlockBoundsForItemRender();
         renderer.setRenderBoundsFromBlock(block);
         GL11.glTranslatef(-0.5f, -0.5f, -0.5f);
 
+        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
+        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
             renderItem(block, renderer, meta);
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
+        MultipassBlockRenderer.rendering = false;
     }
 
     @Override
     public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
             RenderBlocks renderer) {
         boolean r = true;
+        MultipassBlockRenderer.rendering = true;
         MultipassBlockRenderer.layer = 0;
-        while (MultipassBlockRenderer.layer < ((IMultipassBlock) block).getNumberOfPasses()) {
-            r = renderer.renderStandardBlock(block, x, y, z);
+        while (MultipassBlockRenderer.layer < getPassesSafe(block)) {
+            try {
+                r = renderer.renderStandardBlock(block, x, y, z);
+            } catch (Throwable t) {
+                return false;
+            }
             MultipassBlockRenderer.layer++;
         }
         MultipassBlockRenderer.layer = 0;
+        MultipassBlockRenderer.rendering = false;
         return r;
     }
 
@@ -61,7 +99,7 @@ public class MultipassBlockRenderer implements ISimpleBlockRenderingHandler {
     }
 
     public void renderItem(Block block, RenderBlocks renderer, int meta) {
-        setColor(((IMultipassBlock) block).colorMultiplier(meta));
+        setColor(getColorSafe(block, meta));
         Tessellator tessellator = Tessellator.instance;
         tessellator.startDrawingQuads();
         tessellator.setNormal(0.0f, -1.0f, 0.0f);

src/main/java/binnie/core/config/BCConfig.java

@@ -0,0 +1,14 @@
+package binnie.core.config;
+
+import com.gtnewhorizon.gtnhlib.config.Config;
+
+import binnie.core.BinnieCore;
+
+@Config(modid = BinnieCore.CORE_MODID)
+public class BCConfig {
+
+    @Config.Comment("If true, disables all compartment storage machines (no blocks/recipes will be registered).")
+    @Config.DefaultBoolean(false)
+    @Config.RequiresMcRestart
+    public static boolean disableCompartments;
+}

src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java

@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagList;
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.core.Control;
 import binnie.core.craftgui.minecraft.InventoryType;
+import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
 import binnie.core.network.packet.MessageCraftGUI;
 
 public class ControlPlayerInventory extends Control {
@@ -24,19 +25,21 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 3; ++row) {
             for (int column = 0; column < 9; ++column) {
-                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18);
+                ControlSlot slot = new ControlSlot(this, (wide ? 58 : 0) + column * 18, row * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot);
             }
         }
 
         if (wide) {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18);
+                ControlSlot slot2 = new ControlSlot(this, i1 % 3 * 18, i1 / 3 * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot2);
             }
         } else {
             for (int i1 = 0; i1 < 9; ++i1) {
-                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f);
+                ControlSlot slot2 = new ControlSlot(this, i1 * 18, 58.0f).setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot2);
             }
         }
@@ -51,7 +54,8 @@ public class ControlPlayerInventory extends Control {
         slots = new ArrayList<>();
         for (int row = 0; row < 6; ++row) {
             for (int column = 0; column < 6; ++column) {
-                ControlSlot slot = new ControlSlot(this, column * 18, row * 18);
+                ControlSlot slot = new ControlSlot(this, column * 18, row * 18)
+                        .setSlotTexture(CraftGUITexture.SlotInventory);
                 slots.add(slot);
             }
         }

src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java

@@ -49,10 +49,12 @@ public class ControlSlot extends ControlSlotBase {
     }
 
     public Slot slot;
+    private CraftGUITexture slotTexture;
 
     public ControlSlot(IWidget parent, float x, float y) {
         super(parent, x, y);
         slot = null;
+        slotTexture = CraftGUITexture.Slot;
         addSelfEventHandler(new EventMouse.Down.Handler() {
 
             @Override
@@ -80,11 +82,17 @@ public class ControlSlot extends ControlSlotBase {
     public ControlSlot(IWidget parent, int x, int y, Slot slot) {
         super(parent, x, y);
         this.slot = slot;
+        slotTexture = CraftGUITexture.Slot;
+    }
+
+    public ControlSlot setSlotTexture(CraftGUITexture texture) {
+        slotTexture = texture == null ? CraftGUITexture.Slot : texture;
+        return this;
     }
 
     @Override
     public void onRenderBackground() {
-        CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO);
+        CraftGUI.render.texture(slotTexture, IPoint.ZERO);
         if (slot == null) {
             return;
         }

src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java

@@ -10,6 +10,7 @@ public enum CraftGUITexture {
     Button("button"),
     ButtonHighlighted("button.highlighted"),
     Slot("slot"),
+    SlotInventory("slot.inventory"),
     SlotBorder("slot.border"),
     SlotOverlay("slot.overlay"),
     SlotCharge("slot.charge"),

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

@@ -32,6 +32,11 @@ public abstract class MachinePackage {
         return I18N.localise(group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID());
     }
 
+    public String getGuiDisplayName() {
+        String guiKey = group.getMod().getModID() + ".machine." + group.getShortUID() + "." + getUID() + ".title";
+        return I18N.canLocalise(guiKey) ? I18N.localise(guiKey) : getDisplayName();
+    }
+
     public Integer getMetadata() {
         return metadata;
     }

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

@@ -1,7 +1,6 @@
 package binnie.core.machines.inventory;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -16,10 +15,13 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import binnie.core.machines.IMachine;
+import it.unimi.dsi.fastutil.ints.Int2ObjectLinkedOpenHashMap;
 
 public class ComponentInventorySlots extends ComponentInventory implements IInventoryMachine, IInventorySlots {
 
-    private final Map<Integer, InventorySlot> inventory = new LinkedHashMap<>();
+    private final Int2ObjectLinkedOpenHashMap<InventorySlot> inventory = new Int2ObjectLinkedOpenHashMap<>();
+    private int cachedSize = 0;
+    private int[] cachedAccessibleSlots = null;
 
     public ComponentInventorySlots(IMachine machine) {
         super(machine);
@@ -27,25 +29,20 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int getSizeInventory() {
-        int size = 0;
-        for (Integer index : inventory.keySet()) {
-            size = Math.max(size, index + 1);
-        }
-        return size;
+        return cachedSize;
     }
 
     @Override
     public ItemStack getStackInSlot(int index) {
-        if (inventory.containsKey(index)) {
-            return inventory.get(index).getContent();
-        }
-        return null;
+        InventorySlot slot = inventory.get(index);
+        return slot != null ? slot.getContent() : null;
     }
 
     @Override
     public ItemStack decrStackSize(int index, int amount) {
-        if (inventory.containsKey(index)) {
-            ItemStack stack = inventory.get(index).decrStackSize(amount);
+        InventorySlot slot = inventory.get(index);
+        if (slot != null) {
+            ItemStack stack = slot.decrStackSize(amount);
             markDirty();
             return stack;
         }
@@ -59,8 +56,9 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public void setInventorySlotContents(int index, ItemStack itemStack) {
-        if (inventory.containsKey(index) && (itemStack == null || inventory.get(index).isValid(itemStack))) {
-            inventory.get(index).setContent(itemStack);
+        InventorySlot slot = inventory.get(index);
+        if (slot != null && (itemStack == null || slot.isValid(itemStack))) {
+            slot.setContent(itemStack);
         }
         markDirty();
     }
@@ -113,7 +111,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     public void writeToNBT(NBTTagCompound nbttagcompound) {
         super.writeToNBT(nbttagcompound);
         NBTTagList inventoryNBT = new NBTTagList();
-        for (Map.Entry<Integer, InventorySlot> entry : inventory.entrySet()) {
+        for (Map.Entry<Integer, InventorySlot> entry : inventory.int2ObjectEntrySet()) {
             NBTTagCompound slotNBT = new NBTTagCompound();
             slotNBT.setInteger("id", entry.getKey());
             entry.getValue().writeToNBT(slotNBT);
@@ -125,6 +123,8 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
     @Override
     public InventorySlot addSlot(int index, String unlocalizedName) {
         inventory.put(index, new InventorySlot(index, unlocalizedName));
+        cachedSize = Math.max(cachedSize, index + 1);
+        cachedAccessibleSlots = null;
         return getSlot(index);
     }
 
@@ -138,10 +138,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot getSlot(int index) {
-        if (inventory.containsKey(index)) {
-            return inventory.get(index);
-        }
-        return null;
+        return inventory.get(index);
     }
 
     @Override
@@ -151,7 +148,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public InventorySlot[] getSlots(int[] indexes) {
-        List<InventorySlot> list = new ArrayList<>();
+        List<InventorySlot> list = new ArrayList<>(indexes.length);
         for (int i : indexes) {
             if (getSlot(i) != null) {
                 list.add(getSlot(i));
@@ -213,18 +210,20 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public int[] getAccessibleSlotsFromSide(int var1) {
-        List<Integer> slots = new ArrayList<>();
-        for (InventorySlot slot : inventory.values()) {
-            if (slot.canInsert() || slot.canExtract()) {
-                slots.add(slot.getIndex());
+        if (cachedAccessibleSlots == null) {
+            List<Integer> slots = new ArrayList<>();
+            for (InventorySlot slot : inventory.values()) {
+                if (slot.canInsert() || slot.canExtract()) {
+                    slots.add(slot.getIndex());
+                }
+            }
+
+            cachedAccessibleSlots = new int[slots.size()];
+            for (int i = 0; i < slots.size(); ++i) {
+                cachedAccessibleSlots[i] = slots.get(i);
             }
         }
-
-        int[] ids = new int[slots.size()];
-        for (int i = 0; i < slots.size(); ++i) {
-            ids[i] = slots.get(i);
-        }
-        return ids;
+        return cachedAccessibleSlots;
     }
 
     @Override
@@ -234,6 +233,7 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve
 
     @Override
     public boolean canExtractItem(int slot, ItemStack itemstack, int direction) {
-        return getSlot(slot).canExtract(ForgeDirection.getOrientation(direction));
+        InventorySlot iSlot = getSlot(slot);
+        return iSlot != null && iSlot.canExtract(ForgeDirection.getOrientation(direction));
     }
 }

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

@@ -83,7 +83,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
 
     @Override
     public void initialiseClient() {
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
         int x = 16;
         int y = 32;
         ComponentCompartmentInventory inv = Machine.getMachine(getInventory())

src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java

@@ -12,7 +12,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
-import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import cpw.mods.fml.relauncher.Side;
 
@@ -35,7 +34,7 @@ public class WindowAlvearyFrame extends Window {
 
     @Override
     public void initialiseClient() {
-        setTitle(I18N.localise("extrabees.machine.alveay.frame"));
+        setTitle(machine.getPackage().getGuiDisplayName());
         final NBTTagList actions = new NBTTagList();
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, 0);

src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java

@@ -12,7 +12,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlotArray;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
-import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.hatchery.AlvearyHatchery;
 import cpw.mods.fml.relauncher.Side;
@@ -37,7 +36,7 @@ public class WindowAlvearyHatchery extends Window {
     @Override
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
-        setTitle(I18N.localise("extrabees.machine.alveay.hatchery"));
+        setTitle(machine.getPackage().getGuiDisplayName());
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlotArray(this, 43, 30, 5, 1).create(actions, InventoryType.Machine, AlvearyHatchery.SLOT_LARVAE);
         MessageCraftGUI.sendToServer(actions);

src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java

@@ -44,7 +44,7 @@ public class WindowAlvearyMutator extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(I18N.localise("extrabees.machine.alveay.mutator"));
+        setTitle(machine.getPackage().getGuiDisplayName());
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 79.0f, 30.0f).assign(actions, InventoryType.Machine, AlvearyMutator.SLOT_MUTATOR);
         new ControlText(

src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java

@@ -14,7 +14,6 @@ import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.machines.Machine;
 import binnie.core.machines.TileEntityMachine;
 import binnie.core.network.packet.MessageCraftGUI;
-import binnie.core.util.I18N;
 import binnie.extrabees.ExtraBees;
 import binnie.extrabees.apiary.machine.stimulator.AlvearyStimulator;
 import cpw.mods.fml.relauncher.Side;
@@ -39,7 +38,7 @@ public class WindowAlvearyStimulator extends Window {
     @Override
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
-        setTitle(I18N.localise("extrabees.machine.alveay.stimulator"));
+        setTitle(machine.getPackage().getGuiDisplayName());
         playerInventory = new ControlPlayerInventory(this).create(actions);
         new ControlSlot(this, 41.0f, 28.0f).assign(actions, InventoryType.Machine, AlvearyStimulator.SLOT_CIRCUIT);
         new ControlEnergyBar(this, 75, 29, 60, 16, Position.LEFT);

src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java

@@ -43,7 +43,7 @@ public class WindowLumbermill extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
         new ControlSlot(this, 42.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_WOOD);
         new ControlSlot(this, 148.0f, 43.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_PLANKS);
         new ControlSlot(this, 172.0f, 28.0f).assign(actions, InventoryType.Machine, Lumbermill.SLOT_BARK);

src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java

@@ -53,7 +53,7 @@ public class WindowWoodworker extends Window {
     public void initialiseClient() {
         final NBTTagList actions = new NBTTagList();
 
-        setTitle(Machine.getMachine(getInventory()).getPackage().getDisplayName());
+        setTitle(Machine.getMachine(getInventory()).getPackage().getGuiDisplayName());
         new ControlText(
                 this,
                 new IArea(190.0f, 36.0f, 114.0f, 10.0f),

src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java

@@ -64,7 +64,7 @@ public class WindowAcclimatiser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.acclimatiser");
+        return I18N.localise("gui.genetics.machine.labMachine.acclimatiser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowAnalyser.java

@@ -79,7 +79,7 @@ public class WindowAnalyser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.analyser");
+        return I18N.localise("gui.genetics.machine.labMachine.analyser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowGenepool.java

@@ -75,7 +75,7 @@ public class WindowGenepool extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.genepool");
+        return I18N.localise("gui.genetics.machine.labMachine.genepool.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIncubator.java

@@ -77,7 +77,7 @@ public class WindowIncubator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.labMachine.incubator");
+        return I18N.localise("gui.genetics.machine.labMachine.incubator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowInoculator.java

@@ -89,7 +89,7 @@ public class WindowInoculator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.inoculator");
+        return I18N.localise("gui.genetics.machine.machine.inoculator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowIsolator.java

@@ -76,7 +76,7 @@ public class WindowIsolator extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.isolator");
+        return I18N.localise("gui.genetics.machine.machine.isolator.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java

@@ -75,7 +75,7 @@ public class WindowPolymeriser extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.polymeriser");
+        return I18N.localise("gui.genetics.machine.machine.polymeriser.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSequencer.java

@@ -104,7 +104,7 @@ public class WindowSequencer extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.machine.sequencer");
+        return I18N.localise("gui.genetics.machine.machine.sequencer.title");
     }
 
     @Override

src/main/java/binnie/genetics/craftgui/WindowSplicer.java

@@ -83,7 +83,7 @@ public class WindowSplicer extends WindowMachine {
 
     @Override
     public String getTitle() {
-        return I18N.localise("genetics.machine.advMachine.splicer");
+        return I18N.localise("gui.genetics.machine.advMachine.splicer.title");
     }
 
     @Override

src/main/java/binnie/genetics/gui/WindowAnalyst.java

@@ -123,12 +123,12 @@ public class WindowAnalyst extends Window {
     public void initialiseClient() {
         if (isDatabase) {
             if (isMaster) {
-                setTitle(I18N.localise("genetics.item.registry.1.name"));
+                setTitle(I18N.localise("genetics.gui.registry.1.title"));
             } else {
-                setTitle(I18N.localise("genetics.item.registry.0.name"));
+                setTitle(I18N.localise("genetics.gui.registry.title"));
             }
         } else {
-            setTitle(I18N.localise("genetics.item.analyst.name"));
+            setTitle(I18N.localise("genetics.gui.analyst.title"));
         }
 
         getWindowInventory().createSlot(0);

src/main/resources/assets/binniecore/gui/stylesheet.json

@@ -69,6 +69,12 @@
             "uv": "4 4 18 18",
             "padding": "2"
         },
+        {
+            "name": "slot.inventory",
+            "sheet": "slots",
+            "uv": "76 4 18 18",
+            "padding": "2"
+        },
         {
             "name": "slot.border",
             "sheet": "slots",

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

@@ -36,6 +36,10 @@ genetics.item.registry.1.name=Master Registry
 genetics.item.serum.name=%s Serum
 genetics.item.serumArray.name=%s Serum Array
 
+genetics.gui.registry.title=Registry
+genetics.gui.registry.1.title=Master Registry
+genetics.gui.analyst.title=Analyst
+
 genetics.item.sequence=DNA Sequence
 genetics.item.sequence.0=Very Faint
 genetics.item.sequence.1=Faint
@@ -59,6 +63,7 @@ genetics.sequence.partially=Partially Sequenced (%d%%)
 
 tile.machine.name=Isolator
 genetics.machine.machine.isolator=Isolator
+gui.genetics.machine.machine.isolator.title=Isolator
 genetics.machine.machine.isolator.info=The Isolator takes a random allele from a bee, tree or other individual and copies it into an empty sequence vial. This requires the use of ethanol as a solvent and an enzyme to cut up the DNA. The unsequenced serums can then be amplified in a Polymeriser and sequenced in a Sequencer. This process has a small chance to destroy the individual.
 genetics.machine.isolator.error.noIndividual=No individual to isolate
 genetics.machine.isolator.error.noRoom=No room for DNA sequences
@@ -67,6 +72,7 @@ genetics.machine.isolator.error.noLiquid=Insufficient ethanol
 genetics.machine.isolator.error.noEnzyme=No enzyme
 
 genetics.machine.machine.sequencer=Sequencer
+gui.genetics.machine.machine.sequencer.title=Sequencer
 genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums and determines which allele is present in them. This process is slow and requires the use of fluorescent dye.
 genetics.machine.sequencer.unsequencedDNA=Unsequenced DNA
 genetics.machine.sequencer.error.noSequence=No DNA sequence
@@ -78,6 +84,7 @@ genetics.machine.sequencer.gui.sequensedBy=Genes will be sequenced by %s
 genetics.machine.sequencer.gui.willNotSave=Userless. Will not save sequences
 
 genetics.machine.machine.polymeriser=Polymeriser
+gui.genetics.machine.machine.polymeriser.title=Polymeriser
 genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums with Raw DNA and replicating bacteria. This process can be accelerated using gold nuggets. 
 genetics.machine.polymeriser.error.noItem=No item to replicate
 genetics.machine.polymeriser.error.itemFilled=Item Filled
@@ -88,6 +95,7 @@ genetics.machine.polymeriser.replicatingWithGenes=Replicating with %d genes
 genetics.machine.polymeriser.unfilledSerum=Unfilled Serum
 
 genetics.machine.machine.inoculator=Inoculator
+gui.genetics.machine.machine.inoculator.title=Inoculator
 genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process is very slow and requires a Bacteria Vector, but is always successful.  
 genetics.machine.inoculator.error.noIndividual=No Individual to Inoculate
 genetics.machine.inoculator.error.noSerum=No Serum
@@ -105,6 +113,7 @@ genetics.machine.inoculator.inoculableIndividual=Inoculable Individual
 genetics.machine.inoculator.serums=Serum Vials & Arrays
 
 genetics.machine.labMachine.genepool=Genepool
+gui.genetics.machine.labMachine.genepool.title=Genepool
 genetics.machine.labMachine.genepool.info=The Genepool uses enzymes and ethanol to break down living things into DNA. During this process, all genetic information is lost and the source of the DNA is destroyed.
 genetics.machine.genepool.error.noIndividual=No Individual
 genetics.machine.genepool.error.noRoom=Not enough room in Tank
@@ -115,6 +124,7 @@ tile.labMachine.name=Lab Stand
 genetics.machine.labMachine.labMachine=Lab Stand
 
 genetics.machine.labMachine.analyser=Analyzer
+gui.genetics.machine.labMachine.analyser.title=Analyzer
 genetics.machine.labMachine.analyser.info=The Analyzer takes breedable individuals and DNA sequencers and analyzes them to determine the genes present. This requires DNA Dye, created from purple dye and glowstone
 genetics.machine.analyser.dnaDye=DNA Dye
 genetics.machine.analyser.unanalysedItem=Unanalyzed Item
@@ -125,6 +135,7 @@ genetics.machine.analyser.error.insufficientDye=Not enough DNA dye to analyze
 genetics.machine.analyser.error.noItem=No item to analyze
 
 genetics.machine.labMachine.incubator=Incubator
+gui.genetics.machine.labMachine.incubator.title=Incubator
 genetics.machine.labMachine.incubator.info=The Incubator combines liquids and items and allows them to sit at an ideal temperature to encourage bacterial growth. 
 genetics.machine.incubator.error.noRecipe.title=No Recipe
 genetics.machine.incubator.error.noRecipe=There is no valid recipe
@@ -132,6 +143,7 @@ genetics.machine.incubator.error.noLiquid=Not enough incubation liquid
 genetics.machine.incubator.error.noRoom=No room for output
 
 genetics.machine.labMachine.acclimatiser=Acclimatiser
+gui.genetics.machine.labMachine.acclimatiser.title=Acclimatiser
 genetics.machine.labMachine.acclimatiser.info=The Acclimatiser uses acclimatizing items to adjust the temperature and humidity tolerance of individuals. This process has only a small chance to succeed.
 genetics.machine.acclimatiser.acclimatizingItems=Acclimatizing Items
 genetics.machine.acclimatiser.error.noIndividual=No Individual to Acclimatise
@@ -140,6 +152,7 @@ genetics.machine.acclimatiser.error.invalidAcclimatizingItems=Cannot Acclimatise
 
 tile.advMachine.name=Splicer
 genetics.machine.advMachine.splicer=Splicer
+gui.genetics.machine.advMachine.splicer.title=Splicer
 genetics.machine.advMachine.splicer.info=The Splicer is an incredibly powerful machine that is used to insert genes into individuals. This process is fast, but requires monumental amounts of power.
 genetics.machine.splicer.error.noIndividual=No Individual to Splice
 genetics.machine.splicer.error.noSerum=No Serum