Move simple Genetics items to enum

This commit is contained in:
ah-OOG-ah committed 2024-09-29 19:14:10 -04:00
1 parent 1a3b24c589
commit b61fff5691
16 files changed
+148 -132

No files matched your search

+1 -12
View File
@@ -1,7 +1,5 @@
package binnie.genetics;
import net.minecraft.item.Item;
import binnie.core.AbstractMod;
import binnie.core.Tags;
import binnie.core.gui.IBinnieGUID;
@@ -11,9 +9,6 @@ import binnie.core.network.IPacketID;
import binnie.core.proxy.IProxyCore;
import binnie.genetics.core.GeneticsGUI;
import binnie.genetics.core.GeneticsPacket;
import binnie.genetics.item.ItemAnalyst;
import binnie.genetics.item.ItemDatabase;
import binnie.genetics.item.ItemSerumArray;
import binnie.genetics.item.ModuleItem;
import binnie.genetics.machine.ModuleMachine;
import binnie.genetics.nei.IMCForNEI;
@@ -23,6 +18,7 @@ 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",
@@ -38,18 +34,11 @@ 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 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;
@@ -1,5 +1,7 @@
package binnie.genetics.genetics;
import static binnie.genetics.item.GeneticsItemsN.SEQUENCER;
import net.minecraft.item.ItemStack;
import binnie.genetics.Genetics;
@@ -57,7 +59,7 @@ public class Engineering {
if (serum.getItem() instanceof IItemSerum) {
return ((IItemSerum) serum.getItem()).getGenes(serum);
}
if (serum.getItem() == Genetics.itemSequencer) {
if (serum.getItem() == SEQUENCER.getItem()) {
return new IGene[] { new SequencerItem(serum).gene };
}
return new IGene[0];
@@ -0,0 +1,23 @@
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;
}
}
@@ -1,5 +1,7 @@
package binnie.genetics.item;
import static binnie.genetics.item.GeneticsItemsN.SEQUENCER;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -38,7 +40,7 @@ public class ItemSequence extends Item implements IItemAnalysable, IItemChargabl
}
public static ItemStack create(IGene gene, boolean sequenced) {
ItemStack item = new ItemStack(Genetics.itemSequencer);
ItemStack item = new ItemStack(SEQUENCER.getItem());
item.setItemDamage(sequenced ? 0 : item.getMaxDamage());
SequencerItem seq = new SequencerItem(gene);
seq.writeToItem(item);
@@ -1,18 +1,11 @@
package binnie.genetics.item;
import java.util.List;
import java.util.Map;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import static binnie.genetics.item.GeneticsItemsN.SERUM;
import binnie.Binnie;
import binnie.core.genetics.BreedingSystem;
import binnie.core.genetics.Gene;
import binnie.core.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.api.IGene;
import binnie.genetics.api.IItemSerum;
import binnie.genetics.genetics.GeneItem;
@@ -23,6 +16,12 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.ISpeciesRoot;
import java.util.List;
import java.util.Map;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class ItemSerum extends ItemGene implements IItemSerum {
@@ -32,7 +31,7 @@ public class ItemSerum extends ItemGene implements IItemSerum {
}
public static ItemStack create(IGene gene) {
ItemStack item = new ItemStack(Genetics.itemSerum);
ItemStack item = new ItemStack(SERUM.getItem());
item.setItemDamage(item.getMaxDamage());
GeneItem seq = new GeneItem(gene);
seq.writeToItem(item);
@@ -1,5 +1,7 @@
package binnie.genetics.item;
import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -34,7 +36,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
}
public static ItemStack create(IGene gene) {
ItemStack item = new ItemStack(Genetics.itemSerumArray);
ItemStack item = new ItemStack(SERUM_ARRAY.getItem());
item.setItemDamage(item.getMaxDamage());
GeneArrayItem seq = new GeneArrayItem(gene);
seq.writeToItem(item);
@@ -1,5 +1,12 @@
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;
@@ -41,14 +48,7 @@ public class ModuleItem implements IInitializable {
@Override
public void preInit() {
Genetics.itemSerum = new ItemSerum();
Genetics.itemSerumArray = new ItemSerumArray();
Genetics.itemSequencer = new ItemSequence();
Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), GeneticsCreativeTab.instance);
Genetics.database = new ItemDatabase();
Genetics.analyst = new ItemAnalyst();
Genetics.registry = new ItemRegistry();
Genetics.masterRegistry = new ItemMasterRegistry();
Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics);
}
@@ -145,7 +145,7 @@ public class ModuleItem implements IInitializable {
100,
Binnie.Liquid.getLiquidStack("water", 2000),
null,
new ItemStack(Genetics.database),
new ItemStack(DATABASE.getItem()),
"X#X",
"YEY",
"RDR",
@@ -162,9 +162,9 @@ public class ModuleItem implements IInitializable {
'E',
Blocks.obsidian);
GameRegistry.addSmelting(Genetics.itemSequencer, GeneticsItems.EmptySequencer.get(1), 0.0f);
GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(1), 0.0f);
GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(1), 0.0f);
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);
// TODONE refactor refactor refactor this!
// CombatZAK up to the task!
@@ -184,7 +184,7 @@ public class ModuleItem implements IInitializable {
ItemStack circuit = GeneticsItems.IntegratedCircuit.get(1); // get a reference to Integrated circuit
Item diamond = Items.diamond; // save a reference to diamond
ItemStack analyst = new ItemStack(Genetics.analyst); // save a reference to the analyst, will make the next bit
ItemStack analyst = new ItemStack(ANALYST.getItem()); // save a reference to the analyst, will make the next bit
// easier
// the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is
@@ -291,7 +291,7 @@ public class ModuleItem implements IInitializable {
// get some references to dictionary/databases for the various modules; these names are very inconsistent for
// like items.
// should be refactored in their respective modules.
ItemStack registry = new ItemStack(Genetics.registry);
ItemStack registry = new ItemStack(REGISTRY.getItem());
Item beeDb = ExtraBees.dictionary;
Item treeDb = ExtraTrees.itemDictionary;
Item flwrDb = Botany.database;
@@ -1,16 +1,9 @@
package binnie.genetics.machine;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
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 binnie.botany.Botany;
import binnie.core.BinnieCore;
@@ -20,8 +13,17 @@ import binnie.core.machines.component.IInteraction;
import binnie.core.machines.network.INetwork;
import binnie.extrabees.ExtraBees;
import binnie.extratrees.ExtraTrees;
import binnie.genetics.Genetics;
import buildcraft.api.tools.IToolWrench;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick {
@@ -128,10 +130,10 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til
validSelections.add(ExtraTrees.itemDictionaryLepi);
}
validSelections.add(Genetics.database);
validSelections.add(Genetics.analyst);
validSelections.add(Genetics.registry);
validSelections.add(Genetics.masterRegistry);
validSelections.add(DATABASE.getItem());
validSelections.add(ANALYST.getItem());
validSelections.add(REGISTRY.getItem());
validSelections.add(MASTER_REGISTRY.getItem());
validSelections.add(BinnieCore.genesis);
if (stack == null && validSelections.contains(player.getHeldItem().getItem())) {
@@ -1,12 +1,12 @@
package binnie.genetics.machine.sequencer;
import net.minecraft.item.ItemStack;
import static binnie.genetics.item.GeneticsItemsN.SEQUENCER;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.util.I18N;
import binnie.genetics.Genetics;
import binnie.genetics.genetics.SequencerItem;
import binnie.genetics.machine.ModuleMachine;
import net.minecraft.item.ItemStack;
public class UnsequencedSlotValidator extends SlotValidator {
@@ -16,7 +16,7 @@ public class UnsequencedSlotValidator extends SlotValidator {
@Override
public boolean isValid(ItemStack itemStack) {
if (itemStack.getItem() == Genetics.itemSequencer) {
if (itemStack.getItem() == SEQUENCER.getItem()) {
SequencerItem seq = new SequencerItem(itemStack);
return seq.sequenced < 100;
}
@@ -1,23 +1,22 @@
package binnie.genetics.nei;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
import static binnie.genetics.item.GeneticsItemsN.SEQUENCER;
import binnie.botany.Botany;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.item.ItemSequence;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
public class AnalyserRecipeHandler extends RecipeHandlerBase {
@@ -25,7 +24,7 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase {
@Override
public void prepare() {
recipes.add(new AnalyserRecipe(new ItemStack(Genetics.itemSequencer, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new AnalyserRecipe(new ItemStack(SEQUENCER.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
if (BinnieCore.isApicultureActive()) {
recipes.add(new AnalyserRecipe(Mods.forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE)));
@@ -130,8 +129,8 @@ public class AnalyserRecipeHandler extends RecipeHandlerBase {
List<ItemStack> analysableList = new ArrayList<>();
if (recipe.getAnalysable().getItem() instanceof ItemSequence) {
for (ItemStack seq : ItemList.itemMap.get(Genetics.itemSequencer)) {
for (int i = Genetics.itemSequencer.getMaxDamage(); i >= 0; i--) {
for (ItemStack seq : ItemList.itemMap.get(SEQUENCER.getItem())) {
for (int i = SEQUENCER.getItem().getMaxDamage(); i >= 0; i--) {
ItemStack temp = seq.copy();
temp.setItemDamage(i);
analysableList.add(temp);
@@ -1,20 +1,20 @@
package binnie.genetics.nei;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
import static binnie.genetics.item.GeneticsItemsN.SERUM;
import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.item.ItemSerumArray;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.OreDictionary;
public class DatabaseRecipeHandler extends RecipeHandlerBase {
@@ -22,8 +22,8 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase {
@Override
public void prepare() {
recipes.add(new DatabaseRecipe(new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new DatabaseRecipe(new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new DatabaseRecipe(new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new DatabaseRecipe(new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
@@ -1,16 +1,7 @@
package binnie.genetics.nei;
import static binnie.genetics.Genetics.itemSerum;
import static binnie.genetics.Genetics.itemSerumArray;
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.GeneticsItemsN.SERUM;
import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY;
import binnie.botany.Botany;
import binnie.core.BinnieCore;
@@ -25,15 +16,22 @@ import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.ISpeciesRoot;
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 InoculatorRecipeHandler extends RecipeHandlerBase {
private static final List<InoculatorRecipe> recipes = new ArrayList<>();
private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) {
recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(itemSerum, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(
new InoculatorRecipe(dnaManipulable, new ItemStack(itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)));
new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
@@ -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.GeneticsItemsN.SEQUENCER;
import binnie.Binnie;
import binnie.botany.Botany;
@@ -18,7 +11,6 @@ import binnie.core.nei.NEIUtils;
import binnie.core.nei.PositionedFluidTank;
import binnie.core.nei.PositionedStackAdv;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.item.ItemSequence;
import codechicken.lib.gui.GuiDraw;
@@ -28,6 +20,13 @@ import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IChromosomeType;
import forestry.api.genetics.ISpeciesRoot;
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 IsolatorRecipeHandler extends RecipeHandlerBase {
@@ -96,7 +95,7 @@ public class IsolatorRecipeHandler extends RecipeHandlerBase {
@Override
public void loadCraftingRecipes(ItemStack result) {
if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(Genetics.itemSequencer), result)) {
if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(SEQUENCER.getItem()), result)) {
for (IsolatorRecipe recipe : recipes) {
this.arecipes.add(new CachedIsolatorRecipe(recipe));
}
@@ -1,20 +1,13 @@
package binnie.genetics.nei;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.init.Items;
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.GeneticsItemsN.SEQUENCER;
import static binnie.genetics.item.GeneticsItemsN.SERUM;
import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY;
import binnie.core.nei.NEIUtils;
import binnie.core.nei.PositionedFluidTank;
import binnie.core.nei.PositionedStackAdv;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.api.IItemSerum;
import binnie.genetics.genetics.Engineering;
import binnie.genetics.item.GeneticLiquid;
@@ -23,6 +16,14 @@ import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
public class PolymeriserRecipeHandler extends RecipeHandlerBase {
@@ -30,9 +31,9 @@ public class PolymeriserRecipeHandler extends RecipeHandlerBase {
@Override
public void prepare() {
recipes.add(new PolymeriserRecipe(new ItemStack(Genetics.itemSequencer, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new PolymeriserRecipe(new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new PolymeriserRecipe(new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new PolymeriserRecipe(new ItemStack(SEQUENCER.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new PolymeriserRecipe(new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(new PolymeriserRecipe(new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
}
@Override
@@ -1,18 +1,18 @@
package binnie.genetics.nei;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import static binnie.genetics.item.GeneticsItemsN.DATABASE;
import static binnie.genetics.item.GeneticsItemsN.SEQUENCER;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.item.GeneticsItems;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
public class SequencerRecipeHandler extends RecipeHandlerBase {
@@ -61,9 +61,9 @@ public class SequencerRecipeHandler extends RecipeHandlerBase {
@Override
public void loadUsageRecipes(ItemStack ingredient) {
if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(Genetics.itemSequencer), ingredient)
if (NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(SEQUENCER.getItem()), ingredient)
|| NEIServerUtils.areStacksSameTypeCrafting(GeneticsItems.FluorescentDye.get(1), ingredient)
|| NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(Genetics.database), ingredient)) {
|| NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(DATABASE.getItem()), ingredient)) {
this.loadAllRecipes();
}
}
@@ -72,7 +72,7 @@ public class SequencerRecipeHandler extends RecipeHandlerBase {
public PositionedStack seq;
public PositionedStack fluorescentDye = new PositionedStack(GeneticsItems.FluorescentDye.get(1), 53, 40);
public PositionedStack database = new PositionedStack(new ItemStack(Genetics.database), 105, 19);
public PositionedStack database = new PositionedStack(new ItemStack(DATABASE.getItem()), 105, 19);
public PositionedStack emptySeq = new PositionedStack(GeneticsItems.EmptySequencer.get(1), 105, 40);
public List<PositionedStack> ingredients = new ArrayList<>();
public List<PositionedStack> results = new ArrayList<>();
@@ -80,8 +80,8 @@ public class SequencerRecipeHandler extends RecipeHandlerBase {
public CachedSequencerRecipe() {
List<ItemStack> seqList = new ArrayList<>();
for (ItemStack itemStack : ItemList.itemMap.get(Genetics.itemSequencer)) {
for (int i = Genetics.itemSequencer.getMaxDamage(); i >= 0; i--) {
for (ItemStack itemStack : ItemList.itemMap.get(SEQUENCER.getItem())) {
for (int i = SEQUENCER.getItem().getMaxDamage(); i >= 0; i--) {
ItemStack temp = itemStack.copy();
temp.setItemDamage(i);
seqList.add(temp);
@@ -1,12 +1,7 @@
package binnie.genetics.nei;
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.GeneticsItemsN.SERUM;
import static binnie.genetics.item.GeneticsItemsN.SERUM_ARRAY;
import binnie.botany.Botany;
import binnie.core.BinnieCore;
@@ -14,7 +9,6 @@ import binnie.core.Mods;
import binnie.core.nei.NEIUtils;
import binnie.core.nei.PositionedFluidTank;
import binnie.core.nei.RecipeHandlerBase;
import binnie.genetics.Genetics;
import binnie.genetics.api.IItemSerum;
import binnie.genetics.item.GeneticLiquid;
import codechicken.lib.gui.GuiDraw;
@@ -22,6 +16,12 @@ import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.ISpeciesRoot;
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 SplicerRecipeHandler extends RecipeHandlerBase {
@@ -29,11 +29,11 @@ public class SplicerRecipeHandler extends RecipeHandlerBase {
private void createSplicerRecipeForNEI(ItemStack dnaManipulable) {
recipes.add(
new SplicerRecipe(dnaManipulable, new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE)));
new SplicerRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
recipes.add(
new SplicerRecipe(
dnaManipulable,
new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)));
new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE)));
}
@Override