From db967e8ac90fcde20888c533989224447f1fa3b1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 31 Jul 2025 21:07:38 +0100 Subject: [PATCH] who up tweakin they mars crops --- kubejs/assets/betterend/lang/en_us.json | 23 ++++++---- .../models/block/bolux_mushroom_0.json | 42 +++++++++---------- kubejs/server_scripts/betterend/recipes.js | 28 ++++++++++++- kubejs/server_scripts/betterend/tags.js | 38 +++++++++++++++-- kubejs/startup_scripts/betterend/items.js | 20 +++++++++ kubejs/startup_scripts/tfg/blocks.crops.js | 32 +++++++++++++- kubejs/startup_scripts/tfg/blocks.js | 26 ++++++------ 7 files changed, 163 insertions(+), 46 deletions(-) diff --git a/kubejs/assets/betterend/lang/en_us.json b/kubejs/assets/betterend/lang/en_us.json index ffc14a782..2115afb90 100644 --- a/kubejs/assets/betterend/lang/en_us.json +++ b/kubejs/assets/betterend/lang/en_us.json @@ -11,7 +11,9 @@ "block.betterend.blossom_berry": "Blossom Berry", "block.betterend.blossom_berry_wild": "Wild Blossom Berry", "block.betterend.blossom_berry_dead": "Dead Blossom Berry", - "block.betterend.bolux_mushroom": "Bolux Mushroom", + "block.betterend.bolux_mushroom": "Bolux Mushroom Colony", + "block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony", + "block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony", "block.betterend.bushy_grass": "Novagrass", "block.betterend.cave_bush": "Carmine Bush", "block.betterend.cave_grass": "Vermilligma", @@ -27,9 +29,9 @@ "block.betterend.charnia_red": "Red Charnia", "block.betterend.chorus_grass": "Chorus Grass", "block.betterend.chorus_lily": "Chorus Lily", - "block.betterend.chorus_mushroom": "Chalmie Mushroom", - "block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom", - "block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom", + "block.betterend.chorus_mushroom": "Chalmie Mushroom Colony", + "block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony", + "block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony", "block.betterend.clawfern": "Clawfern", "block.betterend.crystal_grass": "Crystal Grass", "block.betterend.end_lily": "Deimos Lily", @@ -59,9 +61,9 @@ "block.betterend.rubinea": "Rubinea", "block.betterend.ruscus": "Ruscus Grass", "block.betterend.salteago": "Salteago", - "block.betterend.shadow_berry": "Nox Berry", - "block.betterend.shadow_berry_wild": "Wild Nox Berry", - "block.betterend.shadow_berry_dead": "Dead Nox Berry", + "block.betterend.shadow_berry": "Nox Berries", + "block.betterend.shadow_berry_wild": "Wild Nox Berries", + "block.betterend.shadow_berry_dead": "Dead Nox Berries", "block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom", "block.betterend.twisted_moss": "Twisted Moss", "block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss", @@ -74,10 +76,17 @@ "item.betterend.amber_root_seeds": "Amber Shoots Seeds", "item.betterend.blossom_berry_product": "Blossom Berry", "item.betterend.blossom_berry_seeds": "Blossom Berry Seeds", + "item.betterend.bolux_mushroom_cooked": "Cooked Bolux Mushroom", + "item.betterend.bolux_mushroom_product": "Bolux Mushroom", + "item.betterend.bolux_mushroom_seeds": "Bolux Mushroom Spores", + "item.betterend.cave_pumpkin_chunks": "Bulbkin Chunks", "item.betterend.cave_pumpkin_product": "Bulbkin", "item.betterend.cave_pumpkin_plant_seeds": "Bulbkin Seeds", + "item.betterend.cave_pumpkin_pie": "Bulbkin Pie", + "item.betterend.chorus_mushroom_cooked": "Cooked Chalmie Mushroom", "item.betterend.chorus_mushroom_product": "Chalmie Mushroom", "item.betterend.chorus_mushroom_seeds": "Chalmie Mushroom Spores", + "item.betterend.shadow_berry_cooked": "Cooked Nox Berry", "item.betterend.shadow_berry_product": "Nox Berry", "item.betterend.shadow_berry_seeds": "Nox Berry Seeds" } \ No newline at end of file diff --git a/kubejs/assets/betterend/models/block/bolux_mushroom_0.json b/kubejs/assets/betterend/models/block/bolux_mushroom_0.json index 91d8344e1..87762ba41 100644 --- a/kubejs/assets/betterend/models/block/bolux_mushroom_0.json +++ b/kubejs/assets/betterend/models/block/bolux_mushroom_0.json @@ -7,38 +7,38 @@ "elements": [ { "__comment": "Box1", - "from": [ 1, 3, 1 ], - "to": [ 9, 7, 9 ], + "from": [ 6, 0, 8 ], + "to": [ 8, 2, 10 ], "faces": { - "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, - "up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" }, - "north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" } + "north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 2, 7, 2 ], - "to": [ 8, 8, 8 ], + "from": [ 5, 2, 7 ], + "to": [ 9, 4, 11 ], "faces": { - "up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" }, - "north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, - "south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, - "west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }, - "east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" } + "down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" }, + "up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" }, + "north": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "south": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "west": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }, + "east": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 4, 0, 4 ], - "to": [ 6, 3, 6 ], + "from": [ 6, 4, 8 ], + "to": [ 8, 5, 10 ], "faces": { - "north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" }, - "west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }, - "east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" } + "up": { "uv": [ 5, 5, 7, 7 ], "texture": "#texture" }, + "north": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "south": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "west": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }, + "east": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" } } } ] diff --git a/kubejs/server_scripts/betterend/recipes.js b/kubejs/server_scripts/betterend/recipes.js index 03fc1ad74..7bd6a9215 100644 --- a/kubejs/server_scripts/betterend/recipes.js +++ b/kubejs/server_scripts/betterend/recipes.js @@ -17,7 +17,7 @@ function registerBetterEndRecipes(event) { .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') - event.recipes.gtceu.greenhouse(`${recipeId }_helium`) + event.recipes.gtceu.greenhouse(`${recipeId}_helium`) .notConsumable(element.id) .inputFluids(Fluid.of('gtceu:helium_3', 500)) .itemOutputs(`8x ${element.id}`) @@ -28,4 +28,30 @@ function registerBetterEndRecipes(event) { .EUt(GTValues.VA[GTValues.MV]) .dimension('ad_astra:moon') }); + + Ingredient.of('#tfg:mars_plants').stacks.forEach(element => { + const itemId = element.id; + const recipeId = `greenhouse_${itemId.replace(':', '_')}`; + + generateGreenHouseRecipe(event, itemId, 'tfg:semiheavy_ammoniacal_water', 8000, `8x ${itemId}`, + recipeId, 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]); + }); + + generateGreenHouseRecipe(event, '8x betterend:amber_root_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:amber_root_product', 'amber_root', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '8x betterend:blossom_berry_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:blossom_berry_product', 'blossom_berry', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '8x betterend:bolux_mushroom_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:bolux_mushroom_product', 'bolux_mushroom', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '8x betterend:cave_pumpkin_plant_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:cave_pumpkin', 'cave_pumpkin', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '8x betterend:chorus_mushroom_seeds', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:chorus_mushroom_product', 'chorus_mushroom', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) + + generateGreenHouseRecipe(event, '8x betterend:shadow_berry', 'tfg:semiheavy_ammoniacal_water', 8000, + '24x betterend:shadow_berry_product', 'shadow_berry', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]) } \ No newline at end of file diff --git a/kubejs/server_scripts/betterend/tags.js b/kubejs/server_scripts/betterend/tags.js index 2a5385f37..fbd659bd6 100644 --- a/kubejs/server_scripts/betterend/tags.js +++ b/kubejs/server_scripts/betterend/tags.js @@ -3,7 +3,39 @@ function registerBetterEndItemTags(event) { - event.add('tfg:moon_plants', 'betterend:chorus_lily') - event.add('tfg:moon_plants', 'betterend:inflexia') - event.add('tfg:moon_plants', 'betterend:chorus_grass') + event.add('forge:seeds', 'betterend:amber_root_seeds') + event.add('forge:seeds', 'betterend:blossom_berry_seeds') + event.add('forge:seeds', 'betterend:bolux_mushroom_seeds') + event.add('forge:seeds', 'betterend:cave_pumpkin_seeds') + event.add('forge:seeds', 'betterend:shadow_berry_seeds') + + event.add('tfc:foods', 'betterend:amber_root_product') + 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', 'betterend:bolux_mushroom_product') + event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_product') + event.add('forge:mushrooms', 'betterend:bolux_mushroom_product') + event.add('tfc:foods', 'betterend:bolux_mushroom_cooked') + event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_cooked') + event.add('forge:mushrooms', 'betterend:bolux_mushroom_cooked') + + 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', 'betterend:cave_pumpkin_pie') + + event.add('tfc:foods', 'betterend:chorus_mushroom_product') + event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_product') + event.add('forge:mushrooms', 'betterend:chorus_mushroom_product') + event.add('tfc:foods', 'betterend:chorus_mushroom_cooked') + event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_cooked') + 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', 'betterend:shadow_berry_cooked') + event.add('tfc:foods/fruit', 'betterend:shadow_berry_cooked') } \ No newline at end of file diff --git a/kubejs/startup_scripts/betterend/items.js b/kubejs/startup_scripts/betterend/items.js index 723de87c0..b38b3464f 100644 --- a/kubejs/startup_scripts/betterend/items.js +++ b/kubejs/startup_scripts/betterend/items.js @@ -7,8 +7,28 @@ */ function registerBetterEndItems(event) { event.create('betterend:bolux_mushroom_cooked') + .food(food => { + food.hunger(2) + food.saturation(2.5) + }) event.create('betterend:cave_pumpkin_chunks') + .food(food => { + food.hunger(4) + food.saturation(1) + }) event.create('betterend:cave_pumpkin_pie') + .food(food => { + food.hunger(4) + food.saturation(3) + }) event.create('betterend:chorus_mushroom_cooked') + .food(food => { + food.hunger(2) + food.saturation(2.5) + }) event.create('betterend:shadow_berry_cooked') + .food(food => { + food.hunger(5) + food.saturation(2) + }) } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 0bcea336b..f487bbb90 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -60,6 +60,12 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + ['productItem(java.util.function.Consumer)'](product => { + product.food(food => { + food.hunger(4) + food.saturation(1) + }) + }) .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') @@ -80,6 +86,12 @@ const registerTFGCrops = (event) => { .nutrient('potassium') .stages(3) .hardness(0.4) + ['productItem(java.util.function.Consumer)'](product => { + product.food(food => { + food.hunger(5) + food.saturation(1) + }) + }) .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') @@ -99,10 +111,10 @@ const registerTFGCrops = (event) => { .soundType('cherry_wood') .tagBlock('minecraft:mineable/axe') .tagBlock('minecraft:mineable/hoe') + .mapColor('color_red') .requiresTool(false) .fullBlock(false) .opaque(false) - .renderType('cutout') event.create('betterend:cave_pumpkin_plant', 'tfc:spreading_crop') .soundType('crop') @@ -131,6 +143,12 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + ['productItem(java.util.function.Consumer)'](product => { + product.food(food => { + food.hunger(2) + food.saturation(1) + }) + }) .deadBlock(dead => { dead.hardness(0.2) dead.soundType('nether_wart') @@ -152,6 +170,12 @@ const registerTFGCrops = (event) => { .nutrient('potassium') .stages(3) .hardness(0.4) + ['productItem(java.util.function.Consumer)'](product => { + product.food(food => { + food.hunger(5) + food.saturation(1) + }) + }) .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') @@ -172,6 +196,12 @@ const registerTFGCrops = (event) => { .nutrient('phosphorous') .stages(3) .hardness(0.4) + ['productItem(java.util.function.Consumer)'](product => { + product.food(food => { + food.hunger(2) + food.saturation(1) + }) + }) .deadBlock(dead => { dead.hardness(0.2) dead.soundType('nether_wart') diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 95cdd68fd..c73d7b257 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -5,7 +5,7 @@ const registerTFGBlocks = (event) => { registerTFGNetherBlocks(event) registerTFGSpaceBlocks(event) registerTFGSupportBlocks(event) - registerTFGCrops(event) + registerTFGCrops(event) event.create('tfg:artificial_end_portal_frame') .stoneSoundType() @@ -26,7 +26,7 @@ const registerTFGBlocks = (event) => { .defaultTranslucent() .mapColor('color_white') .speedFactor(1.2) - .particleOffset(1, 1, 1) + .particleOffset(1, 1, 1) .particleVelocity(0.05, 0, 0.05) .particle('minecraft:campfire_cosy_smoke') .particleCount(2) @@ -46,15 +46,15 @@ const registerTFGBlocks = (event) => { .mapColor('color_light_gray') }) - event.create(`tfg:casings/machine_casing_stainless_evaporation`) - .translationKey(`block.tfg.casings.machine_casing_stainless_evaporation`) - .model(`tfg:block/casings/machine_casing_stainless_evaporation`) - .soundType('copper') - .hardness(5) - .resistance(6) - .tagBlock('minecraft:mineable/pickaxe') - .tagBlock('minecraft:mineable/wrench') - .mapColor('color_light_gray') + event.create(`tfg:casings/machine_casing_stainless_evaporation`) + .translationKey(`block.tfg.casings.machine_casing_stainless_evaporation`) + .model(`tfg:block/casings/machine_casing_stainless_evaporation`) + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('minecraft:mineable/wrench') + .mapColor('color_light_gray') //#endregion @@ -144,7 +144,7 @@ const registerTFGBlocks = (event) => { event.create('tfg:pile/brown_sand', 'tfg:layer_block') .existingItem('tfc:sand/brown') - + event.create('tfg:pile/green_sand', 'tfg:layer_block') .existingItem('tfc:sand/green') @@ -168,7 +168,7 @@ const registerTFGBlocks = (event) => { event.create('tfg:pile/venus_sand', 'tfg:layer_block') .existingItem('ad_astra:venus_sand') - + // #endregion