diff --git a/dependencies.gradle b/dependencies.gradle index f4a36510..041826c0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,12 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:ForestryMC:4.10.17:dev') - implementation('com.github.GTNewHorizons:GTNHLib:0.7.0:dev') + api('com.github.GTNewHorizons:ForestryMC:4.11.0:dev') + implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.26-GTNH:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api') + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api') compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') compileOnly("curse.maven:extrabiomesxl-60041:2273301") } diff --git a/gradle.properties b/gradle.properties index 3b3fb1af..21bd5cd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,6 +43,10 @@ developmentEnvironmentUserName = Developer # See https://github.com/bsideup/jabel for details on how this works. enableModernJavaSyntax = true +# 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 + # Enables injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. enableGenericInjection = true @@ -96,7 +100,9 @@ usesMixinDebug = false # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise. mixinPlugin = -# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! +# Specify the package that contains all of your Mixins. The package must exist or +# the build will fail. If you have a package property defined in your mixins..json, +# it must match with this or the build will fail. mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! @@ -172,6 +178,12 @@ curseForgeRelations = # projects. New projects should not use this parameter. customArchiveBaseName = binnie-mods +# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory. +# runClientWorkingDirectory = run/client + +# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory. +# runServerWorkingDirectory = run/server + # Optional parameter to have the build automatically fail if an illegal version is used. # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'. # The check is ONLY performed if the version is a git tag. diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..b612cc98 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +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/e1118b4c7c2858d28154d086dbff010e/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/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/832229f0f6f0be60ed817c5a5e5848eb/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect +toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 9bbc975c..f8e1ee31 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f853b1..23449a2b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index faf93008..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..c4bdd3ab 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index 5da5eee0..2b172cf9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.6' } diff --git a/src/main/java/binnie/Binnie.java b/src/main/java/binnie/Binnie.java index bfd4bfb0..d836e504 100644 --- a/src/main/java/binnie/Binnie.java +++ b/src/main/java/binnie/Binnie.java @@ -5,7 +5,6 @@ import java.util.List; import binnie.core.ManagerBase; import binnie.core.genetics.ManagerGenetics; -import binnie.core.item.ManagerItem; import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; import binnie.core.resource.ManagerResource; @@ -16,6 +15,5 @@ public final class Binnie { public static ManagerGenetics Genetics = new ManagerGenetics(); public static ManagerLiquid Liquid = new ManagerLiquid(); public static ManagerMachine Machine = new ManagerMachine(); - public static ManagerItem Item = new ManagerItem(); public static ManagerResource Resource = new ManagerResource(); } diff --git a/src/main/java/binnie/botany/Botany.java b/src/main/java/binnie/botany/Botany.java index 3ae6a944..c58a8a41 100644 --- a/src/main/java/binnie/botany/Botany.java +++ b/src/main/java/binnie/botany/Botany.java @@ -64,32 +64,37 @@ public class Botany extends AbstractMod { @SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer") public static Proxy proxy; + // Genetics module public static BlockFlower flower; - public static Item seed; + + public static ItemFlower flowerItem; public static Item pollen; + public static Item seed; public static ItemDictionary database; + + // Gardening module public static BlockPlant plant; - public static ItemTrowel trowelWood; - public static ItemTrowel trowelStone; - public static ItemTrowel trowelIron; - public static ItemTrowel trowelDiamond; - public static ItemTrowel trowelGold; public static BlockSoil soil; public static BlockSoil loam; public static BlockSoil flowerbed; public static BlockSoil soilNoWeed; public static BlockSoil loamNoWeed; public static BlockSoil flowerbedNoWeed; - public static ItemInsulatedTube insulatedTube; + public static BlockCeramic ceramic; + public static BlockStained stained; + public static BlockCeramicPatterned ceramicTile; + public static BlockCeramicBrick ceramicBrick; + public static ItemSoilMeter soilMeter; + public static ItemInsulatedTube insulatedTube; + public static ItemTrowel trowelWood; + public static ItemTrowel trowelStone; + public static ItemTrowel trowelIron; + public static ItemTrowel trowelDiamond; + public static ItemTrowel trowelGold; public static ItemMisc misc; - public static ItemFlower flowerItem; public static ItemPigment pigment; public static ItemClay clay; - public static BlockCeramic ceramic; - public static BlockCeramicPatterned ceramicTile; - public static BlockStained stained; - public static BlockCeramicBrick ceramicBrick; public Botany() { Botany.instance = this; diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index adf59c3f..a0fa48e4 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -1,5 +1,7 @@ package binnie.botany.flower; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.block.Block; @@ -39,6 +41,8 @@ public abstract class ItemBotany extends Item { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName(name); hasSubtypes = true; + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java index 068dd792..73842c5c 100644 --- a/src/main/java/binnie/botany/flower/ItemInsulatedTube.java +++ b/src/main/java/binnie/botany/flower/ItemInsulatedTube.java @@ -1,5 +1,7 @@ package binnie.botany.flower; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemInsulatedTube extends Item { setUnlocalizedName("insulatedTube"); setCreativeTab(CreativeTabBotany.instance); setHasSubtypes(true); + + registerItem(this, getUnlocalizedName().substring(5)); } public static ItemStack getInsulateStack(ItemStack stack) { diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 5173969e..6aea1285 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -1,5 +1,7 @@ package binnie.botany.gardening; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +30,8 @@ public class ItemSoilMeter extends Item { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName("soilMeter"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/botany/gardening/ItemTrowel.java b/src/main/java/binnie/botany/gardening/ItemTrowel.java index 5a2408c1..01a3cfea 100644 --- a/src/main/java/binnie/botany/gardening/ItemTrowel.java +++ b/src/main/java/binnie/botany/gardening/ItemTrowel.java @@ -1,5 +1,7 @@ package binnie.botany.gardening; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +30,8 @@ public class ItemTrowel extends Item { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName("trowel" + material); locName = "trowel" + material; + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 55bf7a3c..4f134964 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -12,7 +12,6 @@ import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import binnie.Binnie; import binnie.botany.Botany; import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; @@ -37,6 +36,7 @@ import binnie.core.block.ItemMetadata; import binnie.core.block.ItemMetadataRenderer; import binnie.core.block.MultipassItemRenderer; import binnie.core.block.TileEntityMetadata; +import binnie.core.item.ItemMisc; import cpw.mods.fml.common.registry.GameRegistry; public class ModuleGardening implements IInitializable { @@ -75,7 +75,7 @@ public class ModuleGardening implements IInitializable { Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron"); Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.EMERALD, "Diamond"); Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold"); - Botany.misc = Binnie.Item.registerMiscItems(BotanyItems.values(), CreativeTabBotany.instance); + Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values()); Botany.pigment = new ItemPigment(); Botany.clay = new ItemClay(); diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 7a38f852..82a868ff 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -1,5 +1,7 @@ package binnie.botany.genetics; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemDictionary extends Item { setCreativeTab(CreativeTabBotany.instance); setUnlocalizedName("database"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/botany/items/ItemClay.java b/src/main/java/binnie/botany/items/ItemClay.java index bc116aea..e3c2900b 100644 --- a/src/main/java/binnie/botany/items/ItemClay.java +++ b/src/main/java/binnie/botany/items/ItemClay.java @@ -1,5 +1,7 @@ package binnie.botany.items; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +24,8 @@ public class ItemClay extends Item { setUnlocalizedName("clay"); setHasSubtypes(true); setCreativeTab(CreativeTabBotany.instance); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/botany/items/ItemPigment.java b/src/main/java/binnie/botany/items/ItemPigment.java index fe2ae787..cf9bb575 100644 --- a/src/main/java/binnie/botany/items/ItemPigment.java +++ b/src/main/java/binnie/botany/items/ItemPigment.java @@ -1,5 +1,7 @@ package binnie.botany.items; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,6 +24,8 @@ public class ItemPigment extends Item { setUnlocalizedName("pigment"); setHasSubtypes(true); setCreativeTab(CreativeTabBotany.instance); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/core/AbstractMod.java b/src/main/java/binnie/core/AbstractMod.java index a5d2054d..dc3cb53d 100644 --- a/src/main/java/binnie/core/AbstractMod.java +++ b/src/main/java/binnie/core/AbstractMod.java @@ -1,13 +1,9 @@ package binnie.core; -import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import binnie.core.gui.IBinnieGUID; -import binnie.core.mod.parser.FieldParser; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.network.IPacketProvider; @@ -20,11 +16,9 @@ import cpw.mods.fml.relauncher.Side; public abstract class AbstractMod implements IPacketProvider, IInitializable { private SimpleNetworkWrapper wrapper; - private final LinkedHashSet fields; protected final List modules; public AbstractMod() { - fields = new LinkedHashSet<>(); modules = new ArrayList<>(); BinnieCore.registerMod(this); } @@ -65,22 +59,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.preInit(); } - - // TODO what does it mean? - Collections.addAll(fields, getClass().getFields()); - for (Class cls : getClass().getClasses()) { - Collections.addAll(fields, getClass().getFields()); - } - for (IInitializable module : modules) { - Collections.addAll(fields, module.getClass().getFields()); - } - for (Field field4 : fields) { - try { - FieldParser.preInitParse(field4, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } @Override @@ -96,14 +74,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.init(); } - - for (Field field : fields) { - try { - FieldParser.initParse(field, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } @Override @@ -116,14 +86,6 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { for (IInitializable module : modules) { module.postInit(); } - - for (Field field : fields) { - try { - FieldParser.postInitParse(field, this); - } catch (Exception e) { - throw new RuntimeException(e); - } - } } protected void addModule(IInitializable init) { diff --git a/src/main/java/binnie/core/BinnieCore.java b/src/main/java/binnie/core/BinnieCore.java index 41128eec..16068484 100644 --- a/src/main/java/binnie/core/BinnieCore.java +++ b/src/main/java/binnie/core/BinnieCore.java @@ -22,8 +22,6 @@ import binnie.core.liquid.FluidContainer; import binnie.core.liquid.ItemFluidContainer; import binnie.core.machines.MachineGroup; import binnie.core.machines.storage.ModuleStorage; -import binnie.core.mod.parser.FieldParser; -import binnie.core.mod.parser.ItemParser; import binnie.core.network.BinnieCorePacketID; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -110,7 +108,6 @@ public class BinnieCore extends AbstractMod { Item item = new ItemFluidContainer(container); GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); } - FieldParser.parsers.add(new ItemParser()); super.preInit(); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java index 71199a80..04718935 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlPlayerInventory.java +++ b/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); } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java index bd9de1c1..cf62c582 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlSlot.java +++ b/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; } diff --git a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java b/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java index 67006781..88fc530b 100644 --- a/src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUITexture.java +++ b/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"), diff --git a/src/main/java/binnie/core/item/ItemGenesis.java b/src/main/java/binnie/core/item/ItemGenesis.java index cb24faef..fe727828 100644 --- a/src/main/java/binnie/core/item/ItemGenesis.java +++ b/src/main/java/binnie/core/item/ItemGenesis.java @@ -1,5 +1,7 @@ package binnie.core.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,6 +27,8 @@ public class ItemGenesis extends Item { setCreativeTab(Tabs.tabApiculture); setUnlocalizedName("genesis"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index 05909bf8..b1816361 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,5 +1,7 @@ package binnie.core.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,11 +18,13 @@ public class ItemMisc extends Item { private final IItemMisc[] items; - protected ItemMisc(CreativeTabs tab, IItemMisc[] items2) { + public ItemMisc(CreativeTabs tab, IItemMisc[] items) { setCreativeTab(tab); setHasSubtypes(true); setUnlocalizedName("misc"); - items = items2; + this.items = items; + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/core/item/ManagerItem.java b/src/main/java/binnie/core/item/ManagerItem.java deleted file mode 100644 index d9b8d5df..00000000 --- a/src/main/java/binnie/core/item/ManagerItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package binnie.core.item; - -import net.minecraft.creativetab.CreativeTabs; - -public class ManagerItem { - - public ItemMisc registerMiscItems(IItemMisc[] items, CreativeTabs tab) { - return new ItemMisc(tab, items); - } -} diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 6a2513f6..57283fa8 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/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; } diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 7be8f55b..16623ebb 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/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()) diff --git a/src/main/java/binnie/core/mod/parser/FieldParser.java b/src/main/java/binnie/core/mod/parser/FieldParser.java deleted file mode 100644 index 3e288669..00000000 --- a/src/main/java/binnie/core/mod/parser/FieldParser.java +++ /dev/null @@ -1,52 +0,0 @@ -package binnie.core.mod.parser; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; - -import binnie.core.AbstractMod; - -public abstract class FieldParser { - - public static Collection parsers = new ArrayList<>(); - - public abstract boolean isHandled(Field field, AbstractMod mod); - - public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public void init(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public void postInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - // ignored - } - - public static void preInitParse(Field field, AbstractMod mod) - throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.preInit(field, mod); - } - } - } - - public static void initParse(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.init(field, mod); - } - } - } - - public static void postInitParse(Field field, AbstractMod mod) - throws IllegalArgumentException, IllegalAccessException { - for (FieldParser parser : FieldParser.parsers) { - if (parser.isHandled(field, mod)) { - parser.postInit(field, mod); - } - } - } -} diff --git a/src/main/java/binnie/core/mod/parser/ItemParser.java b/src/main/java/binnie/core/mod/parser/ItemParser.java deleted file mode 100644 index 46b7abda..00000000 --- a/src/main/java/binnie/core/mod/parser/ItemParser.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.core.mod.parser; - -import java.lang.reflect.Field; - -import net.minecraft.item.Item; - -import binnie.core.AbstractMod; -import cpw.mods.fml.common.registry.GameRegistry; - -public class ItemParser extends FieldParser { - - @Override - public boolean isHandled(Field field, AbstractMod mod) { - return Item.class.isAssignableFrom(field.getType()); - } - - @Override - public void preInit(Field field, AbstractMod mod) throws IllegalArgumentException, IllegalAccessException { - Item item = (Item) field.get(null); - if (item != null) { - GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); - } - } -} diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 12bcc092..2da46ef8 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -2,7 +2,6 @@ package binnie.extrabees; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.item.Item; import com.gtnewhorizon.gtnhlib.config.ConfigException; import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; @@ -11,6 +10,7 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; +import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.apiary.ModuleApiary; @@ -18,7 +18,11 @@ import binnie.extrabees.config.EBConfig; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ModuleCore; import binnie.extrabees.genetics.ModuleGenetics; +import binnie.extrabees.genetics.items.ItemDictionary; import binnie.extrabees.liquids.ModuleLiquids; +import binnie.extrabees.products.ItemHoneyComb; +import binnie.extrabees.products.ItemHoneyDrop; +import binnie.extrabees.products.ItemPropolis; import binnie.extrabees.products.ModuleProducts; import binnie.extrabees.proxy.ExtraBeesProxy; import binnie.extrabees.worldgen.ModuleGeneration; @@ -58,11 +62,11 @@ public class ExtraBees extends AbstractMod { public static Block hive; public static Material materialBeehive; public static Block ectoplasm; - public static Item comb; - public static Item propolis; - public static Item honeyDrop; - public static Item dictionary; - public static Item itemMisc; + public static ItemHoneyComb comb; + public static ItemPropolis propolis; + public static ItemHoneyDrop honeyDrop; + public static ItemDictionary dictionary; + public static ItemMisc itemMisc; public ExtraBees() { ExtraBees.instance = this; diff --git a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java b/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java index 76d271b4..f069b13d 100644 --- a/src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java +++ b/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 getBeeModifiers() { + return getMultiblockLogic().getController().getBeeModifiers(); + } + + @Override + public Iterable 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 getAlvearyBlocks() { LinkedList 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; diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 3f914f26..d5df65d0 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -1,7 +1,7 @@ package binnie.extrabees.core; -import binnie.Binnie; import binnie.core.IInitializable; +import binnie.core.item.ItemMisc; import binnie.extrabees.ExtraBees; import forestry.api.core.Tabs; @@ -9,7 +9,7 @@ public class ModuleCore implements IInitializable { @Override public void preInit() { - ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture); + ExtraBees.itemMisc = new ItemMisc(Tabs.tabApiculture, ExtraBeeItems.values()); } @Override diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index bbb5df2c..7e89cf38 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,5 +1,7 @@ package binnie.extrabees.genetics.items; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemDictionary extends Item { setCreativeTab(Tabs.tabApiculture); setUnlocalizedName("dictionary"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java index 76f03f8c..056b9241 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyFrame.java +++ b/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); diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java index bf6efa23..b6aa94b5 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyHatchery.java +++ b/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); diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index d5e3960f..cb0a5423 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/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( diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java index 36082066..fe1a8df8 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyStimulator.java +++ b/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); diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index fbb1c0ef..581b9e47 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -21,9 +21,8 @@ public class ItemHoneyComb extends ItemProduct { protected IIcon icon2; public ItemHoneyComb() { - super(EnumHoneyComb.values()); + super("honeyComb", EnumHoneyComb.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyComb"); } public static void addSubtypes() { diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index 8a44cf03..3208b7b3 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -15,9 +15,8 @@ public class ItemHoneyDrop extends ItemProduct { protected IIcon icon2; public ItemHoneyDrop() { - super(EnumHoneyDrop.values()); + super("honeyDrop", EnumHoneyDrop.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyDrop"); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index fed448af..513bf9cc 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -1,5 +1,7 @@ package binnie.extrabees.products; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.creativetab.CreativeTabs; @@ -12,11 +14,14 @@ public class ItemProduct extends Item { protected IItemEnum[] types; - public ItemProduct(IItemEnum[] types) { + public ItemProduct(String name, IItemEnum[] types) { this.types = types; setMaxStackSize(64); setMaxDamage(0); setHasSubtypes(true); + setUnlocalizedName(name); + + registerItem(this, getUnlocalizedName().substring(5)); } public IItemEnum get(ItemStack stack) { diff --git a/src/main/java/binnie/extrabees/products/ItemPropolis.java b/src/main/java/binnie/extrabees/products/ItemPropolis.java index 0278cb9f..c9b1a065 100644 --- a/src/main/java/binnie/extrabees/products/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/products/ItemPropolis.java @@ -11,9 +11,8 @@ import forestry.api.core.Tabs; public class ItemPropolis extends ItemProduct { public ItemPropolis() { - super(EnumPropolis.values()); + super("propolis", EnumPropolis.values()); setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("propolis"); } @Override diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index 7c43941f..2e4d65d1 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -4,7 +4,6 @@ import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; import static binnie.extratrees.ExtraTrees.ET_MODID; import net.minecraft.block.Block; -import net.minecraft.item.Item; import com.gtnewhorizon.gtnhlib.config.ConfigException; import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; @@ -13,6 +12,7 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; +import binnie.core.item.ItemMisc; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.ExtraBees; @@ -26,6 +26,10 @@ import binnie.extratrees.config.ETConfig; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; import binnie.extratrees.genetics.ModuleGenetics; +import binnie.extratrees.item.ItemDictionary; +import binnie.extratrees.item.ItemFood; +import binnie.extratrees.item.ItemHammer; +import binnie.extratrees.item.ItemMothDatabase; import binnie.extratrees.item.ModuleItems; import binnie.extratrees.machines.ModuleMachine; import binnie.extratrees.nei.IMCForNEI; @@ -61,10 +65,13 @@ public class ExtraTrees extends AbstractMod { } } - public static Item itemDictionary; - public static Item itemDictionaryLepi; - public static Item itemMisc; - public static Item itemFood; + public static ItemDictionary itemDictionary; + public static ItemMothDatabase itemDictionaryLepi; + public static ItemMisc itemMisc; + public static ItemFood itemFood; + public static ItemHammer itemHammer; + public static ItemHammer itemDurableHammer; + public static Block blockStairs; public static Block blockLog; public static BlockCarpentry blockCarpentry; @@ -75,13 +82,12 @@ public class ExtraTrees extends AbstractMod { public static BlockCarpentry blockPanel; public static Block blockSlab; public static Block blockDoubleSlab; - public static Item itemHammer; - public static Item itemDurableHammer; public static Block blockGate; public static Block blockDoor; public static BlockMultiFence blockMultiFence; public static BlockHedge blockHedge; public static BlockStainedDesign blockStained; + public static int doorRenderId; public static int branchRenderId; public static int fenceID; diff --git a/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java b/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java index 79e8ae84..c149ce33 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowLumbermill.java +++ b/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); diff --git a/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java index e02cfd24..ccd8056f 100644 --- a/src/main/java/binnie/extratrees/craftgui/WindowWoodworker.java +++ b/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), diff --git a/src/main/java/binnie/extratrees/item/ItemDictionary.java b/src/main/java/binnie/extratrees/item/ItemDictionary.java index 822faff5..572421de 100644 --- a/src/main/java/binnie/extratrees/item/ItemDictionary.java +++ b/src/main/java/binnie/extratrees/item/ItemDictionary.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemDictionary extends Item { setCreativeTab(Tabs.tabArboriculture); setUnlocalizedName("database"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemFood.java b/src/main/java/binnie/extratrees/item/ItemFood.java index 712914e0..75998c4b 100644 --- a/src/main/java/binnie/extratrees/item/ItemFood.java +++ b/src/main/java/binnie/extratrees/item/ItemFood.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -24,6 +26,8 @@ public class ItemFood extends net.minecraft.item.ItemFood { setCreativeTab(Tabs.tabArboriculture); setHasSubtypes(true); items = Food.values(); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemHammer.java b/src/main/java/binnie/extratrees/item/ItemHammer.java index 783e27ee..00ab0fb6 100644 --- a/src/main/java/binnie/extratrees/item/ItemHammer.java +++ b/src/main/java/binnie/extratrees/item/ItemHammer.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +24,8 @@ public class ItemHammer extends Item implements IToolHammer { setUnlocalizedName(durable ? "durableHammer" : "hammer"); setMaxStackSize(1); setMaxDamage(durable ? 1562 : 251); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java index 46c056c2..6d5c2b03 100644 --- a/src/main/java/binnie/extratrees/item/ItemMothDatabase.java +++ b/src/main/java/binnie/extratrees/item/ItemMothDatabase.java @@ -1,5 +1,7 @@ package binnie.extratrees.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemMothDatabase extends Item { setCreativeTab(Tabs.tabLepidopterology); setUnlocalizedName("databaseMoth"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/extratrees/item/ModuleItems.java b/src/main/java/binnie/extratrees/item/ModuleItems.java index a884aefd..23ea53f3 100644 --- a/src/main/java/binnie/extratrees/item/ModuleItems.java +++ b/src/main/java/binnie/extratrees/item/ModuleItems.java @@ -28,7 +28,7 @@ public class ModuleItems implements IInitializable { @Override public void preInit() { - ExtraTrees.itemMisc = Binnie.Item.registerMiscItems(ExtraTreeItems.values(), Tabs.tabArboriculture); + ExtraTrees.itemMisc = new ItemMisc(Tabs.tabArboriculture, ExtraTreeItems.values()); ExtraTrees.itemDictionary = new ItemDictionary(); if (BinnieCore.isLepidopteryActive()) { ExtraTrees.itemDictionaryLepi = new ItemMothDatabase(); diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 44123647..48a4e585 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,10 +1,9 @@ package binnie.genetics; -import net.minecraft.item.Item; - import binnie.core.AbstractMod; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; +import binnie.core.item.ItemMisc; import binnie.core.machines.MachineGroup; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -13,6 +12,10 @@ import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsPacket; import binnie.genetics.item.ItemAnalyst; import binnie.genetics.item.ItemDatabase; +import binnie.genetics.item.ItemMasterRegistry; +import binnie.genetics.item.ItemRegistry; +import binnie.genetics.item.ItemSequence; +import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; import binnie.genetics.item.ModuleItem; import binnie.genetics.machine.ModuleMachine; @@ -38,18 +41,20 @@ public class Genetics extends AbstractMod { @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer") public static Proxy proxy; - public static ItemSerumArray itemSerumArray = null; public static final String CHANNEL = "GEN"; - public static Item itemGenetics; - public static Item itemSerum; - public static Item itemSequencer; + + public static ItemSerumArray itemSerumArray = null; + public static ItemMisc itemGenetics; + public static ItemSerum itemSerum; + public static ItemSequence itemSequencer; + public static ItemDatabase database; + public static ItemAnalyst analyst; + public static ItemRegistry registry; + public static ItemMasterRegistry masterRegistry; + public static MachineGroup packageGenetic; public static MachineGroup packageAdvGenetic; public static MachineGroup packageLabMachine; - public static ItemDatabase database; - public static ItemAnalyst analyst; - public static Item registry; - public static Item masterRegistry; public Genetics() { Genetics.instance = this; diff --git a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java b/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java index 6b782965..39a20ab7 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAcclimatiser.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java b/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java index e47ff420..c5f37e79 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowAnalyser.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java b/src/main/java/binnie/genetics/craftgui/WindowGenepool.java index 7dd10a66..8de6e349 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowGenepool.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java b/src/main/java/binnie/genetics/craftgui/WindowIncubator.java index 40dea50c..e7fe7958 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIncubator.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java b/src/main/java/binnie/genetics/craftgui/WindowInoculator.java index 3e2bb66b..1dfb4157 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowInoculator.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java b/src/main/java/binnie/genetics/craftgui/WindowIsolator.java index 067a73c6..27d623ca 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowIsolator.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java b/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java index 50466fff..043decf5 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowPolymeriser.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java b/src/main/java/binnie/genetics/craftgui/WindowSequencer.java index 4d79d4ba..45790176 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSequencer.java +++ b/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 diff --git a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java b/src/main/java/binnie/genetics/craftgui/WindowSplicer.java index 41c1897d..b733684a 100644 --- a/src/main/java/binnie/genetics/craftgui/WindowSplicer.java +++ b/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 diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 31ea6138..a50aa2dd 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/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); diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 7a6b24db..5078cbe6 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -56,9 +56,6 @@ public enum GeneticsItems implements IItemMisc { @Override public ItemStack get(int count) { - if (Genetics.itemGenetics == null) { - return null; - } return new ItemStack(Genetics.itemGenetics, count, ordinal()); } diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index c58f9231..53e6bf1c 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +21,8 @@ public class ItemAnalyst extends Item { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("analyst"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index a2a3ab80..d9a7fa82 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,6 +27,8 @@ public class ItemDatabase extends Item { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("database"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemFieldKit.java b/src/main/java/binnie/genetics/item/ItemFieldKit.java index 547605c4..42c3617e 100644 --- a/src/main/java/binnie/genetics/item/ItemFieldKit.java +++ b/src/main/java/binnie/genetics/item/ItemFieldKit.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,6 +31,8 @@ public class ItemFieldKit extends Item { setCreativeTab(GeneticsCreativeTab.instance); setMaxStackSize(1); setMaxDamage(64); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index b25e5238..6034ef65 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +28,8 @@ public abstract class ItemGene extends Item { setMaxDamage(16); setUnlocalizedName(unlocName); setCreativeTab(GeneticsCreativeTab.instance); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java index 6a861e45..e5a6808d 100644 --- a/src/main/java/binnie/genetics/item/ItemMasterRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemMasterRegistry.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +21,8 @@ public class ItemMasterRegistry extends Item { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("masterRegistry"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index f3f83cbd..2659b5b3 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +21,8 @@ public class ItemRegistry extends Item { setCreativeTab(GeneticsCreativeTab.instance); setUnlocalizedName("registry"); setMaxStackSize(1); + + registerItem(this, getUnlocalizedName().substring(5)); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4dfca467..07725693 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,5 +1,7 @@ package binnie.genetics.item; +import static cpw.mods.fml.common.registry.GameRegistry.registerItem; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -31,6 +33,8 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl setMaxDamage(5); setUnlocalizedName("sequence"); setCreativeTab(GeneticsCreativeTab.instance); + + registerItem(this, getUnlocalizedName().substring(5)); } public static ItemStack create(IGene gene) { @@ -116,4 +120,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; + } } diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index dffd7e87..1546642c 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -12,6 +12,7 @@ import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; +import binnie.core.item.ItemMisc; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; @@ -44,7 +45,7 @@ public class ModuleItem implements IInitializable { Genetics.itemSerum = new ItemSerum(); Genetics.itemSerumArray = new ItemSerumArray(); Genetics.itemSequencer = new ItemSequence(); - Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance); + Genetics.itemGenetics = new ItemMisc(GeneticsCreativeTab.instance, GeneticsItems.values()); Genetics.database = new ItemDatabase(); Genetics.analyst = new ItemAnalyst(); Genetics.registry = new ItemRegistry(); diff --git a/src/main/resources/assets/binniecore/gui/stylesheet.json b/src/main/resources/assets/binniecore/gui/stylesheet.json index f04cf9e4..4c63baef 100644 --- a/src/main/resources/assets/binniecore/gui/stylesheet.json +++ b/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", diff --git a/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png b/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png index d3104618..f4869518 100644 Binary files a/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png and b/src/main/resources/assets/binniecore/textures/gui/craftgui-slots.png differ diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index fcb50c93..e0515497 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/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