diff --git a/src/main/java/binnie/core/item/DamageItems.java b/src/main/java/binnie/core/item/DamageItems.java new file mode 100644 index 00000000..a68109d2 --- /dev/null +++ b/src/main/java/binnie/core/item/DamageItems.java @@ -0,0 +1,73 @@ +package binnie.core.item; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public abstract class DamageItems extends Item { + + private final String[] NAMES; + private final IIcon[] ICONS; + private final String modid; + + protected DamageItems(CreativeTabs tab, String modid, String... names) { + setCreativeTab(tab); + setHasSubtypes(true); + setUnlocalizedName("misc"); + + NAMES = names; + ICONS = new IIcon[names.length]; + this.modid = modid; + GameRegistry.registerItem(this, getUnlocalizedName()); + } + + public ItemStack getStack(int count, int damage) { + return new ItemStack(this, count, damage); + } + + /** + * @param name One of the names passed to the constructor + * @return The unlocalized name string + */ + public String getUnlocalizedName(String name) { + return modid + ".item." + name + ".name"; + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item thiz, CreativeTabs tab, List list) { + for (int i = 0; i < NAMES.length; ++i) { + list.add(new ItemStack(thiz, 1, i)); + } + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + final int damage = stack.getItemDamage(); + return (damage < NAMES.length) ? getUnlocalizedName(NAMES[damage]) : "null"; + } + + @Override + public IIcon getIcon(ItemStack stack, int pass) { + return getIconFromDamage(stack.getItemDamage()); + } + + @Override + public IIcon getIconFromDamage(int damage) { + return (damage < ICONS.length && damage >= 0) ? ICONS[damage] : null; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister register) { + for (int i = 0; i < NAMES.length; ++i) { + ICONS[i] = register.registerIcon(modid + ":" + NAMES[i]); + } + } +} diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index f9f4bc6d..4d88a375 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -1,18 +1,17 @@ package binnie.core.liquid; +import binnie.core.BinnieCore; +import binnie.core.Mods; +import binnie.core.util.I18N; +import binnie.genetics.item.GeneticsMisc; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidContainerRegistry; -import binnie.core.BinnieCore; -import binnie.core.Mods; -import binnie.core.util.I18N; -import binnie.genetics.item.GeneticsItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public enum FluidContainer { Bucket, @@ -71,7 +70,7 @@ public enum FluidContainer { case Capsule -> Mods.forestry.stack("waxCapsule"); case Glass -> new ItemStack(Items.glass_bottle, 1, 0); case Refractory -> Mods.forestry.stack("refractoryEmpty"); - case Cylinder -> GeneticsItems.Cylinder.get(1); + case Cylinder -> GeneticsMisc.Items.Cylinder.get(1); }; } diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index b499a005..a14d6d3a 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -3,6 +3,7 @@ package binnie.genetics; import binnie.core.AbstractMod; import binnie.core.Tags; import binnie.core.gui.IBinnieGUID; +import binnie.core.item.DamageItems; import binnie.core.machines.MachineGroup; import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; @@ -18,16 +19,17 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.item.Item; @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; @@ -35,7 +37,7 @@ public class Genetics extends AbstractMod { public static Proxy proxy; public static final String CHANNEL = "GEN"; - public static Item itemGenetics; + public static DamageItems itemGenetics; public static MachineGroup packageGenetic; public static MachineGroup packageAdvGenetic; public static MachineGroup packageLabMachine; @@ -84,7 +86,7 @@ public class Genetics extends AbstractMod { @Override public String getModID() { - return "genetics"; + return GENETICS_MODID; } @Override @@ -92,11 +94,6 @@ public class Genetics extends AbstractMod { return PacketHandler.class; } - @Override - public boolean isActive() { - return true; - } - public static class PacketHandler extends BinniePacketHandler { public PacketHandler() { diff --git a/src/main/java/binnie/genetics/GeneticsCreativeTab.java b/src/main/java/binnie/genetics/GeneticsCreativeTab.java index 48f47f16..c8c59cc7 100644 --- a/src/main/java/binnie/genetics/GeneticsCreativeTab.java +++ b/src/main/java/binnie/genetics/GeneticsCreativeTab.java @@ -1,14 +1,14 @@ package binnie.genetics; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; + +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import binnie.core.util.I18N; -import binnie.genetics.item.GeneticsItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class GeneticsCreativeTab extends CreativeTabs { public static CreativeTabs instance = new GeneticsCreativeTab(); @@ -19,7 +19,7 @@ public class GeneticsCreativeTab extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return GeneticsItems.EmptySerum.get(1); + return EmptySerum.get(1); } @Override diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index 481d9cd7..78e3668a 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -1,16 +1,16 @@ package binnie.genetics.genetics; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; - -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargable; import binnie.genetics.api.IItemSerum; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; +import net.minecraft.item.ItemStack; public class Engineering { @@ -21,8 +21,8 @@ public class Engineering { if (stack.getItem() instanceof IItemSerum) { return ((IItemSerum) stack.getItem()).getCharges(stack) == 0; } - return stack.getItem() == Genetics.itemGenetics && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() - || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()); + return stack.getItem() == Genetics.itemGenetics && (stack.getItemDamage() == EmptySerum.ordinal() + || stack.getItemDamage() == EmptyGenome.ordinal()); } public static boolean canAcceptGene(ItemStack stack, IGene gene) { @@ -46,10 +46,10 @@ public class Engineering { if (stack.getItem() instanceof IItemSerum) { ((IItemSerum) stack.getItem()).addGene(stack, gene); } - if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) { + if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == EmptySerum.ordinal()) { return ItemSerum.create(gene); } - if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) { + if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == EmptyGenome.ordinal()) { return ItemSerumArray.create(gene); } return stack; diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index a70c6897..0961393e 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -1,11 +1,6 @@ package binnie.genetics.gui; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; import binnie.Binnie; import binnie.botany.api.IFlower; @@ -36,7 +31,6 @@ import binnie.core.genetics.BreedingSystem; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.Genetics; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.analyser.Analyser; import cpw.mods.fml.relauncher.Side; @@ -46,6 +40,11 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; public class WindowAnalyst extends Window { @@ -102,7 +101,7 @@ public class WindowAnalyst extends Window { } }); getWindowInventory() - .setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.IconDye)); + .setValidator(1, new SlotValidator.Item(DNADye.get(1), ModuleMachine.IconDye)); } } diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index f34f9d21..3d2f4310 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -1,56 +1,23 @@ package binnie.genetics.item; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; -import binnie.genetics.Genetics; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; +import net.minecraft.item.Item; -public enum GeneticsItems implements IItemMisc { +public enum GeneticsItems { + SERUM(new ItemSerum()), + SERUM_ARRAY(new ItemSerumArray()), + SEQUENCER(new ItemSequence()), + DATABASE(new ItemDatabase()), + ANALYST(new ItemAnalyst()), + REGISTRY(new ItemRegistry()), + MASTER_REGISTRY(new ItemMasterRegistry()); - LaboratoryCasing("casingIron"), - DNADye("dnaDye"), - FluorescentDye("dyeFluor"), - Enzyme("enzyme"), - GrowthMedium("growthMedium"), - EmptySequencer("sequencerEmpty"), - EmptySerum("serumEmpty"), - EmptyGenome("genomeEmpty"), - Cylinder("cylinderEmpty"), - IntegratedCircuit("integratedCircuit"), - IntegratedCPU("integratedCPU"), - IntegratedCasing("casingCircuit"); + private final Item item; - private IIcon icon; - private final String name; - private final String iconPath; - - GeneticsItems(String name) { - this.name = name; - this.iconPath = name; + GeneticsItems(Item item) { + this.item = item; } - @Override - public IIcon getIcon(ItemStack itemStack) { - return icon; - } - - @Override - public void registerIcons(IIconRegister register) { - icon = Genetics.proxy.getIcon(register, iconPath); - } - - @Override - public String getName(ItemStack itemStack) { - return I18N.localise("genetics.item." + name + ".name"); - } - - @Override - public ItemStack get(int count) { - if (Genetics.itemGenetics == null) { - return null; - } - return new ItemStack(Genetics.itemGenetics, count, ordinal()); + public Item getItem() { + return item; } } diff --git a/src/main/java/binnie/genetics/item/GeneticsItemsN.java b/src/main/java/binnie/genetics/item/GeneticsItemsN.java deleted file mode 100644 index 29765cf6..00000000 --- a/src/main/java/binnie/genetics/item/GeneticsItemsN.java +++ /dev/null @@ -1,23 +0,0 @@ -package binnie.genetics.item; - -import net.minecraft.item.Item; - -public enum GeneticsItemsN { - SERUM(new ItemSerum()), - SERUM_ARRAY(new ItemSerumArray()), - SEQUENCER(new ItemSequence()), - DATABASE(new ItemDatabase()), - ANALYST(new ItemAnalyst()), - REGISTRY(new ItemRegistry()), - MASTER_REGISTRY(new ItemMasterRegistry()); - - private final Item item; - - GeneticsItemsN(Item item) { - this.item = item; - } - - public Item getItem() { - return item; - } -} diff --git a/src/main/java/binnie/genetics/item/GeneticsMisc.java b/src/main/java/binnie/genetics/item/GeneticsMisc.java new file mode 100644 index 00000000..3452f996 --- /dev/null +++ b/src/main/java/binnie/genetics/item/GeneticsMisc.java @@ -0,0 +1,43 @@ +package binnie.genetics.item; + +import static binnie.genetics.Genetics.GENETICS_MODID; +import static binnie.genetics.Genetics.itemGenetics; + +import binnie.core.item.DamageItems; +import binnie.genetics.GeneticsCreativeTab; +import java.util.Arrays; +import net.minecraft.item.ItemStack; + +public class GeneticsMisc extends DamageItems { + + public enum Items { + LaboratoryCasing("casingIron"), + DNADye("dnaDye"), + FluorescentDye("dyeFluor"), + Enzyme("enzyme"), + GrowthMedium("growthMedium"), + EmptySequencer("sequencerEmpty"), + EmptySerum("serumEmpty"), + EmptyGenome("genomeEmpty"), + Cylinder("cylinderEmpty"), + IntegratedCircuit("integratedCircuit"), + IntegratedCPU("integratedCPU"), + IntegratedCasing("casingCircuit"); + + final String name; + private static final Items[] VALUES = values(); + + Items(String name) { + this.name = name; + } + + public ItemStack get(int count) { + return itemGenetics.getStack(count, ordinal()); + } + } + + protected GeneticsMisc() { + super(GeneticsCreativeTab.instance, GENETICS_MODID, + Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + } +} diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 95855f9a..23c054ab 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -1,6 +1,6 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; import java.util.List; diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 6f263657..12a1be2a 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -1,6 +1,6 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItemsN.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM; import binnie.Binnie; import binnie.core.genetics.BreedingSystem; diff --git a/src/main/java/binnie/genetics/item/ItemSerumArray.java b/src/main/java/binnie/genetics/item/ItemSerumArray.java index 95469cd3..403a5481 100644 --- a/src/main/java/binnie/genetics/item/ItemSerumArray.java +++ b/src/main/java/binnie/genetics/item/ItemSerumArray.java @@ -1,6 +1,6 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import java.util.List; diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index b40c3d16..a8e4fca2 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,18 +1,22 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsItemsN.ANALYST; -import static binnie.genetics.item.GeneticsItemsN.DATABASE; -import static binnie.genetics.item.GeneticsItemsN.REGISTRY; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; -import static binnie.genetics.item.GeneticsItemsN.SERUM; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import static binnie.genetics.item.GeneticsMisc.Items.Cylinder; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCPU; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; +import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; +import static binnie.genetics.item.GeneticsMisc.Items.GrowthMedium; +import static binnie.genetics.item.GeneticsItems.ANALYST; +import static binnie.genetics.item.GeneticsItems.DATABASE; +import static binnie.genetics.item.GeneticsItems.REGISTRY; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import binnie.Binnie; import binnie.botany.Botany; @@ -24,9 +28,14 @@ import binnie.core.resource.BinnieIcon; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; import binnie.genetics.Genetics; -import binnie.genetics.GeneticsCreativeTab; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItem implements IInitializable { @@ -48,7 +57,7 @@ public class ModuleItem implements IInitializable { @Override public void preInit() { - Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance); + Genetics.itemGenetics = new GeneticsMisc(); Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); } @@ -74,71 +83,71 @@ public class ModuleItem implements IInitializable { @Override public void postInit() { GameRegistry - .addShapelessRecipe(GeneticsItems.DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); + .addShapelessRecipe(DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.LaboratoryCasing.get(1), + LaboratoryCasing.get(1), new Object[] { "iii", "iYi", "iii", 'i', "ingotIron", 'Y', Mods.forestry.item("sturdyMachine") })); GameRegistry.addRecipe( new ShapelessOreRecipe( - GeneticsItems.DNADye.get(2), + DNADye.get(2), new Object[] { "dyePurple", "dyeMagenta", "dyePink" })); GameRegistry.addRecipe( new ShapelessOreRecipe( - GeneticsItems.FluorescentDye.get(2), + FluorescentDye.get(2), new Object[] { "dyeOrange", "dyeYellow", "dustGlowstone" })); GameRegistry.addRecipe( new ShapelessOreRecipe( - GeneticsItems.GrowthMedium.get(2), + GrowthMedium.get(2), new Object[] { new ItemStack(Items.dye, 1, 15), Items.sugar })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.EmptySequencer.get(1), + EmptySequencer.get(1), new Object[] { " p ", "iGi", " p ", 'i', "ingotGold", 'G', Blocks.glass_pane, 'p', Items.paper })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.EmptySerum.get(1), + EmptySerum.get(1), new Object[] { " g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.glass_pane })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.EmptyGenome.get(1), - new Object[] { "sss", "sss", "sss", 's', GeneticsItems.EmptySerum.get(1) })); + EmptyGenome.get(1), + new Object[] { "sss", "sss", "sss", 's', EmptySerum.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.Cylinder.get(8), + Cylinder.get(8), new Object[] { " g ", "g g", " ", 'g', Blocks.glass_pane })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.IntegratedCircuit.get(1), + IntegratedCircuit.get(1), new Object[] { "l g", " c ", "g l", 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.IntegratedCircuit.get(1), + IntegratedCircuit.get(1), new Object[] { "g l", " c ", "l g", 'c', Mods.forestry.stack("chipsets", 1, 1), 'l', new ItemStack(Items.dye, 1, 4), 'g', "dustGlowstone" })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.IntegratedCasing.get(1), - new Object[] { "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', - GeneticsItems.LaboratoryCasing.get(1) })); + IntegratedCasing.get(1), + new Object[] { "ccc", "cdc", "ccc", 'c', IntegratedCircuit.get(1), 'd', + LaboratoryCasing.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( - GeneticsItems.IntegratedCPU.get(1), - new Object[] { "ccc", "cdc", "ccc", 'c', GeneticsItems.IntegratedCircuit.get(1), 'd', + IntegratedCPU.get(1), + new Object[] { "ccc", "cdc", "ccc", 'c', IntegratedCircuit.get(1), 'd', Items.diamond })); RecipeManagers.carpenterManager.addRecipe( @@ -162,9 +171,9 @@ public class ModuleItem implements IInitializable { 'E', Blocks.obsidian); - GameRegistry.addSmelting(SEQUENCER.getItem(), GeneticsItems.EmptySequencer.get(1), 0.0f); - GameRegistry.addSmelting(SERUM.getItem(), GeneticsItems.EmptySerum.get(1), 0.0f); - GameRegistry.addSmelting(SERUM_ARRAY.getItem(), GeneticsItems.EmptyGenome.get(1), 0.0f); + GameRegistry.addSmelting(SEQUENCER.getItem(), EmptySequencer.get(1), 0.0f); + GameRegistry.addSmelting(SERUM.getItem(), EmptySerum.get(1), 0.0f); + GameRegistry.addSmelting(SERUM_ARRAY.getItem(), EmptyGenome.get(1), 0.0f); // TODONE refactor refactor refactor this! // CombatZAK up to the task! @@ -181,7 +190,7 @@ public class ModuleItem implements IInitializable { // is active : Items.diamond; // otherwise just replace it with another diamond - ItemStack circuit = GeneticsItems.IntegratedCircuit.get(1); // get a reference to Integrated circuit + ItemStack circuit = IntegratedCircuit.get(1); // get a reference to Integrated circuit Item diamond = Items.diamond; // save a reference to diamond ItemStack analyst = new ItemStack(ANALYST.getItem()); // save a reference to the analyst, will make the next bit diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 4e261bc7..0501f556 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -1,9 +1,9 @@ package binnie.genetics.machine; -import static binnie.genetics.item.GeneticsItemsN.ANALYST; -import static binnie.genetics.item.GeneticsItemsN.DATABASE; -import static binnie.genetics.item.GeneticsItemsN.MASTER_REGISTRY; -import static binnie.genetics.item.GeneticsItemsN.REGISTRY; +import static binnie.genetics.item.GeneticsItems.ANALYST; +import static binnie.genetics.item.GeneticsItems.DATABASE; +import static binnie.genetics.item.GeneticsItems.MASTER_REGISTRY; +import static binnie.genetics.item.GeneticsItems.REGISTRY; import binnie.botany.Botany; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 6dee0395..6a6da9be 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -1,10 +1,12 @@ package binnie.genetics.machine; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; +import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCPU; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; +import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; import binnie.core.BinnieCore; import binnie.core.IInitializable; @@ -13,10 +15,14 @@ import binnie.core.machines.MachineGroup; import binnie.core.machines.inventory.ValidatorIcon; import binnie.genetics.Genetics; import binnie.genetics.GeneticsCreativeTab; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { @@ -68,7 +74,7 @@ public class ModuleMachine implements IInitializable { public void postInit() { Acclimatiser.setupRecipes(); Object[] standardCircuit = { Mods.forestry.stack("chipsets", 1, 1) }; - Object[] advCircuit = { GeneticsItems.IntegratedCircuit.get(1) }; + Object[] advCircuit = { IntegratedCircuit.get(1) }; String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "gearIron" : "ingotIron"; String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "gearIron" : "ingotIron"; String diamondGear = OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron"; @@ -77,7 +83,7 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Incubator.get(1), - new Object[] { "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', + new Object[] { "gFg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'F', Blocks.furnace, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', ironGear })); @@ -94,21 +100,21 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Analyser.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', - GeneticsItems.DNADye.get(1) })); + DNADye.get(1) })); } GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Genepool.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', Blocks.glass })); GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Acclimatiser.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', Items.lava_bucket, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', Items.water_bucket })); } @@ -117,24 +123,24 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Isolator.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', goldGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', - GeneticsItems.Enzyme.get(1) })); + Enzyme.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Polymeriser.get(1), - new Object[] { "gBg", "cCc", "gPg", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "gPg", 'C', LaboratoryCasing.get(1), 'B', ironGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze" })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Sequencer.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', "gearBronze", 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', - GeneticsItems.FluorescentDye.get(1) })); + FluorescentDye.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Inoculator.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', diamondGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', Items.emerald })); } @@ -142,13 +148,13 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( AdvGeneticMachine.Splicer.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.IntegratedCasing.get(1), 'B', - diamondGear, 'c', GeneticsItems.IntegratedCPU.get(1), 'g', Items.gold_nugget, 'P', + new Object[] { "gBg", "cCc", "aPa", 'C', IntegratedCasing.get(1), 'B', + diamondGear, 'c', IntegratedCPU.get(1), 'g', Items.gold_nugget, 'P', "gearBronze", 'a', Items.blaze_rod })); GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.LabMachine.get(1), - new Object[] { "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', + new Object[] { "igi", "gCg", "igi", 'C', LaboratoryCasing.get(1), 'i', "ingotIron", 'g', Blocks.glass_pane })); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java index 69c3f326..28e80438 100644 --- a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java @@ -1,11 +1,11 @@ package binnie.genetics.machine.analyser; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; +import net.minecraft.item.ItemStack; public class DyeSlotValidator extends SlotValidator { @@ -15,7 +15,7 @@ public class DyeSlotValidator extends SlotValidator { @Override public boolean isValid(ItemStack itemStack) { - return itemStack.isItemEqual(GeneticsItems.DNADye.get(1)); + return itemStack.isItemEqual(DNADye.get(1)); } @Override diff --git a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java index e05e4c61..3d210914 100644 --- a/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java +++ b/src/main/java/binnie/genetics/machine/genepool/GenepoolPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.genepool; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -12,7 +14,6 @@ import binnie.core.machines.inventory.TankSlot; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; @@ -28,7 +29,7 @@ public class GenepoolPackage extends PackageGeneticBase implements IMachineInfor new ComponentGeneticGUI(machine, GeneticsGUI.Genepool); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot enzymeSlot = inventory.addSlot(Genepool.SLOT_ENZYME, "enzyme"); - enzymeSlot.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.IconEnzyme)); + enzymeSlot.setValidator(new SlotValidator.Item(Enzyme.get(1), ModuleMachine.IconEnzyme)); enzymeSlot.forbidExtraction(); InventorySlot slotBee = inventory.addSlot(Genepool.SLOT_BEE, "process"); diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index 61912121..d0f171fc 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -1,21 +1,22 @@ package binnie.genetics.machine.incubator; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticLiquid.GrowthMedium; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; import binnie.Binnie; import binnie.core.BinnieCore; import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.item.GeneticLiquid; -import binnie.genetics.item.GeneticsItems; +import binnie.genetics.item.GeneticsMisc; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class Incubator { @@ -33,34 +34,34 @@ public class Incubator { public static void addRecipes() { Incubator.RECIPES.add( new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), + GeneticsMisc.Items.GrowthMedium.get(1), Binnie.Liquid.getLiquidStack("water", 25), - GeneticLiquid.GrowthMedium.get(25), + GrowthMedium.get(25), 0.2f)); Incubator.RECIPES.add( new IncubatorRecipe( new ItemStack(Items.wheat), - GeneticLiquid.GrowthMedium.get(25), + GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); Incubator.RECIPES.add( new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), + GeneticsMisc.Items.GrowthMedium.get(1), GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f)); Incubator.RECIPES.add( new IncubatorRecipe(new ItemStack(Items.sugar), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) - .setOutputStack(GeneticsItems.Enzyme.get(1))); + .setOutputStack(Enzyme.get(1))); Incubator.RECIPES.add( new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), + GeneticsMisc.Items.GrowthMedium.get(1), GeneticLiquid.BacteriaPoly.get(0), GeneticLiquid.BacteriaPoly.get(5), 0.05f)); Incubator.RECIPES.add( new IncubatorRecipe( - GeneticsItems.GrowthMedium.get(1), + GeneticsMisc.Items.GrowthMedium.get(1), GeneticLiquid.BacteriaVector.get(0), GeneticLiquid.BacteriaVector.get(5), 0.05f)); diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java index 5afe5eff..e56b993e 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorPackage.java @@ -1,5 +1,8 @@ package binnie.genetics.machine.isolator; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; + import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentChargedSlots; @@ -11,7 +14,6 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; @@ -27,11 +29,11 @@ public class IsolatorPackage extends PackageGeneticBase implements IMachineInfor new ComponentGeneticGUI(machine, GeneticsGUI.Isolator); ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot enzymeSlot = inventory.addSlot(Isolator.SLOT_ENZYME, "enzyme"); - enzymeSlot.setValidator(new SlotValidator.Item(GeneticsItems.Enzyme.get(1), ModuleMachine.IconEnzyme)); + enzymeSlot.setValidator(new SlotValidator.Item(Enzyme.get(1), ModuleMachine.IconEnzyme)); enzymeSlot.forbidExtraction(); InventorySlot vialSlot = inventory.addSlot(Isolator.SLOT_SEQUENCER_VIAL, "sequencervial"); - vialSlot.setValidator(new SlotValidator.Item(GeneticsItems.EmptySequencer.get(1), ModuleMachine.IconSequencer)); + vialSlot.setValidator(new SlotValidator.Item(EmptySequencer.get(1), ModuleMachine.IconSequencer)); vialSlot.forbidExtraction(); inventory.addSlotArray(Isolator.SLOT_RESERVE, "input"); diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java index 28470ba1..6a427af2 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java @@ -1,6 +1,6 @@ package binnie.genetics.machine.sequencer; -import net.minecraft.item.ItemStack; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventoryTransfer; @@ -10,7 +10,7 @@ import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; -import binnie.genetics.item.GeneticsItems; +import net.minecraft.item.ItemStack; public class SequencerComponentLogic extends ComponentProcess implements IProcess, ComponentInventoryTransfer.ITransferRestockListener { @@ -96,7 +96,7 @@ public class SequencerComponentLogic extends ComponentProcess getUtil().decreaseStack(Sequencer.SLOT_TARGET_INDEX, 1); if (getUtil().getStack(Sequencer.SLOT_DONE_INDEX) == null) { - getUtil().setStack(Sequencer.SLOT_DONE_INDEX, GeneticsItems.EmptySequencer.get(1)); + getUtil().setStack(Sequencer.SLOT_DONE_INDEX, EmptySequencer.get(1)); } else { getUtil().decreaseStack(Sequencer.SLOT_DONE_INDEX, -1); } diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java index 22a1cded..323e82ed 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerPackage.java @@ -1,5 +1,7 @@ package binnie.genetics.machine.sequencer; +import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; + import binnie.Binnie; import binnie.core.craftgui.minecraft.IMachineInformation; import binnie.core.machines.Machine; @@ -12,7 +14,6 @@ import binnie.core.machines.power.ComponentPowerReceptor; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ComponentGeneticGUI; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.PackageGeneticBase; @@ -33,7 +34,7 @@ public class SequencerPackage extends PackageGeneticBase implements IMachineInfo ComponentInventorySlots inventory = new ComponentInventorySlots(machine); InventorySlot slotDye = inventory.addSlot(Sequencer.SLOT_DYE_INDEX, "dye"); - slotDye.setValidator(new SlotValidator.Item(GeneticsItems.FluorescentDye.get(1), ModuleMachine.IconDye)); + slotDye.setValidator(new SlotValidator.Item(FluorescentDye.get(1), ModuleMachine.IconDye)); slotDye.forbidExtraction(); inventory.addSlotArray(Sequencer.SLOT_RESERVE, "input"); diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index b6e0971b..8a5aa076 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -1,6 +1,6 @@ package binnie.genetics.machine.sequencer; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index cf69e42c..d83ed9d3 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -1,12 +1,12 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.nei.RecipeHandlerBase; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSequence; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; @@ -90,7 +90,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingredient) { - if (NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.DNADye.get(0), ingredient)) { + if (NEIServerUtils.areStacksSameTypeCrafting(DNADye.get(0), ingredient)) { this.loadAllRecipes(); } else { for (AnalyserRecipe recipe : recipes) { @@ -110,7 +110,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase { } public ItemStack getDNADye() { - return GeneticsItems.DNADye.get(1); + return DNADye.get(1); } public ItemStack getAnalysable() { diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index 7dfead0a..a423953b 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -1,10 +1,11 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SERUM; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; import binnie.core.nei.RecipeHandlerBase; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerumArray; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; @@ -102,8 +103,8 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { } public ItemStack getEmptySerum() { - return this.serum.getItem() instanceof ItemSerumArray ? GeneticsItems.EmptyGenome.get(1) - : GeneticsItems.EmptySerum.get(1); + return this.serum.getItem() instanceof ItemSerumArray ? EmptyGenome.get(1) + : EmptySerum.get(1); } } diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index 40b76e33..0a2ee19e 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -1,13 +1,6 @@ package binnie.genetics.nei; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; import binnie.Binnie; import binnie.botany.Botany; @@ -17,11 +10,17 @@ import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.item.GeneticLiquid; -import binnie.genetics.item.GeneticsItems; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.apiculture.EnumBeeType; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class GenepoolRecipeHandler extends RecipeHandlerBase { @@ -97,7 +96,7 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingredient) { - if (NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.Enzyme.get(1), ingredient)) { + if (NEIServerUtils.areStacksSameTypeCrafting(Enzyme.get(1), ingredient)) { this.loadAllRecipes(); } else { for (GenepoolRecipe recipe : recipes) { @@ -143,7 +142,7 @@ public class GenepoolRecipeHandler extends RecipeHandlerBase { } public ItemStack getEnzyme() { - return GeneticsItems.Enzyme.get(1); + return Enzyme.get(1); } public FluidStack getEthanol() { diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index c45f11b0..b015f6b7 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -1,7 +1,7 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SERUM; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import binnie.botany.Botany; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index b1f0bde6..9541e088 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -1,6 +1,8 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; import binnie.Binnie; import binnie.botany.Botany; @@ -11,7 +13,6 @@ import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.PositionedStackAdv; import binnie.core.nei.RecipeHandlerBase; -import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSequence; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; @@ -111,8 +112,8 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingredient) { - if (NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.EmptySequencer.get(1), ingredient) - || NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.Enzyme.get(1), ingredient)) { + if (NEIServerUtils.areStacksSameTypeCrafting(EmptySequencer.get(1), ingredient) + || NEIServerUtils.areStacksSameTypeCrafting(Enzyme.get(1), ingredient)) { this.loadAllRecipes(); } else { for (IsolatorRecipe recipe : recipes) { @@ -150,11 +151,11 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase { } public ItemStack getEnzyme() { - return GeneticsItems.Enzyme.get(1); + return Enzyme.get(1); } public ItemStack getEmptySequencer() { - return GeneticsItems.EmptySequencer.get(1); + return EmptySequencer.get(1); } } diff --git a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java index ff11c7ed..4e3d22ea 100644 --- a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java @@ -1,8 +1,8 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; -import static binnie.genetics.item.GeneticsItemsN.SERUM; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; diff --git a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java index 2552c46c..a6f004a8 100644 --- a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java @@ -1,10 +1,11 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.DATABASE; -import static binnie.genetics.item.GeneticsItemsN.SEQUENCER; +import static binnie.genetics.item.GeneticsItems.DATABASE; +import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; import binnie.core.nei.RecipeHandlerBase; -import binnie.genetics.item.GeneticsItems; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; @@ -54,7 +55,7 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { @Override public void loadCraftingRecipes(ItemStack result) { - if (NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.EmptySequencer.get(1), result)) { + if (NEIServerUtils.areStacksSameTypeCrafting(EmptySequencer.get(1), result)) { this.loadAllRecipes(); } } @@ -62,7 +63,7 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { @Override public void loadUsageRecipes(ItemStack ingredient) { if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(SEQUENCER.getItem()), ingredient) - || NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.FluorescentDye.get(1), ingredient) + || NEIServerUtils.areStacksSameTypeCrafting(FluorescentDye.get(1), ingredient) || NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(DATABASE.getItem()), ingredient)) { this.loadAllRecipes(); } @@ -71,9 +72,9 @@ public class SequencerRecipeHandler extends RecipeHandlerBase { public class CachedSequencerRecipe extends CachedBaseRecipe { public PositionedStack seq; - public PositionedStack fluorescentDye = new PositionedStack(GeneticsItems.FluorescentDye.get(1), 53, 40); + public PositionedStack fluorescentDye = new PositionedStack(FluorescentDye.get(1), 53, 40); public PositionedStack database = new PositionedStack(new ItemStack(DATABASE.getItem()), 105, 19); - public PositionedStack emptySeq = new PositionedStack(GeneticsItems.EmptySequencer.get(1), 105, 40); + public PositionedStack emptySeq = new PositionedStack(EmptySequencer.get(1), 105, 40); public List ingredients = new ArrayList<>(); public List results = new ArrayList<>(); diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index 02f30ba3..54e864be 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -1,7 +1,7 @@ package binnie.genetics.nei; -import static binnie.genetics.item.GeneticsItemsN.SERUM; -import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsItems.SERUM; +import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import binnie.botany.Botany; import binnie.core.BinnieCore;