From 0ed048d2e50db227bf331810fec5e138bac4735a Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 18 Jun 2024 21:20:08 -0400 Subject: [PATCH 1/5] obliterate command blocks Signed-off-by: IThundxr --- config/item_obliterator.json5 | 4 ++++ index.toml | 2 +- pack.toml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5 index d068294c..72f8a1cc 100644 --- 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 index 37311d4c..094fd44e 100644 --- a/index.toml +++ b/index.toml @@ -62,7 +62,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b" [[files]] file = "config/item_obliterator.json5" -hash = "c342e48d8a0b1ccee431f0817ac85369b4c1f4e1028062ef8f7438115f311d53" +hash = "0e641a1aec782687e647e8878d6d924d305e37b032e61db8d0158f2629c75a61" [[files]] file = "config/lmft.json" diff --git a/pack.toml b/pack.toml index 7ae8b799..e0c4248b 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "3db18bdb5021a98ec8b023125920864d3728af2313544da992a11d3dbacbe626" +hash = "e69d0e1a61035744097d9eed3a28907ee676ba3ee70a07c22b688464d40796f1" [versions] fabric = "0.15.11" From e81948dabeb621b05bd8dc65e823bb7ffeb78ee9 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 18 Jun 2024 22:10:27 -0400 Subject: [PATCH 2/5] lootjs and npcs Signed-off-by: IThundxr --- index.toml | 11 ++++++++++- kubejs/server_scripts/loot_modifications.js | 4 ++++ mods/lootjs.pw.toml | 13 +++++++++++++ mods/taterzens.pw.toml | 2 +- pack.toml | 2 +- 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 kubejs/server_scripts/loot_modifications.js create mode 100644 mods/lootjs.pw.toml diff --git a/index.toml b/index.toml index 094fd44e..65d7fc62 100644 --- a/index.toml +++ b/index.toml @@ -330,6 +330,10 @@ hash = "b2a9f8a2abb9d646e59174085c0a13acea9abead7c28c071cd9ba0b059b6ac19" file = "kubejs/server_scripts/easter_eggs.js" hash = "17f9f724dab3a3499a8ac933bb12a77740e02e45b3a6c403d3fa018cd077b457" +[[files]] +file = "kubejs/server_scripts/loot_modifications.js" +hash = "deb1f3dab08ebb4269ccd4bc7187bf280db84e094f7892f00d76ff12c4aa4c4f" + [[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" @@ -1421,7 +1430,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 new file mode 100644 index 00000000..9772d0d7 --- /dev/null +++ b/kubejs/server_scripts/loot_modifications.js @@ -0,0 +1,4 @@ +onEvent("lootjs", (event) => { + // disable totems + event.addBlockLootModifier(/.*/).removeLoot("minecraft:totem"); +}); diff --git a/mods/lootjs.pw.toml b/mods/lootjs.pw.toml new file mode 100644 index 00000000..035ae381 --- /dev/null +++ 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 index b42e16cb..2dbdb339 100644 --- 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 index e0c4248b..295c1ee0 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "e69d0e1a61035744097d9eed3a28907ee676ba3ee70a07c22b688464d40796f1" +hash = "d83d483f1f1118eb5fcf3170fae14626b36d1606737741c9d095fe9242a979d7" [versions] fabric = "0.15.11" From 08df57d2421923f1e53b34aa9d253e5172e2de26 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 18 Jun 2024 22:12:14 -0400 Subject: [PATCH 3/5] loot modifications Signed-off-by: IThundxr --- index.toml | 2 +- kubejs/server_scripts/loot_modifications.js | 7 +++++-- pack.toml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/index.toml b/index.toml index 65d7fc62..074dc208 100644 --- a/index.toml +++ b/index.toml @@ -332,7 +332,7 @@ hash = "17f9f724dab3a3499a8ac933bb12a77740e02e45b3a6c403d3fa018cd077b457" [[files]] file = "kubejs/server_scripts/loot_modifications.js" -hash = "deb1f3dab08ebb4269ccd4bc7187bf280db84e094f7892f00d76ff12c4aa4c4f" +hash = "ff8092997eae613248e2abcf9a6d1576b43277ecb07a4eeed0c582a45a8c1726" [[files]] file = "kubejs/server_scripts/misc_recipes.js" diff --git a/kubejs/server_scripts/loot_modifications.js b/kubejs/server_scripts/loot_modifications.js index 9772d0d7..f92bd183 100644 --- a/kubejs/server_scripts/loot_modifications.js +++ b/kubejs/server_scripts/loot_modifications.js @@ -1,4 +1,7 @@ +let removeFromAllLootTables = ["minecraft:totem"]; + onEvent("lootjs", (event) => { - // disable totems - event.addBlockLootModifier(/.*/).removeLoot("minecraft:totem"); + removeFromAllLootTables.forEach((item) => { + event.addBlockLootModifier(/.*/).removeLoot(item); + }); }); diff --git a/pack.toml b/pack.toml index 295c1ee0..1c5289cd 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "d83d483f1f1118eb5fcf3170fae14626b36d1606737741c9d095fe9242a979d7" +hash = "c8d545150996112177a5d714c4d1a5497102c7a1fd1adcd5519221ab40c5427c" [versions] fabric = "0.15.11" From 67c4eaaa5df4c1efb2e7479873a7383f1cc3020c Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 18 Jun 2024 23:53:30 -0400 Subject: [PATCH 4/5] Update item_obliterator.json5 --- config/item_obliterator.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/item_obliterator.json5 b/config/item_obliterator.json5 index 72f8a1cc..bd3e80a9 100644 --- a/config/item_obliterator.json5 +++ b/config/item_obliterator.json5 @@ -19,7 +19,7 @@ "minecraft:command_block", "minecraft:command_block_minecart", "minecraft:chain_command_block", - "minecraft:repeating_command_block" + "minecraft:repeating_command_block", "armourers_workshop:skin-library-creative", "create:handheld_worldshaper", "create:creative_motor", From 12e237e95fc3cd7e5a044a24b686cb386959587c Mon Sep 17 00:00:00 2001 From: IThundxr Date: Wed, 19 Jun 2024 03:54:36 +0000 Subject: [PATCH 5/5] Apply automatic changes --- index.toml | 2 +- pack.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.toml b/index.toml index 074dc208..a40807d3 100644 --- a/index.toml +++ b/index.toml @@ -62,7 +62,7 @@ hash = "1de5a07a92ed99574f03555597da94db00d30b2f28ead3b1caf9abd86485452b" [[files]] file = "config/item_obliterator.json5" -hash = "0e641a1aec782687e647e8878d6d924d305e37b032e61db8d0158f2629c75a61" +hash = "65f5c02042726224d08f337690c017186ff5bfee76f0ba93f9429553db14560b" [[files]] file = "config/lmft.json" diff --git a/pack.toml b/pack.toml index 1c5289cd..2407d612 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "c8d545150996112177a5d714c4d1a5497102c7a1fd1adcd5519221ab40c5427c" +hash = "44fae126245a64d3664d2a4be15878337932457b7977451c66478122f3d43ed1" [versions] fabric = "0.15.11"