From fbbfe31ba8d6cfe715c4f0dd3e53c1f1b58fa399 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 9 Aug 2025 23:57:45 +0100 Subject: [PATCH] mars farmland stuff, also fixed nox berry EGH recipe --- .../tfg/blockstates/grass/mars_farmland.json | 7 +++++++ .../tfg/models/block/grass/mars_farmland.json | 7 +++++++ .../tfg/models/item/grass/mars_farmland.json | 3 +++ .../tfg/textures/block/grass/mars_farmland.png | Bin 0 -> 355 bytes kubejs/server_scripts/betterend/recipes.js | 2 +- kubejs/server_scripts/tfg/data.js | 4 ++-- kubejs/server_scripts/tfg/tags.js | 8 ++++++++ 7 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/grass/mars_farmland.json create mode 100644 kubejs/assets/tfg/models/block/grass/mars_farmland.json create mode 100644 kubejs/assets/tfg/models/item/grass/mars_farmland.json create mode 100644 kubejs/assets/tfg/textures/block/grass/mars_farmland.png diff --git a/kubejs/assets/tfg/blockstates/grass/mars_farmland.json b/kubejs/assets/tfg/blockstates/grass/mars_farmland.json new file mode 100644 index 000000000..66bde5612 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/grass/mars_farmland.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/grass/mars_farmland" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/grass/mars_farmland.json b/kubejs/assets/tfg/models/block/grass/mars_farmland.json new file mode 100644 index 000000000..bdd8da762 --- /dev/null +++ b/kubejs/assets/tfg/models/block/grass/mars_farmland.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/template_farmland", + "textures": { + "dirt": "tfg:block/grass/mars_dirt", + "top": "tfg:block/grass/mars_farmland" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/grass/mars_farmland.json b/kubejs/assets/tfg/models/item/grass/mars_farmland.json new file mode 100644 index 000000000..e9b59dcba --- /dev/null +++ b/kubejs/assets/tfg/models/item/grass/mars_farmland.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/grass/mars_farmland" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/grass/mars_farmland.png b/kubejs/assets/tfg/textures/block/grass/mars_farmland.png new file mode 100644 index 0000000000000000000000000000000000000000..2fe960e7d06b7e7e940be3b91dbdfcd19808369d GIT binary patch literal 355 zcmV-p0i6DcP)0fT&=Ja?2WI zvGcoI7_gO7D3^-O$UJ?_YEk5z?dc)`!1cBPpka!F&RL~`+nJ|usO}iXq<}FCHo2@1 zX@U4Gi9rfv-WOA@X~|&i9q?=1uJu)pOdyMK(SI((yC%*&8jb(}002ovPDHLkV1j$m BlT!cy literal 0 HcmV?d00001 diff --git a/kubejs/server_scripts/betterend/recipes.js b/kubejs/server_scripts/betterend/recipes.js index 7bd6a9215..9a6dc0f55 100644 --- a/kubejs/server_scripts/betterend/recipes.js +++ b/kubejs/server_scripts/betterend/recipes.js @@ -52,6 +52,6 @@ function registerBetterEndRecipes(event) { 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, + generateGreenHouseRecipe(event, '8x betterend:shadow_berry_seeds', '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/tfg/data.js b/kubejs/server_scripts/tfg/data.js index 086667137..0a89ca871 100644 --- a/kubejs/server_scripts/tfg/data.js +++ b/kubejs/server_scripts/tfg/data.js @@ -468,12 +468,12 @@ const registerTFGFLPlanters = (event) => { ) event.firmalifePlantable( - 'betterend:cave_pumpkin_seeds', + 'betterend:cave_pumpkin_plant_seeds', 'hanging', 2, 3, 0.15, - 'betterend:cave_pumpkin_seeds', + 'betterend:cave_pumpkin_plant_seeds', 'betterend:cave_pumpkin', 'phosphorous', [ diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index ab75be69c..5533b79b5 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -283,6 +283,7 @@ const registerTFGItemTags = (event) => { event.add('tfc:grass', 'tfg:grass/amber_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') + event.add('tfc:farmland', 'tfg:grass/mars_farmland') // #endregion // Mars stone dust @@ -429,18 +430,25 @@ const registerTFGBlockTags = (event) => { event.add('minecraft:dirt', 'tfg:grass/rusticus_mycelium') event.add('minecraft:dirt', 'tfg:grass/sangnum_mycelium') event.add('tfc:dirt', 'tfg:grass/mars_dirt') + event.add('tfc:farmland', 'tfg:grass/mars_farmland') event.add('tfc:grass', 'tfg:grass/amber_mycelium') event.add('tfc:grass', 'tfg:grass/rusticus_mycelium') event.add('tfc:grass', 'tfg:grass/sangnum_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/amber_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/rusticus_mycelium') event.add('tfg:do_not_destroy_in_space', 'tfg:grass/sangnum_mycelium') + event.add('tfg:do_not_destroy_in_space', 'tfg:grass/mars_farmland') event.add('tfc:can_landslide', 'tfg:grass/mars_dirt') + event.add('tfc:can_landslide', 'tfg:grass/mars_farmland') event.add('tfc:can_landslide', 'tfg:grass/amber_mycelium') event.add('tfc:can_landslide', 'tfg:grass/rusticus_mycelium') event.add('tfc:can_landslide', 'tfg:grass/sangnum_mycelium') event.add('minecraft:mushroom_grow_block', '#tfc:dirt') event.add('minecraft:mushroom_grow_block', '#tfc:grass') + event.add('minecraft:mineable/shovel', 'tfg:grass/mars_farmland') + event.add('tfc:bush_plantable_on', 'tfg:grass/mars_farmland') + event.add('tfc:grass_plantable_on', 'tfg:grass/mars_farmland') + event.add('tfc:creeping_plantable_on', 'tfg:grass/mars_farmland') // #endregion event.add('tfg:harvester_harvestable', '#tfc:fruit_tree_leaves')