diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 48a4e585..824f40fb 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -1,5 +1,8 @@ package binnie.genetics; +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import binnie.core.AbstractMod; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; @@ -8,6 +11,7 @@ import binnie.core.machines.MachineGroup; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.IProxyCore; +import binnie.genetics.config.GeneticsConfig; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsPacket; import binnie.genetics.item.ItemAnalyst; @@ -28,19 +32,29 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( - modid = "Genetics", + modid = Genetics.GENETICS_MODID, name = "Genetics", version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class Genetics extends AbstractMod { + public static final String GENETICS_MODID = "Genetics"; + @Mod.Instance("Genetics") public static Genetics instance; @SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer") public static Proxy proxy; + static { + try { + ConfigurationManager.registerConfig(GeneticsConfig.class); + } catch (ConfigException e) { + throw new RuntimeException(e); + } + } + public static final String CHANNEL = "GEN"; public static ItemSerumArray itemSerumArray = null; diff --git a/src/main/java/binnie/extrabees/config/EBConfigMachines.java b/src/main/java/binnie/genetics/config/GeneticsConfig.java similarity index 65% rename from src/main/java/binnie/extrabees/config/EBConfigMachines.java rename to src/main/java/binnie/genetics/config/GeneticsConfig.java index 1b18556c..de3f3abe 100644 --- a/src/main/java/binnie/extrabees/config/EBConfigMachines.java +++ b/src/main/java/binnie/genetics/config/GeneticsConfig.java @@ -1,11 +1,11 @@ -package binnie.extrabees.config; +package binnie.genetics.config; -import static binnie.extrabees.ExtraBees.EB_MODID; +import static binnie.genetics.Genetics.GENETICS_MODID; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = EB_MODID) -public class EBConfigMachines { +@Config(modid = GENETICS_MODID) +public class GeneticsConfig { @Config.Comment("Percentage chance of Isolator consuming bee. 0 never consumes, 1 always does.") @Config.RangeFloat(min = 0f, max = 1f) diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index f4b4329c..c22fa107 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -13,7 +13,7 @@ import binnie.core.machines.power.ComponentProcessSetCost; import binnie.core.machines.power.ErrorState; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import binnie.extrabees.config.EBConfigMachines; +import binnie.genetics.config.GeneticsConfig; import binnie.genetics.item.ItemSequence; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -100,7 +100,7 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I ItemStack serum = ItemSequence.create(gene); getUtil().setStack(Isolator.SLOT_RESULT, serum); getUtil().decreaseStack(Isolator.SLOT_SEQUENCER_VIAL, 1); - if (rand.nextFloat() < EBConfigMachines.isolatorConsumptionChance) { + if (rand.nextFloat() < GeneticsConfig.isolatorConsumptionChance) { getUtil().decreaseStack(Isolator.SLOT_TARGET, 1); } getUtil().drainTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess);