From e0c16dceca3bf4c31be00838b4c1a3c2e0fa9924 Mon Sep 17 00:00:00 2001 From: Oganesson897 <101081378+Oganesson897@users.noreply.github.com> Date: Sun, 15 Dec 2024 17:51:44 +0900 Subject: [PATCH 1/3] Fixed #1108 --- config/gregtech/worldgen/vein/beneath/phosphorite_vein.json | 2 +- config/gregtech/worldgen/vein/overworld/phosphorite_vein.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/gregtech/worldgen/vein/beneath/phosphorite_vein.json b/config/gregtech/worldgen/vein/beneath/phosphorite_vein.json index 48722c271..acd7b083e 100644 --- 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 index 1246e6c98..d9ab31ad8 100644 --- 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" } ] } From aa801272d424e6af272525942283d7d2fdb65c5e Mon Sep 17 00:00:00 2001 From: Oganesson897 <101081378+Oganesson897@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:00:16 +0900 Subject: [PATCH 2/3] Fixed #1095 --- groovy/postInit/mod/GregTech.groovy | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index e3e709df4..e07f88303 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/groovy/postInit/mod/GregTech.groovy @@ -10,6 +10,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 @@ -1481,3 +1485,23 @@ crafting.addShaped('gregtech:electric_jetpack_advanced2', metaitem('advanced_ele [metaitem('power_thruster_advanced'), metaitem('battery.re.hv.cadmium'), metaitem('power_thruster_advanced')], [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(); \ No newline at end of file From 88b13ea3b6df210beb316f4a32872a9850bc1c66 Mon Sep 17 00:00:00 2001 From: Oganesson897 <101081378+Oganesson897@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:06:43 +0900 Subject: [PATCH 3/3] Fixed #983 --- groovy/postInit/mod/BuildingGadgets.groovy | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/groovy/postInit/mod/BuildingGadgets.groovy b/groovy/postInit/mod/BuildingGadgets.groovy index d28fa0bb1..b60d99557 100755 --- 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()