textures for mars twigs, fixed models for saplings, some tags

kubejs/assets/tfg/blockstates/saplings/aeronos.json

@@ -1,5 +1,5 @@
 {
 	"variants": {
-		"": { "model": "ad_astra:block/alphacene_mushroom" }
+		"": { "model": "ad_astra:block/aeronos_mushroom" }
 	}
 }

kubejs/assets/tfg/blockstates/saplings/glacian.json

@@ -0,0 +1,5 @@
+{
+	"variants": {
+		"": { "model": "tfg:block/glacian_mushroom" }
+	}
+}

kubejs/assets/tfg/blockstates/saplings/strophar.json

@@ -1,5 +1,5 @@
 {
 	"variants": {
-		"": { "model": "ad_astra:block/strophar" }
+		"": { "model": "ad_astra:block/strophar_mushroom" }
 	}
 }

kubejs/assets/tfg/models/block/glacian_mushroom.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:block/cross",
+	"textures": {
+		"cross": "tfg:item/wood/glacian_mushroom"
+	}
+}

kubejs/assets/tfg/models/item/saplings/glacian.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "tfg:item/wood/glacian_mushroom"
+  }
+}

kubejs/data/ad_astra/loot_tables/blocks/aeronos_mushroom.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:saplings/aeronos"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/data/ad_astra/loot_tables/blocks/strophar_mushroom.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:saplings/strophar"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/data/minecraft/loot_tables/blocks/crimson_fungus.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:saplings/crimson"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/data/minecraft/loot_tables/blocks/warped_fungus.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:saplings/warped"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/data/species/loot_tables/blocks/alphacene_mushroom.json

@@ -0,0 +1,20 @@
+{
+	"type": "minecraft:block",
+	"pools": [
+		{
+			"name": "loot_pool",
+			"rolls": 1,
+			"entries": [
+				{
+					"type": "minecraft:item",
+					"name": "tfg:saplings/alphacene"
+				}
+			],
+			"conditions": [
+				{
+					"condition": "minecraft:survives_explosion"
+				}
+			]
+		}
+	]
+}

kubejs/server_scripts/ad_astra/tags.js

@@ -45,6 +45,9 @@ const registerAdAstraItemTags = (event) => {
 		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')

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

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

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"

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()
 }

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