diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index 913e58bc..28c48ac6 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -14,6 +14,7 @@ public class Mods { public static final Mod botania = new Mod("Botania"); public static final Mod extraBiomes = new Mod("ExtrabiomesXL"); public static final Mod dreamcraft = new Mod("dreamcraft"); + public static final Mod buildcraftCore = new Mod("BuildCraft|Core"); private static Item findItem(String modId, String name) { Item stack = GameRegistry.findItem(modId, name); diff --git a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java index 823b07b2..7ad7e0bd 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/core/craftgui/minecraft/control/ControlEnergyBar.java @@ -1,5 +1,7 @@ package binnie.core.craftgui.minecraft.control; +import org.lwjgl.opengl.GL11; + import binnie.core.craftgui.CraftGUI; import binnie.core.craftgui.ITooltip; import binnie.core.craftgui.IWidget; @@ -15,7 +17,6 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture; import binnie.core.machines.Machine; import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; -import org.lwjgl.opengl.GL11; public class ControlEnergyBar extends Control implements ITooltip { diff --git a/src/main/java/binnie/core/network/packet/MessageCoordinates.java b/src/main/java/binnie/core/network/packet/MessageCoordinates.java index 5eb89570..7bd8df53 100644 --- a/src/main/java/binnie/core/network/packet/MessageCoordinates.java +++ b/src/main/java/binnie/core/network/packet/MessageCoordinates.java @@ -1,10 +1,12 @@ package binnie.core.network.packet; -import io.netty.buffer.ByteBuf; import java.io.IOException; + import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import io.netty.buffer.ByteBuf; + public class MessageCoordinates extends MessageBase { public int posX; diff --git a/src/main/java/binnie/core/network/packet/MessageUpdate.java b/src/main/java/binnie/core/network/packet/MessageUpdate.java index 4c239982..2d6eb689 100644 --- a/src/main/java/binnie/core/network/packet/MessageUpdate.java +++ b/src/main/java/binnie/core/network/packet/MessageUpdate.java @@ -1,10 +1,12 @@ package binnie.core.network.packet; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +import net.minecraft.tileentity.TileEntity; + import binnie.core.network.INetworkedEntity; import io.netty.buffer.ByteBuf; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import net.minecraft.tileentity.TileEntity; public class MessageUpdate extends MessageCoordinates { diff --git a/src/main/java/binnie/core/proxy/BinnieProxy.java b/src/main/java/binnie/core/proxy/BinnieProxy.java index 5edfd549..4fb05bda 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxy.java +++ b/src/main/java/binnie/core/proxy/BinnieProxy.java @@ -1,14 +1,7 @@ package binnie.core.proxy; -import binnie.core.AbstractMod; -import binnie.core.BinnieCore; -import binnie.core.network.BinnieCorePacketID; -import binnie.core.network.INetworkedEntity; -import binnie.core.network.packet.MessageUpdate; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +13,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; +import binnie.core.AbstractMod; +import binnie.core.BinnieCore; +import binnie.core.network.BinnieCorePacketID; +import binnie.core.network.INetworkedEntity; +import binnie.core.network.packet.MessageUpdate; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + public class BinnieProxy extends BinnieModProxy implements IBinnieProxy { private short uniqueTextureUID; diff --git a/src/main/java/binnie/core/proxy/BinnieProxyClient.java b/src/main/java/binnie/core/proxy/BinnieProxyClient.java index 087262b6..3ea4327a 100644 --- a/src/main/java/binnie/core/proxy/BinnieProxyClient.java +++ b/src/main/java/binnie/core/proxy/BinnieProxyClient.java @@ -1,14 +1,8 @@ package binnie.core.proxy; -import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; -import binnie.core.resource.BinnieResource; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import java.io.File; import java.io.IOException; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.SimpleTexture; @@ -23,9 +17,18 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; +import binnie.core.craftgui.resource.minecraft.CraftGUIResourceManager; +import binnie.core.resource.BinnieResource; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; + public class BinnieProxyClient extends BinnieProxy implements IBinnieProxy { @Override diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 3312ca78..3670acd9 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -11,8 +11,6 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.config.ConfigurationMachines; -import binnie.extrabees.config.ConfigurationMain; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ModuleCore; import binnie.extrabees.genetics.ModuleGenetics; @@ -27,13 +25,16 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( - modid = "ExtraBees", - name = "Extra Bees", + modid = ExtraBees.EB_MODID, + name = ExtraBees.EB_MOD_NAME, version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore") public class ExtraBees extends AbstractMod { + public static final String EB_MODID = "ExtraBees"; + public static final String EB_MOD_NAME = "Extra Bees"; + @Mod.Instance("ExtraBees") public static ExtraBees instance; @@ -81,11 +82,6 @@ public class ExtraBees extends AbstractMod { return ExtraBeeGUID.values(); } - @Override - public Class[] getConfigs() { - return new Class[] { ConfigurationMain.class, ConfigurationMachines.class }; - } - @Override public IProxyCore getProxy() { return ExtraBees.proxy; diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java b/src/main/java/binnie/extrabees/config/ConfigurationMachines.java deleted file mode 100644 index 483a7530..00000000 --- a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java +++ /dev/null @@ -1,24 +0,0 @@ -package binnie.extrabees.config; - -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropDouble; -import binnie.core.mod.config.PropPercentage; - -@ConfigFile(filename = "/config/forestry/extrabees/machines.conf") -public class ConfigurationMachines { - - @ConfigProperty( - key = "isolatorConsumptionChance", - comment = { "Percentage chance of Isolator consuming bee, in x%." }) - @PropPercentage - public static int isolatorConsumptionChance = 30; - - @ConfigProperty( - key = "geneticErrorModifier", - comment = { "Modifier that changes how severe splicer/inoculator erros are.", - "0 would result in no errors, even for awful serums.", - "2.0 would result in twice as severe errors" }) - @PropDouble - public static double geneticErrorModifier = 1.0; -} diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMain.java b/src/main/java/binnie/extrabees/config/ConfigurationMain.java deleted file mode 100644 index 007d1291..00000000 --- a/src/main/java/binnie/extrabees/config/ConfigurationMain.java +++ /dev/null @@ -1,30 +0,0 @@ -package binnie.extrabees.config; - -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropBoolean; -import binnie.core.mod.config.PropInteger; - -@ConfigFile(filename = "/config/forestry/extrabees/main.conf") -public class ConfigurationMain { - - @ConfigProperty(key = "canQuarryMineHives") - @PropBoolean - public static boolean canQuarryMineHives = true; - - @ConfigProperty(key = "waterHiveRate") - @PropInteger - public static int waterHiveRate = 1; - - @ConfigProperty(key = "rockHiveRate") - @PropInteger - public static int rockHiveRate = 2; - - @ConfigProperty(key = "netherHiveRate") - @PropInteger - public static int netherHiveRate = 2; - - @ConfigProperty(key = "marbleHiveRate") - @PropInteger - public static int marbleHiveRate = 2; -} diff --git a/src/main/java/binnie/extrabees/config/EBConfig.java b/src/main/java/binnie/extrabees/config/EBConfig.java new file mode 100644 index 00000000..a08a2205 --- /dev/null +++ b/src/main/java/binnie/extrabees/config/EBConfig.java @@ -0,0 +1,26 @@ +package binnie.extrabees.config; + +import static binnie.extrabees.ExtraBees.EB_MODID; + +import com.gtnewhorizon.gtnhlib.config.Config; + +@Config(modid = EB_MODID) +public class EBConfig { + + @Config.DefaultBoolean(true) + @Config.RequiresMcRestart + public static boolean canQuarryMineHives; + + @Config.DefaultInt(1) + public static int waterHiveRate; + + @Config.DefaultInt(2) + public static int rockHiveRate; + + @Config.DefaultInt(2) + public static int netherHiveRate; + + @Config.Comment("Marble hives don't appear to be implemented in code, so this does nothing.") + @Config.DefaultInt(2) + public static int marbleHiveRate; +} diff --git a/src/main/java/binnie/extrabees/config/EBConfigGUI.java b/src/main/java/binnie/extrabees/config/EBConfigGUI.java new file mode 100644 index 00000000..b2794b58 --- /dev/null +++ b/src/main/java/binnie/extrabees/config/EBConfigGUI.java @@ -0,0 +1,16 @@ +package binnie.extrabees.config; + +import static binnie.extrabees.ExtraBees.EB_MODID; +import static binnie.extrabees.ExtraBees.EB_MOD_NAME; + +import net.minecraft.client.gui.GuiScreen; + +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig; + +public class EBConfigGUI extends SimpleGuiConfig { + + public EBConfigGUI(GuiScreen parent) throws ConfigException { + super(parent, EB_MODID, EB_MOD_NAME, false, EBConfig.class, EBConfigMachines.class); + } +} diff --git a/src/main/java/binnie/extrabees/config/EBConfigGUIFactory.java b/src/main/java/binnie/extrabees/config/EBConfigGUIFactory.java new file mode 100644 index 00000000..6cc570d6 --- /dev/null +++ b/src/main/java/binnie/extrabees/config/EBConfigGUIFactory.java @@ -0,0 +1,13 @@ +package binnie.extrabees.config; + +import net.minecraft.client.gui.GuiScreen; + +import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory; + +public class EBConfigGUIFactory implements SimpleGuiFactory { + + @Override + public Class mainConfigGuiClass() { + return EBConfigGUI.class; + } +} diff --git a/src/main/java/binnie/extrabees/config/EBConfigMachines.java b/src/main/java/binnie/extrabees/config/EBConfigMachines.java new file mode 100644 index 00000000..1b18556c --- /dev/null +++ b/src/main/java/binnie/extrabees/config/EBConfigMachines.java @@ -0,0 +1,14 @@ +package binnie.extrabees.config; + +import static binnie.extrabees.ExtraBees.EB_MODID; + +import com.gtnewhorizon.gtnhlib.config.Config; + +@Config(modid = EB_MODID) +public class EBConfigMachines { + + @Config.Comment("Percentage chance of Isolator consuming bee. 0 never consumes, 1 always does.") + @Config.RangeFloat(min = 0f, max = 1f) + @Config.DefaultFloat(0.05f) + public static float isolatorConsumptionChance; +} diff --git a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java b/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java index e339d475..23033260 100644 --- a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java +++ b/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java @@ -1,5 +1,7 @@ package binnie.extrabees.worldgen; +import static binnie.core.Mods.buildcraftCore; + import java.util.Random; import net.minecraft.world.World; @@ -7,7 +9,7 @@ import net.minecraft.world.chunk.IChunkProvider; import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; -import binnie.extrabees.config.ConfigurationMain; +import binnie.extrabees.config.EBConfig; import binnie.extrabees.genetics.ExtraBeeDefinition; import buildcraft.api.core.BuildCraftAPI; import cpw.mods.fml.common.IWorldGenerator; @@ -16,11 +18,6 @@ import forestry.apiculture.genetics.BeeDefinition; public class ModuleGeneration implements IWorldGenerator, IInitializable { - protected static int waterRate = 2; - protected static int rockRate = 2; - protected static int netherRate = 2; - protected static int marbleRate = 2; - @Override public void preInit() { ExtraBees.materialBeehive = new MaterialBeehive(); @@ -30,11 +27,8 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable { @Override public void init() { - ModuleGeneration.waterRate = ConfigurationMain.waterHiveRate; - ModuleGeneration.rockRate = ConfigurationMain.rockHiveRate; - ModuleGeneration.netherRate = ConfigurationMain.netherHiveRate; GameRegistry.registerWorldGenerator(new ModuleGeneration(), 0); - if (!ConfigurationMain.canQuarryMineHives) { + if (!EBConfig.canQuarryMineHives && buildcraftCore.active()) { BuildCraftAPI.softBlocks.add(ExtraBees.hive); } } @@ -62,21 +56,21 @@ public class ModuleGeneration implements IWorldGenerator, IInitializable { chunkX <<= 4; chunkZ <<= 4; - for (int i = 0; i < ModuleGeneration.waterRate; ++i) { + for (int i = 0; i < EBConfig.waterHiveRate; ++i) { int randPosX = chunkX + rand.nextInt(16); int randPosY = rand.nextInt(50) + 20; int randPosZ = chunkZ + rand.nextInt(16); new WorldGenHiveWater().generate(world, rand, randPosX, randPosY, randPosZ); } - for (int i = 0; i < ModuleGeneration.rockRate; ++i) { + for (int i = 0; i < EBConfig.rockHiveRate; ++i) { int randPosX = chunkX + rand.nextInt(16); int randPosY = rand.nextInt(50) + 20; int randPosZ = chunkZ + rand.nextInt(16); new WorldGenHiveRock().generate(world, rand, randPosX, randPosY, randPosZ); } - for (int i = 0; i < ModuleGeneration.netherRate; ++i) { + for (int i = 0; i < EBConfig.netherHiveRate; ++i) { int randPosX = chunkX + rand.nextInt(16); int randPosY = rand.nextInt(50) + 20; int randPosZ = chunkZ + rand.nextInt(16); diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index f6ee7fb6..7ab1ee31 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,14 +1,14 @@ package binnie.extratrees; -import static binnie.extratrees.ExtraTrees.MODID; -import static binnie.extratrees.ExtraTrees.MOD_NAME; +import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; +import static binnie.extratrees.ExtraTrees.ET_MODID; -import binnie.extratrees.config.ETConfig; -import com.gtnewhorizon.gtnhlib.config.ConfigException; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import net.minecraft.block.Block; import net.minecraft.item.Item; +import com.gtnewhorizon.gtnhlib.config.ConfigException; +import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; + import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.Tags; @@ -22,6 +22,7 @@ import binnie.extratrees.block.decor.BlockMultiFence; import binnie.extratrees.carpentry.BlockCarpentry; import binnie.extratrees.carpentry.BlockStainedDesign; import binnie.extratrees.carpentry.ModuleCarpentry; +import binnie.extratrees.config.ETConfig; import binnie.extratrees.core.ExtraTreesGUID; import binnie.extratrees.core.ModuleCore; import binnie.extratrees.genetics.ModuleGenetics; @@ -35,12 +36,17 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = MODID, name = MOD_NAME, version = Tags.VERSION, useMetadata = true, dependencies = "after:BinnieCore", -guiFactory = "binnie.extratrees.config.ETConfigGUIFactory") +@Mod( + modid = ET_MODID, + name = EB_MOD_NAME, + version = Tags.VERSION, + useMetadata = true, + dependencies = "after:BinnieCore", + guiFactory = "binnie.extratrees.config.ETConfigGUIFactory") public class ExtraTrees extends AbstractMod { - public static final String MODID = "ExtraTrees"; - public static final String MOD_NAME = "Extra Trees"; + public static final String ET_MODID = "ExtraTrees"; + public static final String EB_MOD_NAME = "Extra Trees"; @Mod.Instance("ExtraTrees") public static ExtraTrees instance; diff --git a/src/main/java/binnie/extratrees/config/ETConfig.java b/src/main/java/binnie/extratrees/config/ETConfig.java index 82101ed6..61acdfe4 100644 --- a/src/main/java/binnie/extratrees/config/ETConfig.java +++ b/src/main/java/binnie/extratrees/config/ETConfig.java @@ -1,10 +1,10 @@ package binnie.extratrees.config; -import static binnie.extratrees.ExtraTrees.MODID; +import static binnie.extratrees.ExtraTrees.ET_MODID; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = MODID) +@Config(modid = ET_MODID) public class ETConfig { @Config.Comment("Uses reflection to convert the Forestry lemon tree to the Citrus family.") diff --git a/src/main/java/binnie/extratrees/config/ETConfigGUI.java b/src/main/java/binnie/extratrees/config/ETConfigGUI.java index 902cea71..b171576a 100644 --- a/src/main/java/binnie/extratrees/config/ETConfigGUI.java +++ b/src/main/java/binnie/extratrees/config/ETConfigGUI.java @@ -1,14 +1,16 @@ package binnie.extratrees.config; -import static binnie.extratrees.ExtraTrees.MODID; -import static binnie.extratrees.ExtraTrees.MOD_NAME; +import static binnie.extratrees.ExtraTrees.EB_MOD_NAME; +import static binnie.extratrees.ExtraTrees.ET_MODID; + +import net.minecraft.client.gui.GuiScreen; import com.gtnewhorizon.gtnhlib.config.ConfigException; import com.gtnewhorizon.gtnhlib.config.SimpleGuiConfig; -import net.minecraft.client.gui.GuiScreen; public class ETConfigGUI extends SimpleGuiConfig { + public ETConfigGUI(GuiScreen parent) throws ConfigException { - super(parent, ETConfig.class, MODID, MOD_NAME); + super(parent, ETConfig.class, ET_MODID, EB_MOD_NAME); } } diff --git a/src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java b/src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java index 7bd21621..0e8cf1dc 100644 --- a/src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java +++ b/src/main/java/binnie/extratrees/config/ETConfigGUIFactory.java @@ -1,8 +1,9 @@ package binnie.extratrees.config; -import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory; import net.minecraft.client.gui.GuiScreen; +import com.gtnewhorizon.gtnhlib.config.SimpleGuiFactory; + public class ETConfigGUIFactory implements SimpleGuiFactory { @Override diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java index 3daf87bd..dfb17089 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java @@ -16,8 +16,8 @@ import com.gtnewhorizon.gtnhlib.reflect.Fields; import binnie.Binnie; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; -import binnie.extratrees.config.ETConfig; import binnie.extratrees.block.FruitPod; +import binnie.extratrees.config.ETConfig; import binnie.extratrees.item.Food; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java index dd93350c..0d45c4e0 100644 --- a/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java @@ -1,5 +1,19 @@ package binnie.extratrees.genetics; +import java.awt.Color; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import net.minecraft.world.gen.feature.WorldGenerator; +import net.minecraftforge.common.EnumPlantType; + +import com.mojang.authlib.GameProfile; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.util.I18N; @@ -65,7 +79,6 @@ import binnie.extratrees.worldgen.WorldGenWesternHemlock; import binnie.extratrees.worldgen.WorldGenWhitebeam; import binnie.extratrees.worldgen.WorldGenYew; import binnie.genetics.genetics.AlleleHelper; -import com.mojang.authlib.GameProfile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; @@ -92,16 +105,6 @@ import forestry.arboriculture.render.TextureLeaves; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.render.TextureManager; import forestry.plugins.PluginArboriculture; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.common.EnumPlantType; public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGermlingIconProvider { diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index ffef9f12..ad1b7699 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -11,6 +11,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.item.ItemSequence; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; @@ -86,7 +87,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() < 0.05f) { + if (rand.nextFloat() < EBConfigMachines.isolatorConsumptionChance) { getUtil().decreaseStack(Isolator.SLOT_TARGET, 1); } getUtil().drainTank(Isolator.TANK_ETHANOL, (int) ethanolPerProcess);