aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-02-05 01:40:43 +0900
committerGitHub <noreply@github.com>2023-02-04 17:40:43 +0100
commitbb9da48b9975cb27e3b7c538bff2853a34b36fcd (patch)
tree9de91abf611bf119935df6322e27805cf835fafc /src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
parent8792eb5d9b70cbb1dc0b444cfd8524dfb4a0aa0c (diff)
downloadGT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.gz
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.tar.bz2
GT5-Unofficial-bb9da48b9975cb27e3b7c538bff2853a34b36fcd.zip
Remove redundant flags (#529)
* Remove CORE.GTNH * Remove LoadedMods.Gregtech * Remove LoadedMods.IndustrialCraft2 * Remove LoadedMods.MiscUtils * Remove CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK * clean * Remove mention to GT versions * Fix assembler mode
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java')
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java306
1 files changed, 96 insertions, 210 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 0d76bd5db9..730ef865fc 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -90,107 +90,53 @@ public class RECIPE_IC2 {
checkForEnderIO();
addAdvancedHazmat();
- if (!CORE.GTNH) {
- // Rotor Blade Recipes
-
- RecipeUtils.addShapedRecipe(
- plate_T1,
- ingot_T1,
- plate_T1,
- plate_T1,
- ingot_T1,
- plate_T1,
- plate_T1,
- ingot_T1,
- plate_T1,
- rotor_blade_T1);
-
- RecipeUtils.addShapedRecipe(
- plate_T2,
- ingot_T2,
- plate_T2,
- plate_T2,
- ingot_T2,
- plate_T2,
- plate_T2,
- ingot_T2,
- plate_T2,
- rotor_blade_T2);
-
- RecipeUtils.addShapedRecipe(
- plate_T3,
- ingot_T3,
- plate_T3,
- plate_T3,
- ingot_T3,
- plate_T3,
- plate_T3,
- ingot_T3,
- plate_T3,
- rotor_blade_T3);
-
- RecipeUtils.addShapedRecipe(
- plate_T4,
- ingot_T4,
- plate_T4,
- plate_T4,
- ingot_T4,
- plate_T4,
- plate_T4,
- ingot_T4,
- plate_T4,
- rotor_blade_T4);
- }
- if (CORE.GTNH) {
-
- RecipeUtils.addShapedRecipe(
- plate_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- ring_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- plate_T1,
- rotor_blade_T1);
-
- RecipeUtils.addShapedRecipe(
- plate_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- ring_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- plate_T2,
- rotor_blade_T2);
-
- RecipeUtils.addShapedRecipe(
- plate_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- ring_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- plate_T3,
- rotor_blade_T3);
-
- RecipeUtils.addShapedRecipe(
- plate_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- ring_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- plate_T4,
- rotor_blade_T4);
- }
+ RecipeUtils.addShapedRecipe(
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ ring_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ plate_T1,
+ rotor_blade_T1);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ ring_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ plate_T2,
+ rotor_blade_T2);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ ring_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ plate_T3,
+ rotor_blade_T3);
+
+ RecipeUtils.addShapedRecipe(
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ ring_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ plate_T4,
+ rotor_blade_T4);
// Shaft Extruder Recipe
GT_ModHandler.addCraftingRecipe(
@@ -269,11 +215,7 @@ public class RECIPE_IC2 {
shaft_T1,
2560,
250);
- if (LoadedMods.EnderIO || CORE.GTNH) {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
- } else {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Magnalium]");
- }
+ Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Energetic]");
GT_Values.RA.addExtruderRecipe(
GT_Utility.copyAmount(9L, block_T2),
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]),
@@ -300,11 +242,7 @@ public class RECIPE_IC2 {
shaft_T3,
10240,
2000);
- if (LoadedMods.EnderIO || CORE.GTNH) {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
- } else {
- Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Ultimet]");
- }
+ Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Vibrant]");
GT_Values.RA.addExtruderRecipe(
GT_Utility.copyAmount(9L, block_T4),
GregtechItemList.Shape_Extruder_WindmillShaft.get(0L, new Object[0]),
@@ -319,105 +257,53 @@ public class RECIPE_IC2 {
4000);
Logger.INFO("Added recipe for GT5 Extruder: Windmill Shaft [Iridium]");
- if (!CORE.GTNH) {
- // Rotor Recipes
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T1,
- null,
- rotor_blade_T1,
- shaft_T1,
- rotor_blade_T1,
- null,
- rotor_blade_T1,
- null,
- rotor_T1);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T2,
- null,
- rotor_blade_T2,
- shaft_T2,
- rotor_blade_T2,
- null,
- rotor_blade_T2,
- null,
- rotor_T2);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T3,
- null,
- rotor_blade_T3,
- shaft_T3,
- rotor_blade_T3,
- null,
- rotor_blade_T3,
- null,
- rotor_T3);
-
- RecipeUtils.addShapedRecipe(
- null,
- rotor_blade_T4,
- null,
- rotor_blade_T4,
- shaft_T4,
- rotor_blade_T4,
- null,
- rotor_blade_T4,
- null,
- rotor_T4);
- }
- if (CORE.GTNH) {
- RecipeUtils.addShapedRecipe(
- shaft_T1,
- rotor_blade_T1,
- craftingToolHardHammer,
- rotor_blade_T1,
- ring_T1,
- rotor_blade_T1,
- craftingToolWrench,
- rotor_blade_T1,
- shaft_T1,
- rotor_T1);
-
- RecipeUtils.addShapedRecipe(
- shaft_T2,
- rotor_blade_T2,
- craftingToolHardHammer,
- rotor_blade_T2,
- ring_T2,
- rotor_blade_T2,
- craftingToolWrench,
- rotor_blade_T2,
- shaft_T2,
- rotor_T2);
-
- RecipeUtils.addShapedRecipe(
- shaft_T3,
- rotor_blade_T3,
- craftingToolHardHammer,
- rotor_blade_T3,
- ring_T3,
- rotor_blade_T3,
- craftingToolWrench,
- rotor_blade_T3,
- shaft_T3,
- rotor_T3);
-
- RecipeUtils.addShapedRecipe(
- shaft_T4,
- rotor_blade_T4,
- craftingToolHardHammer,
- rotor_blade_T4,
- ring_T4,
- rotor_blade_T4,
- craftingToolWrench,
- rotor_blade_T4,
- shaft_T4,
- rotor_T4);
- }
+ RecipeUtils.addShapedRecipe(
+ shaft_T1,
+ rotor_blade_T1,
+ craftingToolHardHammer,
+ rotor_blade_T1,
+ ring_T1,
+ rotor_blade_T1,
+ craftingToolWrench,
+ rotor_blade_T1,
+ shaft_T1,
+ rotor_T1);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T2,
+ rotor_blade_T2,
+ craftingToolHardHammer,
+ rotor_blade_T2,
+ ring_T2,
+ rotor_blade_T2,
+ craftingToolWrench,
+ rotor_blade_T2,
+ shaft_T2,
+ rotor_T2);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T3,
+ rotor_blade_T3,
+ craftingToolHardHammer,
+ rotor_blade_T3,
+ ring_T3,
+ rotor_blade_T3,
+ craftingToolWrench,
+ rotor_blade_T3,
+ shaft_T3,
+ rotor_T3);
+
+ RecipeUtils.addShapedRecipe(
+ shaft_T4,
+ rotor_blade_T4,
+ craftingToolHardHammer,
+ rotor_blade_T4,
+ ring_T4,
+ rotor_blade_T4,
+ craftingToolWrench,
+ rotor_blade_T4,
+ shaft_T4,
+ rotor_T4);
}
private static void addAdvancedHazmat() {
generated by cgit (git 2.46.0) at 2025-03-06 22:07:36 +0000