Added title localization and inventory slot texture (#81)

dependencies.gradle

@@ -2,9 +2,9 @@
 
 dependencies {
     api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.39:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev')
 
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev')
 
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

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

@@ -76,12 +76,14 @@ public class TileEntityMetadata extends TileEntity {
     }
 
     public static ItemStack getItemStack(Block block, int damage) {
-        NBTTagCompound tag = new NBTTagCompound();
-        tag.setInteger("meta", damage);
-
         ItemStack item = new ItemStack(block, 1, 0);
-        item.setItemDamage(Math.min(damage, 16387));
-        item.setTagCompound(tag);
+        if (0 <= damage && damage < Short.MAX_VALUE) {
+            item.setItemDamage(damage);
+        } else {
+            NBTTagCompound tag = new NBTTagCompound();
+            tag.setInteger("meta", damage);
+            item.setTagCompound(tag);
+        }
         return item;
     }
 

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

@@ -248,13 +248,6 @@ public class ContainerCraftGUI extends Container {
     public void handleNBT(Side side, EntityPlayer player, NBTTagCompound action) {
         final String actionType = action.getString(ACTION_TYPE);
 
-        if (actionType.equals(ACTION_BATCH)) {
-            NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
-            for (int i = 0; i < actionsBatch.tagCount(); i++) {
-                handleNBT(side, player, actionsBatch.getCompoundTagAt(i));
-            }
-        }
-
         if (side == Side.SERVER) {
             switch (actionType) {
                 case TANK_CLICK -> tankClick(player, action.getByte(SLOT_ID));
@@ -494,6 +487,13 @@ public class ContainerCraftGUI extends Container {
 
     public void receiveNBT(Side side, EntityPlayer player, NBTTagCompound action) {
         String actionType = action.getString(ACTION_TYPE);
+        if (actionType.equals(ACTION_BATCH)) {
+            NBTTagList actionsBatch = action.getTagList(ACTIONS, TAG_COMPOUND);
+            for (int i = 0; i < actionsBatch.tagCount(); i++) {
+                receiveNBT(side, player, actionsBatch.getCompoundTagAt(i));
+            }
+            return;
+        }
         handleNBT(side, player, action);
         window.receiveGuiNBT(getSide(), player, actionType, action);
         INetwork.ReceiveGuiNBT machine = Machine.getInterface(INetwork.ReceiveGuiNBT.class, window.getInventory());

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/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/apiary/TileExtraBeeAlveary.java

@@ -6,14 +6,23 @@ import java.util.List;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
+import net.minecraft.util.Vec3;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.BiomeGenBase;
 
 import com.mojang.authlib.GameProfile;
 
 import binnie.core.machines.TileEntityMachine;
 import binnie.extrabees.apiary.machine.AlvearyMachine;
 import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IBeeHousingInventory;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IBeekeepingLogic;
+import forestry.api.core.EnumHumidity;
+import forestry.api.core.EnumTemperature;
+import forestry.api.core.IErrorLogic;
 import forestry.api.genetics.IIndividual;
 import forestry.api.multiblock.IAlvearyComponent;
 import forestry.api.multiblock.IMultiblockComponent;
@@ -21,7 +30,7 @@ import forestry.api.multiblock.IMultiblockController;
 import forestry.api.multiblock.IMultiblockLogicAlveary;
 import forestry.api.multiblock.MultiblockManager;
 
-public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyComponent.Active,
+public class TileExtraBeeAlveary extends TileEntityMachine implements IBeeHousing, IAlvearyComponent.Active,
         IAlvearyComponent.BeeModifier, IAlvearyComponent.BeeListener, IBeeListener, IBeeModifier {
 
     protected IMultiblockLogicAlveary structureLogic;
@@ -42,11 +51,51 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
         return new ChunkCoordinates(xCoord, yCoord, zCoord);
     }
 
+    @Override
+    public Iterable<IBeeModifier> getBeeModifiers() {
+        return getMultiblockLogic().getController().getBeeModifiers();
+    }
+
+    @Override
+    public Iterable<IBeeListener> getBeeListeners() {
+        return getMultiblockLogic().getController().getBeeListeners();
+    }
+
+    @Override
+    public IBeeHousingInventory getBeeInventory() {
+        return getMultiblockLogic().getController().getBeeInventory();
+    }
+
+    @Override
+    public IBeekeepingLogic getBeekeepingLogic() {
+        return getMultiblockLogic().getController().getBeekeepingLogic();
+    }
+
+    @Override
+    public int getBlockLightValue() {
+        return getMultiblockLogic().getController().getBlockLightValue();
+    }
+
+    @Override
+    public boolean canBlockSeeTheSky() {
+        return getMultiblockLogic().getController().canBlockSeeTheSky();
+    }
+
+    @Override
+    public World getWorld() {
+        return null;
+    }
+
     @Override
     public GameProfile getOwner() {
         return getMachine().getOwner();
     }
 
+    @Override
+    public Vec3 getBeeFXCoordinates() {
+        return getMultiblockLogic().getController().getBeeFXCoordinates();
+    }
+
     public List<TileEntity> getAlvearyBlocks() {
         LinkedList<TileEntity> tiles = new LinkedList<>();
         if (min == null || max == null) {
@@ -226,6 +275,26 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
         }
     }
 
+    @Override
+    public BiomeGenBase getBiome() {
+        return getMultiblockLogic().getController().getBiome();
+    }
+
+    @Override
+    public EnumTemperature getTemperature() {
+        return getMultiblockLogic().getController().getTemperature();
+    }
+
+    @Override
+    public EnumHumidity getHumidity() {
+        return getMultiblockLogic().getController().getHumidity();
+    }
+
+    @Override
+    public IErrorLogic getErrorLogic() {
+        return getMultiblockLogic().getController().getErrorLogic();
+    }
+
     // TODO why its commented?
     // boolean init;
     // //IStructureLogic structureLogic;

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/java/binnie/genetics/item/ItemSequence.java

@@ -116,4 +116,9 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
     public int getCharges(ItemStack stack) {
         return stack.getItem().getMaxDamage() - stack.getItemDamage();
     }
+
+    @Override
+    public boolean isRepairable() {
+        return false;
+    }
 }

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