From 820debe993df753566dab02e9755b6a5ea4bb778 Mon Sep 17 00:00:00 2001
From: ursamina <143211829+ursamina@users.noreply.github.com>
Date: Sat, 6 Jul 2024 20:37:23 +0100
Subject: [PATCH] consolidate miscellaneous kjs scripts into one file

less fragmenting
---
 .../crafting_station/recipes.js               | 12 -----
 kubejs/server_scripts/elden_ring.js           | 21 --------
 kubejs/server_scripts/miscellaneous.js        | 50 +++++++++++++++++++
 kubejs/server_scripts/tool_belt/recipes.js    | 15 ------
 4 files changed, 50 insertions(+), 48 deletions(-)
 delete mode 100644 kubejs/server_scripts/crafting_station/recipes.js
 delete mode 100644 kubejs/server_scripts/elden_ring.js
 create mode 100644 kubejs/server_scripts/miscellaneous.js
 delete mode 100644 kubejs/server_scripts/tool_belt/recipes.js

diff --git a/kubejs/server_scripts/crafting_station/recipes.js b/kubejs/server_scripts/crafting_station/recipes.js
deleted file mode 100644
index c50effe..0000000
--- a/kubejs/server_scripts/crafting_station/recipes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-ServerEvents.recipes((event) => {
-  event.remove({ id: "craftingstation:crafting_station" });
-  event.shapeless("craftingstation:crafting_station", [
-    "minecraft:crafting_table",
-    "#forge:tools/saws",
-  ]);
-  event.remove({ id: "craftingstation:crafting_station_slab" });
-  event.shapeless("craftingstation:crafting_station_slab", [
-    "craftingstation:crafting_station",
-    "#forge:tools/saws",
-  ]);
-});
diff --git a/kubejs/server_scripts/elden_ring.js b/kubejs/server_scripts/elden_ring.js
deleted file mode 100644
index 0c572c1..0000000
--- a/kubejs/server_scripts/elden_ring.js
+++ /dev/null
@@ -1,21 +0,0 @@
-ServerEvents.recipes((event) => {
-// Void Portal
-  event.remove({ id: "javd:portal_block" });
-  event.shaped(`javd:portal_block`, ["PPP", "PEP", "PPP"], {
-    P: "#forge:plates/obsidian",
-    E: "gtceu:ender_pearl_block",
-  });
-
-  event.remove({ id: "travelanchors:travel_anchor" });
-  event.shaped(`travelanchors:travel_anchor`, ["SGS", "GPG", "SGS"], {
-    S: "#forge:plates/black_steel",
-    G: "#forge:plates/green_sapphire",
-    P: "ender_pearl",
-  });
-
-  event.remove({ id: "travelanchors:travel_staff" });
-  event.shaped(`travelanchors:travel_staff`, ["  P", " R ", "R  "], {
-    R: "#forge:rods/black_steel",
-    P: "gtceu:green_sapphire_gem",
-  });
-});
diff --git a/kubejs/server_scripts/miscellaneous.js b/kubejs/server_scripts/miscellaneous.js
new file mode 100644
index 0000000..d59b994
--- /dev/null
+++ b/kubejs/server_scripts/miscellaneous.js
@@ -0,0 +1,50 @@
+ServerEvents.recipes((event) => {
+  // Void Portal
+  event.remove({ id: "javd:portal_block" });
+  event.shaped(`javd:portal_block`, ["PPP", "PEP", "PPP"], {
+    P: "#forge:plates/obsidian",
+    E: "gtceu:ender_pearl_block",
+  });
+
+
+  // Travel Anchors
+  event.remove({ id: "travelanchors:travel_anchor" });
+  event.shaped(`travelanchors:travel_anchor`, ["SGS", "GPG", "SGS"], {
+    S: "#forge:plates/black_steel",
+    G: "#forge:plates/green_sapphire",
+    P: "ender_pearl",
+  });
+
+  event.remove({ id: "travelanchors:travel_staff" });
+  event.shaped(`travelanchors:travel_staff`, ["  P", " R ", "R  "], {
+    R: "#forge:rods/black_steel",
+    P: "gtceu:green_sapphire_gem",
+  });
+
+  // Crafting Station
+  event.remove({ id: "craftingstation:crafting_station" });
+  event.shapeless("craftingstation:crafting_station", [
+    "minecraft:crafting_table",
+    "#forge:tools/saws",
+  ]);
+  event.remove({ id: "craftingstation:crafting_station_slab" });
+  event.shapeless("craftingstation:crafting_station_slab", [
+    "craftingstation:crafting_station",
+    "#forge:tools/saws",
+  ]);
+
+  // Tool Belt
+  event.remove({ id: "toolbelt:belt" });
+  event.shaped("toolbelt:belt", ["SLS", "C C", "LIL"], {
+    S: "minecraft:string",
+    L: "minecraft:leather",
+    I: "#forge:plates/steel",
+    C: "#forge:screws/steel",
+  });
+  event.remove({ id: "toolbelt:pouch" });
+  event.shaped("toolbelt:pouch", [" G ", "LSL", "   "], {
+    G: "#forge:rings/gold",
+    L: "minecraft:leather",
+    S: "#forge:plates/steel",
+  });
+});
diff --git a/kubejs/server_scripts/tool_belt/recipes.js b/kubejs/server_scripts/tool_belt/recipes.js
deleted file mode 100644
index 14e5c74..0000000
--- a/kubejs/server_scripts/tool_belt/recipes.js
+++ /dev/null
@@ -1,15 +0,0 @@
-ServerEvents.recipes((event) => {
-  event.remove({ id: "toolbelt:belt" });
-  event.shaped("toolbelt:belt", ["SLS", "C C", "LIL"], {
-    S: "minecraft:string",
-    L: "minecraft:leather",
-    I: "#forge:plates/steel",
-    C: "#forge:screws/steel",
-  });
-  event.remove({ id: "toolbelt:pouch" });
-  event.shaped("toolbelt:pouch", [" G ", "LSL", "   "], {
-    G: "#forge:rings/gold",
-    L: "minecraft:leather",
-    S: "#forge:plates/steel",
-  });
-});