aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-06-02 11:45:15 +1000
committerAlkalus <draknyte1@hotmail.com>2017-06-02 11:45:15 +1000
commita3735e8ef75eb98de7493d706d5b8d163fed9d25 (patch)
tree9b7562815ef1f85b44372fd29f45679ec99777f5 /src/Java
parenta42dc8bfc43bf088447db6e4c92d3e1a8bd11a30 (diff)
downloadGT5-Unofficial-a3735e8ef75eb98de7493d706d5b8d163fed9d25.tar.gz
GT5-Unofficial-a3735e8ef75eb98de7493d706d5b8d163fed9d25.tar.bz2
GT5-Unofficial-a3735e8ef75eb98de7493d706d5b8d163fed9d25.zip
+ Added ULV component Recipes.
+ Added a small wrought iron gear if it doesn't exist. + Added a Lithium plate if it doesn't exist.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java20
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java69
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java204
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java54
5 files changed, 232 insertions, 123 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index b6953456b1..f093d7bf41 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -13,6 +13,7 @@ import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust;
import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust;
import gtPlusPlus.core.item.base.foods.BaseItemFood;
import gtPlusPlus.core.item.base.foods.BaseItemHotFood;
+import gtPlusPlus.core.item.base.gears.BaseItemSmallGear;
import gtPlusPlus.core.item.base.ingots.BaseItemIngot_OLD;
import gtPlusPlus.core.item.base.misc.BaseItemMisc;
import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
@@ -199,6 +200,9 @@ public final class ModItems {
public static Fluid fluidFLiBeSalt;
+ public static Item itemSmallWroughtIronGear;
+ public static Item itemPlateLithium;
+
public static final void init(){
@@ -429,8 +433,6 @@ public final class ModItems {
dustTerra = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().TERRA, true)[0];
dustAqua = ItemUtils.generateSpecialUseDusts(ELEMENT.getInstance().AQUA, true)[0];
-
-
//Nuclear Fuel Dusts
dustLithiumCarbonate = ItemUtils.generateSpecialUseDusts("LithiumCarbonate", "Lithium Carbonate", Utils.rgbtoHexValue(240, 240, 240))[0]; //https://en.wikipedia.org/wiki/Lithium_carbonate
dustLithiumPeroxide = ItemUtils.generateSpecialUseDusts("LithiumPeroxide", "Lithium Peroxide", Utils.rgbtoHexValue(250, 250, 250))[0]; //https://en.wikipedia.org/wiki/Lithium_peroxide
@@ -521,7 +523,17 @@ public final class ModItems {
//Just an unusual plate needed for some black magic.
itemPlateClay = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay));
-
+
+ //A small gear needed for wizardry.
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){
+ itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron));
+ }
+
+ //A plate of Lithium.
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null){
+ itemPlateLithium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Lithium));
+ }
+
//Misc Items
Item tI;
tI = new BaseItemMisc("Chilly", new short[]{0,64,196}, 32, MiscTypes.POTION, new String[]{"It's Blue"});
@@ -660,7 +672,7 @@ public final class ModItems {
if (configSwitches.enableAlternativeBatteryAlloy) {
//ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0); TODO
ModItems.itemPlateBatteryAlloy = ItemUtils.generateSpecialUsePlate("itemPlateBatteryAlloy", "Battery Alloy", new short[]{35, 228, 141}, 0);
-
+
}
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
index 4729b2182a..54be041972 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -64,6 +64,9 @@ public class BaseItemComponent extends Item{
if (this.componentType == ComponentTypes.GEAR){
return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt";
}
+ else if (this.componentType == ComponentTypes.SMALLGEAR){
+ return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGtSmall";
+ }
else if (this.componentType == ComponentTypes.ROD){
return "gregtech" + ":" + "materialicons/METALLIC/" + "stick";
}
@@ -79,6 +82,10 @@ public class BaseItemComponent extends Item{
@Override
public String getItemStackDisplayName(final ItemStack p_77653_1_) {
+ if (this.componentType == ComponentTypes.SMALLGEAR){
+ return "Small " + this.materialName+" Gear";
+ }
+
if (this.componentMaterial != null) {
return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME);
}
@@ -181,6 +188,7 @@ public class BaseItemComponent extends Item{
ROD("Rod", " Rod", "stick"),
RODLONG("RodLong", " Long Rod", "stickLong"),
GEAR("Gear", " Gear", "gear"),
+ SMALLGEAR("SmallGear", " Gear", "gearGtSmall"), //TODO
SCREW("Screw", " Screw", "screw"),
BOLT("Bolt", " Bolt", "bolt"),
ROTOR("Rotor", " Rotor", "rotor"),
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index fa8dad30b5..17abf3f06e 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -10,13 +10,17 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
public class RECIPES_MachineComponents {
//Wire
+ static String wireTier0 = "wireGt01Lead";
+ static String wireTier1 = "wireGt01RedAlloy";
static String wireTier6 = "wireGt08NiobiumTitanium";
static String wireTier7 = "wireGt08Osmium";
static String wireTier8 = "wireGt08Naquadah";
static String wireTier9 = "wireGt08Superconductor";
static String wireTier10 = "wireGt16Superconductor";
- //Wire
+ //Cable
+ static String cableTier0 = "cableGt01Lead";
+ static String cableTier1 = "cableGt01RedAlloy";
static String cableTier6 = "cableGt04Tungsten";
static String cableTier7 = "cableGt04NiobiumTitanium";
static String cableTier8 = "cableGt04Osmium";
@@ -24,12 +28,16 @@ public class RECIPES_MachineComponents {
static String cableTier10 = "wireGt08Superconductor";
//Plates
+ static String plateTier0 = "plateWroughtIron";
static String plateTier7 = "plateChrome";
static String plateTier8 = "plateIridium";
static String plateTier9 = "plateOsmium";
static String plateTier10 = "plateNeutronium";
//rods
+ static String rodTier0 = "stickWroughtIron";
+ static String rodTier1 = "stickPotin";
+ static String rodTier2 = "stickIronMagnetic";
static String rodTier7a = "stickChrome";
static String rodTier8a = "stickIridium";
static String rodTier9a = "stickOsmium";
@@ -44,18 +52,21 @@ public class RECIPES_MachineComponents {
static String rodTier10c = "stickOsmium";
//Screws
+ static String screwTier0 = "screwPotin";
static String screwTier7 = "screwChrome";
static String screwTier8 = "screwIridium";
static String screwTier9 = "screwOsmium";
static String screwTier10 = "screwNeutronium";
//Rotors
+ static String rotorTier0 = "rotorPotin";
static String rotorTier7 = "rotorChrome";
static String rotorTier8 = "rotorIridium";
static String rotorTier9 = "rotorOsmium";
static String rotorTier10 = "rotorNeutronium";
//Fluid Pipe
+ static String pipeTier0 = "pipeSmallLead";
static String pipeTier7 = "pipeHugeSteel";
static String pipeTier8 = "pipeHugeStainlessSteel";
static String pipeTier9 = "pipeHugeTitanium";
@@ -66,6 +77,8 @@ public class RECIPES_MachineComponents {
static String plateRubber = "plateRubber";
//Circuits
+ static String circuitTier0 = "circuitPrimitive";
+ static String circuitTier1 = "circuitBasic";
static String circuitTier6 = "circuitMaster";
static String circuitTier7 = "circuitUltimate";
static String circuitTier8 = "circuitSymbiotic";
@@ -73,6 +86,7 @@ public class RECIPES_MachineComponents {
static String circuitTier10 = "circuitQuantum";
//small gears
+ static String smallGearTier0 = "gearGtSmallWroughtIron";
static String smallGearTier7 = "gearGtSmallChrome";
static String smallGearTier8 = "gearGtSmallIridium";
static String smallGearTier9 = "gearGtSmallOsmium";
@@ -88,6 +102,7 @@ public class RECIPES_MachineComponents {
run();
}
else {
+ onlyULVComponents();
onlyMaxComponents();
}
GregtechMachinePhase();
@@ -270,9 +285,61 @@ public class RECIPES_MachineComponents {
circuitTier10, plateTier10, plateTier10,
RECIPE_CONSTANTS.sensor_MAX);
+ onlyULVComponents();
+
Utils.LOG_INFO("Done loading recipes for the Various machine components.");
}
+
+ private static void onlyULVComponents(){
+ RecipeUtils.addShapedGregtechRecipe(
+ cableTier1, wireTier0, rodTier0,
+ wireTier0, rodTier2, wireTier0,
+ rodTier0, wireTier0, cableTier1,
+ RECIPE_CONSTANTS.electricMotor_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ cableTier0, rotorTier0, itemRubberRing,
+ craftingToolScrewdriver, pipeTier0, craftingToolWrench,
+ itemRubberRing, RECIPE_CONSTANTS.electricMotor_ULV, cableTier0,
+ RECIPE_CONSTANTS.electricPump_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier0, plateTier0, plateTier0,
+ cableTier0, rodTier1, rodTier1,
+ cableTier0, RECIPE_CONSTANTS.electricMotor_ULV, smallGearTier0,
+ RECIPE_CONSTANTS.electricPiston_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ cableTier0, cableTier0, cableTier0,
+ RECIPE_CONSTANTS.electricMotor_ULV, rodTier1, RECIPE_CONSTANTS.electricMotor_ULV,
+ RECIPE_CONSTANTS.electricPiston_ULV, circuitTier0, rodTier1,
+ RECIPE_CONSTANTS.robotArm_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ plateRubber, plateRubber, plateRubber,
+ RECIPE_CONSTANTS.electricMotor_ULV, cableTier0, RECIPE_CONSTANTS.electricMotor_ULV,
+ plateRubber, plateRubber, plateRubber,
+ RECIPE_CONSTANTS.conveyorModule_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ rodTier2, rodTier2, circuitTier0,
+ cableTier0, circuitTier1, rodTier2,
+ circuitTier0, cableTier0, rodTier2,
+ RECIPE_CONSTANTS.emitter_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ wireTier0, circuitTier0, wireTier0,
+ circuitTier0, circuitTier1, circuitTier0,
+ wireTier0, circuitTier0, wireTier0,
+ RECIPE_CONSTANTS.fieldGenerator_ULV);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier0, null, circuitTier1,
+ plateTier0, rodTier2, null,
+ circuitTier0, plateTier0, plateTier0,
+ RECIPE_CONSTANTS.sensor_ULV);
+ }
private static void onlyMaxComponents(){
RecipeUtils.addShapedGregtechRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index baa4b546eb..9b786c5a73 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -639,104 +639,104 @@ public class RECIPES_Machines {
//Tiered Tanks
if (CORE.configSwitches.enableMachine_FluidTanks){
- Utils.LOG_INFO("Is New Horizons Loaded? "+CORE.GTNH);
- if (!CORE.GTNH){
- RecipeUtils.addShapedGregtechRecipe(
- plateTier1, plateTier1, plateTier1,
- plateTier1, pipeTier1, plateTier1,
- plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1,
- GregtechItemList.GT_FluidTank_ULV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier2, plateTier2, plateTier2,
- plateTier2, pipeTier2, plateTier2,
- plateTier2, electricPump_LV, plateTier2,
- GregtechItemList.GT_FluidTank_LV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier3, plateTier3, plateTier3,
- plateTier3, pipeTier3, plateTier3,
- plateTier3, electricPump_MV, plateTier3,
- GregtechItemList.GT_FluidTank_MV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier4, plateTier4, plateTier4,
- plateTier4, pipeTier4, plateTier4,
- plateTier4, electricPump_HV, plateTier4,
- GregtechItemList.GT_FluidTank_HV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier5, plateTier5, plateTier5,
- plateTier5, pipeTier5, plateTier5,
- plateTier5, electricPump_EV, plateTier5,
- GregtechItemList.GT_FluidTank_EV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier6, plateTier6, plateTier6,
- plateTier6, pipeTier6, plateTier6,
- plateTier6, electricPump_IV, plateTier6,
- GregtechItemList.GT_FluidTank_IV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier7, plateTier7, plateTier7,
- plateTier7, pipeTier7, plateTier7,
- plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7,
- GregtechItemList.GT_FluidTank_LuV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier8, plateTier8, plateTier8,
- plateTier8, pipeTier8, plateTier8,
- plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8,
- GregtechItemList.GT_FluidTank_ZPM.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier9, plateTier9, plateTier9,
- plateTier9, pipeTier9, plateTier9,
- plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9,
- GregtechItemList.GT_FluidTank_UV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier10, plateTier10, plateTier10,
- plateTier10, pipeTier10, plateTier10,
- plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10,
- GregtechItemList.GT_FluidTank_MAX.get(1));
- }
- else {
-
- plateTier1 = "plateTin";
- pipeTier1 = "pipeLargeClay";
- circuitTier1 = "circuitPrimitive";
- plateTier2 = "plateCopper";
- pipeTier2 = "pipeHugeClay";
- plateTier3 = "plateBronze";
- pipeTier3 = "pipeMediumBronze";
- plateTier4 = "plateIron";
- pipeTier4 = "pipeMediumSteel";
- plateTier5 = "plateSteel";
- plateTier6 = "plateRedstone";
- plateTier7 = "plateRedstoneAlloy";
- plateTier8 = "plateDarkSteel";
- ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
-
-
- Utils.LOG_INFO("Loading New Horizon Tanks, with custom recipes.");
- Utils.LOG_INFO("Using "+plateTier1+" with "+pipeTier1);
- Utils.LOG_INFO("Using "+plateTier2+" with "+pipeTier2);
- Utils.LOG_INFO("Using " + plateTier3 + " with " + pipeTier3);
- Utils.LOG_INFO("Using " + plateTier4 + " with " + pipeTier4);
-
- RecipeUtils.addShapedGregtechRecipe(
- plateTier1, plateTier4, plateTier1,
- plateTier1, pipeTier1, plateTier1,
- plateTier1, waterBucket, plateTier1,
- GregtechItemList.GT_FluidTank_ULV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier2, plateTier5, plateTier2,
- plateTier2, pipeTier2, plateTier2,
- plateTier2, electricPump_LV, plateTier2,
- GregtechItemList.GT_FluidTank_LV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- plateTier6, plateTier7, plateTier6,
- plateTier3, pipeTier3, plateTier3,
- plateTier6, electricPump_LV, plateTier6,
- GregtechItemList.GT_FluidTank_MV.get(1));
- RecipeUtils.addShapedGregtechRecipe(
- circuitTier1, plateTier8, circuitTier1,
- plateTier4, pipeTier4, plateTier4,
- circuitTier1, electricPump_LV, circuitTier1,
- GregtechItemList.GT_FluidTank_HV.get(1));
- }
+ Utils.LOG_INFO("Is New Horizons Loaded? "+CORE.GTNH);
+ if (!CORE.GTNH){
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier1, plateTier1, plateTier1,
+ plateTier1, pipeTier1, plateTier1,
+ plateTier1, GregtechItemList.Fluid_Cell_144L.get(1), plateTier1,
+ GregtechItemList.GT_FluidTank_ULV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier2, plateTier2, plateTier2,
+ plateTier2, pipeTier2, plateTier2,
+ plateTier2, electricPump_LV, plateTier2,
+ GregtechItemList.GT_FluidTank_LV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier3, plateTier3, plateTier3,
+ plateTier3, pipeTier3, plateTier3,
+ plateTier3, electricPump_MV, plateTier3,
+ GregtechItemList.GT_FluidTank_MV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier4, plateTier4, plateTier4,
+ plateTier4, pipeTier4, plateTier4,
+ plateTier4, electricPump_HV, plateTier4,
+ GregtechItemList.GT_FluidTank_HV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier5, plateTier5, plateTier5,
+ plateTier5, pipeTier5, plateTier5,
+ plateTier5, electricPump_EV, plateTier5,
+ GregtechItemList.GT_FluidTank_EV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier6, plateTier6, plateTier6,
+ plateTier6, pipeTier6, plateTier6,
+ plateTier6, electricPump_IV, plateTier6,
+ GregtechItemList.GT_FluidTank_IV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier7, plateTier7, plateTier7,
+ plateTier7, pipeTier7, plateTier7,
+ plateTier7, RECIPE_CONSTANTS.electricPump_LuV, plateTier7,
+ GregtechItemList.GT_FluidTank_LuV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier8, plateTier8, plateTier8,
+ plateTier8, pipeTier8, plateTier8,
+ plateTier8, RECIPE_CONSTANTS.electricPump_ZPM, plateTier8,
+ GregtechItemList.GT_FluidTank_ZPM.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier9, plateTier9, plateTier9,
+ plateTier9, pipeTier9, plateTier9,
+ plateTier9, RECIPE_CONSTANTS.electricPump_UV, plateTier9,
+ GregtechItemList.GT_FluidTank_UV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier10, plateTier10, plateTier10,
+ plateTier10, pipeTier10, plateTier10,
+ plateTier10, RECIPE_CONSTANTS.electricPump_MAX, plateTier10,
+ GregtechItemList.GT_FluidTank_MAX.get(1));
+ }
+ else {
+
+ plateTier1 = "plateTin";
+ pipeTier1 = "pipeLargeClay";
+ circuitTier1 = "circuitPrimitive";
+ plateTier2 = "plateCopper";
+ pipeTier2 = "pipeHugeClay";
+ plateTier3 = "plateBronze";
+ pipeTier3 = "pipeMediumBronze";
+ plateTier4 = "plateIron";
+ pipeTier4 = "pipeMediumSteel";
+ plateTier5 = "plateSteel";
+ plateTier6 = "plateRedstone";
+ plateTier7 = "plateRedstoneAlloy";
+ plateTier8 = "plateDarkSteel";
+ ItemStack waterBucket = ItemUtils.getSimpleStack(Items.water_bucket);
+
+
+ Utils.LOG_INFO("Loading New Horizon Tanks, with custom recipes.");
+ Utils.LOG_INFO("Using "+plateTier1+" with "+pipeTier1);
+ Utils.LOG_INFO("Using "+plateTier2+" with "+pipeTier2);
+ Utils.LOG_INFO("Using " + plateTier3 + " with " + pipeTier3);
+ Utils.LOG_INFO("Using " + plateTier4 + " with " + pipeTier4);
+
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier1, plateTier4, plateTier1,
+ plateTier1, pipeTier1, plateTier1,
+ plateTier1, waterBucket, plateTier1,
+ GregtechItemList.GT_FluidTank_ULV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier2, plateTier5, plateTier2,
+ plateTier2, pipeTier2, plateTier2,
+ plateTier2, electricPump_LV, plateTier2,
+ GregtechItemList.GT_FluidTank_LV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ plateTier6, plateTier7, plateTier6,
+ plateTier3, pipeTier3, plateTier3,
+ plateTier6, electricPump_LV, plateTier6,
+ GregtechItemList.GT_FluidTank_MV.get(1));
+ RecipeUtils.addShapedGregtechRecipe(
+ circuitTier1, plateTier8, circuitTier1,
+ plateTier4, pipeTier4, plateTier4,
+ circuitTier1, electricPump_LV, circuitTier1,
+ GregtechItemList.GT_FluidTank_HV.get(1));
+ }
}
//Industrial Multi Tank Casing
@@ -791,8 +791,8 @@ public class RECIPES_Machines {
"frameGtStellite", machineCasing_UV, "frameGtStellite",
"plateQuantum", "plateQuantum", "plateQuantum",
RECIPE_IndustrialMatterFabCoil);
-
-
+
+
//Industrial Sieve
RecipeUtils.addShapedGregtechRecipe(
"plateEglinSteel", circuitTier2, "plateEglinSteel",
@@ -811,8 +811,8 @@ public class RECIPES_Machines {
"wireFineSteel", "wireFineSteel", "wireFineSteel",
"frameGtEglinSteel", "wireFineSteel", "frameGtEglinSteel",
RECIPE_IndustrialSieveGrate);
-
-
+
+
//Industrial Tree Farm Controller
RecipeUtils.addShapedGregtechRecipe(
"plateEglinSteel", "rotorEglinSteel", "plateEglinSteel",
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
index 87462d22b8..5d87dd3a20 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPE_CONSTANTS.java
@@ -8,34 +8,42 @@ import net.minecraft.item.ItemStack;
public class RECIPE_CONSTANTS {
//Machine Components
+ public static ItemStack electricMotor_ULV;
public static ItemStack electricMotor_LuV;
public static ItemStack electricMotor_ZPM;
public static ItemStack electricMotor_UV;
public static ItemStack electricMotor_MAX;
+ public static ItemStack electricPump_ULV;
public static ItemStack electricPump_LuV;
public static ItemStack electricPump_ZPM;
public static ItemStack electricPump_UV;
public static ItemStack electricPump_MAX;
+ public static ItemStack electricPiston_ULV;
public static ItemStack electricPiston_LuV;
public static ItemStack electricPiston_ZPM;
public static ItemStack electricPiston_UV ;
public static ItemStack electricPiston_MAX;
+ public static ItemStack robotArm_ULV;
public static ItemStack robotArm_LuV;
public static ItemStack robotArm_ZPM;
public static ItemStack robotArm_UV;
public static ItemStack robotArm_MAX;
+ public static ItemStack conveyorModule_ULV;
public static ItemStack conveyorModule_LuV;
public static ItemStack conveyorModule_ZPM;
public static ItemStack conveyorModule_UV;
public static ItemStack conveyorModule_MAX;
+ public static ItemStack emitter_ULV;
public static ItemStack emitter_LuV;
public static ItemStack emitter_ZPM;
public static ItemStack emitter_UV;
public static ItemStack emitter_MAX;
+ public static ItemStack fieldGenerator_ULV;
public static ItemStack fieldGenerator_LuV;
public static ItemStack fieldGenerator_ZPM;
public static ItemStack fieldGenerator_UV;
public static ItemStack fieldGenerator_MAX;
+ public static ItemStack sensor_ULV;
public static ItemStack sensor_LuV;
public static ItemStack sensor_ZPM;
public static ItemStack sensor_UV;
@@ -83,15 +91,8 @@ public class RECIPE_CONSTANTS {
sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
- //Max Tier Components Blood Never added... Useless, lol.
- electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
- electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
- electricPiston_MAX = GregtechItemList.Electric_Piston_MAX.get(1);
- robotArm_MAX = GregtechItemList.Robot_Arm_MAX.get(1);
- conveyorModule_MAX = GregtechItemList.Conveyor_Module_MAX.get(1);
- emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
- fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
- sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
+ registerComponent_ULV();
+ registerComponent_MAX();
}
private static void registerGTStandardComponents(){
@@ -127,6 +128,8 @@ public class RECIPE_CONSTANTS {
sensor_ZPM = GregtechItemList.Sensor_ZPM.get(1);
sensor_UV = GregtechItemList.Sensor_UV.get(1);
sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
+
+ registerComponent_ULV();
}
private static void registerGTNHComponents(){
@@ -134,35 +137,53 @@ public class RECIPE_CONSTANTS {
electricMotor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32606, 1);
electricMotor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32607, 1);
electricMotor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32608, 1);
-
+
electricPump_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32615, 1);
electricPump_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32616, 1);
electricPump_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32617, 1);
-
+
electricPiston_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32645, 1);
electricPiston_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32646, 1);
electricPiston_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32647, 1);
-
+
robotArm_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32655, 1);
robotArm_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32656, 1);
robotArm_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32657, 1);
-
+
conveyorModule_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32635, 1);
conveyorModule_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32636, 1);
conveyorModule_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32637, 1);
-
+
emitter_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32685, 1);
emitter_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32686, 1);
emitter_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32687, 1);
-
+
fieldGenerator_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32675, 1);
fieldGenerator_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32676, 1);
fieldGenerator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32677, 1);
-
+
sensor_LuV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32695, 1);
sensor_ZPM = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32696, 1);
sensor_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32697, 1);
+ registerComponent_ULV();
+ registerComponent_MAX();
+ }
+
+ private static boolean registerComponent_ULV(){
+
+ electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1);
+ electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1);
+ electricPiston_ULV = GregtechItemList.Electric_Piston_ULV.get(1);
+ robotArm_ULV = GregtechItemList.Robot_Arm_ULV.get(1);
+ conveyorModule_ULV = GregtechItemList.Conveyor_Module_ULV.get(1);
+ emitter_ULV = GregtechItemList.Emitter_ULV.get(1);
+ fieldGenerator_ULV = GregtechItemList.Field_Generator_ULV.get(1);
+ sensor_ULV = GregtechItemList.Sensor_ULV.get(1);
+ return true;
+ }
+
+ private static boolean registerComponent_MAX(){
//Max Tier Components Blood Never added... Useless, lol.
electricMotor_MAX = GregtechItemList.Electric_Motor_MAX.get(1);
electricPump_MAX = GregtechItemList.Electric_Pump_MAX.get(1);
@@ -172,6 +193,7 @@ public class RECIPE_CONSTANTS {
emitter_MAX = GregtechItemList.Emitter_MAX.get(1);
fieldGenerator_MAX = GregtechItemList.Field_Generator_MAX.get(1);
sensor_MAX = GregtechItemList.Sensor_MAX.get(1);
+ return true;
}
}