illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mars pumpkin pie + other tag stuff

Browse source
This commit is contained in:
Pyritie 2025-08-11 22:59:10 +01:00
parent 8a4d458c40
commit 2bdb46c397
16 changed files with 111 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json
View file

@ -1,3 +1,6 @@
{
"parent": "betterend:item/cave_pumpkin_chunks"
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/cave_pumpkin_chunks"
}
}

5
kubejs/assets/betterend/models/item/cave_pumpkin_pie.json
View file

@ -1,3 +1,6 @@
{
"parent": "betterend:item/cave_pumpkin_pie"
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/cave_pumpkin_pie"
}
}

6
kubejs/assets/betterend/models/item/cave_pumpkin_pie_dough.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/cave_pumpkin_pie_dough"
}
}

6
kubejs/assets/betterend/models/item/cave_pumpkin_pie_raw.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "betterend:item/cave_pumpkin_pie_raw"
}
}

BIN
kubejs/assets/betterend/textures/item/cave_pumpkin_pie.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 419 B

Before After
Before After

BIN
kubejs/assets/betterend/textures/item/cave_pumpkin_pie_dough.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 385 B

BIN
kubejs/assets/betterend/textures/item/cave_pumpkin_pie_raw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 370 B

2
kubejs/server_scripts/beneath/tags.js
View file

@ -33,6 +33,8 @@ const registerBeneathItemTags = (event) => {
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')
}

14
kubejs/server_scripts/betterend/tags.js
View file

@ -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')
}

7
kubejs/server_scripts/firmalife/recipes.js
View file

@ -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

2
kubejs/server_scripts/tfc/tags.js
View file

@ -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) => {

18
kubejs/server_scripts/tfg/data.js
View file

@ -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 => {

44
kubejs/server_scripts/tfg/recipes.food.js
View file

@ -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

3
kubejs/startup_scripts/betterend/items.js
View file

@ -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)

13
kubejs/startup_scripts/tfc/constants.js
View file

@ -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 = [

5
kubejs/startup_scripts/tfg/blocks.crops.js
View file

@ -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 => {