From 6a75fe9500a9b3c7a7ca370d7ac771551c5c4f26 Mon Sep 17 00:00:00 2001 From: Jika Date: Thu, 20 Nov 2025 20:24:20 +0100 Subject: [PATCH] Adjust mods --- ...tant-horizon-headlights-and-qol-perf.patch | 87 ------------------- scripts/sync-extra-mods.sh | 6 +- 2 files changed, 2 insertions(+), 91 deletions(-) diff --git a/patches/0006-Distant-horizon-headlights-and-qol-perf.patch b/patches/0006-Distant-horizon-headlights-and-qol-perf.patch index b5cb35b27..f48496cc6 100644 --- a/patches/0006-Distant-horizon-headlights-and-qol-perf.patch +++ b/patches/0006-Distant-horizon-headlights-and-qol-perf.patch @@ -812,91 +812,4 @@ index 00000000..e3ce8515 + # NAME_IP_PORT: Example: "Minecraft Server IP 192.168.1.40:25565"NAME_IP_PORT_MC_VERSION: Example: "Minecraft Server IP 192.168.1.40:25565 GameVersion 1.16.5" + serverFolderNameMode = "NAME_ONLY" + -diff --git a/config/smoothchunk.json b/config/smoothchunk.json -new file mode 100644 -index 00000000..d9a2d386 ---- /dev/null -+++ b/config/smoothchunk.json -@@ -0,0 +1,10 @@ -+{ -+ "chunkSaveDelay": { -+ "desc:": "Delay before a chunk is saved to disk, default: 300 seconds", -+ "chunkSaveDelay": 300 -+ }, -+ "debugLogging": { -+ "desc:": "Enables debug logging of how many chunks got saved in a tick. default: false", -+ "debugLogging": false -+ } -+} -\ No newline at end of file -diff --git a/kubejs/server_scripts/headlight/recipes.js b/kubejs/server_scripts/headlight/recipes.js -new file mode 100644 -index 00000000..4536816f ---- /dev/null -+++ b/kubejs/server_scripts/headlight/recipes.js -@@ -0,0 +1,24 @@ -+// priority: 0 -+"use strict"; -+ -+// Headlight: replace default recipe and add TFG-specific one -+/** -+ * @param {Internal.RecipesEventJS} event -+ */ -+const registerHeadlightRecipes = (event) => { -+ // Remove default Headlight recipe (as done in Gravitas²) -+ event.remove({ id: "headlight:headlight" }) -+ -+ // Add shaped recipe aligned with Gravitas², using TFG ID namespace -+ event.shaped("headlight:headlight", [ -+ " I ", -+ "LPL", -+ "S S" -+ ], { -+ I: "minecraft:item_frame", -+ L: "#forge:leather", -+ P: "tfc:wool_cloth", -+ S: "minecraft:string" -+ }).id("tfg:headlight/headlight") -+} -+ -diff --git a/kubejs/server_scripts/headlight/tags.js b/kubejs/server_scripts/headlight/tags.js -new file mode 100644 -index 00000000..4cb3cbcd ---- /dev/null -+++ b/kubejs/server_scripts/headlight/tags.js -@@ -0,0 +1,14 @@ -+// priority: 0 -+"use strict"; -+ -+// Headlight integration: define which items count as lights -+// Adds TFC torches to Headlight's lights tag so they emit handheld light -+/** -+ * @param {Internal.TagsItemEventJS} event -+ */ -+const registerHeadlightItemTags = (event) => { -+ event.add("headlight:lights", [ -+ "tfc:torch" -+ ]) -+} -+ -diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js -index b6fd1223..a43d62c3 100644 ---- a/kubejs/server_scripts/main_server_script.js -+++ b/kubejs/server_scripts/main_server_script.js -@@ -41,6 +41,7 @@ ServerEvents.tags('item', event => { - registerModernMarkingsItemTags(event) - registerMoreRedItemTags(event) - registerHotOrNotItemTags(event) -+ registerHeadlightItemTags(event) - registerPrimitiveCreaturesItemTags(event) - registerRailWaysItemTags(event) - registerRnrItemTags(event) -@@ -241,6 +242,7 @@ ServerEvents.recipes(event => { - registerGreateRecipes(event) - registerGTCEURecipes(event); - registerHandGliderRecipes(event) -+ registerHeadlightRecipes(event) - registerHotOrNotRecipes(event) - registerImmersiveAircraftRecipes(event) - registerMacawsForTFCRecipes(event) diff --git a/scripts/sync-extra-mods.sh b/scripts/sync-extra-mods.sh index 6dc2ec411..6fa8f191b 100755 --- a/scripts/sync-extra-mods.sh +++ b/scripts/sync-extra-mods.sh @@ -8,11 +8,9 @@ mods=( blaze-map caelum cartography - clumps crash-assistant crash-utilities cupboard - headlight precision-prospecting smooth-chunk-save tfc-caelum @@ -20,7 +18,7 @@ mods=( zume ) -java -jar "$PAKKU_JAR" add ${mods[*]} -y +java -jar "$PAKKU_JAR" -y add ${mods[*]} -java -jar "$PAKKU_JAR" add prj --mr distanthorizons --cf distant-horizons -y +java -jar "$PAKKU_JAR" -y add prj --mr distanthorizons --cf distant-horizons