From 548c22afa81cb4da421ea5b5b63963fdf80280c6 Mon Sep 17 00:00:00 2001 From: Merith-TK Date: Mon, 24 Apr 2023 21:11:12 -0700 Subject: [PATCH] update mods --- .minecraft/index.toml | 20 ++-- .minecraft/kubejs/server_scripts/blacklist.js | 98 ++++++++++--------- .../kubejs/server_scripts/loot-table.js | 4 +- .minecraft/mods/entitytexturefeatures.pw.toml | 8 +- .minecraft/mods/gigeresque.pw.toml | 8 +- .minecraft/mods/pehkui.pw.toml | 8 +- .minecraft/mods/simple-voice-chat.pw.toml | 8 +- .minecraft/mods/spark.pw.toml | 8 +- .minecraft/mods/travelersbackpack.pw.toml | 8 +- .../xaeros-minimap-fair-play-edition.pw.toml | 6 +- .minecraft/mods/xaeros-world-map.pw.toml | 6 +- .minecraft/pack.toml | 2 +- 12 files changed, 95 insertions(+), 89 deletions(-) diff --git a/.minecraft/index.toml b/.minecraft/index.toml index 4c0b305..768aef5 100644 --- a/.minecraft/index.toml +++ b/.minecraft/index.toml @@ -42,11 +42,11 @@ hash = "35437b4437d2a9292a0f05a7567a4c74da8b414a28cb7e53bdcae7f71d34f3b9" [[files]] file = "kubejs/server_scripts/blacklist.js" -hash = "19d0d5abc449c46aa42f10682eccaaf20df7444b29d14b6ee3675313df98c603" +hash = "60e07e880bdd4e54bf5dd810f3e82a4b300f36455b83b0da605779a89b11c104" [[files]] file = "kubejs/server_scripts/loot-table.js" -hash = "552e7612afeab1ec64668559982ca7d35ef917e38915b4849d8e5b24fb333546" +hash = "5ba4966ae0f01e959fedc74ee48338d33f402f47601470aefeceee391857d83c" [[files]] file = "mods/adorn.pw.toml" @@ -210,7 +210,7 @@ metafile = true [[files]] file = "mods/entitytexturefeatures.pw.toml" -hash = "c3b9347961a06e85aad24fa8f863f617da394df49a67b0b1a1a952ad7f0056f7" +hash = "64e37fd54d2b0afced5c242e90579f321c7fa9cbf1b3270cd4c31a0575eb0e07" metafile = true [[files]] @@ -250,7 +250,7 @@ metafile = true [[files]] file = "mods/gigeresque.pw.toml" -hash = "a67a75a22c1f9ca6238e2038b2586b5ff157107db1c6f3671663e1bf22517287" +hash = "4f678b28ad52158ab57388ed89f612367368d8a311cf117fc586aaad77c283a7" metafile = true [[files]] @@ -405,7 +405,7 @@ metafile = true [[files]] file = "mods/pehkui.pw.toml" -hash = "f20bf84a820c2c157ffe838f6ea821524cfe4eb056664ac250fac5af3fbac68a" +hash = "a0febce406dd277730980450f98c94a80179b8df55e2136279003f30ae8eeaba" metafile = true [[files]] @@ -450,7 +450,7 @@ metafile = true [[files]] file = "mods/simple-voice-chat.pw.toml" -hash = "a030cd72bfa72fe3844b95348fe4a35770e2e9b6e13c13bc0833c4fa56bc49b5" +hash = "b326f8f8cdaca0ee982d4a37ae24834d2a5dc2839120039c7c3fd0182beb4d44" metafile = true [[files]] @@ -470,7 +470,7 @@ metafile = true [[files]] file = "mods/spark.pw.toml" -hash = "50c06afeef4a0f87ce306a734f3a26f48a0e346bd6a42b3fb967d3ee62b65894" +hash = "245599aeee8c2497af5588bcf1430a2753c9cd4827b7c8891dfbe9c578405038" metafile = true [[files]] @@ -490,7 +490,7 @@ metafile = true [[files]] file = "mods/travelersbackpack.pw.toml" -hash = "8a533ee0a14837da5f9101161de18908c96e098e54d521c8839f0d9d73eff213" +hash = "be6d65a34d1a56d81d3348b9634a445e7d59a34d7713cb379a29f48d770e3fa3" metafile = true [[files]] @@ -525,12 +525,12 @@ metafile = true [[files]] file = "mods/xaeros-minimap-fair-play-edition.pw.toml" -hash = "8ea90a90292ef89b77fba94f89870023d002708bf4e1d19e3e78e8ca20f51519" +hash = "652142461f9c339fe9ca7b877474376b960aa2ab40ee2142a4eb9f196cc37dc6" metafile = true [[files]] file = "mods/xaeros-world-map.pw.toml" -hash = "c071fa54273dc9f6358fb0b740e4893e617ffbe779c14909c27ad928bd246411" +hash = "ddb32bebc93de51dea1349e9ddd32d9d51dca6b3dffdf69a7e1466e295e2f498" metafile = true [[files]] diff --git a/.minecraft/kubejs/server_scripts/blacklist.js b/.minecraft/kubejs/server_scripts/blacklist.js index 3dc66f2..80fe189 100644 --- a/.minecraft/kubejs/server_scripts/blacklist.js +++ b/.minecraft/kubejs/server_scripts/blacklist.js @@ -1,50 +1,58 @@ const itemBlacklist = [ - "allium_peripherals:chat_modem_creative" + // "minecraft:stone" ] -// remove recipes -onEvent('recipes', event => { - itemBlacklist.forEach(item => { - event.remove({output: item}) - }) -}); +ServerEvents.recipes(event => { + for (let item of itemBlacklist) { + event.remove({ output: item }) + } +}) -// handle items -onEvent('item.pickup', event => { - if (itemBlacklist.includes(event.item.id)) { - event.cancel(); - }; - -}); -onEvent('item.toss', event => { - if (itemBlacklist.includes(event.item.id)) { - event.cancel(); - }; -}); -onEvent('item.right_click', event => { - if (itemBlacklist.includes(event.item.id)) { - event.cancel(); - }; -}); +ItemEvents.rightClicked(event => { + for (let item of itemBlacklist) { + if (event.item.id == item) { + event.cancel() + } + } +}) -// handle blocks -onEvent('block.place', event => { - if (itemBlacklist.includes(event.block.id)) { - event.cancel(); - }; -}); -onEvent('block.break', event => { - if (itemBlacklist.includes(event.block.id)) { - event.cancel(); - }; -}); -onEvent('block.right_click', event => { - if (itemBlacklist.includes(event.block.id)) { - event.cancel(); - }; -}); -onEvent('block.left_click', event => { - if (itemBlacklist.includes(event.block.id)) { - event.cancel(); - }; -}); \ No newline at end of file +ItemEvents.pickedUp(event => { + for (let item of itemBlacklist) { + if (event.item.id == item) { + event.cancel() + } + } +}) + +ItemEvents.dropped(event => { + for (let item of itemBlacklist) { + if (event.item.id == item) { + event.cancel() + } + } +}) + +// Block events +BlockEvents.broken(event => { + for (let item of itemBlacklist) { + if (event.block.id == item) { + event.cancel() + } + } +}) + +BlockEvents.placed(event => { + for (let item of itemBlacklist) { + if (event.block.id == item) { + event.cancel() + } + } +}) + +BlockEvents.rightClicked(event => { + for (let item of itemBlacklist) { + if (event.block.id == item) { + event.cancel() + } + } +}) \ No newline at end of file diff --git a/.minecraft/kubejs/server_scripts/loot-table.js b/.minecraft/kubejs/server_scripts/loot-table.js index e54f841..ca626e3 100644 --- a/.minecraft/kubejs/server_scripts/loot-table.js +++ b/.minecraft/kubejs/server_scripts/loot-table.js @@ -1,6 +1,6 @@ // Custom Loot Tables -onEvent('block.loot_tables', event => { +ServerEvents.blockLootTables(event => { event.addBlock('minecraft:cobblestone', table => { table.addPool(pool => { pool.addItem('minecraft:coal', 1).randomChance(0.3) @@ -27,8 +27,6 @@ onEvent('block.loot_tables', event => { event.addBlock('minecraft:deepslate', table => { table.addPool(pool => { pool.addItem('minecraft:cobbled_deepslate', 1) - - // add tuff to loot table pool.addItem('minecraft:tuff', 1).randomChance(0.02) // add deepslate ores to loot table with a 0.005 chance diff --git a/.minecraft/mods/entitytexturefeatures.pw.toml b/.minecraft/mods/entitytexturefeatures.pw.toml index b454046..25f8ef0 100644 --- a/.minecraft/mods/entitytexturefeatures.pw.toml +++ b/.minecraft/mods/entitytexturefeatures.pw.toml @@ -1,13 +1,13 @@ name = "Entity Texture Features" -filename = "entity_texture_features_fabric_1.19.2-4.3.3.jar" +filename = "entity_texture_features_fabric_1.19.2-4.4.0.jar" side = "client" [download] -url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/Mm7KueIp/entity_texture_features_fabric_1.19.2-4.3.3.jar" +url = "https://cdn.modrinth.com/data/BVzZfTc1/versions/4DE0PgtE/entity_texture_features_fabric_1.19.2-4.4.0.jar" hash-format = "sha1" -hash = "2a2a6bb3d618be61cb99eb98f305d3a28d9ce1c9" +hash = "d5e73a9744a46422d5203350bc7d3c7639e37b13" [update] [update.modrinth] mod-id = "BVzZfTc1" -version = "Mm7KueIp" +version = "4DE0PgtE" diff --git a/.minecraft/mods/gigeresque.pw.toml b/.minecraft/mods/gigeresque.pw.toml index 6267fbb..7682f92 100644 --- a/.minecraft/mods/gigeresque.pw.toml +++ b/.minecraft/mods/gigeresque.pw.toml @@ -1,13 +1,13 @@ name = "Gigeresque" -filename = "gigeresque-1.19.2-0.5.21.jar" +filename = "gigeresque-1.19.2-0.5.24.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/2kXK3iBI/versions/t9p6P76H/gigeresque-1.19.2-0.5.21.jar" +url = "https://cdn.modrinth.com/data/2kXK3iBI/versions/6EzFlvNK/gigeresque-1.19.2-0.5.24.jar" hash-format = "sha1" -hash = "eecbbea0a02a17185696fddd49d89de6925ea206" +hash = "c9ef42f6fcd333365ec8e8e8048997a3a65d6ac9" [update] [update.modrinth] mod-id = "2kXK3iBI" -version = "t9p6P76H" +version = "6EzFlvNK" diff --git a/.minecraft/mods/pehkui.pw.toml b/.minecraft/mods/pehkui.pw.toml index 017565d..d230cae 100644 --- a/.minecraft/mods/pehkui.pw.toml +++ b/.minecraft/mods/pehkui.pw.toml @@ -1,13 +1,13 @@ name = "Pehkui" -filename = "Pehkui-3.7.2+1.14.4-1.19.4.jar" +filename = "Pehkui-3.7.3+1.14.4-1.20.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/t5W7Jfwy/versions/79X6I2xj/Pehkui-3.7.2%2B1.14.4-1.19.4.jar" +url = "https://cdn.modrinth.com/data/t5W7Jfwy/versions/T6zz9cnV/Pehkui-3.7.3%2B1.14.4-1.20.jar" hash-format = "sha1" -hash = "5c40d17bcfd6a9387d017fb8ad77a8447f6eecd5" +hash = "8a5e4ce714a047c26b553e59a8f0d8a2aedf0fb7" [update] [update.modrinth] mod-id = "t5W7Jfwy" -version = "79X6I2xj" +version = "T6zz9cnV" diff --git a/.minecraft/mods/simple-voice-chat.pw.toml b/.minecraft/mods/simple-voice-chat.pw.toml index 8e41f76..aec3217 100644 --- a/.minecraft/mods/simple-voice-chat.pw.toml +++ b/.minecraft/mods/simple-voice-chat.pw.toml @@ -1,13 +1,13 @@ name = "Simple Voice Chat" -filename = "voicechat-fabric-1.19.2-2.4.4.jar" +filename = "voicechat-fabric-1.19.2-2.4.5.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/4rKGtleq/voicechat-fabric-1.19.2-2.4.4.jar" +url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/EDqQK2Bn/voicechat-fabric-1.19.2-2.4.5.jar" hash-format = "sha1" -hash = "f94a9a969c9251227585d10ac23ac27139056ba8" +hash = "0d7c4ab0c1a6d0e8d6afe323201cec51e55a18d4" [update] [update.modrinth] mod-id = "9eGKb6K1" -version = "4rKGtleq" +version = "EDqQK2Bn" diff --git a/.minecraft/mods/spark.pw.toml b/.minecraft/mods/spark.pw.toml index eae11bc..a44d0e1 100644 --- a/.minecraft/mods/spark.pw.toml +++ b/.minecraft/mods/spark.pw.toml @@ -1,13 +1,13 @@ name = "spark" -filename = "spark-1.10.34-fabric.jar" +filename = "spark-1.10.37-fabric.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/l6YH9Als/versions/N7JzEApO/spark-1.10.34-fabric.jar" +url = "https://cdn.modrinth.com/data/l6YH9Als/versions/XhFbpH8f/spark-1.10.37-fabric.jar" hash-format = "sha1" -hash = "aa67f7b653bf4b091d37732ced8cb858290ad2dc" +hash = "11ca9a59e95b50a9cbfb3b1e14b8bfd7cfa7e31c" [update] [update.modrinth] mod-id = "l6YH9Als" -version = "N7JzEApO" +version = "XhFbpH8f" diff --git a/.minecraft/mods/travelersbackpack.pw.toml b/.minecraft/mods/travelersbackpack.pw.toml index a0cd7e5..50558be 100644 --- a/.minecraft/mods/travelersbackpack.pw.toml +++ b/.minecraft/mods/travelersbackpack.pw.toml @@ -1,13 +1,13 @@ name = "Traveler's Backpack" -filename = "travelers-backpack-1.19.2-8.2.18.jar" +filename = "travelers-backpack-1.19.2-8.2.19.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/rlloIFEV/versions/nnDkqHOG/travelers-backpack-1.19.2-8.2.18.jar" +url = "https://cdn.modrinth.com/data/rlloIFEV/versions/C5cDj800/travelers-backpack-1.19.2-8.2.19.jar" hash-format = "sha1" -hash = "2bb8fb06c8b0328ba75bd5c7d62e8bcbdbdf9704" +hash = "0c1b573b42b51a9db8d2845a1ab2b4bb1869c175" [update] [update.modrinth] mod-id = "rlloIFEV" -version = "nnDkqHOG" +version = "C5cDj800" diff --git a/.minecraft/mods/xaeros-minimap-fair-play-edition.pw.toml b/.minecraft/mods/xaeros-minimap-fair-play-edition.pw.toml index 975b55c..2928dcd 100644 --- a/.minecraft/mods/xaeros-minimap-fair-play-edition.pw.toml +++ b/.minecraft/mods/xaeros-minimap-fair-play-edition.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's Minimap (Fair-play Edition)" -filename = "Xaeros_Minimap_FP23.3.1_Fabric_1.19.1.jar" +filename = "Xaeros_Minimap_FP23.4.0_Fabric_1.19.1.jar" side = "both" [download] hash-format = "sha1" -hash = "b1d94e7523c974909ee76edc59752e6322349079" +hash = "dcffde552212275e0ba0d4b7fde54bea136b2a4b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4449130 +file-id = 4503433 project-id = 263466 diff --git a/.minecraft/mods/xaeros-world-map.pw.toml b/.minecraft/mods/xaeros-world-map.pw.toml index f983dbe..586bfbf 100644 --- a/.minecraft/mods/xaeros-world-map.pw.toml +++ b/.minecraft/mods/xaeros-world-map.pw.toml @@ -1,13 +1,13 @@ name = "Xaero's World Map" -filename = "XaerosWorldMap_1.29.5_Fabric_1.19.1.jar" +filename = "XaerosWorldMap_1.30.0_Fabric_1.19.1.jar" side = "both" [download] hash-format = "sha1" -hash = "f5e659df4bb8276cce0ba40afd672895940a7900" +hash = "c577920cd108145342305cd22b4430a43361b592" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4470076 +file-id = 4492956 project-id = 317780 diff --git a/.minecraft/pack.toml b/.minecraft/pack.toml index 3983b24..ce1eccf 100644 --- a/.minecraft/pack.toml +++ b/.minecraft/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "878c8a6d9edd4862637af5e2e1e1ebaa7fab125dd34750a81021b8efa71d892c" +hash = "885a5921af692964fbcbe03f05e3144c42428810ae08f6b979dc5211c0f3efa2" [versions] fabric = "0.14.19"