From 11be2da734f4780d9404e30f8ef75077a938f47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jozef=20Steinh=C3=BCbl?= Date: Tue, 2 Jul 2024 22:23:49 +0200 Subject: [PATCH] feat: resolve conflicts w/ Ad Astra, Thermal, GT --- .../ad_astra/removed/recipes.js | 35 +++++ .../ad_astra_gtc_integration.js | 31 ----- .../server_scripts/regions_unexplored/door.js | 2 + .../server_scripts/thermal/removed/recipes.js | 127 ++++++++++++++++++ .../server_scripts/thermal_gtc_integration.js | 62 --------- 5 files changed, 164 insertions(+), 93 deletions(-) create mode 100755 packwiz/1.20.1/kubejs/server_scripts/ad_astra/removed/recipes.js delete mode 100755 packwiz/1.20.1/kubejs/server_scripts/ad_astra_gtc_integration.js create mode 100755 packwiz/1.20.1/kubejs/server_scripts/thermal/removed/recipes.js delete mode 100755 packwiz/1.20.1/kubejs/server_scripts/thermal_gtc_integration.js diff --git a/packwiz/1.20.1/kubejs/server_scripts/ad_astra/removed/recipes.js b/packwiz/1.20.1/kubejs/server_scripts/ad_astra/removed/recipes.js new file mode 100755 index 0000000..e0c4801 --- /dev/null +++ b/packwiz/1.20.1/kubejs/server_scripts/ad_astra/removed/recipes.js @@ -0,0 +1,35 @@ +ServerEvents.recipes((event) => { + const REMOVED_PLATE_RECIPES = ["steel", "iron"]; + + const REMOVED_ROD_RECIPES = ["steel", "iron"]; + + const REMOVED_NUGGET_RECIPES = ["steel"]; + + REMOVED_PLATE_RECIPES.forEach((metal) => { + event.remove({ + id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingot`, + }); + event.remove({ + id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingots`, + }); + + event.remove({ + id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_block`, + }); + event.remove({ + id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_blocks`, + }); + }); + + REMOVED_ROD_RECIPES.forEach((metal) => { + event.remove({ + id: `ad_astra:${metal}_rod`, + }); + }); + + REMOVED_NUGGET_RECIPES.forEach((metal) => { + event.remove({ + id: `ad_astra:${metal}_nugget`, + }); + }); +}); diff --git a/packwiz/1.20.1/kubejs/server_scripts/ad_astra_gtc_integration.js b/packwiz/1.20.1/kubejs/server_scripts/ad_astra_gtc_integration.js deleted file mode 100755 index 0cce9a0..0000000 --- a/packwiz/1.20.1/kubejs/server_scripts/ad_astra_gtc_integration.js +++ /dev/null @@ -1,31 +0,0 @@ -ServerEvents.recipes((event) => { - const AD_ASTRA_REMOVED_PLATE_RECIPES = ["steel", "iron"]; - - const AD_ASTRA_REMOVED_ROD_RECIPES = ["steel"]; - - const AD_ASTRA_REMOVED_NUGGET_RECIPES = ["steel"]; - - // Remove Ad Astra recipes for plates - AD_ASTRA_REMOVED_PLATE_RECIPES.forEach((metal) => { - event.remove({ - id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_ingots`, - }); - event.remove({ - id: `ad_astra:compressing/${metal}_plate_from_compressing_${metal}_blocks`, - }); - }); - - // Remove Ad Astra recipes for gears - AD_ASTRA_REMOVED_ROD_RECIPES.forEach((metal) => { - event.remove({ - id: `ad_astra:${metal}_rod`, - }); - }); - - // Remove Ad Astra recipes for nuggets - AD_ASTRA_REMOVED_NUGGET_RECIPES.forEach((metal) => { - event.remove({ - id: `ad_astra:${metal}_nugget`, - }); - }); -}); diff --git a/packwiz/1.20.1/kubejs/server_scripts/regions_unexplored/door.js b/packwiz/1.20.1/kubejs/server_scripts/regions_unexplored/door.js index b192147..e3803f5 100755 --- a/packwiz/1.20.1/kubejs/server_scripts/regions_unexplored/door.js +++ b/packwiz/1.20.1/kubejs/server_scripts/regions_unexplored/door.js @@ -25,4 +25,6 @@ ServerEvents.recipes((event) => { "regions_unexplored:willow_door", "regions_unexplored:yellow_bioshroom_door", ].forEach((d) => gregifyDoorRecipe(event, ":", d)); + + event.remove({ id: "regions_unexplored:oak_door" }); }); diff --git a/packwiz/1.20.1/kubejs/server_scripts/thermal/removed/recipes.js b/packwiz/1.20.1/kubejs/server_scripts/thermal/removed/recipes.js new file mode 100755 index 0000000..979f40a --- /dev/null +++ b/packwiz/1.20.1/kubejs/server_scripts/thermal/removed/recipes.js @@ -0,0 +1,127 @@ +ServerEvents.recipes((event) => { + const REMOVED_PLATE_RECIPES = [ + "tin", + "lead", + "silver", + "nickel", + "bronze", + "invar", + "iron", + "gold", + "copper", + "electrum", + ]; + + const REMOVED_GEAR_RECIPES = [ + "tin", + "lead", + "silver", + "nickel", + "bronze", + "invar", + "iron", + "gold", + "copper", + "electrum", + "lapis", + "emerald", + //"quartz" + ]; + + const REMOVED_NUGGET_RECIPES = [ + "tin", + "lead", + "silver", + "nickel", + "bronze", + "electrum", + "invar", + "copper", + ]; + + const REMOVED_BLEND_RECIPES = ["bronze", "electrum", "invar"]; + const REMOVED_DUST_RECIPES = [ + "bronze", + "tin", + "lead", + "silver", + "electrum", + "invar", + "nickel", + "ruby", + "sapphire", + "apatite", + "niter", + "lapis", + "diamond", + "emerald", + "sulfur", + "cinnabar", + ]; + + REMOVED_PLATE_RECIPES.forEach((metal) => { + event.remove({ + id: `thermal:machines/press/press_${metal}_ingot_to_plate`, + }); + }); + + REMOVED_GEAR_RECIPES.forEach((metal) => { + event.remove({ + id: `thermal:parts/${metal}_gear`, + }); + + event.remove({ + id: `thermal:machines/press/press_${metal}_ingot_to_gear`, + }); + }); + + REMOVED_NUGGET_RECIPES.forEach((metal) => { + event.remove({ + id: `thermal:storage/${metal}_nugget_from_ingot`, + }); + }); + + REMOVED_BLEND_RECIPES.forEach((metal) => { + event.remove({ + id: `thermal:${metal}_dust_2`, + }); + event.remove({ + id: `thermal:${metal}_dust_3`, + }); + event.remove({ + id: `thermal:${metal}_dust_4`, + }); + + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}_plate_to_dust`, + }); + + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}_ingot_to_dust`, + }); + }); + + REMOVED_DUST_RECIPES.forEach((metal) => { + event.remove({ + id: `thermal:machines/centrifuge/centrifuge_${metal}_dust`, + }); + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}`, + }); + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}_ore`, + }); + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_raw_${metal}`, + }); + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}_ingot_to_dust`, + }); + event.remove({ + id: `thermal:machines/pulverizer/pulverizer_${metal}_plate_to_dust`, + }); + event.remove({ + id: `thermal:earth_charge/${metal}_dust_from_${metal}`, + }); + }); +}); diff --git a/packwiz/1.20.1/kubejs/server_scripts/thermal_gtc_integration.js b/packwiz/1.20.1/kubejs/server_scripts/thermal_gtc_integration.js deleted file mode 100755 index 7f1758f..0000000 --- a/packwiz/1.20.1/kubejs/server_scripts/thermal_gtc_integration.js +++ /dev/null @@ -1,62 +0,0 @@ -ServerEvents.recipes((event) => { - const THERMAL_REMOVED_PLATE_RECIPES = [ - "tin", - "lead", - "silver", - "nickel", - "bronze", - "invar", - "iron", - "gold", - "copper", - "electrum", - ]; - - const THERMAL_REMOVED_GEAR_RECIPES = [ - "tin", - "lead", - "silver", - "nickel", - "bronze", - "invar", - "iron", - "gold", - "copper", - "electrum", - "lapis", - "emerald", - //"quartz" - ]; - - const THERMAL_REMOVED_NUGGET_RECIPES = [ - "tin", - "lead", - "silver", - "nickel", - "bronze", - "electrum", - "invar", - "copper", - ]; - - // Remove Thermal Foundation recipes for plates - THERMAL_REMOVED_PLATE_RECIPES.forEach((metal) => { - event.remove({ - id: `thermal:machines/press/press_${metal}_ingot_to_plate`, - }); - }); - - // Remove Thermal Foundation recipes for gears - THERMAL_REMOVED_GEAR_RECIPES.forEach((metal) => { - event.remove({ - id: `thermal:parts/${metal}_gear`, - }); - }); - - // Remove Thermal Foundation recipes for nuggets - THERMAL_REMOVED_NUGGET_RECIPES.forEach((metal) => { - event.remove({ - id: `thermal:storage/${metal}_nugget_from_ingot`, - }); - }); -});