From 6700a6022e987bc784b3a953ce749b0108e4edfa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Thu, 31 Jul 2025 12:49:35 +0100 Subject: [PATCH] more mars crop stuff --- .../models/item/cave_pumpkin_chunks.json | 3 + .../models/item/cave_pumpkin_pie.json | 3 + .../models/item/chorus_mushroom_cooked.json | 6 ++ kubejs/server_scripts/tfg/data.js | 65 ++++++++++++++++--- kubejs/startup_scripts/betterend/items.js | 14 ++++ kubejs/startup_scripts/main_startup_script.js | 1 + kubejs/startup_scripts/tfg/blocks.crops.js | 4 +- 7 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json create mode 100644 kubejs/assets/betterend/models/item/cave_pumpkin_pie.json create mode 100644 kubejs/assets/betterend/models/item/chorus_mushroom_cooked.json create mode 100644 kubejs/startup_scripts/betterend/items.js diff --git a/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json new file mode 100644 index 000000000..64136f5db --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_chunks.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/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 new file mode 100644 index 000000000..16fc029ee --- /dev/null +++ b/kubejs/assets/betterend/models/item/cave_pumpkin_pie.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/cave_pumpkin_pie" +} diff --git a/kubejs/assets/betterend/models/item/chorus_mushroom_cooked.json b/kubejs/assets/betterend/models/item/chorus_mushroom_cooked.json new file mode 100644 index 000000000..e645fc90c --- /dev/null +++ b/kubejs/assets/betterend/models/item/chorus_mushroom_cooked.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/chorus_mushroom_cooked" + } +} diff --git a/kubejs/server_scripts/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 7ef384086..28f05800f 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -173,43 +173,90 @@ const registerTFGFoodData = (event) => { }) event.foodItem('tfg:rapeseed_product', food => { - food.decayModifier(0.5) + food.decayModifier(0.3) }) event.foodItem('betterend:amber_root_product', food => { - + food.hunger(4) + food.decayModifier(1) + food.saturation(1) + food.grain(3) }) event.foodItem('betterend:blossom_berry_product', food => { - + food.hunger(5) + food.decayModifier(2) + food.saturation(1) + food.water(7.5) + food.fruit(1.5) }) event.foodItem('betterend:cave_pumpkin', food => { + food.hunger(4) + food.saturation(0) + food.decayModifier(0.5) + }) + event.foodItem('betterend:cave_pumpkin_chunks', food => { + food.hunger(4) + food.saturation(1) + food.decayModifier(1.5) + food.water(5) + food.fruit(0.75) + }) + + event.foodItem('betterend:cave_pumpkin_pie', food => { + food.hunger(4) + food.saturation(3) + food.decayModifier(2.5) + food.water(5) + food.fruit(2) + food.grain(1.5) }) event.foodItem('betterend:chorus_mushroom_product', food => { - + food.hunger(2) + food.saturation(1) + food.decayModifier(3) + food.water(3) + food.vegetables(1.5) }) event.foodItem('betterend:chorus_mushroom_cooked', food => { - + food.hunger(2) + food.saturation(2.5) + food.decayModifier(1.5) + food.vegetables(2) }) event.foodItem('betterend:shadow_berry_product', food => { - + food.hunger(5) + food.decayModifier(2) + food.saturation(1) + food.water(5) + food.fruit(1.5) }) event.foodItem('betterend:shadow_berry_cooked', food => { - + food.hunger(5) + food.decayModifier(1) + food.saturation(2) + food.fruit(2) }) event.foodItem('betterend:bolux_mushroom_product', food => { - + food.hunger(2) + food.saturation(1) + food.decayModifier(3) + food.water(3) + food.vegetables(1.5) }) event.foodItem('betterend:bolux_mushroom_cooked', food => { - + food.hunger(2) + food.saturation(2.5) + food.decayModifier(1.5) + food.vegetables(2) }) // misc diff --git a/kubejs/startup_scripts/betterend/items.js b/kubejs/startup_scripts/betterend/items.js new file mode 100644 index 000000000..723de87c0 --- /dev/null +++ b/kubejs/startup_scripts/betterend/items.js @@ -0,0 +1,14 @@ +// priority: 0 +"use strict"; + +/** + * + * @param {Registry.Item} event + */ +function registerBetterEndItems(event) { + event.create('betterend:bolux_mushroom_cooked') + event.create('betterend:cave_pumpkin_chunks') + event.create('betterend:cave_pumpkin_pie') + event.create('betterend:chorus_mushroom_cooked') + event.create('betterend:shadow_berry_cooked') +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 4c2935fb2..9a90f4b81 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -2,6 +2,7 @@ "use strict"; StartupEvents.registry('item', event => { + registerBetterEndItems(event) registerGTCEuItems(event) registerTFGItems(event) }) diff --git a/kubejs/startup_scripts/tfg/blocks.crops.js b/kubejs/startup_scripts/tfg/blocks.crops.js index 2f8809280..76b377eb0 100644 --- a/kubejs/startup_scripts/tfg/blocks.crops.js +++ b/kubejs/startup_scripts/tfg/blocks.crops.js @@ -133,7 +133,7 @@ const registerTFGCrops = (event) => { .hardness(0.4) .deadBlock(dead => { dead.hardness(0.2) - dead.soundType('crop') + dead.soundType('nether_wart') }) event.create('betterend:chorus_mushroom_wild', 'tfc:wild_crop') @@ -174,7 +174,7 @@ const registerTFGCrops = (event) => { .hardness(0.4) .deadBlock(dead => { dead.hardness(0.2) - dead.soundType('crop') + dead.soundType('nether_wart') }) event.create('betterend:bolux_mushroom_wild', 'tfc:wild_crop')