From 848dc99bf8268926052b2b97c78aaca06c8bca72 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:06:50 -0500 Subject: [PATCH] some modpack cleanup from glacian ram/sniffer (#1617) * whitespace changes * some animal compat * snifferified recipes * nest box recipe --- .../assets/tfg/models/item/sniffer_wool.json | 6 + .../entity/sniffer/sheared_sniffer.png | Bin 0 -> 8607 bytes .../assets/tfg/textures/item/sniffer_wool.png | Bin 0 -> 852 bytes .../tfg/loot_tables/entities/glacian_ram.json | 118 +++++++++--------- .../tfg/loot_tables/entities/sniffer.json | 118 +++++++++--------- kubejs/server_scripts/tfg/recipes.food.js | 5 +- .../tfg/recipes.miscellaneous.js | 38 +++++- kubejs/server_scripts/tfg/tags.js | 16 +++ 8 files changed, 179 insertions(+), 122 deletions(-) create mode 100644 kubejs/assets/tfg/models/item/sniffer_wool.json create mode 100644 kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png create mode 100644 kubejs/assets/tfg/textures/item/sniffer_wool.png diff --git a/kubejs/assets/tfg/models/item/sniffer_wool.json b/kubejs/assets/tfg/models/item/sniffer_wool.json new file mode 100644 index 000000000..ce0429cbd --- /dev/null +++ b/kubejs/assets/tfg/models/item/sniffer_wool.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "tfg:item/sniffer_wool" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png b/kubejs/assets/tfg/textures/entity/sniffer/sheared_sniffer.png new file mode 100644 index 0000000000000000000000000000000000000000..7bdc6c7c158fe5a9cac6f8d7077a0c1ca5c0d247 GIT binary patch literal 8607 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 Aod5s; literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/sniffer_wool.png b/kubejs/assets/tfg/textures/item/sniffer_wool.png new file mode 100644 index 0000000000000000000000000000000000000000..05346ed1673d9bf39eaa4943deb7ddc2b1d748e1 GIT binary patch literal 852 zcmV-a1FQUrP)EX>4Tx04R}tkv&MmKpe$iQ>8^(9IPPXkfA!+MMWG-6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|E;uQ=NQwVT3N2zhIPS;0dyl(!fY7Qj)$EG{s%9CP zWJ1grR>i<8f(S#vF#HlT^;C8-2hZ_!4omuZ#1c|SLxhY5s;I$2j8=^l6B*i1c=$&hf0|q}xvF5~ zSU?>rB*zc_2fw>DOVd+sQYZoRzu5N2I1tzc+D+U3KDO=l3E+PQuC%Vd-U8-6NpE(w z=n*iu4P0DzHF*!X+yO?Objgq$$xl-#m4Np%`lbRfbPEiuxxIDvaryw{sH^20;NTFL zC{y;j$Gd~Qz5RQp)87v@_HvH!58R6Y000JJOGiWi000000Qp0^e*gdg32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk2n_-o3j*b}iU0rr8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0WC>HK~y-)&62-M0%077pY!76@)jk8BSEcDYG?}#K?vFu zT3!1S8=Bg}p&vBV&>;~HX4-qFo|4=-y-jzR`hr`1w)YFq=Y4p;FZ^}1uz21@zGffY~gJ)pd8s#Ptb8K>zwqTWb&w z!x)}=(^y>vuM~XUJZYjW5N#1ZT%^1XUfDua0$|rGa^SQ8n7IDtKXEa3y&}!5sl0uo e*!7C!U*`uL?T5c<=^Cp50000 { event.add('forge:mars_stone_dusts', 'gtceu:granite_red_dust') event.add('forge:mars_stone_dusts', 'tfg:mars_stone_dust') + //Mars animal region + event.add('tfg:martian_eggs', 'tfg:sniffer_egg') + + event.add('tfg:martian_animal_foods', 'betterend:amber_root_product') + event.add('tfg:martian_animal_foods', 'betterend:blossom_berry_product') + event.add('tfg:martian_animal_foods', 'betterend:chorus_mushroom_product') + event.add('tfg:martian_animal_foods', 'betterend:shadow_berry_product') + event.add('tfg:martian_animal_foods', 'betterend:bolux_mushroom_product') + event.add('tfg:martian_animal_foods', 'betterend:cave_pumpkin_chunks') + + event.add('tfg:glacian_ram_food', '#tfg:martian_animal_foods') + event.add('tfg:sniffer_food', '#tfg:martian_animal_foods') + + //#endregion + + // #region 0.7.19 -> 0.9 conversion event.add('c:hidden_from_recipe_viewers', 'treetap:tap') event.add('c:hidden_from_recipe_viewers', 'tfcea:refrigerator')