Fix Stone Pressure Plate / Button recipe conflict (#4131)

Author: DilithiumThoride

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/StoneMachineRecipes.java

@@ -202,14 +202,14 @@ private static List<StoneTypeEntry> getDefaultEntries() {
                             .stair(Items.POLISHED_BLACKSTONE_STAIRS)
                             .wall(Items.POLISHED_BLACKSTONE_WALL)
                             .pressurePlate(Items.POLISHED_BLACKSTONE_PRESSURE_PLATE)
+                            .button(Items.POLISHED_BLACKSTONE_BUTTON)
                             .material(GTMaterials.Blackstone)
                             .registerAllMaterialInfo()
                             .build(),
                     new StoneTypeEntry.Builder(mcModID, "polished_blackstone_brick")
                             .stone(Items.POLISHED_BLACKSTONE_BRICKS)
                             .slab(Items.POLISHED_BLACKSTONE_BRICK_SLAB)
                             .stair(Items.POLISHED_BLACKSTONE_BRICK_STAIRS)
-                            .button(Items.POLISHED_BLACKSTONE_BUTTON)
                             .wall(Items.POLISHED_BLACKSTONE_BRICK_WALL)
                             .material(GTMaterials.Blackstone)
                             .registerAllMaterialInfo()
@@ -595,15 +595,36 @@ public static void registerStoneTypeRecipes(Consumer<FinishedRecipe> provider, @
             }
         }
 
+        if (entry.pressurePlate != null) {
+
+            if (ConfigHolder.INSTANCE.recipes.hardRedstoneRecipes && entry.slab != null) {
+                VanillaRecipeHelper.addShapedRecipe(provider, entry.stoneName + "_pressure_plate",
+                        new ItemStack(entry.pressurePlate, 2), "ShS", "LCL", "SdS",
+                        'S', new MaterialEntry(TagPrefix.screw, GTMaterials.Iron),
+                        'L', entry.slab,
+                        'C', new MaterialEntry(TagPrefix.spring, GTMaterials.Iron));
+
+                ASSEMBLER_RECIPES.recipeBuilder(entry.stoneName + "_pressure_plate")
+                        .inputItems(TagPrefix.spring, GTMaterials.Iron)
+                        .inputItems(entry.stone, 2)
+                        .outputItems(entry.pressurePlate, 2)
+                        .duration(100)
+                        .EUt(VA[ULV])
+                        .save(provider);
+            } else if (ConfigHolder.INSTANCE.recipes.removeVanillaBlockRecipes) {
+
+            }
+        }
+
         if (entry.button != null) {
             if (ConfigHolder.INSTANCE.recipes.hardRedstoneRecipes && entry.pressurePlate != null) {
                 VanillaRecipeHelper.addShapedRecipe(provider, "stone_button", new ItemStack(entry.button, 6), "sP",
                         'P', entry.pressurePlate);
             }
 
-            if (entry.slab != null) {
+            if (entry.pressurePlate != null) {
                 GTRecipeTypes.CUTTER_RECIPES.recipeBuilder("cut_" + entry.stoneName + "slab_into_button")
-                        .inputItems(entry.slab)
+                        .inputItems(entry.pressurePlate)
                         .outputItems(entry.button, 3)
                         .duration(60)
                         .EUt(8)
@@ -619,27 +640,6 @@ public static void registerStoneTypeRecipes(Consumer<FinishedRecipe> provider, @
             }
         }
 
-        if (entry.pressurePlate != null) {
-
-            if (ConfigHolder.INSTANCE.recipes.hardRedstoneRecipes && entry.slab != null) {
-                VanillaRecipeHelper.addShapedRecipe(provider, entry.stoneName + "_pressure_plate",
-                        new ItemStack(entry.pressurePlate, 2), "ShS", "LCL", "SdS",
-                        'S', new MaterialEntry(TagPrefix.screw, GTMaterials.Iron),
-                        'L', entry.slab,
-                        'C', new MaterialEntry(TagPrefix.spring, GTMaterials.Iron));
-
-                ASSEMBLER_RECIPES.recipeBuilder(entry.stoneName + "_pressure_plate")
-                        .inputItems(TagPrefix.spring, GTMaterials.Iron)
-                        .inputItems(entry.stone, 2)
-                        .outputItems(entry.pressurePlate, 2)
-                        .duration(100)
-                        .EUt(VA[ULV])
-                        .save(provider);
-            } else if (ConfigHolder.INSTANCE.recipes.removeVanillaBlockRecipes) {
-
-            }
-        }
-
         if (entry.stair != null) {
             if (ConfigHolder.INSTANCE.recipes.removeVanillaBlockRecipes) {
                 VanillaRecipeHelper.addShapedRecipe(provider, entry.stoneName + "_stair_saw",