From 6a26c9b6e2cede704f8ed3cca115ddc33fee72c3 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:17:52 -0500 Subject: [PATCH] - Added loot table to piglin disguise and updated its texture. (#1123) - Reformated lootjs file --- .../tfg/textures/block/piglin_disguise.png | Bin 2465 -> 2225 bytes .../blocks/piglin_disguise_block.json | 20 ++++++++++++++++++ kubejs/server_scripts/main_server_script.js | 1 + .../{loot_tables.block.js => loot_tables.js} | 7 +++--- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json rename kubejs/server_scripts/tfg/{loot_tables.block.js => loot_tables.js} (98%) diff --git a/kubejs/assets/tfg/textures/block/piglin_disguise.png b/kubejs/assets/tfg/textures/block/piglin_disguise.png index c9d15b8ebaeee90837649002f0a5279a35704c22..a7793f207045a25059a80953fc4cdece083c2fa4 100644 GIT binary patch delta 2213 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 diff --git a/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json b/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json new file mode 100644 index 000000000..32e03b788 --- /dev/null +++ b/kubejs/data/tfg/loot_tables/blocks/piglin_disguise_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:piglin_disguise_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 3dc3f3ca7..7f77008b8 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -141,6 +141,7 @@ LootJS.modifiers((event) => { registerLootrLoots(event) registerPrimitiveCreatesLoots(event) registerTFCLoots(event) + registerTFGLoots(event) }); /** diff --git a/kubejs/server_scripts/tfg/loot_tables.block.js b/kubejs/server_scripts/tfg/loot_tables.js similarity index 98% rename from kubejs/server_scripts/tfg/loot_tables.block.js rename to kubejs/server_scripts/tfg/loot_tables.js index 4e7cef3b7..f9644fbba 100644 --- a/kubejs/server_scripts/tfg/loot_tables.block.js +++ b/kubejs/server_scripts/tfg/loot_tables.js @@ -1,7 +1,6 @@ +function registerTFGLoots(event) { -LootJS.modifiers((event) => { - - //Generated Vases Loot + //#region Vase Loot global.MINECRAFT_DYE_NAMES.forEach(color => { event.addBlockLootModifier(`tfg:decorative_vase/generated/${color}`) .removeLoot(Ingredient.all) @@ -81,4 +80,4 @@ LootJS.modifiers((event) => { ); }) }); -}); \ No newline at end of file +}; \ No newline at end of file