diff options
| author | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-31 22:16:31 +1000 |
|---|---|---|
| committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-01-31 22:16:31 +1000 |
| commit | 7a1c92118a53b5bc6294d65361e16c5859597a10 (patch) | |
| tree | 2dba81c7d2eb78e48ceba687af6aaaa1de746289 /src/Java/gtPlusPlus/core/recipe | |
| parent | c793ff869c74bae8c35516042f5ae883aeb270c9 (diff) | |
| download | GT5-Unofficial-7a1c92118a53b5bc6294d65361e16c5859597a10.tar.gz GT5-Unofficial-7a1c92118a53b5bc6294d65361e16c5859597a10.tar.bz2 GT5-Unofficial-7a1c92118a53b5bc6294d65361e16c5859597a10.zip | |
$ Finished ASM for getDrops() GT fix.
% Mild re-arrangement to CI.java.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/common/CI.java | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java index f9dc105792..03bf3a6020 100644 --- a/src/Java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java @@ -171,20 +171,7 @@ public class CI { public static ItemStack explosiveTNT; public static ItemStack explosiveITNT; - public static void Init(){ - - //Set Explosives - if (ItemList.valueOf("Block_Powderbarrel") != null){ - explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1); - } - else { - explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder); - } - explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt); - explosiveITNT = Ic2Items.industrialTnt.copy(); - - - + public static void preInit(){ //Tiered Components component_Plate = new String[]{ @@ -241,39 +228,7 @@ public class CI { circuitTier7 = getTieredCircuit(7); circuitTier8 = getTieredCircuit(8); circuitTier9 = getTieredCircuit(9); - - //Machine Components - LOADER_Machine_Components.initialise(); - - //Machine Casings - machineCasing_ULV = ItemList.Casing_ULV.get(1); - machineCasing_LV = ItemList.Casing_LV.get(1); - machineCasing_MV = ItemList.Casing_MV.get(1); - machineCasing_HV = ItemList.Casing_HV.get(1); - machineCasing_EV = ItemList.Casing_EV.get(1); - machineCasing_IV = ItemList.Casing_IV.get(1); - machineCasing_LuV = ItemList.Casing_LuV.get(1); - machineCasing_ZPM = ItemList.Casing_ZPM.get(1); - machineCasing_UV = ItemList.Casing_UV.get(1); - machineCasing_MAX = ItemList.Casing_MAX.get(1); - - //Machine Hulls - machineHull_ULV = ItemList.Hull_ULV.get(1); - machineHull_LV = ItemList.Hull_LV.get(1); - machineHull_MV = ItemList.Hull_MV.get(1); - machineHull_HV = ItemList.Hull_HV.get(1); - machineHull_EV = ItemList.Hull_EV.get(1); - machineHull_IV = ItemList.Hull_IV.get(1); - machineHull_LuV = ItemList.Hull_LuV.get(1); - machineHull_ZPM = ItemList.Hull_ZPM.get(1); - machineHull_UV = ItemList.Hull_UV.get(1); - machineHull_MAX = ItemList.Hull_MAX.get(1); - - //Gear box Casings - gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); - gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); - gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); - gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + } public static Object getTieredCircuit(int tier){ @@ -500,5 +455,50 @@ public class CI { return machineCasing_MAX; } } + + public static void init() { + //Set Explosives + if (ItemList.valueOf("Block_Powderbarrel") != null){ + explosivePowderKeg = ItemList.valueOf("Block_Powderbarrel").get(1); + } + else { + explosivePowderKeg = ItemUtils.getSimpleStack(Items.gunpowder); + } + explosiveTNT = ItemUtils.getSimpleStack(Blocks.tnt); + explosiveITNT = Ic2Items.industrialTnt.copy(); + + //Machine Casings + machineCasing_ULV = ItemList.Casing_ULV.get(1); + machineCasing_LV = ItemList.Casing_LV.get(1); + machineCasing_MV = ItemList.Casing_MV.get(1); + machineCasing_HV = ItemList.Casing_HV.get(1); + machineCasing_EV = ItemList.Casing_EV.get(1); + machineCasing_IV = ItemList.Casing_IV.get(1); + machineCasing_LuV = ItemList.Casing_LuV.get(1); + machineCasing_ZPM = ItemList.Casing_ZPM.get(1); + machineCasing_UV = ItemList.Casing_UV.get(1); + machineCasing_MAX = ItemList.Casing_MAX.get(1); + + //Machine Hulls + machineHull_ULV = ItemList.Hull_ULV.get(1); + machineHull_LV = ItemList.Hull_LV.get(1); + machineHull_MV = ItemList.Hull_MV.get(1); + machineHull_HV = ItemList.Hull_HV.get(1); + machineHull_EV = ItemList.Hull_EV.get(1); + machineHull_IV = ItemList.Hull_IV.get(1); + machineHull_LuV = ItemList.Hull_LuV.get(1); + machineHull_ZPM = ItemList.Hull_ZPM.get(1); + machineHull_UV = ItemList.Hull_UV.get(1); + machineHull_MAX = ItemList.Hull_MAX.get(1); + + //Gear box Casings + gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); + gearboxCasing_Tier_2 = ItemList.Casing_Gearbox_Steel.get(1); + gearboxCasing_Tier_3 = ItemList.Casing_Gearbox_Titanium.get(1); + gearboxCasing_Tier_4 = ItemList.Casing_Gearbox_TungstenSteel.get(1); + + //Machine Components + LOADER_Machine_Components.initialise(); + } } |