aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java38
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java50
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java2
3 files changed, 74 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index ba7e3246e6..cfa436ceb7 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -961,11 +961,41 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("molten.tantalum", 144 * 4),
ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 8), 32, 120);
addAR(ItemUtils.simpleMetaStack(ModItems.itemHalfCompleteCasings, 1, 1),
- ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("nitrogen", 1000),
+ ItemUtils.getItemStackOfAmountFromOreDict("plateLead", 4), FluidUtils.getFluidStack("oxygen", 1000),
ItemUtils.getSimpleStack(GregtechItemList.Casing_Vanadium_Redox.get(1), 1), 64, 240);
- addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
+
+ //Tier 2-6
+ ItemStack T1 = GregtechItemList.Casing_Vanadium_Redox.get(1);
+ ItemStack T2 = GregtechItemList.Casing_Vanadium_Redox_IV.get(1);
+ ItemStack T3 = GregtechItemList.Casing_Vanadium_Redox_LuV.get(1);
+ ItemStack T4 = GregtechItemList.Casing_Vanadium_Redox_ZPM.get(1);
+ ItemStack T5 = GregtechItemList.Casing_Vanadium_Redox_UV.get(1);
+ ItemStack T6 = GregtechItemList.Casing_Vanadium_Redox_MAX.get(1);
+
+ addAR(T1,
+ ItemUtils.getItemStackOfAmountFromOreDict("plateStainlessSteel", 4),
+ FluidUtils.getFluidStack("nitrogen", 2000),
+ T2, 128, 2000);
+ addAR(T2,
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTitanium", 4),
+ FluidUtils.getFluidStack("helium", 2000),
+ T3, 256, 8000);
+ addAR(T3,
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungsten", 4),
+ FluidUtils.getFluidStack("argon", 4000),
+ T4, 512, 32000);
+ addAR(T4,
+ ItemUtils.getItemStackOfAmountFromOreDict("plateTungstenSteel", 4),
+ FluidUtils.getFluidStack("radon", 4000),
+ T5, 1024, 128000);
+ addAR(T5,
+ ItemUtils.getItemStackOfAmountFromOreDict("plateIridium", 4),
+ FluidUtils.getFluidStack("krypton", 500),
+ T6, 2048, 512000);
+
+ /*addAR(ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloy020", 16),
ItemUtils.getItemStackOfAmountFromOreDict("frameGtIncoloyMA956", 4), null,
- GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);
+ GregtechItemList.Casing_Power_SubStation.get(4), 80, 120);*/
}
private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final ItemStack outputA,
@@ -1406,4 +1436,4 @@ public class RECIPES_GREGTECH {
30 * 20, 500);
}
-}
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index 34653bf772..7b9769ea02 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -141,7 +141,7 @@ public class RECIPES_Machines {
public static String pipeTier10 = "pipeHuge"+"HastelloyX";
public static String pipeTier11 = "pipeHuge"+"Europium";
- //IV MACHINES
+ // EV/IV MACHINES
public static ItemStack EV_MACHINE_Electrolyzer;
public static ItemStack EV_MACHINE_Centrifuge;
public static ItemStack EV_MACHINE_BendingMachine;
@@ -151,6 +151,10 @@ public class RECIPES_Machines {
public static ItemStack EV_MACHINE_Cutter;
public static ItemStack EV_MACHINE_MassFabricator;
public static ItemStack EV_MACHINE_Extruder;
+ public static ItemStack EV_MACHINE_Sifter;
+ public static ItemStack EV_MACHINE_ThermalCentrifuge;
+ public static ItemStack EV_MACHINE_OreWasher;
+ public static ItemStack EV_MACHINE_AlloySmelter;
//Cables
@@ -215,6 +219,8 @@ public class RECIPES_Machines {
boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
//IV MACHINES
+
+ if (!CORE.GTNH){
EV_MACHINE_Electrolyzer = ItemList.Machine_EV_Electrolyzer.get(1);
EV_MACHINE_BendingMachine= ItemList.Machine_EV_Bender.get(1);
EV_MACHINE_Wiremill= ItemList.Machine_EV_Wiremill.get(1);
@@ -224,6 +230,28 @@ public class RECIPES_Machines {
EV_MACHINE_Centrifuge= ItemList.Machine_EV_Centrifuge.get(1);
EV_MACHINE_Cutter = ItemList.Machine_EV_Cutter.get(1);
EV_MACHINE_Extruder = ItemList.Machine_EV_Extruder.get(1);
+ EV_MACHINE_Sifter = ItemList.Machine_EV_Sifter.get(1);
+ EV_MACHINE_ThermalCentrifuge = ItemList.Machine_EV_ThermalCentrifuge.get(1);
+ EV_MACHINE_OreWasher = ItemList.Machine_EV_OreWasher.get(1);
+ EV_MACHINE_AlloySmelter = ItemList.Machine_EV_AlloySmelter.get(1);
+ }
+ //Balance or some shit
+ else {
+ EV_MACHINE_Electrolyzer = ItemList.Machine_IV_Electrolyzer.get(1);
+ EV_MACHINE_BendingMachine= ItemList.Machine_IV_Bender.get(1);
+ EV_MACHINE_Wiremill= ItemList.Machine_IV_Wiremill.get(1);
+ HV_MACHINE_Macerator= ItemList.Machine_EV_Macerator.get(1);
+ EV_MACHINE_Macerator= ItemList.Machine_IV_Macerator.get(1);
+ EV_MACHINE_MassFabricator= ItemList.Machine_LuV_Massfab.get(1);
+ EV_MACHINE_Centrifuge= ItemList.Machine_IV_Centrifuge.get(1);
+ EV_MACHINE_Cutter = ItemList.Machine_IV_Cutter.get(1);
+ EV_MACHINE_Extruder = ItemList.Machine_IV_Extruder.get(1);
+ EV_MACHINE_Sifter = ItemList.Machine_IV_Sifter.get(1);
+ EV_MACHINE_ThermalCentrifuge = ItemList.Machine_IV_ThermalCentrifuge.get(1);
+ EV_MACHINE_OreWasher = ItemList.Machine_IV_OreWasher.get(1);
+ EV_MACHINE_AlloySmelter = ItemList.Machine_IV_AlloySmelter.get(1);
+ }
+
}
@@ -277,7 +305,7 @@ public class RECIPES_Machines {
//Buffer Core
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[1], cableTier1, CI.component_Plate[1],
- CI.circuitPrimitive, IC2MFE, CI.circuitPrimitive,
+ CI.circuitPrimitive, "plateStaballloy", CI.circuitPrimitive,
CI.component_Plate[1], cableTier1, CI.component_Plate[1],
RECIPE_BufferCore_ULV);
RecipeUtils.addShapedGregtechRecipe(
@@ -701,7 +729,7 @@ public class RECIPES_Machines {
//Blast Smelter
RecipeUtils.addShapedGregtechRecipe(
"plateZirconiumCarbide", CI.circuitTier4, "plateZirconiumCarbide",
- cableTier4, CI.machineCasing_EV, cableTier4,
+ cableTier4, EV_MACHINE_AlloySmelter, cableTier4,
"plateZirconiumCarbide", CI.circuitTier3, "plateZirconiumCarbide",
RECIPE_IndustrialBlastSmelterController);
//Blast Smelter Frame Casing
@@ -753,7 +781,7 @@ public class RECIPES_Machines {
//Industrial Sieve
RecipeUtils.addShapedGregtechRecipe(
"plateEglinSteel", CI.circuitTier2, "plateEglinSteel",
- cableTier3, CI.machineCasing_MV, cableTier3,
+ cableTier3, EV_MACHINE_Sifter, cableTier3,
"plateEglinSteel", CI.circuitTier2, "plateEglinSteel",
RECIPE_IndustrialSieveController);
//Industrial Sieve Casing
@@ -1061,15 +1089,15 @@ public class RECIPES_Machines {
if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation){
RecipeUtils.recipeBuilder(
- null, "plateIncoloy020", null,
+ "screwTitanium", "plateIncoloy020", "screwTitanium",
"plateIncoloy020", "frameGtIncoloyMA956", "plateIncoloy020",
- null, "plateIncoloy020", null,
+ "screwTitanium", "plateIncoloy020", "screwTitanium",
GregtechItemList.Casing_Power_SubStation.get(Casing_Amount));
- ItemStack mBattery = (!CORE.GTNH ? ItemList.Energy_LapotronicOrb2.get(1) : ItemList.ZPM2.get(1));
+ ItemStack mBattery = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
RecipeUtils.recipeBuilder(
- "plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "plateIncoloyMA956",
+ "plateIncoloyMA956", mBattery, "plateIncoloyMA956",
GregtechItemList.Casing_Power_SubStation.get(1), GregtechItemList.Casing_Vanadium_Redox.get(1), GregtechItemList.Casing_Power_SubStation.get(1),
"plateIncoloy020", "plateIncoloyMA956", "plateIncoloy020",
GregtechItemList.PowerSubStation.get(1));
@@ -1084,7 +1112,7 @@ public class RECIPES_Machines {
RecipeUtils.recipeBuilder(
"plateRedSteel","circuitData","plateRedSteel",
- "stickTalonite",GregtechItemList.Casing_ThermalCentrifuge.get(1),"stickTalonite",
+ "stickTalonite",EV_MACHINE_ThermalCentrifuge,"stickTalonite",
"plateRedSteel","gearGtTalonite","plateRedSteel",
GregtechItemList.Industrial_ThermalCentrifuge.get(1));
}
@@ -1098,7 +1126,7 @@ public class RECIPES_Machines {
RecipeUtils.recipeBuilder(
"plateGrisium",CI.electricPump_MV,"plateGrisium",
- "plateTalonite",GregtechItemList.Casing_WashPlant.get(1),"plateTalonite",
+ "plateTalonite",EV_MACHINE_OreWasher,"plateTalonite",
"plateGrisium","circuitData","plateGrisium",
GregtechItemList.Industrial_WashPlant.get(1));
}
@@ -1243,4 +1271,4 @@ public class RECIPES_Machines {
}
Logger.INFO("Done loading recipes for the Various machine blocks.");
}
-}
+} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index d77edb631b..a501061849 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -64,7 +64,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
"Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches",
"Power can be Input/Extracted from the rear face at any time, change with screwdriver",
"Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "",
- "Redox Cells can be upgraded via the GUI without having to deconstruct the multiblock",
+ "Redox Cells can be upgraded via the GUI without having to deconstruct the multiblock (WIP)",
"Size(WxHxD): External 5xHx5, Sub-Station Casings, Controller (Bottom, Centre)",
"Size(WxHxD): Internal 3x(H-2)x3, Energy Storage Cells",
"Number and quality of cells determines power storage",
generated by cgit (git 2.46.0) at 2025-03-10 15:02:28 +0000