Delete unused steam machines (#309)

Author: tier940

CHANGELOG.md

@@ -1,5 +1,10 @@
+# v2.4.2
+- Delete unused steam machines.
+
+* * *
+
 # v2.4.1
-- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added
+- A recipe for processing FluixAlloy Molten in AlloyBlastFurnace into Ingot using Mold has been added.
 
 * * *
 

src/main/java/gtexpert/api/recipes/GTERecipeMaps.java

@@ -37,26 +37,4 @@ public class GTERecipeMaps {
                     .setSlotOverlay(true, true, GuiTextures.CENTRIFUGE_OVERLAY)
                     .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, ProgressWidget.MoveType.HORIZONTAL)
                     .setSound(GTSoundEvents.COOLING);
-
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> STEAM_MIXER_RECIPES = new RecipeMap<>(
-            "steam_mixer", 6, 2, 0, 0, new SimpleRecipeBuilder(), false)
-                    .setSlotOverlay(false, false, GuiTextures.DUST_OVERLAY)
-                    .setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY)
-                    .setProgressBar(GuiTextures.PROGRESS_BAR_MIXER, ProgressWidget.MoveType.CIRCULAR)
-                    .setSound(GTSoundEvents.MIXER);
-
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> STEAM_ASSEMBLER_RECIPES = new RecipeMap<>(
-            "steam_assembler", 9, 2, 0, 0, new SimpleRecipeBuilder(), false)
-                    .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY)
-                    .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT, ProgressWidget.MoveType.HORIZONTAL)
-                    .setSound(GTSoundEvents.ASSEMBLER);
-
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> STEAM_CIRCUIT_ASSEMBLER_RECIPES = new RecipeMap<>(
-            "steam_circuit_assembler", 6, 2, 0, 0, new SimpleRecipeBuilder(), false)
-                    .setSlotOverlay(false, false, GuiTextures.CIRCUIT_OVERLAY)
-                    .setProgressBar(GuiTextures.PROGRESS_BAR_CIRCUIT_ASSEMBLER, ProgressWidget.MoveType.HORIZONTAL)
-                    .setSound(GTSoundEvents.ASSEMBLER);
 }

src/main/java/gtexpert/common/GTEConfigHolder.java

@@ -38,17 +38,6 @@ public static class ModpackFlag {
                 "Default: easy" })
         public String componentsRecipeType = "easy";
 
-        @Config.Comment({
-                "Enable the new steam machines.",
-                "Steam Mixer, Steam Assembler, Steam Circuit Assembler",
-                "Default: false" })
-        public boolean steamNewMachine = false;
-
-        @Config.Comment({
-                "Recipe Type. Options: none (no generated recipes), easy (2x2 crafting(WIP)), normal (3x3 crafting).",
-                "The steamNewMachine must also be enabled.", "Default: normal" })
-        public String steamRecipeType = "normal";
-
         @Config.Comment({
                 "1. When enabled, the following recipes will be changed to Peaceful difficulty: ",
                 "Nether Star Dust, Skeleton Skull, Wither Skeleton Skull, Zombie Head, Creeper Head, Enderman Head",

src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java

@@ -13,19 +13,10 @@
 
 import gtexpert.common.GTEConfigHolder;
 import gtexpert.common.metatileentities.multi.*;
-import gtexpert.common.metatileentities.single.SteamAssembler;
-import gtexpert.common.metatileentities.single.SteamCircuitAssembler;
-import gtexpert.common.metatileentities.single.SteamMixer;
 
 public class GTEMetaTileEntities {
 
     // Single Machine
-    public static SteamMixer STEAM_MIXER_BRONZE;
-    public static SteamMixer STEAM_MIXER_STEEL;
-    public static SteamAssembler STEAM_ASSEMBLER_BRONZE;
-    public static SteamAssembler STEAM_ASSEMBLER_STEEL;
-    public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_BRONZE;
-    public static SteamCircuitAssembler STEAM_CIRCUIT_ASSEMBLER_STEEL;
 
     // Multi Machine
     public static MetaTileEntityLargeCrackingUnit LARGE_CRACKER;
@@ -35,21 +26,7 @@ public class GTEMetaTileEntities {
 
     public static void init() {
         // Single Machine
-        // Steam machine 11004~11009
-        if (GTEConfigHolder.gteFlag.steamNewMachine) {
-            STEAM_MIXER_BRONZE = registerMetaTileEntity(11004,
-                    new SteamMixer(gteId("steam_mixer_bronze"), false));
-            STEAM_MIXER_STEEL = registerMetaTileEntity(11005,
-                    new SteamMixer(gteId("steam_mixer_steel"), true));
-            STEAM_ASSEMBLER_BRONZE = registerMetaTileEntity(11006,
-                    new SteamAssembler(gteId("steam_assembler_bronze"), false));
-            STEAM_ASSEMBLER_STEEL = registerMetaTileEntity(11007,
-                    new SteamAssembler(gteId("steam_assembler_steel"), true));
-            STEAM_CIRCUIT_ASSEMBLER_BRONZE = registerMetaTileEntity(11008,
-                    new SteamCircuitAssembler(gteId("steam_circuit_assembler_bronze"), false));
-            STEAM_CIRCUIT_ASSEMBLER_STEEL = registerMetaTileEntity(11009,
-                    new SteamCircuitAssembler(gteId("steam_circuit_assembler_steel"), true));
-        }
+        // Free: 11004~11999
 
         // Multi Machine
         // Free: 12000~12001

src/main/java/gtexpert/common/metatileentities/single/SteamAssembler.java

@@ -542,10 +542,10 @@ public static void init() {
         // Formation Core
         ModHandler.removeRecipeByName(Mods.AppliedEnergistics2.getResource("materials/formationcore"));
         ModHandler.addShapedRecipe(true, "formation_core",
-                Mods.AppliedEnergistics2.getItem("material", 2, 43),
+                Mods.AppliedEnergistics2.getItem("material", 1, 43),
                 "SES", "LQL", "SES",
                 'S', OreDictUnifier.get(stick, tierMaterials[GTEValues.ae2VoltageTier - 1]),
-                'Q', "gemMaterials.NetherQuartz",
+                'Q', "gemNetherQuartz",
                 'E', Mods.AppliedEnergistics2.getItem("material", 1, 24),
                 'L', Mods.AppliedEnergistics2.getItem("material", 1, 22));
         ModHandler.addShapedRecipe("formation_core_pure",
@@ -568,7 +568,7 @@ public static void init() {
         // Annihilation Core
         ModHandler.removeRecipeByName(Mods.AppliedEnergistics2.getResource("materials/annihilationcore"));
         ModHandler.addShapedRecipe(true, "annihilation_core",
-                Mods.AppliedEnergistics2.getItem("material", 2, 44),
+                Mods.AppliedEnergistics2.getItem("material", 1, 44),
                 "SES", "CQC", "SES",
                 'S', OreDictUnifier.get(stick, tierMaterials[GTEValues.ae2VoltageTier - 1]),
                 'Q', "gemCertusQuartz",