mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-17 11:05:32 +00:00
Improve code readability in binnie.genetics package
Drop unused (empty) method MachinePackage#register() from all classes
This commit is contained in:
1 parent
856f08b752
commit
730043ba9c
112 files changed
+4354
-4697
No files matched your search
@@ -1,39 +1,38 @@
|
||||
//
|
||||
// Decompiled by Procyon v0.5.30
|
||||
//
|
||||
|
||||
package binnie.genetics.machine;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.init.Items;
|
||||
import binnie.core.BinnieCore;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import binnie.genetics.item.GeneticsItems;
|
||||
import binnie.core.Mods;
|
||||
import binnie.genetics.CreativeTabGenetics;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.core.machines.inventory.ValidatorIcon;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.core.Mods;
|
||||
import binnie.core.machines.MachineGroup;
|
||||
import binnie.core.machines.inventory.ValidatorIcon;
|
||||
import binnie.genetics.CreativeTabGenetics;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.item.GeneticsItems;
|
||||
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
|
||||
{
|
||||
public class ModuleMachine implements IInitializable {
|
||||
public static ValidatorIcon IconDye;
|
||||
static ValidatorIcon IconSequencer;
|
||||
static ValidatorIcon IconSerum;
|
||||
static ValidatorIcon IconEnzyme;
|
||||
public static ValidatorIcon IconDye;
|
||||
static ValidatorIcon IconBacteria;
|
||||
static ValidatorIcon IconNugget;
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
(Genetics.packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageLabMachine = new MachineGroup(Genetics.instance, "labMachine", "labMachine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageAdvGenetic = new MachineGroup(Genetics.instance, "advMachine", "advMachine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
Genetics.packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values());
|
||||
Genetics.packageGenetic.setCreativeTab(CreativeTabGenetics.instance);
|
||||
|
||||
Genetics.packageLabMachine = new MachineGroup(Genetics.instance, "labMachine", "labMachine", LaboratoryMachine.values());
|
||||
Genetics.packageLabMachine.setCreativeTab(CreativeTabGenetics.instance);
|
||||
|
||||
Genetics.packageAdvGenetic = new MachineGroup(Genetics.instance, "advMachine", "advMachine", AdvGeneticMachine.values());
|
||||
Genetics.packageAdvGenetic.setCreativeTab(CreativeTabGenetics.instance);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -50,36 +49,145 @@ public class ModuleMachine implements IInitializable
|
||||
@Override
|
||||
public void postInit() {
|
||||
Acclimatiser.setupRecipes();
|
||||
final Object[] standardCircuit = { Mods.Forestry.stack("chipsets", 1, 1) };
|
||||
final Object[] advCircuit = { GeneticsItems.IntegratedCircuit.get(1) };
|
||||
final String ironGear = OreDictionary.getOres("gearIron").isEmpty() ? "gearIron" : "ingotIron";
|
||||
final String goldGear = OreDictionary.getOres("gearGold").isEmpty() ? "gearIron" : "ingotIron";
|
||||
final String diamondGear = OreDictionary.getOres("gearDiamond").isEmpty() ? "gearIron" : "ingotIron";
|
||||
for (final Object circuit : standardCircuit) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Incubator.get(1), new Object[] { "gFg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'F', Blocks.furnace, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', ironGear }));
|
||||
Object[] standardCircuit = {Mods.Forestry.stack("chipsets", 1, 1)};
|
||||
Object[] advCircuit = {GeneticsItems.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";
|
||||
|
||||
for (Object circuit : standardCircuit) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
LaboratoryMachine.Incubator.get(1),
|
||||
new Object[]{
|
||||
"gFg", "cCc", "aPa",
|
||||
'C', GeneticsItems.LaboratoryCasing.get(1),
|
||||
'F', Blocks.furnace,
|
||||
'c', circuit,
|
||||
'g', Blocks.glass_pane,
|
||||
'P', "gearBronze",
|
||||
'a', ironGear
|
||||
}
|
||||
));
|
||||
|
||||
Item alyzer = null;
|
||||
if (BinnieCore.isApicultureActive()) {
|
||||
alyzer = Mods.Forestry.item("beealyzer");
|
||||
}
|
||||
else if (BinnieCore.isArboricultureActive()) {
|
||||
} else if (BinnieCore.isArboricultureActive()) {
|
||||
alyzer = Mods.Forestry.item("treealyzer");
|
||||
}
|
||||
else if (BinnieCore.isArboricultureActive()) {
|
||||
} else if (BinnieCore.isArboricultureActive()) {
|
||||
alyzer = Mods.Forestry.item("flutterlyzer");
|
||||
}
|
||||
|
||||
if (alyzer != null) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Analyser.get(1), new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', alyzer, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', GeneticsItems.DNADye.get(1) }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
LaboratoryMachine.Analyser.get(1),
|
||||
new Object[]{
|
||||
"gBg", "cCc", "aPa",
|
||||
'C', GeneticsItems.LaboratoryCasing.get(1),
|
||||
'B', alyzer,
|
||||
'c', circuit,
|
||||
'g', Blocks.glass_pane,
|
||||
'P', "gearBronze",
|
||||
'a', GeneticsItems.DNADye.get(1)
|
||||
}
|
||||
));
|
||||
}
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.Genepool.get(1), new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.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', Items.lava_bucket, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', Items.water_bucket }));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
LaboratoryMachine.Genepool.get(1),
|
||||
new Object[]{
|
||||
"gBg", "cCc", "aPa",
|
||||
'C', GeneticsItems.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', Items.lava_bucket,
|
||||
'c', circuit,
|
||||
'g', Blocks.glass_pane,
|
||||
'P', "gearBronze",
|
||||
'a', Items.water_bucket
|
||||
}
|
||||
));
|
||||
}
|
||||
for (final Object circuit : advCircuit) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Isolator.get(1), new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', goldGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', GeneticsItems.Enzyme.get(1) }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Polymeriser.get(1), new Object[] { "gBg", "cCc", "gPg", 'C', GeneticsItems.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', "gearBronze", 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', GeneticsItems.FluorescentDye.get(1) }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(GeneticMachine.Inoculator.get(1), new Object[] { "gBg", "cCc", "aPa", 'C', GeneticsItems.LaboratoryCasing.get(1), 'B', diamondGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', Items.emerald }));
|
||||
|
||||
for (Object circuit : advCircuit) {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticMachine.Isolator.get(1),
|
||||
new Object[]{
|
||||
"gBg", "cCc", "aPa",
|
||||
'C', GeneticsItems.LaboratoryCasing.get(1),
|
||||
'B', goldGear,
|
||||
'c', circuit,
|
||||
'g', Items.gold_nugget,
|
||||
'P', "gearBronze",
|
||||
'a', GeneticsItems.Enzyme.get(1)
|
||||
}
|
||||
));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticMachine.Polymeriser.get(1),
|
||||
new Object[]{
|
||||
"gBg", "cCc", "gPg",
|
||||
'C', GeneticsItems.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', "gearBronze", 'c', circuit,
|
||||
'g', Items.gold_nugget,
|
||||
'P', "gearBronze",
|
||||
'a', GeneticsItems.FluorescentDye.get(1)
|
||||
}
|
||||
));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
GeneticMachine.Inoculator.get(1),
|
||||
new Object[]{
|
||||
"gBg", "cCc", "aPa",
|
||||
'C', GeneticsItems.LaboratoryCasing.get(1),
|
||||
'B', diamondGear,
|
||||
'c', circuit,
|
||||
'g', Items.gold_nugget,
|
||||
'P', "gearBronze",
|
||||
'a', Items.emerald
|
||||
}
|
||||
));
|
||||
}
|
||||
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', "gearBronze", 'a', Items.blaze_rod }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(LaboratoryMachine.LabMachine.get(1), new Object[] { "igi", "gCg", "igi", 'C', GeneticsItems.LaboratoryCasing.get(1), 'i', "ingotIron", 'g', Blocks.glass_pane }));
|
||||
|
||||
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', "gearBronze",
|
||||
'a', Items.blaze_rod
|
||||
}
|
||||
));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(
|
||||
LaboratoryMachine.LabMachine.get(1),
|
||||
new Object[]{
|
||||
"igi", "gCg", "igi",
|
||||
'C', GeneticsItems.LaboratoryCasing.get(1),
|
||||
'i', "ingotIron",
|
||||
'g', Blocks.glass_pane
|
||||
}
|
||||
));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user