Improve code readability in binnie.extrabees package and other packages

* Improve code readability in binnie.extrabees package and other packages
* Fix compile error after refactoring
This commit is contained in:
Alexander Kornilov authored and marcin212 committed 2017-04-29 13:43:35 +02:00
1 parent b609d6688f
commit c09ad04284
95 files changed
+3916 -3900

No files matched your search

@@ -1,36 +1,30 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.apiary;
import forestry.api.circuits.ICircuitLayout;
import binnie.extrabees.apiary.machine.AlvearyStimulator;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.ShapedOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.init.Items;
import binnie.core.Mods;
import binnie.extrabees.apiary.machine.AlvearyMutator;
import net.minecraft.item.ItemStack;
import net.minecraft.init.Blocks;
import binnie.core.BinnieCore;
import forestry.api.core.Tabs;
import binnie.core.machines.MachineGroup;
import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.ExtraBees;
import binnie.core.circuits.BinnieCircuitLayout;
import net.minecraft.block.Block;
import binnie.core.IInitializable;
import binnie.core.Mods;
import binnie.core.circuits.BinnieCircuitLayout;
import binnie.core.machines.MachineGroup;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.apiary.machine.AlvearyMachine;
import binnie.extrabees.apiary.machine.AlvearyMutator;
import binnie.extrabees.apiary.machine.AlvearyStimulator;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.core.Tabs;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.ShapedOreRecipe;
public class ModuleApiary implements IInitializable
{
public class ModuleApiary implements IInitializable {
public static Block blockComponent;
BinnieCircuitLayout stimulatorLayout;
protected BinnieCircuitLayout stimulatorLayout;
@Override
public void preInit() {
final MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
MachineGroup machineGroup = new MachineGroup(ExtraBees.instance, "alveay", "alveary", AlvearyMachine.values());
machineGroup.setCreativeTab(Tabs.tabApiculture);
BinnieCore.proxy.registerTileEntity(TileExtraBeeAlveary.class, "extrabees.tile.alveary", BinnieCore.proxy.createObject("binnie.core.machines.RendererMachine"));
ModuleApiary.blockComponent = machineGroup.getBlock();
@@ -44,7 +38,8 @@ public class ModuleApiary implements IInitializable
AlvearyMutator.addMutationItem(Mods.IC2.stack("Uran238"), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_pearl), 2.0f);
AlvearyMutator.addMutationItem(new ItemStack(Items.ender_eye), 4.0f);
for (final EnumHiveFrame frame : EnumHiveFrame.values()) {
for (EnumHiveFrame frame : EnumHiveFrame.values()) {
GameRegistry.registerItem(frame.item = new ItemHiveFrame(frame), "hiveFrame." + frame.name().toLowerCase());
}
}
@@ -52,20 +47,72 @@ public class ModuleApiary implements IInitializable
@Override
public void postInit() {
EnumHiveFrame.init();
GameRegistry.addRecipe(AlvearyMachine.Mutator.get(1), new Object[] { "g g", " a ", "t t", 'g', Items.gold_ingot, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 5) });
GameRegistry.addRecipe(AlvearyMachine.Frame.get(1), new Object[] { "iii", "tat", " t ", 'i', Items.iron_ingot, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4) });
GameRegistry.addRecipe(AlvearyMachine.RainShield.get(1), new Object[] { " b ", "bab", "t t", 'b', Items.brick, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4) });
GameRegistry.addRecipe(AlvearyMachine.Lighting.get(1), new Object[] { "iii", "iai", " t ", 'i', Items.glowstone_dust, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4) });
GameRegistry.addRecipe(AlvearyMachine.Stimulator.get(1), new Object[] { "kik", "iai", " t ", 'i', Items.gold_nugget, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4), 'k', new ItemStack(Mods.Forestry.item("chipsets"), 1, 2) });
GameRegistry.addRecipe(AlvearyMachine.Hatchery.get(1), new Object[] { "i i", " a ", "iti", 'i', Blocks.glass_pane, 'a', Mods.Forestry.block("alveary"), 't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 5) });
GameRegistry.addRecipe(new ShapedOreRecipe(AlvearyMachine.Transmission.get(1), new Object[] { " t ", "tat", " t ", 'a', Mods.Forestry.block("alveary"), 't', "gearTin" }));
for (final AlvearyStimulator.CircuitType type : AlvearyStimulator.CircuitType.values()) {
type.createCircuit(this.stimulatorLayout);
GameRegistry.addRecipe(
AlvearyMachine.Mutator.get(1),
"g g", " a ", "t t",
'g', Items.gold_ingot,
'a', Mods.Forestry.block("alveary"),
't',
new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 5)
);
GameRegistry.addRecipe(
AlvearyMachine.Frame.get(1),
"iii", "tat", " t ",
'i', Items.iron_ingot,
'a', Mods.Forestry.block("alveary"),
't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.RainShield.get(1),
" b ", "bab", "t t",
'b', Items.brick,
'a', Mods.Forestry.block("alveary"),
't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.Lighting.get(1),
"iii", "iai", " t ",
'i', Items.glowstone_dust,
'a', Mods.Forestry.block("alveary"),
't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4)
);
GameRegistry.addRecipe(
AlvearyMachine.Stimulator.get(1),
"kik", "iai", " t ",
'i', Items.gold_nugget,
'a', Mods.Forestry.block("alveary"),
't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 4),
'k', new ItemStack(Mods.Forestry.item("chipsets"), 1, 2)
);
GameRegistry.addRecipe(
AlvearyMachine.Hatchery.get(1),
"i i", " a ", "iti",
'i', Blocks.glass_pane,
'a', Mods.Forestry.block("alveary"),
't', new ItemStack(Mods.Forestry.item("thermionicTubes"), 1, 5)
);
GameRegistry.addRecipe(new ShapedOreRecipe(
AlvearyMachine.Transmission.get(1),
new Object[]{
" t ", "tat", " t ",
'a', Mods.Forestry.block("alveary"),
't', "gearTin"
}
));
for (AlvearyStimulator.CircuitType type : AlvearyStimulator.CircuitType.values()) {
type.createCircuit(stimulatorLayout);
}
}
@Override
public void init() {
this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator");
stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator");
}
}