Merge pull request #1166 from Oganesson897/little-fixes

Little fixes
SymmetricDevs · Dec 18, 2024 · 7035fa8 · 7035fa8
2 parents 97b2095 + 3c81bc1
commit 7035fa8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/config/gregtech/worldgen/vein/beneath/phosphorite_vein.json b/config/gregtech/worldgen/vein/beneath/phosphorite_vein.json
@@ -24,7 +24,7 @@
         "between": "ore:phosphorite"
       },
       {
-        "sporadic": "ore:apatite"
+        "sporadic": "ore:chlorapatite"
       }
     ]
   }

diff --git a/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json b/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json
@@ -32,7 +32,7 @@
 	}
       },
       {
-        "sporadic": "ore:apatite"
+        "sporadic": "ore:chlorapatite"
       }
     ]
   }

diff --git a/groovy/postInit/mod/BuildingGadgets.groovy b/groovy/postInit/mod/BuildingGadgets.groovy
@@ -12,29 +12,29 @@ for (name in name_removals) {
 
 // Building Gadget
 crafting.addShaped('buildinggadgets:buildingtool', item('buildinggadgets:buildingtool'), [
-    [null, metaitem('electric.piston.hv'), null],
-    [ore('plateStainlessSteel'), metaitem('power_unit.hv'), ore('plateStainlessSteel')],
-    [ore('plateStainlessSteel'), ore('circuitHv'), ore('plateStainlessSteel')]
+    [null, metaitem('electric.piston.lv'), null],
+    [ore('plateSteel'), metaitem('power_unit.lv'), ore('plateSteel')],
+    [ore('plateSteel'), ore('circuitLv'), ore('plateSteel')]
 ])
 
 // Exchanging Gadget
 crafting.addShaped('buildinggadgets:exchangertool', item('buildinggadgets:exchangertool'), [
-    [null, metaitem('robot.arm.hv'), null],
-    [ore('plateStainlessSteel'), metaitem('power_unit.hv'), ore('plateStainlessSteel')],
-    [ore('plateStainlessSteel'), ore('circuitHv'), ore('plateStainlessSteel')]
+    [null, metaitem('robot.arm.lv'), null],
+    [ore('plateSteel'), metaitem('power_unit.lv'), ore('plateSteel')],
+    [ore('plateSteel'), ore('circuitLv'), ore('plateSteel')]
 ])
 
 // Copy Paste Gadget
 crafting.addShaped('buildinggadgets:copypastetool', item('buildinggadgets:copypastetool'), [
-    [null, metaitem('electric.piston.hv'), ore('gearSmallStainlessSteel')],
-    [ore('plateStainlessSteel'), metaitem('power_unit.hv'), ore('plateStainlessSteel')],
-    [ore('plateStainlessSteel'), ore('circuitHv'), ore('plateStainlessSteel')]
+    [null, metaitem('electric.piston.lv'), ore('plateSteel')],
+    [ore('plateSteel'), metaitem('power_unit.lv'), ore('plateSteel')],
+    [ore('plateSteel'), ore('circuitLv'), ore('plateSteel')]
 ])
 
 crafting.replaceShaped('buildinggadgets:templatemanager', item('buildinggadgets:templatemanager'), [
-        [null, metaitem('electric.piston.hv'), null],
-        [item('minecraft:paper'), metaitem('hull.hv'), item('minecraft:paper')],
-        [ore('plateStainlessSteel'), ore('circuitHv'), ore('plateStainlessSteel')]
+        [null, metaitem('electric.piston.lv'), null],
+        [item('minecraft:paper'), metaitem('hull.lv'), item('minecraft:paper')],
+        [ore('plateSteel'), ore('circuitLv'), ore('plateSteel')]
 ])
 
 CENTRIFUGE.recipeBuilder()

diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy
@@ -9,6 +9,10 @@ log.infoMC("Running GregTech.groovy...")
 
 //REMOVALS
 
+// Note Block * 1
+mods.gregtech.assembler.removeByInput(16, [metaitem('plateWood') * 8, item('minecraft:redstone'), metaitem('circuit.integrated').withNbt(['Configuration': 9])], null)
+// Wood Pulp * 8
+mods.gregtech.macerator.removeByInput(2, [item('minecraft:noteblock')], null)
 // Carbon Dust * 2
 mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustCoal')], null)
 // Small Pile of Rare Earth * 1
@@ -1678,6 +1682,26 @@ crafting.addShaped('gregtech:electric_jetpack_advanced2', metaitem('advanced_ele
     [metaitem('wireGtQuadrupleGold'), ore('circuitHv'), metaitem('wireGtQuadrupleGold')]
 ])
 
+mods.gregtech.assembler.recipeBuilder()
+        .inputs(ore('plankWood') * 4)
+        .inputs(ore('stickIronMagnetic') * 1)
+        .inputs(ore('wireFineRedAlloy') * 2)
+        .inputs(item('minecraft:leather') * 2)
+        .circuitMeta(9)
+        .outputs(item('minecraft:noteblock'))
+        .duration(100)
+        .EUt(30)
+        .buildAndRegister();
+
+mods.gregtech.macerator.recipeBuilder()
+        .inputs(item('minecraft:noteblock'))
+        .outputs(metaitem('dustWood') * 4)
+        .outputs(metaitem('dustSmallIron') * 2)
+        .outputs(metaitem('dustSmallRedAlloy'))
+        .duration(869)
+        .EUt(2)
+        .buildAndRegister();
+
 // MV Alternate Energy Handling
 crafting.addShaped('gregtech:energy_hatch.mv2', item('gregtech:machine', 1212), [
     [null, metaitem('voltage_coil.mv'), null],
@@ -1838,4 +1862,3 @@ JET_WINGPACK.recipeBuilder()
 		.fluidInputs(fluid('supreme_kerosene') * 1)
 		.duration(80)
 		.buildAndRegister()
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
             "between": "ore:phosphorite"
           },
           {
-            "sporadic": "ore:apatite"
+            "sporadic": "ore:chlorapatite"
           }
         ]
       }
@@ Expand Down @@