Merge remote-tracking branch 'EnderProyects/RockBreaker' into dev

GTNewHorizons · Feb 3, 2025 · 1c9c753 · 1c9c753
2 parents 6081ecf + ec7bd2d
commit 1c9c753
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 9 deletions.
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTERockBreaker.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTERockBreaker.java
@@ -23,6 +23,7 @@
 
 import gregtech.api.enums.MachineType;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -31,6 +32,7 @@
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 
@@ -169,9 +171,12 @@ public int checkRecipe() {
             || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.lava)
             || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.lava)) {
                 if (GTUtility.areStacksEqual(getStackInSlot(getCircuitSlot()), GTUtility.getIntegratedCircuit(1))) {
-                    if (GTUtility.areStacksEqual(getInputAt(0), new ItemStack(Blocks.packed_ice, 0))) {
+                    if (GTUtility.areStacksEqual(
+                        getInputAt(0),
+                        GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "blue_ice", 0, 0))) {
                         if ((aBaseMetaTileEntity.getBlockOffset(0, -1, 0) == Blocks.soul_sand)) {
-                            ItemStack tOutput = GTOreDictUnificator.get(OrePrefixes.block, Materials.Basalt, 1L);
+                            ItemStack tOutput = (GTOreDictUnificator
+                                .get(OrePrefixes.cobblestone, Materials.Basalt, 1L));
                             if (canOutput(tOutput)) {
                                 calculateOverclockedNess(30, 16);
                                 // In case recipe is too OP for that machine
@@ -181,7 +186,31 @@ public int checkRecipe() {
                                 return 2;
                             }
                         }
-                    }
+                    } else if ((aBaseMetaTileEntity.getBlockOffset(0, 0, 1) == Blocks.lava)
+                        || (aBaseMetaTileEntity.getBlockOffset(0, 0, -1) == Blocks.lava)
+                        || (aBaseMetaTileEntity.getBlockOffset(-1, 0, 0) == Blocks.lava)
+                        || (aBaseMetaTileEntity.getBlockOffset(1, 0, 0) == Blocks.lava)) {
+                            if (GTUtility
+                                .areStacksEqual(getStackInSlot(getCircuitSlot()), GTUtility.getIntegratedCircuit(1))) {
+                                if (GTUtility.areStacksEqual(
+                                    getInputAt(0),
+                                    GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "magma", 0, 0))) {
+                                    if ((aBaseMetaTileEntity.getBlockOffset(0, -1, 0) == Blocks.soul_sand)) {
+                                        ItemStack tOutput = GTModHandler
+                                            .getModItem(Mods.EtFuturumRequiem.ID, "cobbled_deepslate", 1, 0);
+                                        if (canOutput(tOutput)) {
+                                            calculateOverclockedNess(30, 16);
+                                            // In case recipe is too OP for that machine
+                                            if (mMaxProgresstime == Integer.MAX_VALUE - 1
+                                                && mEUt == Integer.MAX_VALUE - 1)
+                                                return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+                                            this.mOutputItems[0] = tOutput;
+                                            return 2;
+                                        }
+                                    }
+                                }
+                            }
+                        }
                 }
             }
         return 0;

diff --git a/src/main/java/gregtech/loaders/postload/GTPostLoad.java b/src/main/java/gregtech/loaders/postload/GTPostLoad.java
@@ -34,6 +34,7 @@
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
@@ -362,8 +363,22 @@ public static void addFakeRecipes() {
             .addTo(rockBreakerFakeRecipes);
 
         GTValues.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.packed_ice, 0), GTUtility.getIntegratedCircuit(1))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.Basalt, 1L))
+            .itemInputs(
+                GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "blue_ice", 0, 0),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cobblestone, Materials.Basalt, 1L))
+            .duration(16 * TICKS)
+            .eut(TierEU.RECIPE_LV)
+            .ignoreCollision()
+            .noOptimize()
+            .fake()
+            .addTo(rockBreakerFakeRecipes);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "blue_ice", 0, 0),
+                GTUtility.getIntegratedCircuit(1))
+            .itemOutputs(GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "cobbled_deepslate", 1, 0))
             .duration(16 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .ignoreCollision()

diff --git a/...xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/...xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
@@ -81,9 +81,10 @@ protected MultiblockTooltipBuilder createTooltip() {
         tt.addMachineType(getMachineType())
             .addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8")
             .addInfo("Use Integrated Circuit to determine recipe")
-            .addInfo("1 = cobble, 2 = stone, 3 = obsidian, 4 = basalt")
+            .addInfo("1 = cobble, 2 = stone, 3 = obsidian, 4 = basalt, 5 = deepslate")
             .addInfo("Needs Water and Lava in input hatch")
-            .addInfo("Needs Soul Sand and Packed Ice in input bus for basalt")
+            .addInfo("Needs Soul Sand and Blue Ice in input bus for basalt")
+            .addInfo("Needs Soul Sand and Magma in input bus for deepslate")
             .addPollutionAmount(getPollutionPerSecond(null))
             .beginStructureBlock(3, 4, 3, true)
             .addController("Bottom Center")

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderIndustrialRockBreaker.java
@@ -9,8 +9,10 @@
 
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
+import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 
@@ -43,9 +45,19 @@ public static void run() {
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTUtility.getIntegratedCircuit(4),
-                new ItemStack(Blocks.packed_ice, 0),
+                GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "blue_ice", 0, 0),
                 new ItemStack(Blocks.soul_sand, 0))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.Basalt, 1L))
+            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cobblestone, Materials.Basalt, 1L))
+            .duration(16 * TICKS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(multiblockRockBreakerRecipes);
+
+        GTValues.RA.stdBuilder()
+            .itemInputs(
+                GTUtility.getIntegratedCircuit(5),
+                GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "magma", 0, 0),
+                new ItemStack(Blocks.soul_sand, 0))
+            .itemOutputs(GTModHandler.getModItem(Mods.EtFuturumRequiem.ID, "cobbled_deepslate", 1, 0))
             .duration(16 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(multiblockRockBreakerRecipes);