From 2bdb46c397426c9bc6e927f85286e3ff0a36c964 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Mon, 11 Aug 2025 22:59:10 +0100 Subject: [PATCH] mars pumpkin pie + other tag stuff --- .../models/item/cave_pumpkin_chunks.json | 5 +- .../models/item/cave_pumpkin_pie.json | 5 +- .../models/item/cave_pumpkin_pie_dough.json | 6 +++ .../models/item/cave_pumpkin_pie_raw.json | 6 +++ .../textures/item/cave_pumpkin_pie.png | Bin 220 -> 419 bytes .../textures/item/cave_pumpkin_pie_dough.png | Bin 0 -> 385 bytes .../textures/item/cave_pumpkin_pie_raw.png | Bin 0 -> 370 bytes kubejs/server_scripts/beneath/tags.js | 2 + kubejs/server_scripts/betterend/tags.js | 14 ++++-- kubejs/server_scripts/firmalife/recipes.js | 7 +++ kubejs/server_scripts/tfc/tags.js | 2 + kubejs/server_scripts/tfg/data.js | 18 +++++-- kubejs/server_scripts/tfg/recipes.food.js | 44 +++++++++++++++++- kubejs/startup_scripts/betterend/items.js | 3 ++ kubejs/startup_scripts/tfc/constants.js | 13 ++---- kubejs/startup_scripts/tfg/blocks.crops.js | 5 ++ 16 files changed, 111 insertions(+), 19 deletions(-) create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json create mode 100644 kubejs/assets/betterend/textures/item/cave_pumpkin_pie_dough.png create mode 100644 kubejs/assets/betterend/textures/item/cave_pumpkin_pie_raw.png diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json index bfa019840..61f1ceec6 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json @@ -1,3 +1,6 @@ { - "parent": "betterend:item/cave_pumpkin_chunks" + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_chunks" + } } diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json index 85d9c0613..60392ed2a 100644 --- a/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json @@ -1,3 +1,6 @@ { - "parent": "betterend:item/cave_pumpkin_pie" + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie" + } } diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json new file mode 100644 index 000000000..9b26d1ba2 --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie_dough" + } +} diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json new file mode 100644 index 000000000..fd408aadf --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/cave_pumpkin_pie_raw" + } +} diff --git a/kubejs/assets/betterend/textures/item/cave_pumpkin_pie.png b/kubejs/assets/betterend/textures/item/cave_pumpkin_pie.png index 419b2de106541e3ba496f48952e5a5e9baa3d51d..150e6d368d98845ff39047357a6d289d63a6ca11 100644 GIT binary patch delta 404 zcmcb^xR`l@WIY=L1B3kM|A`C?44efXk;M!Q+`=Ht$S`Y;1Oo$OsHcl#h(+(!iH_b( zg#t(G+c;)7ChS&ux^!|=IA@E4(u5ZiE-d`TB% zTB`TG-3f%1yHf1+RfnPK zZbE8$X#(?cf%nCgP4$lthdHm8&UuqwvF9|WC5zK$rww@wYj3HEg)*$TYVRR0&KR-g zUc~c=bSd6jyVRuS#ER{x^EEKP^>{_Z##zfW_X#doo4savNKX;thP{SXMk!UvoQ-ql z^czq1FcOq_yz`@z;rc~!cax@kw%PMNrpfVsOMFQDAM;n-eTyc5KFf2!nX|&hrG;5_<(GS<(^MAC*7xdR zdSCqZ8*lbG*UQRmj8{u8`#WFoFymt=zs}N}e|@X*{xZg3Q>L|lKlnUjU|?YIboFyt I=akR{0FxV0Z~y=R diff --git a/kubejs/assets/betterend/textures/item/cave_pumpkin_pie_dough.png b/kubejs/assets/betterend/textures/item/cave_pumpkin_pie_dough.png new file mode 100644 index 0000000000000000000000000000000000000000..7a1a0c9d794d9fd2fffb3ae81c3a33f96e633cef GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0XB4uLSEsD@Vq z0|TS6r;B5VMeor`ivEWkM2^?b)k;w7OHrM%Q#h2nZOJO%f{s;+KSYXWL^dhbba2Jk zo(%9dU|~J^Q}?!z-<6!z+D&(sUhhlvsCcGV{{HX3|KC47*njx9uA=nPsXOEEKVSQ2 zZ$r+MutXb%1p!?@lP)*?;V?M*H{(Q*FN4O`XMca5Z7lg_sWByKr5cNo;snlp0xcg8 zWM-=`m=}s%>&B+W^fhp6E nb6mL^-JrHY?(8A^ZhhmwbCoN$oaSL*U|{fc^>bP0l+XkKz7nLJ literal 0 HcmV?d00001 diff --git a/kubejs/assets/betterend/textures/item/cave_pumpkin_pie_raw.png b/kubejs/assets/betterend/textures/item/cave_pumpkin_pie_raw.png new file mode 100644 index 0000000000000000000000000000000000000000..15cdc67547ce5ebdaa1c400c66265647e6784364 GIT binary patch literal 370 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_nkIPZ!4!i{9h}iBAoJvmZ3hd-4Cq5m~QkNh{J1F1u*3R8H^P-`CtNHq3|XOPVDn znr6E!Gd3_VFsP|1n)>kfYjYkDn6pT!fcZ!27D)*S35h(N`JCo0f|16%++uR-By)Et z`kaVs&{R6|?8&r*icfE(nL(h7@y{!%7l|#56ZW;J0HjfVNTP@CWxI&Md)NM>U@qN9%MBE&Ej^~Gy6FmbJY~Gd5>5)+3c^hc5&!T?9 z!&Cc;3+jCCSGkEWA33t*e|X3 { event.add("forge:raw_materials/sylvite", "tfc:ores/sylvite") event.add('forge:ores', 'beneath:ore/nether_cursecoal') event.add('forge:ores', 'beneath:ore/blackstone_sylvite') + + event.add('forge:mushrooms', '#beneath:mushrooms') event.remove('beneath:sparks_on_sulfur') } \ No newline at end of file diff --git a/kubejs/server_scripts/betterend/tags.js b/kubejs/server_scripts/betterend/tags.js index fbd659bd6..a8810133a 100644 --- a/kubejs/server_scripts/betterend/tags.js +++ b/kubejs/server_scripts/betterend/tags.js @@ -13,7 +13,7 @@ function registerBetterEndItemTags(event) { event.add('tfc:foods/grains', 'betterend:amber_root_product') event.add('tfc:foods', 'betterend:blossom_berry_product') - event.add('tfc:foods/fruit', 'betterend:blossom_berry_product') + event.add('tfc:foods/fruits', 'betterend:blossom_berry_product') event.add('tfc:foods', 'betterend:bolux_mushroom_product') event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_product') @@ -24,8 +24,11 @@ function registerBetterEndItemTags(event) { event.add('tfc:foods', 'betterend:cave_pumpkin') event.add('tfc:foods', 'betterend:cave_pumpkin_chunks') - event.add('tfc:foods/fruit', 'betterend:cave_pumpkin_chunks') + event.add('tfc:foods/fruits', 'betterend:cave_pumpkin_chunks') + event.add('tfc:foods', 'betterend:cave_pumpkin_pie_dough') + event.add('tfc:foods', 'betterend:cave_pumpkin_pie_raw') event.add('tfc:foods', 'betterend:cave_pumpkin_pie') + event.add('firmalife:foods/washable', 'betterend:cave_pumpkin_pie') event.add('tfc:foods', 'betterend:chorus_mushroom_product') event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_product') @@ -35,7 +38,10 @@ function registerBetterEndItemTags(event) { event.add('forge:mushrooms', 'betterend:chorus_mushroom_cooked') event.add('tfc:foods', 'betterend:shadow_berry_product') - event.add('tfc:foods/fruit', 'betterend:shadow_berry_product') + event.add('tfc:foods/fruits', 'betterend:shadow_berry_product') event.add('tfc:foods', 'betterend:shadow_berry_cooked') - event.add('tfc:foods/fruit', 'betterend:shadow_berry_cooked') + event.add('tfc:foods/fruits', 'betterend:shadow_berry_cooked') + + event.add('forge:mushrooms', 'betterend:flammalix') + event.add('forge:mushrooms', 'betterend:small_amaranita_mushroom') } \ No newline at end of file diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index 9f873817b..97703d632 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -164,6 +164,13 @@ const registerFirmaLifeRecipes = (event) => { .duration(30) .EUt(GTValues.VA[GTValues.ULV]) + event.recipes.gtceu.alloy_smelter('pie_pan') + .itemInputs('#forge:ingots/wrought_iron') + .notConsumable('gtceu:cylinder_casting_mold') + .itemOutputs('6x firmalife:pie_pan') + .EUt(GTValues.VA[GTValues.ULV]) + .duration(100) + event.replaceInput({ id: 'firmalife:crafting/bottle_label' }, 'firmalife:beeswax', '#forge:wax') //#endregion diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 3a474067a..dacd213d5 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -323,6 +323,8 @@ const registerTFCItemTags = (event) => { event.add('tfc:forge_invisible_whitelist', 'greate:aluminum_mechanical_pump') event.add('tfc:forge_invisible_whitelist', 'greate:stainless_steel_mechanical_pump') event.add('tfc:forge_invisible_whitelist', 'greate:titanium_mechanical_pump') + + event.add('forge:mushrooms', 'tfc:plant/artists_conk') } const registerTFCBlockTags = (event) => { diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 0946de948..a394700ae 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -207,13 +207,23 @@ const registerTFGFoodData = (event) => { food.fruit(0.75) }) + event.foodItem('betterend:cave_pumpkin_pie_dough', food => { + food.hunger(2) + food.decayModifier(3) + }) + + event.foodItem('betterend:cave_pumpkin_pie_raw', food => { + food.hunger(2) + food.decayModifier(3) + }) + event.foodItem('betterend:cave_pumpkin_pie', food => { food.hunger(4) - food.saturation(3) - food.decayModifier(2.5) + food.saturation(4) + food.decayModifier(2) food.water(5) - food.fruit(2) - food.grain(1.5) + food.fruit(4) + food.grain(2) }) event.foodItem('betterend:chorus_mushroom_product', food => { diff --git a/kubejs/server_scripts/tfg/recipes.food.js b/kubejs/server_scripts/tfg/recipes.food.js index 6de3fd8c3..084c286ac 100644 --- a/kubejs/server_scripts/tfg/recipes.food.js +++ b/kubejs/server_scripts/tfg/recipes.food.js @@ -814,6 +814,7 @@ function registerTFGFoodRecipes(event) { itemOutputs: ["species:birtday_cake"] }) + // These don't need the ISP handling, they're just here to keep all the food recipes together event.recipes.gtceu.mixer('tfg:tfc/olive_oil_water') @@ -880,7 +881,7 @@ function registerTFGFoodRecipes(event) { //#endregion - //#region Heating recipes for new foods + //#region New foods event.recipes.tfc.heating('tfg:food/raw_birt', 200) .resultItem(TFC.isp.of('tfg:food/cooked_birt').copyFood()) @@ -897,6 +898,47 @@ function registerTFGFoodRecipes(event) { event.recipes.tfc.heating('tfg:food/raw_moon_rabbit', 200) .resultItem(TFC.isp.of('tfg:food/cooked_moon_rabbit').copyFood()) + event.recipes.tfc.heating('betterend:bolux_mushroom_product', 200) + .resultItem(TFC.isp.of('betterend:bolux_mushroom_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:chorus_mushroom_product', 200) + .resultItem(TFC.isp.of('betterend:chorus_mushroom_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:shadow_berry_product', 200) + .resultItem(TFC.isp.of('betterend:shadow_berry_cooked').copyFood()) + + event.recipes.tfc.heating('betterend:cave_pumpkin_pie_raw', 200) + .resultItem(TFC.isp.of('betterend:cave_pumpkin_pie').copyFood()) + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), + [TFC.ingredient.notRotten('betterend:cave_pumpkin'), '#forge:tools/hammers'], 'betterend:cave_pumpkin') + .id(`tfg:crafting/cave_pumpkin_chunks_hammer`) + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.itemStackProvider.of('4x betterend:cave_pumpkin_chunks').copyFood(), + [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'], + 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'], + Fluid.of('minecraft:water', 1000)) + .outputItem('betterend:cave_pumpkin_pie_dough') + .id('tfg:mixing_bowl/cave_pumpkin_pie_dough') + + event.recipes.tfc.advanced_shapeless_crafting( + TFC.isp.of(`betterend:cave_pumpkin_pie_raw`).copyFood().firmaLifeAddPiePan(), [ + TFC.ingredient.notRotten(`betterend:cave_pumpkin_pie_dough`), + '#firmalife:pie_pans' + ]).id(`tfg:shapeless/cave_pumpkin_pie_raw`) + //#endregion // Food processing machine recipes diff --git a/kubejs/startup_scripts/betterend/items.js b/kubejs/startup_scripts/betterend/items.js index b38b3464f..02809bb71 100644 --- a/kubejs/startup_scripts/betterend/items.js +++ b/kubejs/startup_scripts/betterend/items.js @@ -16,6 +16,9 @@ function registerBetterEndItems(event) { food.hunger(4) food.saturation(1) }) + event.create('betterend:cave_pumpkin_pie_raw') + event.create('betterend:cave_pumpkin_pie_dough') + .food(food => {}) event.create('betterend:cave_pumpkin_pie') .food(food => { food.hunger(4) diff --git a/kubejs/startup_scripts/tfc/constants.js b/kubejs/startup_scripts/tfc/constants.js index 4069a4633..7c52bd704 100644 --- a/kubejs/startup_scripts/tfc/constants.js +++ b/kubejs/startup_scripts/tfc/constants.js @@ -690,7 +690,6 @@ global.TFC_MUD_TYPES = [ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:lumber': { name: 'lumber', output: ['1x gtceu:wood_dust'] }, '#tfc:support_beams': { name: 'support_beams', output: ['2x gtceu:wood_dust'] }, - // '#minecraft:boats': { name: 'boats', output: ['5x gtceu:wood_dust'] }, '#tfc:minecarts': { name: 'minecarts', output: ['5x gtceu:wood_dust', '1x gtceu:small_wrought_iron_dust'] }, '#minecraft:signs': { name: 'signs', output: ['1x gtceu:wood_dust'] }, '#minecraft:hanging_signs': { name: 'hanging_signs', output: ['1x gtceu:wood_dust'] }, @@ -709,18 +708,12 @@ global.TFC_WOOD_ITEM_TYPES_TO_WOOD_DUST = { '#tfc:twigs': { name: 'twigs', output: ['1x gtceu:wood_dust'] }, '#tfc:workbenches': { name: 'workbenches', output: ['1x gtceu:wood_dust'] }, '#forge:chests/wooden': { name: 'wooden_chests', output: ['8x gtceu:wood_dust'] }, - // '#tfg:only_trapped_wooden_chests': { name: 'trapped_wooden_chests', output: ['8x gtceu:wood_dust', '1x gtceu:wrought_iron_small_dust'] }, '#tfc:looms': { name: 'looms', output: ['2x gtceu:wood_dust'] }, '#tfc:sluices': { name: 'sluices', output: ['4x gtceu:wood_dust'] }, '#tfc:barrels': { name: 'barrels', output: ['2x gtceu:wood_dust'] }, '#tfc:lecterns': { name: 'lecterns', output: ['4x gtceu:wood_dust'] }, '#tfc:scribing_tables': { name: 'scribing_tables', output: ['1x gtceu:wood_dust'] }, '#tfc:jar_shelves': { name: 'jar_shelves', output: ['1x gtceu:wood_dust'] }, - // '#tfc:axles': { name: 'axles', output: ['1x gtceu:wood_dust'] }, - // '#tfg:bladed_axles': { name: 'bladed_axles', output: ['1x gtceu:wood_dust'] }, - // '#tfc:clutches': { name: 'clutches', output: ['1x gtceu:wood_dust'] }, - // '#tfc:gear_boxes': { name: 'gear_boxes', output: ['3x gtceu:wood_dust'] }, - // '#tfc:water_wheels': { name: 'water_wheels', output: ['4x gtceu:wood_dust'] }, '#tfcastikorcarts:cart_wheel': { name: '', output: ['1x gtceu:wood_dust'] }, '#tfcastikorcarts:plow': { name: 'plow', output: ['2x gtceu:wood_dust'] }, '#tfcastikorcarts:animal_cart': { name: 'animal_cart', output: ['2x gtceu:wood_dust'] }, @@ -919,7 +912,11 @@ global.TFC_MEAT_RECIPE_COMPONENTS = [ { input: 'tfg:food/raw_crawlermari', output: 'tfg:food/cooked_crawlermari', name: 'cooked_crawlermari' }, { input: 'tfg:food/raw_limpet', output: 'tfg:food/cooked_limpet', name: 'cooked_limpet' }, { input: 'tfg:sunflower_product', output: 'tfg:roasted_sunflower_seeds', name: 'roasted_sunflower_seeds' }, - { input: 'tfg:food/raw_moon_rabbit', output: 'tfg:food/cooked_moon_rabbit', name: 'cooked_moon_rabbit' } + { input: 'tfg:food/raw_moon_rabbit', output: 'tfg:food/cooked_moon_rabbit', name: 'cooked_moon_rabbit' }, + { input: 'betterend:bolux_mushroom_product', output: 'betterend:bolux_mushroom_cooked', name: 'bolux_mushroom' }, + { input: 'betterend:chorus_mushroom_product', output: 'betterend:chorus_mushroom_cooked', name: 'chorus_mushroom' }, + { input: 'betterend:shadow_berry_product', output: 'betterend:shadow_berry_cooked', name: 'shadow_berry' }, + { input: 'betterend:cave_pumpkin_pie_raw', output: 'betterend:cave_pumpkin_pie', name: 'cave_pumpkin_pie' } ]; global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [ diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index ccdbce9d7..2a520e0a0 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -154,6 +154,8 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(2) food.saturation(1) + food.effect('minecraft:hunger', 30 * 20, 0, 1) + food.effect('minecraft:weakness', 30 * 20, 0, 1) }) }) .deadBlock(dead => { @@ -181,6 +183,7 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(5) food.saturation(1) + food.effect('minecraft:poison', 5 * 20, 0, 1) }) }) .deadBlock(dead => { @@ -207,6 +210,8 @@ const registerTFGCrops = (event) => { product.food(food => { food.hunger(2) food.saturation(1) + food.effect('tfc:thirst', 60 * 20, 0, 1) + food.effect('minecraft:nausea', 30 * 20, 0, 1) }) }) .deadBlock(dead => {