Clean up Genetics Mod

This commit is contained in:
Nedelosk committed 2017-03-22 17:17:12 +01:00
1 parent e88822fb3d
commit 044a8a1984
25 files changed
+286 -247

No files matched your search

@@ -30,11 +30,26 @@ public class MachineGroup {
this.mod = mod;
this.uid = uid;
this.blockName = blockName;
for (final IMachineType type : types) {
createPackages(types);
Binnie.MACHINE.registerMachineGroup(this);
this.block = new BlockMachine(this, blockName);
mod.getProxy().registerBlock(this.block);
Item i = mod.getProxy().registerItem(new ItemMachine(this.block));
for (int j = 0; j < types.length; j++) {
BinnieCore.getBinnieProxy().registerModel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j));
}
for (final MachinePackage pack : this.getPackages()) {
pack.register();
}
}
private void createPackages(IMachineType[] types){
for (IMachineType type : types) {
if (type.getPackageClass() != null) {
if (type.isActive()) {
try {
final MachinePackage pack = type.getPackageClass().newInstance();
MachinePackage pack = type.getPackageClass().newInstance();
pack.assignMetadata(type.ordinal());
pack.setActive(type.isActive());
this.addPackage(pack);
@@ -44,17 +59,6 @@ public class MachineGroup {
}
}
}
Binnie.MACHINE.registerMachineGroup(this);
this.block = new BlockMachine(this, blockName);
mod.getProxy().registerBlock(this.block);
Item i = mod.getProxy().registerItem(new ItemMachine(this.block));
for (int j = 0; j < types.length; j++) {
BinnieCore.getBinnieProxy().registermodel(i, j, new ModelResourceLocation(i.getRegistryName(), "machine_type=" + j));
}
for (final MachinePackage pack2 : this.getPackages()) {
pack2.register();
}
}
private void addPackage(final MachinePackage pack) {
@@ -88,11 +88,11 @@ public class BinnieModProxy implements IBinnieModProxy {
this.getMod().getNetworkWrapper().sendToServer(packet.GetMessage());
}
public void registermodel(Item item, int meta) {
public void registerModel(Item item, int meta) {
}
public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
}
@@ -70,12 +70,12 @@ public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy
}
@Override
public void registermodel(Item item, int meta) {
registermodel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
public void registerModel(Item item, int meta) {
registerModel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
}
@Override
public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation);
}
@@ -26,7 +26,7 @@ public class ItemHoneyCrystal extends Item {
this.setCreativeTab(Tabs.tabApiculture);
this.setUnlocalizedName("honey_crystal");
setRegistryName(name);
ExtraBees.proxy.registermodel(this, 0);
ExtraBees.proxy.registerModel(this, 0);
}
@Override
@@ -22,11 +22,11 @@ public class ModuleProducts implements IInitializable {
ExtraBees.proxy.registerItem(ExtraBees.comb);
ExtraBees.proxy.registerItem(ExtraBees.honeyDrop);
ExtraBees.proxy.registerItem(ExtraBees.propolis);
ExtraBees.proxy.registermodel(ExtraBees.honeyCrystal, 0);
ExtraBees.proxy.registermodel(ExtraBees.honeyCrystalEmpty, 0);
ExtraBees.proxy.registerModel(ExtraBees.honeyCrystal, 0);
ExtraBees.proxy.registerModel(ExtraBees.honeyCrystalEmpty, 0);
for (EnumHoneyComb c : EnumHoneyComb.values()) {
if (c.isActive())
ExtraBees.proxy.registermodel(ExtraBees.comb, c.ordinal());
ExtraBees.proxy.registerModel(ExtraBees.comb, c.ordinal());
}
@@ -23,12 +23,12 @@ public class ExtraBeesProxyClient extends ExtraBeesProxy {
}
@Override
public void registermodel(Item item, int meta) {
registermodel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
public void registerModel(Item item, int meta) {
registerModel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
}
@Override
public void registermodel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
public void registerModel(Item item, int meta, ModelResourceLocation modelResourceLocation) {
ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation);
}
+13 -13
View File
@@ -56,6 +56,19 @@ public class ExtraTrees extends AbstractMod {
@SuppressWarnings("NullableProblems")
@SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer")
public static Proxy proxy;
@Nullable
private static ModuleBlocks blocks;
@Nullable
private static ModuleItems items;
@Nullable
private static ModuleAlcohol alcohol;
@Nullable
private static ModuleCarpentry carpentry;
@Nullable
private static ModuleMachine machine;
@Nullable
private static ModuleKitchen kitchen;
@Mod.EventHandler
public void onConstruction(FMLConstructionEvent e) {
@@ -77,19 +90,6 @@ public class ExtraTrees extends AbstractMod {
this.postInit();
}
@Nullable
private static ModuleBlocks blocks;
@Nullable
private static ModuleItems items;
@Nullable
private static ModuleAlcohol alcohol;
@Nullable
private static ModuleCarpentry carpentry;
@Nullable
private static ModuleMachine machine;
@Nullable
private static ModuleKitchen kitchen;
public static ModuleItems items() {
Preconditions.checkState(items != null);
return items;
+18 -32
View File
@@ -4,22 +4,15 @@ import binnie.Constants;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.gui.IBinnieGUID;
import binnie.core.machines.MachineGroup;
import binnie.core.network.BinniePacketHandler;
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.ItemSequence;
import binnie.genetics.item.ItemSerum;
import binnie.genetics.item.ItemSerumArray;
import binnie.genetics.item.ModuleItem;
import binnie.genetics.item.ModuleItems;
import binnie.genetics.machine.ModuleMachine;
import binnie.genetics.proxy.Proxy;
import com.google.common.base.Preconditions;
import net.minecraft.item.Item;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -37,28 +30,11 @@ public class Genetics extends AbstractMod {
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
public static Proxy proxy;
public static String channel = "GEN";
public static final String CHANNEL = "GEN";
@Nullable
private static Item itemGenetics;
public static ItemSerum itemSerum;
public static ItemSequence 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 static ItemSerumArray itemSerumArray = null;
public static Item getItemGenetics() {
Preconditions.checkState(itemGenetics != null);
return itemGenetics;
}
public static void setItemGenetics(Item itemGenetics) {
Genetics.itemGenetics = itemGenetics;
}
private static ModuleItems items;
@Nullable
private static ModuleMachine machine;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
@@ -75,10 +51,20 @@ public class Genetics extends AbstractMod {
this.postInit();
}
public static ModuleItems items() {
Preconditions.checkState(items != null);
return items;
}
public static ModuleMachine machine() {
Preconditions.checkState(machine != null);
return machine;
}
@Override
protected void registerModules() {
this.addModule(new ModuleItem());
this.addModule(new ModuleMachine());
this.addModule(items = new ModuleItems());
this.addModule(machine = new ModuleMachine());
}
@Override
@@ -93,7 +79,7 @@ public class Genetics extends AbstractMod {
@Override
public String getChannel() {
return "GEN";
return CHANNEL;
}
@Override
@@ -19,7 +19,7 @@ public class Engineering {
if (stack.getItem() instanceof IItemSerum) {
return ((IItemSerum) stack.getItem()).getCharges(stack) == 0;
}
return stack.getItem() == Genetics.getItemGenetics() && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal());
return stack.getItem() == Genetics.items().getItemGenetics() && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal());
}
public static boolean canAcceptGene(final ItemStack stack, final IGene gene) {
@@ -44,10 +44,10 @@ public class Engineering {
if (stack.getItem() instanceof IItemSerum) {
((IItemSerum) stack.getItem()).addGene(stack, gene);
}
if (stack.getItem() == Genetics.getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) {
if (stack.getItem() == Genetics.items().getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) {
return ItemSerum.create(gene);
}
if (stack.getItem() == Genetics.getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) {
if (stack.getItem() == Genetics.items().getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) {
return ItemSerumArray.create(gene);
}
return stack;
@@ -58,7 +58,7 @@ public class Engineering {
if (serum.getItem() instanceof IItemSerum) {
return ((IItemSerum) serum.getItem()).getGenes(serum);
}
if (serum.getItem() == Genetics.itemSequencer) {
if (serum.getItem() == Genetics.items().itemSequencer) {
SequencerItem sequencerItem = SequencerItem.create(serum);
if (sequencerItem != null) {
return new IGene[]{sequencerItem.getGene()};
@@ -29,6 +29,7 @@ import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeWrapper;
import binnie.genetics.integration.jei.sequencer.SequencerRecipeCategory;
import binnie.genetics.integration.jei.sequencer.SequencerRecipeMaker;
import binnie.genetics.integration.jei.sequencer.SequencerRecipeWrapper;
import binnie.genetics.item.ModuleItems;
import binnie.genetics.machine.AdvGeneticMachine;
import binnie.genetics.machine.GeneticMachine;
import binnie.genetics.machine.LaboratoryMachine;
@@ -55,7 +56,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
@Override
public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
List<Item> chargeables = Arrays.asList(Genetics.itemSequencer, Genetics.itemSerum, Genetics.itemSerumArray);
ModuleItems items = Genetics.items();
List<Item> chargeables = Arrays.asList(items.itemSequencer, items.itemSerum, items.itemSerumArray);
ChargeableSubtypeInterpreter chargeableSubtypeInterpreter = new ChargeableSubtypeInterpreter();
for (Item chargeable : chargeables) {
subtypeRegistry.registerSubtypeInterpreter(chargeable, chargeableSubtypeInterpreter);
@@ -99,8 +101,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
registry.addRecipeCategoryCraftingItem(GeneticMachine.Inoculator.get(1), RecipeUids.INOCULATOR);
registry.addRecipeCategoryCraftingItem(AdvGeneticMachine.Splicer.get(1), RecipeUids.SPLICER);
registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Genepool.get(1), RecipeUids.GENEPOOL);
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.database), RecipeUids.DATABASE);
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.database, 1, 1), RecipeUids.DATABASE);
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.items().database), RecipeUids.DATABASE);
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.items().database, 1, 1), RecipeUids.DATABASE);
registry.addRecipes(Incubator.getRecipes());
registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe()));
@@ -3,6 +3,7 @@ package binnie.genetics.integration.jei.database;
import binnie.genetics.Genetics;
import binnie.genetics.integration.jei.GeneticsJeiPlugin;
import binnie.genetics.item.GeneticsItems;
import binnie.genetics.item.ModuleItems;
import mezz.jei.api.recipe.IStackHelper;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -13,10 +14,11 @@ import java.util.List;
public class DatabaseRecipeMaker {
public static List<DatabaseRecipeWrapper> create() {
List<DatabaseRecipeWrapper> recipes = new ArrayList<>();
ModuleItems items = Genetics.items();
{
ItemStack emptySerum = GeneticsItems.EmptySerum.get(1);
ItemStack resultSerum = new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE);
ItemStack resultSerum = new ItemStack(items.itemSerum, 1, OreDictionary.WILDCARD_VALUE);
IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper();
List<ItemStack> subtypes = stackHelper.toItemStackList(resultSerum);
List<ItemStack> resultSerums = new ArrayList<>();
@@ -30,7 +32,7 @@ public class DatabaseRecipeMaker {
{
ItemStack emptySerumArray = GeneticsItems.EmptyGenome.get(1);
ItemStack resultSerumArray = new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE);
ItemStack resultSerumArray = new ItemStack(items.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE);
IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper();
List<ItemStack> subtypes = stackHelper.toItemStackList(resultSerumArray);
List<ItemStack> resultSerumArrays = new ArrayList<>();
@@ -43,7 +43,7 @@ public class DatabaseRecipeWrapper extends BlankRecipeWrapper {
public void getIngredients(IIngredients ingredients) {
ingredients.setInputs(ItemStack.class, Arrays.asList(
input,
new ItemStack(Genetics.database)
new ItemStack(Genetics.items().database)
));
ingredients.setOutputLists(ItemStack.class, Collections.singletonList(outputs));
@@ -15,9 +15,9 @@ public class PolymeriserRecipeMaker {
List<PolymeriserRecipeWrapper> recipes = new ArrayList<>();
List<ItemStack> inputs = Arrays.asList(
new ItemStack(Genetics.itemSequencer, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack(Genetics.itemSerum, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack(Genetics.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)
new ItemStack(Genetics.items().itemSequencer, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack(Genetics.items().itemSerum, 1, OreDictionary.WILDCARD_VALUE),
new ItemStack(Genetics.items().itemSerumArray, 1, OreDictionary.WILDCARD_VALUE)
);
IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper();
@@ -36,7 +36,7 @@ public class SequencerRecipeWrapper extends BlankRecipeWrapper {
ingredients.setInputs(ItemStack.class, Arrays.asList(
input,
GeneticsItems.FluorescentDye.get(1),
new ItemStack(Genetics.database)
new ItemStack(Genetics.items().database)
));
ingredients.setOutput(ItemStack.class, GeneticsItems.EmptySequencer.get(1));
@@ -44,7 +44,7 @@ public enum GeneticsItems implements IItemMiscProvider {
@Override
public ItemStack get(final int size) {
return new ItemStack(Genetics.getItemGenetics(), size, this.ordinal());
return new ItemStack(Genetics.items().getItemGenetics(), size, this.ordinal());
}
public ItemStack get(Item itemGenetics, final int size) {
@@ -98,7 +98,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar
}
public static ItemStack create(final IGene gene, final boolean sequenced) {
final ItemStack item = new ItemStack(Genetics.itemSequencer);
final ItemStack item = new ItemStack(Genetics.items().itemSequencer);
item.setItemDamage(sequenced ? 0 : item.getMaxDamage());
final SequencerItem seq = new SequencerItem(gene);
seq.writeToItem(item);
@@ -106,7 +106,7 @@ public class ItemSerum extends ItemGene implements IItemSerum {
}
public static ItemStack create(final IGene gene) {
final ItemStack item = new ItemStack(Genetics.itemSerum);
final ItemStack item = new ItemStack(Genetics.items().itemSerum);
item.setItemDamage(item.getMaxDamage());
final GeneItem seq = new GeneItem(gene);
seq.writeToItem(item);
@@ -121,7 +121,7 @@ public class ItemSerumArray extends ItemGene implements IItemSerum {
}
public static ItemStack create(final IGene gene) {
final ItemStack item = new ItemStack(Genetics.itemSerumArray);
final ItemStack item = new ItemStack(Genetics.items().itemSerumArray);
item.setItemDamage(item.getMaxDamage());
final GeneArrayItem seq = new GeneArrayItem(gene);
seq.writeToItem(item);
@@ -1,152 +0,0 @@
package binnie.genetics.item;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.item.ItemMisc;
import binnie.core.liquid.FluidContainerType;
import binnie.core.resource.BinnieSprite;
import binnie.extrabees.ExtraBees;
import binnie.extratrees.ExtraTrees;
import binnie.genetics.CreativeTabGenetics;
import binnie.genetics.Genetics;
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.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
public class ModuleItem implements IInitializable {
public static BinnieSprite iconNight;
public static BinnieSprite iconDaytime;
public static BinnieSprite iconAllDay;
public static BinnieSprite iconRain;
public static BinnieSprite iconNoRain;
public static BinnieSprite iconSky;
public static BinnieSprite iconNoSky;
public static BinnieSprite iconFire;
public static BinnieSprite iconNoFire;
public static BinnieSprite iconAdd;
public static BinnieSprite iconArrow;
public static BinnieSprite iconAdd0;
public static BinnieSprite iconArrow0;
public static BinnieSprite iconAdd1;
public static BinnieSprite iconArrow1;
@Override
public void preInit() {
Genetics.itemSerum = new ItemSerum();
Genetics.itemSerumArray = new ItemSerumArray();
Genetics.itemSequencer = new ItemSequence();
Genetics.setItemGenetics(new ItemMisc(CreativeTabGenetics.instance, GeneticsItems.values()));
Genetics.proxy.registerItem(Genetics.itemSerum);
Genetics.proxy.registerItem(Genetics.itemSerumArray);
Genetics.proxy.registerItem(Genetics.itemSequencer);
Genetics.proxy.registerItem(Genetics.getItemGenetics());
Genetics.database = new ItemDatabase();
Genetics.analyst = new ItemAnalyst();
Genetics.registry = new ItemRegistry();
Genetics.masterRegistry = new ItemMasterRegistry();
Genetics.proxy.registerItem(Genetics.database);
Genetics.proxy.registerItem(Genetics.analyst);
Genetics.proxy.registerItem(Genetics.registry);
Genetics.proxy.registerItem(Genetics.masterRegistry);
Binnie.LIQUID.createLiquids(GeneticLiquid.values());
}
@Override
public void init() {
ModuleItem.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.night");
ModuleItem.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.day");
ModuleItem.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.allday");
ModuleItem.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.rain");
ModuleItem.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.norain");
ModuleItem.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.sky");
ModuleItem.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nosky");
ModuleItem.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.fire");
ModuleItem.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nofire");
ModuleItem.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add");
ModuleItem.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow");
ModuleItem.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.0");
ModuleItem.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.0");
ModuleItem.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.1");
ModuleItem.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.1");
}
@Override
public void postInit() {
Item itemGenetics = Genetics.getItemGenetics();
GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8),
Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1),
"iii", "iYi", "iii",
'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine")));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2),
"dyePurple", "dyeMagenta", "dyePink"));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2),
"dyeOrange", "dyeYellow", "dustGlowstone"));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2),
new ItemStack(Items.DYE, 1, 15), Items.SUGAR));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1),
" p ", "iGi", " p ",
'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySerum.get(itemGenetics, 1),
" g ", " G ", "GGG",
'g', "ingotGold", 'G', Blocks.GLASS_PANE));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptyGenome.get(itemGenetics, 1),
"sss", "sss", "sss",
's', GeneticsItems.EmptySerum.get(itemGenetics, 1)));
GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8),
" g ", "g g", " ",
'g', Blocks.GLASS_PANE));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1),
"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(itemGenetics, 1),
"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(itemGenetics, 1),
"ccc", "cdc", "ccc",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1)));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1),
"ccc", "cdc", "ccc",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND));
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY,
new ItemStack(Genetics.database),
"X#X", "YEY", "RDR",
'#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN);
GameRegistry.addSmelting(Genetics.itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f);
GameRegistry.addSmelting(Genetics.itemSerum, GeneticsItems.EmptySerum.get(itemGenetics, 1), 0.0f);
GameRegistry.addSmelting(Genetics.itemSerumArray, GeneticsItems.EmptyGenome.get(itemGenetics, 1), 0.0f);
GameRegistry.addShapedRecipe(new ItemStack(Genetics.analyst),
" c ", "cac", " d ",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1),
'a', Mods.Forestry.item("portable_alyzer"),
'd', new ItemStack(Items.DIAMOND));
final Item[] dbs = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database};
if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
for (final Item a2 : dbs) {
for (final Item b2 : dbs) {
for (final Item c2 : dbs) {
for (final Item d : dbs) {
if (a2 != b2 && a2 != c2 && a2 != d && b2 != c2 && b2 != d && c2 != d) {
GameRegistry.addShapedRecipe(new ItemStack(Genetics.registry), " b ", "fct", " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', a2, 't', b2, 'f', c2, 'l', d);
}
}
}
}
}
}
}
}
@@ -0,0 +1,190 @@
package binnie.genetics.item;
import javax.annotation.Nullable;
import com.google.common.base.Preconditions;
import binnie.Binnie;
import binnie.botany.Botany;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.item.ItemMisc;
import binnie.core.liquid.FluidContainerType;
import binnie.core.resource.BinnieSprite;
import binnie.extrabees.ExtraBees;
import binnie.extratrees.ExtraTrees;
import binnie.genetics.CreativeTabGenetics;
import binnie.genetics.Genetics;
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.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
public class ModuleItems implements IInitializable {
public static BinnieSprite iconNight;
public static BinnieSprite iconDaytime;
public static BinnieSprite iconAllDay;
public static BinnieSprite iconRain;
public static BinnieSprite iconNoRain;
public static BinnieSprite iconSky;
public static BinnieSprite iconNoSky;
public static BinnieSprite iconFire;
public static BinnieSprite iconNoFire;
public static BinnieSprite iconAdd;
public static BinnieSprite iconArrow;
public static BinnieSprite iconAdd0;
public static BinnieSprite iconArrow0;
public static BinnieSprite iconAdd1;
public static BinnieSprite iconArrow1;
@Nullable
private Item itemGenetics;
public ItemSerum itemSerum;
public ItemSequence itemSequencer;
public ItemDatabase database;
public ItemAnalyst analyst;
public Item registry;
public Item masterRegistry;
public ItemSerumArray itemSerumArray = null;
@Override
public void preInit() {
itemSerum = new ItemSerum();
Genetics.proxy.registerItem(itemSerum);
itemSerumArray = new ItemSerumArray();
Genetics.proxy.registerItem(itemSerumArray);
database = new ItemDatabase();
Genetics.proxy.registerItem(database);
analyst = new ItemAnalyst();
Genetics.proxy.registerItem(analyst);
registry = new ItemRegistry();
Genetics.proxy.registerItem(registry);
masterRegistry = new ItemMasterRegistry();
Genetics.proxy.registerItem(masterRegistry);
itemGenetics = new ItemMisc(CreativeTabGenetics.instance, GeneticsItems.values());
Genetics.proxy.registerItem(itemGenetics);
itemSequencer = new ItemSequence();
Genetics.proxy.registerItem(itemSequencer);
Binnie.LIQUID.createLiquids(GeneticLiquid.values());
}
public Item getItemGenetics() {
Preconditions.checkState(itemGenetics != null);
return itemGenetics;
}
@Override
public void init() {
ModuleItems.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.night");
ModuleItems.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.day");
ModuleItems.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.allday");
ModuleItems.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.rain");
ModuleItems.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.norain");
ModuleItems.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.sky");
ModuleItems.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nosky");
ModuleItems.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.fire");
ModuleItems.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nofire");
ModuleItems.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add");
ModuleItems.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow");
ModuleItems.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.0");
ModuleItems.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.0");
ModuleItems.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.1");
ModuleItems.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.1");
}
@Override
public void postInit() {
GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8),
Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.LaboratoryCasing.get(itemGenetics, 1),
"iii",
"iYi",
"iii",
'i', "ingotIron", 'Y', Mods.Forestry.item("sturdy_machine")));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.DNADye.get(itemGenetics, 2), "dyePurple", "dyeMagenta", "dyePink"));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.FluorescentDye.get(itemGenetics, 2), "dyeOrange", "dyeYellow", "dustGlowstone"));
GameRegistry.addRecipe(new ShapelessOreRecipe(GeneticsItems.GrowthMedium.get(itemGenetics, 2), new ItemStack(Items.DYE, 1, 15), Items.SUGAR));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySequencer.get(itemGenetics, 1),
" p ",
"iGi",
" p ",
'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySerum.get(itemGenetics, 1),
" g ",
" G ",
"GGG",
'g', "ingotGold", 'G', Blocks.GLASS_PANE));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptyGenome.get(itemGenetics, 1),
"sss",
"sss",
"sss",
's', GeneticsItems.EmptySerum.get(itemGenetics, 1)));
GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8),
" g ",
"g g",
" ",
'g', Blocks.GLASS_PANE));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCircuit.get(itemGenetics, 1),
"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(itemGenetics, 1),
"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(itemGenetics, 1),
"ccc",
"cdc",
"ccc",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', GeneticsItems.LaboratoryCasing.get(itemGenetics, 1)));
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.IntegratedCPU.get(itemGenetics, 1),
"ccc",
"cdc",
"ccc",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'd', Items.DIAMOND));
RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY,
new ItemStack(database),
"X#X",
"YEY",
"RDR",
'#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN);
GameRegistry.addSmelting(itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f);
GameRegistry.addSmelting(itemSerum, GeneticsItems.EmptySerum.get(itemGenetics, 1), 0.0f);
GameRegistry.addSmelting(itemSerumArray, GeneticsItems.EmptyGenome.get(itemGenetics, 1), 0.0f);
GameRegistry.addShapedRecipe(new ItemStack(analyst),
" c ",
"cac",
" d ",
'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND));
Item[] databases = {ExtraBees.dictionary, ExtraTrees.items().itemDictionary, ExtraTrees.items().itemDictionaryLepi, Botany.database};
if (BinnieCore.isBotanyActive() && BinnieCore.isExtraBeesActive() && BinnieCore.isExtraTreesActive()) {
for (Item databaseA : databases) {
for (Item databaseB : databases) {
for (Item databaseC : databases) {
for (Item databaseD : databases) {
if (databaseA != databaseB && databaseA != databaseC && databaseA != databaseD && databaseB != databaseC && databaseB != databaseD && databaseC != databaseD) {
GameRegistry.addShapedRecipe(new ItemStack(registry),
" b ",
"fct",
" l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', databaseA, 't', databaseB, 'f', databaseC, 'l', databaseD);
}
}
}
}
}
}
}
}
@@ -27,7 +27,8 @@ public enum AdvGeneticMachine implements IMachineType {
}
public ItemStack get(final int i) {
return new ItemStack(Genetics.packageAdvGenetic.getBlock(), i, this.ordinal());
Genetics.machine();
return new ItemStack(ModuleMachine.packageAdvGenetic.getBlock(), i, this.ordinal());
}
public abstract static class PackageAdvGeneticBase extends GeneticMachine.PackageGeneticBase {
@@ -38,7 +38,8 @@ public enum GeneticMachine implements IMachineType {
}
public ItemStack get(final int i) {
return new ItemStack(Genetics.packageGenetic.getBlock(), i, this.ordinal());
Genetics.machine();
return new ItemStack(ModuleMachine.packageGenetic.getBlock(), i, this.ordinal());
}
public abstract static class PackageGeneticBase extends MachinePackage {
@@ -44,7 +44,8 @@ public enum LaboratoryMachine implements IMachineType {
}
public ItemStack get(final int amount) {
return new ItemStack(Genetics.packageLabMachine.getBlock(), amount, this.ordinal());
Genetics.machine();
return new ItemStack(ModuleMachine.packageLabMachine.getBlock(), amount, this.ordinal());
}
public static class PackageLabMachine extends GeneticMachine.PackageGeneticBase {
@@ -23,12 +23,16 @@ public class ModuleMachine implements IInitializable {
public static ValidatorSprite spriteDye;
public static ValidatorSprite spriteBacteria;
public static ValidatorSprite spriteNugget;
public static MachineGroup packageGenetic;
public static MachineGroup packageAdvGenetic;
public static MachineGroup packageLabMachine;
@Override
public void preInit() {
(Genetics.packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
(Genetics.packageLabMachine = new MachineGroup(Genetics.instance, "lab_machine", "lab_machine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
(Genetics.packageAdvGenetic = new MachineGroup(Genetics.instance, "adv_machine", "adv_machine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
(packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
(packageLabMachine = new MachineGroup(Genetics.instance, "lab_machine", "lab_machine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
(packageAdvGenetic = new MachineGroup(Genetics.instance, "adv_machine", "adv_machine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
}
@Override
@@ -13,7 +13,7 @@ public class SlotValidatorUnsequenced extends SlotValidator {
@Override
public boolean isValid(final ItemStack itemStack) {
if (itemStack.getItem() == Genetics.itemSequencer) {
if (itemStack.getItem() == Genetics.items().itemSequencer) {
final SequencerItem seq = SequencerItem.create(itemStack);
return seq != null && seq.sequenced < 100;
}