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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 alfUs`8+T&ou`UJ%1_n=8KbLh*2~7az=%t+i 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7n=_rA13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LE#Yn03yg+~(>THSPYmGKtsPFT1_G^*5K=NIl-CMueGeNEX1 z5B48j)!e;#9pAbpg&&NM^ei-Yd365w=F&~Fv3PfUcXj{n@`ekm46nZFW?q#hIWxuS zjCk151KLd-&Ib(s2pNA3DKlh0|FM)`KK^}@&FSBF<}0re@n!qr^2p*cZ+As=McL&` zmhXk#BV2 z?xnVV7E9lHEn#l;C-JtfTVB&%n;f5TL@3C^xuu6~)rx~oJz>2f!jiZAD}K1k*3XJD z+PNy>NrZ!}mdbJdf9(5rn|fak&I{6D{IdVXx8oK9H&}1^-u`E|?d>9@jP z3{O_9ek%Rofxrxn;BUK*?{40^_iy#G%lG+BzZLa;;J?$&z`($k4nJ=qZCRW5rVYG6n_)_7YEDSN4}2yiC&EOi#CVF)%PlmbgZgIOpf)rskC} zI2WZRmZYXAlxLP?D7bt2281{Ai8C-T>Uz33hFF|FJ88c+Q=&}!{Lhb`d=gV_QFdG# zkd?vBiF)Fi{5#=b#kVm2d^3Ji9IvXS6uKhAH&TOL5EeRgu2^*R`?y7|EP3cazu~y zi)D=yHyRjS>w2iq{QaA2bMj0d^^Fbh9>_7=HPN^(^~I+B{q^!GY=ND5QY?ul4!*Qp z8N}Ey@A-z^#T}(v&fj}FGeqpk>`=+ZM{gT9{Px^=jUnN|mJ4?mR&oDK3ti^L`sE@= z!%dx@tEJ^9j(p{GarpnsFFIR*@36$Ys>>0vtm{Q;?%HH7(iO-Rw2xV`hcE7?QwUSS zb?u@DTNq~S`1j1d(6DT;(%CgD_tY-F@wMwo{Bw4hx9$5gUrMb8MTe)WpUXO@geCxe C$am!c literal 0 HcmV?d00001 diff --git a/kubejs/data/tfg/loot_tables/entities/glacian_ram.json b/kubejs/data/tfg/loot_tables/entities/glacian_ram.json index b42b5f472..d6074695c 100644 --- a/kubejs/data/tfg/loot_tables/entities/glacian_ram.json +++ b/kubejs/data/tfg/loot_tables/entities/glacian_ram.json @@ -1,60 +1,60 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_glacian_mutton", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:animal_yield", - "min": 4, - "max": { - "type": "minecraft:uniform", - "min": 12, - "max": 18 - } - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfc:small_raw_hide" - } - ] - } - ] +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_glacian_mutton", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "tfc:animal_yield", + "min": 4, + "max": { + "type": "minecraft:uniform", + "min": 12, + "max": 18 + } + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:small_raw_hide" + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/data/tfg/loot_tables/entities/sniffer.json b/kubejs/data/tfg/loot_tables/entities/sniffer.json index 9dd0b7197..f2e4f9c6c 100644 --- a/kubejs/data/tfg/loot_tables/entities/sniffer.json +++ b/kubejs/data/tfg/loot_tables/entities/sniffer.json @@ -1,60 +1,60 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "type": "minecraft:entity", - "pools": [ - { - "name": "loot_pool", - "rolls": 2, - "entries": [ - { - "type": "minecraft:item", - "name": "tfg:food/raw_sniffer_beef", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "type": "tfc:animal_yield", - "min": 4, - "max": { - "type": "minecraft:uniform", - "min": 12, - "max": 18 - } - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 2, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:bone", - "functions": [ - { - "function": "minecraft:set_count", - "count": { - "min": 1, - "max": 3, - "type": "minecraft:uniform" - } - } - ] - } - ] - }, - { - "name": "loot_pool", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "tfc:large_raw_hide" - } - ] - } - ] +{ + "__comment__": "This file was automatically created by mcresources", + "type": "minecraft:entity", + "pools": [ + { + "name": "loot_pool", + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "tfg:food/raw_sniffer_beef", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "type": "tfc:animal_yield", + "min": 4, + "max": { + "type": "minecraft:uniform", + "min": 12, + "max": 18 + } + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:bone", + "functions": [ + { + "function": "minecraft:set_count", + "count": { + "min": 1, + "max": 3, + "type": "minecraft:uniform" + } + } + ] + } + ] + }, + { + "name": "loot_pool", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "tfc:large_raw_hide" + } + ] + } + ] } \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index e24102fd8..09075ca13 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -926,15 +926,14 @@ function registerTFGFoodRecipes(event) { [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#tfc:knives'], 'betterend:cave_pumpkin') .id(`tfg:crafting/cave_pumpkin_chunks_knife`) - // TODO: replace sniffer egg with a tag for all mars eggs? processorRecipe("cave_pumpkin_pie_dough", 300, GTValues.VA[GTValues.HV], { - itemInputs: ['minecraft:sniffer_egg', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], + itemInputs: ['#tfg:martian_eggs', '2x betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], fluidInputs: ['minecraft:water 1000'], itemOutputs: ["betterend:cave_pumpkin_pie_dough"] }) event.recipes.firmalife.mixing_bowl() - .ingredients(['minecraft:sniffer_egg', 'betterend:cave_pumpkin_chunks', 'betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], + .ingredients(['#tfg:martian_eggs', 'betterend:cave_pumpkin_chunks', 'betterend:cave_pumpkin_chunks', 'betterend:amber_root_product', '#tfc:sweetener'], Fluid.of('minecraft:water', 1000)) .outputItem('betterend:cave_pumpkin_pie_dough') .id('tfg:mixing_bowl/cave_pumpkin_pie_dough') diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index d4ddaaf2e..d12eb97b4 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -995,6 +995,17 @@ function registerTFGMiscellaneousRecipes(event) { .duration(1000) .blastFurnaceTemp(3000) .EUt(GTValues.VA[GTValues.EV]) + + event.recipes.gtceu.electric_blast_furnace('smelt_sniffer_wool') + .itemInputs('tfg:sniffer_wool') + .chancedOutput('gtceu:ash_dust', 7500, 0) + .outputFluids(Fluid.of('tfg:molten_aes', 200)) + .circuit(4) + .duration(80) + .blastFurnaceTemp(3400) + .EUt(GTValues.VA[GTValues.EV]) + + //endregion //#region Casings @@ -1149,7 +1160,7 @@ function registerTFGMiscellaneousRecipes(event) { .duration(80) .EUt(GTValues.VA[GTValues.IV]) event.recipes.gtceu.mixer('tfg:aes_polyurethane_electric_only') - .itemInputs('tfg:aes_compressed_wool', '#forge:dusts/methylene_diphenyl_diisocyanate') + .itemInputs('tfg:aes_compressed_wool', '2x tfg:sniffer_wool','#forge:dusts/methylene_diphenyl_diisocyanate') .inputFluids(Fluid.of('gtceu:diethylenetriamine', 250), Fluid.of('gtceu:acetone', 1000)) .itemOutputs('tfg:aes_polyurethane') .duration(80) @@ -1324,4 +1335,29 @@ function registerTFGMiscellaneousRecipes(event) { ])); event.replaceInput({ id: "minecraft:jukebox"}, 'minecraft:diamond', 'tfg:etching_diamond_tip'); + + + //Large Nest + event.shaped('tfg:large_nest_box', + [ + 'B B', + 'ABA', + 'AAA' + ], { + A: 'beneath:crimson_thatch', + B: 'beneath:crimson_straw' + }).id('tfg:shaped_large_nest_crimson') + + event.shaped('tfg:large_nest_box_warped', + [ + 'B B', + 'ABA', + 'AAA' + ], { + A: 'beneath:warped_thatch', + B: 'beneath:warped_straw' + }).id('tfg:shaped_large_nest_warped') + + + //#endregion } diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 2bf19e011..9ec621689 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -304,6 +304,22 @@ const registerTFGItemTags = (event) => { 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')