Merge pull request #1326 from trainvoi/concrete-dupe-fixes

Fixing a concrete dupe by disabling recycling recipes for Industrial Concrete
SymmetricDevs · Mar 9, 2025 · 514e1db · 514e1db
2 parents 6cf71c2 + 4847c2c
commit 514e1db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/groovy/postInit/mod/DecorationBlocks.groovy b/groovy/postInit/mod/DecorationBlocks.groovy
@@ -1,51 +1,51 @@
 crafting.addShaped('susy:gabbro_bricks', item('susy:susy_stone_bricks') * 4, [
-        [ore('stoneGabbro'), ore('stoneGabbro')],
-        [ore('stoneGabbro'), ore('stoneGabbro')]
+    [ore('stoneGabbro'), ore('stoneGabbro')],
+    [ore('stoneGabbro'), ore('stoneGabbro')]
 ])
 
 crafting.addShaped('susy:gneiss_bricks', item('susy:susy_stone_bricks', 1) * 4, [
-        [ore('stoneGneiss'), ore('stoneGneiss')],
-        [ore('stoneGneiss'), ore('stoneGneiss')]
+    [ore('stoneGneiss'), ore('stoneGneiss')],
+    [ore('stoneGneiss'), ore('stoneGneiss')]
 ])
 
 crafting.addShaped('susy:limestone_bricks', item('susy:susy_stone_bricks', 2) * 4, [
-        [ore('stoneLimestone'), ore('stoneLimestone')],
-        [ore('stoneLimestone'), ore('stoneLimestone')]
+    [ore('stoneLimestone'), ore('stoneLimestone')],
+    [ore('stoneLimestone'), ore('stoneLimestone')]
 ])
 
 crafting.addShaped('susy:phyllite_bricks', item('susy:susy_stone_bricks', 3) * 4, [
-        [ore('stonePhyllite'), ore('stonePhyllite')],
-        [ore('stonePhyllite'), ore('stonePhyllite')]
+    [ore('stonePhyllite'), ore('stonePhyllite')],
+    [ore('stonePhyllite'), ore('stonePhyllite')]
 ])
 
 crafting.addShaped('susy:quartzite_bricks', item('susy:susy_stone_bricks', 4) * 4, [
-        [ore('stoneQuartzite'), ore('stoneQuartzite')],
-        [ore('stoneQuartzite'), ore('stoneQuartzite')]
+    [ore('stoneQuartzite'), ore('stoneQuartzite')],
+    [ore('stoneQuartzite'), ore('stoneQuartzite')]
 ])
 
 crafting.addShaped('susy:shale_bricks', item('susy:susy_stone_bricks', 5) * 4, [
-        [ore('stoneShale'), ore('stoneShale')],
-        [ore('stoneShale'), ore('stoneShale')]
+    [ore('stoneShale'), ore('stoneShale')],
+    [ore('stoneShale'), ore('stoneShale')]
 ])
 
 crafting.addShaped('susy:slate_bricks', item('susy:susy_stone_bricks', 6) * 4, [
-        [ore('stoneSlate'), ore('stoneSlate')],
-        [ore('stoneSlate'), ore('stoneSlate')]
+    [ore('stoneSlate'), ore('stoneSlate')],
+    [ore('stoneSlate'), ore('stoneSlate')]
 ])
 
 crafting.addShaped('susy:soapstone_bricks', item('susy:susy_stone_bricks', 7) * 4, [
-        [ore('stoneSoapstone'), ore('stoneSoapstone')],
-        [ore('stoneSoapstone'), ore('stoneSoapstone')]
+    [ore('stoneSoapstone'), ore('stoneSoapstone')],
+    [ore('stoneSoapstone'), ore('stoneSoapstone')]
 ])
 
 crafting.addShaped('susy:kimberlite_bricks', item('susy:susy_stone_bricks', 8) * 4, [
-        [ore('stoneKimberlite'), ore('stoneKimberlite')],
-        [ore('stoneKimberlite'), ore('stoneKimberlite')]
+    [ore('stoneKimberlite'), ore('stoneKimberlite')],
+    [ore('stoneKimberlite'), ore('stoneKimberlite')]
 ])
 
 crafting.addShaped('susy:industrial_concrete_bricks', item('susy:susy_stone_bricks', 9) * 4, [
-        [item('susy:susy_stone_smooth', 9), item('susy:susy_stone_smooth', 9)],
-        [item('susy:susy_stone_smooth', 9), item('susy:susy_stone_smooth', 9)]
+    [item('susy:susy_stone_smooth', 9), item('susy:susy_stone_smooth', 9)],
+    [item('susy:susy_stone_smooth', 9), item('susy:susy_stone_smooth', 9)]
 ])
 
 crafting.addShapeless('marble_conversion', item('gregtech:stone_smooth', 2), [item('chisel:marble2', 7)])
@@ -57,8 +57,8 @@ mods.gregtech.extruder.recipeBuilder()
 	.fluidInputs(fluid('concrete') * 576)
 	.outputs(item('susy:structural_block') * 32)
 	.duration(200)
-        .EUt(30)
-        .buildAndRegister();
+	.EUt(30)
+	.buildAndRegister();
 
 //add variants to chisel group
 mods.chisel.carving.addGroup("susy_structural_blocks")

diff --git a/groovy/postInit/mod/SusyCore.groovy b/groovy/postInit/mod/SusyCore.groovy
@@ -348,10 +348,15 @@ ASSEMBLER.recipeBuilder()
     .EUt(Globals.voltAmps[4])
     .buildAndRegister()
 
+//Industrial Concrete
 FLUID_SOLIDIFIER.recipeBuilder()
     .inputs(ore('frameGtSteel'))
     .fluidInputs(fluid('concrete') * 576)
     .outputs(item('susy:susy_stone_smooth', 9) * 32)
     .duration(100)
     .EUt(Globals.voltAmps[1])
     .buildAndRegister()
+
+// Concrete Dust * 1 (remove Industrial Concrete recycling)
+mods.gregtech.macerator.removeByInput(2, [item('susy:susy_stone_smooth', 9)], null)
+