From ede77ef95009f74a1b1ad839f33032885d8d75db Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 3 Sep 2025 22:16:02 +0100 Subject: [PATCH] textures for mars twigs, fixed models for saplings, some tags --- .../tfg/blockstates/saplings/aeronos.json | 2 +- .../tfg/blockstates/saplings/glacian.json | 5 ++ .../tfg/blockstates/saplings/strophar.json | 2 +- .../tfg/models/block/glacian_mushroom.json | 6 ++ .../tfg/models/item/saplings/glacian.json | 6 ++ .../textures/item/wood/glacian_mushroom.png | Bin 0 -> 399 bytes .../tfg/textures/item/wood/twig/aeronos.png | Bin 0 -> 373 bytes .../tfg/textures/item/wood/twig/alphacene.png | Bin 0 -> 364 bytes .../tfg/textures/item/wood/twig/glacian.png | Bin 0 -> 358 bytes .../tfg/textures/item/wood/twig/strophar.png | Bin 0 -> 372 bytes .../loot_tables/blocks/aeronos_mushroom.json | 20 +++++++ .../loot_tables/blocks/strophar_mushroom.json | 20 +++++++ .../loot_tables/blocks/crimson_fungus.json | 20 +++++++ .../loot_tables/blocks/warped_fungus.json | 20 +++++++ .../blocks/alphacene_mushroom.json | 20 +++++++ kubejs/server_scripts/ad_astra/tags.js | 3 + kubejs/server_scripts/species/tags.js | 7 +-- kubejs/server_scripts/tfc/recipes.js | 2 +- kubejs/startup_scripts/minecraft/constants.js | 3 + kubejs/startup_scripts/tfg/blocks.plants.js | 12 ++++ kubejs/startup_scripts/tfg/items.js | 56 ++++++++++-------- 21 files changed, 173 insertions(+), 31 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/saplings/glacian.json create mode 100644 kubejs/assets/tfg/models/block/glacian_mushroom.json create mode 100644 kubejs/assets/tfg/models/item/saplings/glacian.json create mode 100644 kubejs/assets/tfg/textures/item/wood/glacian_mushroom.png create mode 100644 kubejs/assets/tfg/textures/item/wood/twig/aeronos.png create mode 100644 kubejs/assets/tfg/textures/item/wood/twig/alphacene.png create mode 100644 kubejs/assets/tfg/textures/item/wood/twig/glacian.png create mode 100644 kubejs/assets/tfg/textures/item/wood/twig/strophar.png create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/aeronos_mushroom.json create mode 100644 kubejs/data/ad_astra/loot_tables/blocks/strophar_mushroom.json create mode 100644 kubejs/data/minecraft/loot_tables/blocks/crimson_fungus.json create mode 100644 kubejs/data/minecraft/loot_tables/blocks/warped_fungus.json create mode 100644 kubejs/data/species/loot_tables/blocks/alphacene_mushroom.json diff --git a/kubejs/assets/tfg/blockstates/saplings/aeronos.json b/kubejs/assets/tfg/blockstates/saplings/aeronos.json index 1ec4995be..f5294b69e 100644 --- a/kubejs/assets/tfg/blockstates/saplings/aeronos.json +++ b/kubejs/assets/tfg/blockstates/saplings/aeronos.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "ad_astra:block/alphacene_mushroom" } + "": { "model": "ad_astra:block/aeronos_mushroom" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/glacian.json b/kubejs/assets/tfg/blockstates/saplings/glacian.json new file mode 100644 index 000000000..ae03de2bb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/saplings/glacian.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "tfg:block/glacian_mushroom" } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/saplings/strophar.json b/kubejs/assets/tfg/blockstates/saplings/strophar.json index 2a714f2ca..027b7f4ce 100644 --- a/kubejs/assets/tfg/blockstates/saplings/strophar.json +++ b/kubejs/assets/tfg/blockstates/saplings/strophar.json @@ -1,5 +1,5 @@ { "variants": { - "": { "model": "ad_astra:block/strophar" } + "": { "model": "ad_astra:block/strophar_mushroom" } } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/glacian_mushroom.json b/kubejs/assets/tfg/models/block/glacian_mushroom.json new file mode 100644 index 000000000..c6d7276f3 --- /dev/null +++ b/kubejs/assets/tfg/models/block/glacian_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "tfg:item/wood/glacian_mushroom" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/saplings/glacian.json b/kubejs/assets/tfg/models/item/saplings/glacian.json new file mode 100644 index 000000000..653a72425 --- /dev/null +++ b/kubejs/assets/tfg/models/item/saplings/glacian.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/wood/glacian_mushroom" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/wood/glacian_mushroom.png b/kubejs/assets/tfg/textures/item/wood/glacian_mushroom.png new file mode 100644 index 0000000000000000000000000000000000000000..228dd16539c0458b6426d06dc346216b1ebd39fa GIT binary patch literal 399 zcmV;A0dW3_P)z>&K}keGR5*>Lk-tvDP!xy1TL=gxMokkWjEWn?)u%8#0h@y+;)sJG zPOQdJC!fGqFkxUckxeEO4K!(hP}(YiUI$_=p)Ce~+d1d{zVqk8KPCJ@zEYR|_~YSP zutLIbJUcGZwoF<^52X|1%d!?gK@CK{QkO|pWum#99_|CswoIBGorIwPc%Y=J0x;2B z0OXr9pP*E3$Z;-)TbOaA?b0%O089shgrO|tr-S)c2}2>%o&DaRRBlLsaW3X{0Ell( z4>ZwS&j|4Hcqx{S^aI*4ru4Nq{i5(z@f#P87^ai+8=1{+q3c6lpG}^cS4;1eC_pN$ zvYFWc2sEz*IJOm4js{d~_p($xSRdfn7LGk)H2z!<;8!ZGhSuUi$!hIh7WVQu_6S`c ta(8002ovPDHLkV1hzVrECBI literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/wood/twig/aeronos.png b/kubejs/assets/tfg/textures/item/wood/twig/aeronos.png new file mode 100644 index 0000000000000000000000000000000000000000..2c7d906881db440e7a71815028be3f87e6da387e GIT binary patch literal 373 zcmV-*0gC>KP)R5*>bkiSa9P#DF3krI+rZRjBQhm?Zv(5ZtD5Jbd9ToqAQ zXYo12Nnb$XQU{k#d53_a#n!5&5}KRF>UFVVn>0kkvwfHE``vR6{D*dSkL2doq0F*7 zHU6-^b|Cvbf$w)SeU=+J3UHH3;^JV0;6C8FuySOdw{BI zsJg~<(L~iX_V7blA6dEc;B^J$`k)Q0WVZD}no0pNKawX3t(exie+A`t@6 zX}>`9PPJmkqU2&%V}RhbOXL2Ay6YsmO?9A1$?aVOBVU-flL{C@YS-tfUHwU)+U#W& T-4D3A00000NkvXXu0mjf5QL+& literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/wood/twig/alphacene.png b/kubejs/assets/tfg/textures/item/wood/twig/alphacene.png new file mode 100644 index 0000000000000000000000000000000000000000..92a3b8adeb1d76c5df0b98119ba348da5a0eb612 GIT binary patch literal 364 zcmV-y0h9iTP)bl1)m(Koo$#iLI$c?ZPTjwWxFJw_?M}Rg zXYdHFgO_kqa3hG6LX$MqHqd}Jv=nAsgn-y|8U^3#&EGfQdo%DK@$O%%zS~rJ_7;9l z1aDVLP9#AX=ekU!N#AWMIg$iXOyksIP3>TA-w54d03%Iy>klG`V)l>LDT`yGj~DWk zVSFE)T|A0jkf=Q}NAt_POwh|%CgRZ8bjg3n4zYcK}@=yYDGAB>mTC#Jf^ zqFDuC*t=a=Mkc_r9pQQ&vuOyxY&`tEfn__Q+wLN#ij_i@*3)ICg|-ApUW3&Md$n>V zB(sTW2s7dPeu!l|nV(8)u(?sh^*pw!wZ(=yKngi*+%Nsoe~vHJ-CFM?tYJU^0000< KMNUMnLSTX*f0_LN literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/wood/twig/glacian.png b/kubejs/assets/tfg/textures/item/wood/twig/glacian.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8417ba5f7e9b627b7a5138a0fd5bc8cc691b6d GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wk0|TRk zr;B5VMQ?J#0@jH5%^&_B+$Z|KGw^ha-iEcM_v+c$*xKCJ&l60Qm_QyK2C3eIKiF_*iOI6>%ny1>*YsR<8~T6ec)=!=}qOa62AM}K3h z#mUfu>LIv;-LYGdR90`vFx+BWZO`Qc&Cz!oth zQexlVALk0{KI+Z6cOc6l$6fI8S!wf!f1dZxd$6TNa6Y$K_?N%p&!(q65KBp{`0_x} z8K|VKYEN84W4Zr6pt+ugUsO$!Dq2}*v!xu+J#nbu@iXSO1JkP3tULOeDJ)H_ZMJ!y xQO2s%k3*WTv&P8G0XczZ-c-(t!(B=Y4Da|n#J0SBVGRs822WQ%mvv4FO#pwzjp_gZ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/wood/twig/strophar.png b/kubejs/assets/tfg/textures/item/wood/twig/strophar.png new file mode 100644 index 0000000000000000000000000000000000000000..9c92f7a57511a0735bb8a513182de7af8c15d4ed GIT binary patch literal 372 zcmV-)0gL{LP)bl08eqU=)R)6cb33#u6*&-k;*;7>+x>enU?(kx}8=W1Q8F`Gu3JpQIawN3X@`Eb4Td)UeL>B02FnZi}vxa zF$&WUquvl+`)@?ym?#_*1|v?I2MZyE*@jVX2vHaSpjRraudQZxFww`rMlH#}ca+?K zl2SxdWh%OcB#B&Ko~Oo01Z>rI1=G9-KvQLWZg!n z4vMVMJldaw%>Be^h2aR-@i9#cquvm5JCH<)$0rMYCH)c$0TW1VdoOYOpXdvbgkb(Z SkS*l^0000 { event.removeAllTagsFrom(item) event.add('c:hidden_from_recipe_viewers', item) }) + + event.add('c:hidden_from_recipe_viewers', 'ad_astra:alphacene_mushroom') + event.add('c:hidden_from_recipe_viewers', 'ad_astra:strophar_mushroom') event.add('gtceu:ppe_armor', '#ad_astra:space_suit_items') event.add('minecraft:trimmable_armor', '#ad_astra:space_suit_items') diff --git a/kubejs/server_scripts/species/tags.js b/kubejs/server_scripts/species/tags.js index 1cf9597a5..f52da1be0 100644 --- a/kubejs/server_scripts/species/tags.js +++ b/kubejs/server_scripts/species/tags.js @@ -17,12 +17,11 @@ const registerSpeciesItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + event.add('c:hidden_from_recipe_viewers', 'species:alphacene_mushroom') + event.add('forge:eggs', 'species:birt_egg') event.add('firmalife:foods/raw_eggs', 'species:birt_egg') - event.add('species:goober_breed_items', 'betterend:flammalix') - event.add('species:goober_breed_items', 'betterend:small_amaranita_mushroom') - event.add('species:goober_breed_items', 'betterend:bolux_mushroom_product') - event.add('species:goober_breed_items', 'betterend:chorus_mushroom_product') + event.add('species:goober_breed_items', '#forge:mushrooms') event.add('species:cruncher_eats', '#tfc:foods/meat') } diff --git a/kubejs/server_scripts/tfc/recipes.js b/kubejs/server_scripts/tfc/recipes.js index 720cc8d96..7f70eb164 100644 --- a/kubejs/server_scripts/tfc/recipes.js +++ b/kubejs/server_scripts/tfc/recipes.js @@ -90,7 +90,7 @@ const registerTFCRecipes = (event) => { const recipeId = `greenhouse_${itemId.replace(':', '_')}`; generateGreenHouseRecipe(event, itemId, '#tfc:any_fresh_water', 8000, `8x ${itemId}`, - recipeId, null, 8, `16x ${itemId}`, GTValues.VH[GTValues.LV]); + recipeId, null, 8, ${itemId}, GTValues.VH[GTValues.LV]); }); //#endregion diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index 29ae97104..751aa93a1 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -743,6 +743,9 @@ global.MINECRAFT_HIDED_ITEMS = [ 'minecraft:oxidized_cut_copper_stairs', 'minecraft:oxidized_cut_copper_slab',*/ + 'minecraft:crimson_fungus', + 'minecraft:warped_fungus', + "minecraft:raw_iron_block", "minecraft:raw_copper_block", "minecraft:raw_gold_block" diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index ae8bbf71c..130ebc1bc 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -291,29 +291,41 @@ const registerTFGCrops = (event) => { .features('tfg:mars/tree/crimson') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(6) + .soundType('nether_wart') + .defaultCutout() event.create('tfg:saplings/warped', 'tfc:sapling') .features('tfg:mars/tree/warped') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(6) + .soundType('nether_wart') + .defaultCutout() event.create('tfg:saplings/alphacene', 'tfc:sapling') .features('species:alphacene_mushroom') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(3) + .soundType('nether_wart') + .defaultCutout() event.create('tfg:saplings/strophar', 'tfc:sapling') .features('tfg:mars/tree/strophar') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(7) + .soundType('nether_wart') + .defaultCutout() event.create('tfg:saplings/aeronos', 'tfc:sapling') .features('tfg:mars/tree/aeronos') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(9) + .soundType('nether_wart') + .defaultCutout() event.create('tfg:saplings/glacian', 'tfc:sapling') .features('tfg:mars/tree/glacian') .tagBlock('tfg:do_not_destroy_in_space') .growthDays(9) + .soundType('nether_wart') + .defaultCutout() } \ No newline at end of file diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index 6e34a4554..f5c91a68b 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -45,22 +45,22 @@ const registerTFGItems = (event) => { event.create('tfg:soaked_unrefined_paper') .translationKey('item.tfg.soaked_unrefined_paper') - + event.create('tfg:terra_firma_greg') .translationKey('item.tfg.terra_firma_greg') .tag('c:hidden_from_recipe_viewers') - + //#region chalk creation event.create('tfg:unfired_chalk') .translationKey('item.tfg.unfired_chalk') Color.DYE.forEach((dyeName, dye) => { event.create(`tfg:wet_${dyeName}_chalk`) - .translationKey(`item.tfg.wet_${dyeName}_chalk`) - .textureJson({ - layer0: 'tfg:item/unfired_chalk' - }) - .color(0, dye.getHexJS()); + .translationKey(`item.tfg.wet_${dyeName}_chalk`) + .textureJson({ + layer0: 'tfg:item/unfired_chalk' + }) + .color(0, dye.getHexJS()); }); //#endregion @@ -137,7 +137,7 @@ const registerTFGItems = (event) => { event.create(`tfg:antipoison_tablet`) .translationKey(`item.tfg.antipoison_tablet`) - .tooltip(`§9Cures All Harmful Effects`) + .tooltip(`§9Cures All Harmful Effects`) //salvos @@ -176,10 +176,18 @@ const registerTFGItems = (event) => { event.create('tfg:clean_foil_pack') event.create('tfg:flint_club_head') - event.create('tfg:twigs/strophar').tag('tfc:twigs') - event.create('tfg:twigs/aeronos').tag('tfc:twigs') - event.create('tfg:twigs/glacian').tag('tfc:twigs') - event.create('tfg:twigs/alphacene').tag('tfc:twigs') + event.create('tfg:twigs/strophar') + .tag('tfc:twigs') + .texture('tfg:item/wood/twig/strophar') + event.create('tfg:twigs/aeronos') + .tag('tfc:twigs') + .texture('tfg:item/wood/twig/aeronos') + event.create('tfg:twigs/glacian') + .tag('tfc:twigs') + .texture('tfg:item/wood/twig/glacian') + event.create('tfg:twigs/alphacene') + .tag('tfc:twigs') + .texture('tfg:item/wood/twig/alphacene') //#endregion //#region Cloth & String @@ -279,10 +287,10 @@ const registerTFGItems = (event) => { event.create('tfg:airship_balloon') .translationKey('item.tfg.airship_balloon') - + event.create('tfg:lv_aircraft_engine') .translationKey('item.tfg.lv_aircraft_engine') - + event.create('tfg:hv_aircraft_engine') .translationKey('item.tfg.hv_aircraft_engine') @@ -318,14 +326,14 @@ const registerTFGItems = (event) => { event.create('tfg:aluminium_hull_reinforcement') .translationKey('item.tfg.aluminium_hull_reinforcement') - + event.create('tfg:stainless_steel_hull_reinforcement') .translationKey('item.tfg.stainless_steel_hull_reinforcement') event.create('tfg:titanium_hull_reinforcement') .translationKey('item.tfg.titanium_hull_reinforcement') //#endregion - + //Tacz Helper Region event.create('tfg:flintlock_mechanism') .translationKey('item.tfg.flintlock_mechanism') @@ -343,7 +351,7 @@ const registerTFGItems = (event) => { event.create('tfg:nitrocellulose') .translationKey('tfg:nitrocellulose') //endregion - + //Tier2 Insulation event.create('tfg:aes_wool') .translationKey('tfg:aes_wool') @@ -354,23 +362,23 @@ const registerTFGItems = (event) => { event.create('tfg:aes_insulation_roll') .translationKey('tfg:aes_insulation_roll') //endregion - + //Tier 2 Rocket Parts event.create('tfg:rocket_fin_t2') event.create('tfg:rocket_cone_t2') //endregion - + //Tier 3 Insulation event.create('tfg:aes_polyurethane') event.create('tfg:mli_shielding') event.create('tfg:silica_aerogel') //endregion - + //Tier 3 Rocket Parts event.create('tfg:rocket_fin_t3') event.create('tfg:rocket_cone_t3') event.create('tfg:elite_power_thruster') - + event.create('tfg:better_space_suit_fabric') //endregion @@ -393,14 +401,14 @@ const registerTFGItems = (event) => { .translationKey("item.tfg.basic.photovoltaic.cell") .texture('tfg:item/photo_cell_t1') //#endregion - + //#region Mars Animals event.create('tfg:wraptor_sugar') .tag('tfg:sugars') .tag('tfg:haste_ingredients') .tag('tfc:sweetener') //#endregion - + //#region Flax Stuff event.create('tfg:flax_waste') .tag('tfc:scrapable') @@ -414,5 +422,5 @@ const registerTFGItems = (event) => { event.create('tfg:linen_cloth') .tag('forge:cloth') .tag('tfc:sewing_light_cloth') - + }