Merge branch '1.20.1/dev' of https://github.com/Layers-of-Railways/mo…

…dpack into 1.20.1/dev
Layers-of-Railways · Jun 19, 2024 · 1aaeb57 · 1aaeb57
2 parents ebc5c3d + 12e237e
commit 1aaeb57
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5
@@ -16,6 +16,10 @@
     // Items here will be unusable completely
     //    Example: minecraft:diamond
     blacklisted_items: [
+        "minecraft:command_block",
+        "minecraft:command_block_minecart",
+        "minecraft:chain_command_block",
+        "minecraft:repeating_command_block",
         "armourers_workshop:skin-library-creative",
         "create:handheld_worldshaper",
         "create:creative_motor",

diff --git a/index.toml b/index.toml
@@ -62,7 +62,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b"
 
 [[files]]
 file = "config/item_obliterator.json5"
-hash = "c342e48d8a0b1ccee431f0817ac85369b4c1f4e1028062ef8f7438115f311d53"
+hash = "65f5c02042726224d08f337690c017186ff5bfee76f0ba93f9429553db14560b"
 
 [[files]]
 file = "config/lmft.json"
@@ -330,6 +330,10 @@ hash = "b2a9f8a2abb9d646e59174085c0a13acea9abead7c28c071cd9ba0b059b6ac19"
 file = "kubejs/server_scripts/easter_eggs.js"
 hash = "17f9f724dab3a3499a8ac933bb12a77740e02e45b3a6c403d3fa018cd077b457"
 
+[[files]]
+file = "kubejs/server_scripts/loot_modifications.js"
+hash = "ff8092997eae613248e2abcf9a6d1576b43277ecb07a4eeed0c582a45a8c1726"
+
 [[files]]
 file = "kubejs/server_scripts/misc_recipes.js"
 hash = "d6e013d21b3014bda7d7b5f74f53b3e16807c30476dc89d78d980a29cc3b4060"
@@ -1041,6 +1045,11 @@ file = "mods/log-begone.pw.toml"
 hash = "86ce30ccc9a035c6249d8140abf8d0fae7f828472913409b3febf46394bbc34d"
 metafile = true
 
+[[files]]
+file = "mods/lootjs.pw.toml"
+hash = "33315b872164da7d6ecb69cb3996dc2ac6d126a33eb8b7e90425874f257aa93a"
+metafile = true
+
 [[files]]
 file = "mods/lootr.pw.toml"
 hash = "996bf4e23ceb3ebe203859eda250fddf210babc15b5683fe585159a9398e4d70"
@@ -1426,7 +1435,7 @@ metafile = true
 
 [[files]]
 file = "mods/taterzens.pw.toml"
-hash = "a9130456bfeb0256291677f12b0f732ec776fea865c9d9a8254980f02ae512e5"
+hash = "28143eb8e3d0b5c4a0e06dd78c25cdeb32196cc1c67766064527a27932f39b5b"
 metafile = true
 
 [[files]]

diff --git a/kubejs/server_scripts/loot_modifications.js b/kubejs/server_scripts/loot_modifications.js
@@ -0,0 +1,7 @@
+let removeFromAllLootTables = ["minecraft:totem"];
+
+onEvent("lootjs", (event) => {
+    removeFromAllLootTables.forEach((item) => {
+        event.addBlockLootModifier(/.*/).removeLoot(item);
+    });
+});
diff --git a/mods/lootjs.pw.toml b/mods/lootjs.pw.toml
@@ -0,0 +1,13 @@
+name = "LootJS: KubeJS Addon"
+filename = "lootjs-fabric-1.20.1-2.12.0.jar"
+side = "both"
+
+[download]
+url = "https://cdn.modrinth.com/data/fJFETWDN/versions/4bA9z4Qr/lootjs-fabric-1.20.1-2.12.0.jar"
+hash-format = "sha1"
+hash = "adf7c51350801872af155343381a0d39418c129f"
+
+[update]
+[update.modrinth]
+mod-id = "fJFETWDN"
+version = "4bA9z4Qr"
diff --git a/mods/taterzens.pw.toml b/mods/taterzens.pw.toml
@@ -1,6 +1,6 @@
 name = "Taterzen NPCs"
 filename = "taterzens-fabric-1.20.1-1.11.7.jar"
-side = "both"
+side = "server"
 
 [download]
 url = "https://cdn.modrinth.com/data/vE972Kux/versions/UN6eZfbk/taterzens-fabric-1.20.1-1.11.7.jar"

diff --git a/pack.toml b/pack.toml
@@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-hash = "5427d89e4520d6decba870a3ce2f507afb66b5a1deff6fae0840129c9aca5e9b"
+hash = "44552c90cb955b8709d0160d917bd4980e22c58ea90243487875bf806f554313"
 
 [versions]
 fabric = "0.15.11"