aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java57
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java4
4 files changed, 34 insertions, 31 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index d3eada8a75..34653bf772 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -85,7 +85,7 @@ public class RECIPES_Machines {
public static ItemStack RECIPE_LFTRController;
public static ItemStack RECIPE_LFTROuterCasing;
public static ItemStack RECIPE_LFTRInnerCasing;
-
+
//Cyclotron
public static ItemStack RECIPE_CyclotronController;
public static ItemStack RECIPE_CyclotronOuterCasing;
@@ -187,12 +187,12 @@ public class RECIPES_Machines {
public static ItemStack INPUT_RCCokeOvenBlock;
public static ItemStack INPUT_IECokeOvenBlock;
- //Output Determiner
+ //Output Determiner
public static int Casing_Amount;
-
-
-
- public static final void loadRecipes(){
+
+
+
+ public static final void loadRecipes(){
run();
Logger.INFO("Loading Recipes for the Various machine blocks.");
}
@@ -242,16 +242,15 @@ public class RECIPES_Machines {
private static void runModRecipes(){
if (LoadedMods.Gregtech){
-
//Determines Casing Recipe Output
- if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
- Casing_Amount=2;
- }
- else {
- Casing_Amount=1;
+ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK && !CORE.GTNH){
+ Casing_Amount=2;
+ }
+ else {
+ Casing_Amount=1;
}
-
-
+
+
//Computer Cube
RecipeUtils.addShapedGregtechRecipe(
CI.getDataOrb(),ItemList.Cover_Screen.get(1),"circuitMaster",
@@ -671,7 +670,7 @@ public class RECIPES_Machines {
"plateDoubleGrisium", "rotorGrisium", "plateDoubleGrisium",
RECIPE_IndustrialMultiTankController);
}
-
+
ItemStack mSemiFluidgen = ItemUtils.simpleMetaStack("IC2:blockGenerator:7", 7, 1);
//Semi-Fluid Generators
GT_ModHandler.addCraftingRecipe(GregtechItemList.Generator_SemiFluid_LV.get(1L, new Object[0]), CI.bitsd,
@@ -839,7 +838,7 @@ public class RECIPES_Machines {
"dustCarbon", "dustCarbon", "dustCarbon",
"plateCarbon", "plateCarbon", "plateCarbon",
ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1));
-
+
RecipeUtils.addShapedGregtechRecipe(
"plateCarbon", "plateCarbon", "plateCarbon",
"cellLithiumPeroxide", "dustCarbon", "cellLithiumPeroxide",
@@ -1029,7 +1028,7 @@ public class RECIPES_Machines {
}
-
+
//Cyclotron
if (CORE.ConfigSwitches.enableMultiblock_Cyclotron){
@@ -1044,7 +1043,7 @@ public class RECIPES_Machines {
RECIPE_CyclotronOuterCasing,
30 * 20,
500);
-
+
GT_Values.RA.addAssemblerRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("plateIncoloyDS", 16),
ItemList.Field_Generator_HV.get(1),
@@ -1052,7 +1051,7 @@ public class RECIPES_Machines {
RECIPE_CyclotronInnerCoil,
90 * 20,
1000);
-
+
RecipeUtils.recipeBuilder(
"plateIncoloy020", CI.getTieredCircuit(6), "plateIncoloy020",
RECIPE_CyclotronInnerCoil, CI.machineHull_IV, RECIPE_CyclotronInnerCoil,
@@ -1068,14 +1067,14 @@ public class RECIPES_Machines {
GregtechItemList.Casing_Power_SubStation.get(Casing_Amount));
ItemStack mBattery = (!CORE.GTNH ? ItemList.Energy_LapotronicOrb2.get(1) : ItemList.ZPM2.get(1));
-
+
RecipeUtils.recipeBuilder(
"plateIncoloyMA956", GregtechItemList.Battery_RE_EV_Lithium.get(1), "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));
}
-
+
if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge){
RecipeUtils.recipeBuilder(
"plateRedSteel", CI.craftingToolHammer_Hard, "plateRedSteel",
@@ -1089,7 +1088,7 @@ public class RECIPES_Machines {
"plateRedSteel","gearGtTalonite","plateRedSteel",
GregtechItemList.Industrial_ThermalCentrifuge.get(1));
}
-
+
if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant){
RecipeUtils.recipeBuilder(
"plateGrisium", CI.craftingToolHammer_Hard, "plateGrisium",
@@ -1103,7 +1102,7 @@ public class RECIPES_Machines {
"plateGrisium","circuitData","plateGrisium",
GregtechItemList.Industrial_WashPlant.get(1));
}
-
+
if (CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter){
RecipeUtils.recipeBuilder(
"plateStainlessSteel", CI.craftingToolHammer_Hard, "plateStainlessSteel",
@@ -1116,7 +1115,7 @@ public class RECIPES_Machines {
"wireFineOsmium",GregtechItemList.Gregtech_Computer_Cube.get(1), "wireFineOsmium",
"plateStainlessSteel",CI.emitter_EV,"plateStainlessSteel",
GregtechItemList.GT4_Multi_Crafter.get(1));
-
+
RecipeUtils.recipeBuilder(
"plateStainlessSteel",CI.craftingToolSolderingIron,"plateStainlessSteel",
CI.robotArm_ULV, ItemList.Casing_SolidSteel.get(1), CI.robotArm_ULV,
@@ -1138,7 +1137,7 @@ public class RECIPES_Machines {
plate,CI.getTieredCircuit(4),plate,
GregtechItemList.Industrial_CuttingFactoryController.get(1));
}
-
+
//EV_MACHINE_Extruder
if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine){
ItemStack plate = ALLOY.INCONEL_690.getPlate(1);
@@ -1154,7 +1153,7 @@ public class RECIPES_Machines {
plate,CI.getTieredCircuit(4),plate,
GregtechItemList.Industrial_Extruder.get(1));
}
-
+
if (CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort){
ItemStack plate = ALLOY.INCONEL_792.getPlate(1);
RecipeUtils.recipeBuilder(
@@ -1169,10 +1168,10 @@ public class RECIPES_Machines {
plate,CI.getTieredCircuit(2),plate,
GregtechItemList.Industrial_FishingPond.get(1));
}
-
-
-
+
+
+
if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine){
ItemStack plate = ALLOY.STABALLOY.getPlate(1);
ItemStack o_Compressor = ItemList.Machine_HV_Compressor.get(1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 0ea26debe4..88e690f43d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -52,7 +52,7 @@ extends GregtechMetaCasingBlocksAbstract {
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)");
- GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");;
+ GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index 45ca6c56dc..f2ec97c42c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -35,7 +35,7 @@ public class CasingTextureHandler3 {
//Vanadium Redox MAX
return TexturesGtBlock.Casing_Redox_6.getIcon();
case 9:
- //Amazon Warehouse Casing
+ //Amazon Warehouse Casing
return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
case 10:
return TexturesGtBlock._PlaceHolder.getIcon();
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 4746dc2728..d15820514f 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
@@ -118,6 +118,10 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
return 6;
} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 6) {
return 7;
+ } else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 7) {
+ return 8;
+ } else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 8) {
+ return 9;
} else {
return -1;
}
generated by cgit (git 2.46.0) at 2025-03-10 09:59:00 +0000