mars crop stuff

kubejs/assets/betterend/blockstates/bolux_mushroom.json

@@ -1,18 +1,72 @@
 {
-    "variants": {
-        "": [
-			{ "model": "betterend:block/bolux_mushroom_1" },
-			{ "model": "betterend:block/bolux_mushroom_2" },
-			{ "model": "betterend:block/bolux_mushroom_3" },
-			{ "model": "betterend:block/bolux_mushroom_1", "y": 90 },
-			{ "model": "betterend:block/bolux_mushroom_2", "y": 90 },
-			{ "model": "betterend:block/bolux_mushroom_3", "y": 90 },
-			{ "model": "betterend:block/bolux_mushroom_1", "y": 180 },
-			{ "model": "betterend:block/bolux_mushroom_2", "y": 180 },
-			{ "model": "betterend:block/bolux_mushroom_3", "y": 180 },
-			{ "model": "betterend:block/bolux_mushroom_1", "y": 270 },
-			{ "model": "betterend:block/bolux_mushroom_2", "y": 270 },
-			{ "model": "betterend:block/bolux_mushroom_3", "y": 270 }
+	"variants": {
+		"age=0": [
+			{
+				"model": "betterend:block/bolux_mushroom_0"
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_0",
+				"y": 90
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_0",
+				"y": 180
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_0",
+				"y": 270
+			}
+		],
+		"age=1": [
+			{
+				"model": "betterend:block/bolux_mushroom_1"
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_1",
+				"y": 90
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_1",
+				"y": 180
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_1",
+				"y": 270
+			}
+		],
+		"age=2": [
+			{
+				"model": "betterend:block/bolux_mushroom_2"
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_2",
+				"y": 90
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_2",
+				"y": 180
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_2",
+				"y": 270
+			}
+		],
+		"age=3": [
+			{
+				"model": "betterend:block/bolux_mushroom_3"
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 90
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 180
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 270
+			}
 		]
-    }
+	}
 }

kubejs/assets/betterend/blockstates/bolux_mushroom_wild.json

@@ -0,0 +1,21 @@
+{
+	"variants": {
+		"": [
+			{
+				"model": "betterend:block/bolux_mushroom_3"
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 90
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 180
+			},
+			{
+				"model": "betterend:block/bolux_mushroom_3",
+				"y": 270
+			}
+		]
+	}
+}

kubejs/assets/betterend/models/block/bolux_mushroom_0.json

@@ -0,0 +1,45 @@
+{
+	"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
+	"textures": {
+		"particle": "betterend:block/bolux_mushroom",
+		"texture": "betterend:block/bolux_mushroom"
+	},
+	"elements": [ 	 
+		{
+			"__comment": "Box1",
+			"from": [ 1, 3, 1 ],
+			"to": [ 9, 7, 9 ],
+			"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" }
+			}
+		},
+		{
+			"__comment": "Box1",
+			"from": [ 2, 7, 2 ],
+			"to": [ 8, 8, 8 ],
+			"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" }
+			}
+		},
+		{
+			"__comment": "Box1",
+			"from": [ 4, 0, 4 ],
+			"to": [ 6, 3, 6 ],
+			"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" }
+			}
+		}
+	]
+}

kubejs/assets/betterend/models/item/bolux_mushroom_cooked.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:item/bolux_mushroom_cooked"
+	}
+}

kubejs/assets/betterend/models/item/bolux_mushroom_seeds.json

@@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:item/bolux_mushroom_seeds"
+	}
+}

kubejs/data/tfg/worldgen/configured_feature/mars/surface/bolux_mushroom.json

@@ -8,7 +8,7 @@
 					"to_place": {
 						"type": "minecraft:simple_state_provider",
 						"state": {
-							"Name": "betterend:bolux_mushroom"
+							"Name": "betterend:bolux_mushroom_wild"
 						}
 					}
 				}

kubejs/server_scripts/ad_astra/tags.js

@@ -406,7 +406,7 @@ const registerAdAstraPlacedFeatures = (event) => {
 	event.add("tfg:mars_sangnum_small_plants", "tfg:mars/surface/lamellarium")
 
 	event.add("tfg:mars_global_small_plants", "tfg:mars/surface/small_amaranita_mushroom")
-	event.add("tfg:mars_global_small_plants", "tfg:mars/surface/bolux_mushroom")
+	//event.add("tfg:mars_global_small_plants", "tfg:mars/surface/bolux_mushroom")
 	
 	// TODO
 	event.add("tfg:mars_trees", "tfg:mars/surface/strophar_huge")

kubejs/server_scripts/tfg/data.js

@@ -6,7 +6,6 @@ function registerTFCDataForTFG(event) {
 	registerTFGItemSize(event);
 	registerTFGSupportData(event);
 	registerTFGFoodData(event);
-	registerTFGFauna(event);
 	registerTFGCropRanges(event);
 	registerTFGFLPlanters(event);
 }
@@ -79,7 +78,7 @@ const registerTFGSupportData = (event) => {
 
 const registerTFGFoodData = (event) => {
 
-	// birt has the same stats as chicken
+	// meats
 
 	event.foodItem('tfg:food/raw_birt', food => {
 		food.hunger(4)
@@ -122,6 +121,21 @@ const registerTFGFoodData = (event) => {
 		food.decayModifier(2.25)
 	})
 
+	event.foodItem('tfg:food/raw_moon_rabbit', food => {
+		food.hunger(4)
+		food.protein(2.0)
+		food.decayModifier(3)
+	})
+
+	event.foodItem('tfg:food/cooked_moon_rabbit', food => {
+		food.hunger(6)
+		food.saturation(2.5)
+		food.protein(5)
+		food.decayModifier(2.25)
+	})
+
+	// high-tech food
+
 	global.FOOD_FRUIT.forEach(fruit => {
 		event.foodItem(`tfg:food/freeze_dried/${fruit.name}`, food => {
 			food.hunger(4)
@@ -145,6 +159,8 @@ const registerTFGFoodData = (event) => {
 		food.type('dynamic')
 	})
 
+	// crops
+
 	event.foodItem('tfg:roasted_sunflower_seeds', food => {
 		food.hunger(4)
 		food.decayModifier(0.5)
@@ -156,19 +172,48 @@ const registerTFGFoodData = (event) => {
 		food.decayModifier(0.5)
 	})
 
-	event.foodItem('tfg:food/raw_moon_rabbit', food => {
-		food.hunger(4)
-		food.protein(2.0)
-		food.decayModifier(3)
+	event.foodItem('tfg:rapeseed_product', food => {
+		food.decayModifier(0.5)
 	})
 
-	event.foodItem('tfg:food/cooked_moon_rabbit', food => {
-		food.hunger(6)
-		food.saturation(2.5)
-		food.protein(5)
-		food.decayModifier(2.25)
+	event.foodItem('betterend:amber_root_product', food => {
+
 	})
 
+	event.foodItem('betterend:blossom_berry_product', food => {
+
+	})
+
+	event.foodItem('betterend:cave_pumpkin', food => {
+
+	})
+
+	event.foodItem('betterend:chorus_mushroom_product', food => {
+
+	})
+
+	event.foodItem('betterend:chorus_mushroom_cooked', food => {
+
+	})
+
+	event.foodItem('betterend:shadow_berry_product', food => {
+
+	})
+
+	event.foodItem('betterend:shadow_berry_cooked', food => {
+
+	})
+
+	event.foodItem('betterend:bolux_mushroom_product', food => {
+
+	})
+
+	event.foodItem('betterend:bolux_mushroom_cooked', food => {
+
+	})
+
+	// misc
+
 	event.foodItem('tfg:food/ice_soup', food => {
 		food.hunger(1)
 		food.water(20)
@@ -176,77 +221,73 @@ const registerTFGFoodData = (event) => {
 	})
 }
 
-const registerTFGFauna = (event) => {
-
-	//event.fauna(climate => { }, fauna => { fauna.chance(0) }, 'tfg:moon_rabbit')
-}
 
 const registerTFGCropRanges = (event) => {
 
 	// Earth
 	event.climateRange(climate => {
-        climate.minHydration(20)
-        climate.maxHydration(80)
-        climate.minTemperature(5)
-        climate.maxTemperature(40)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'tfg:sunflower')
-
-    event.climateRange(climate => {
-        climate.minHydration(10)
-        climate.maxHydration(60)
-        climate.minTemperature(-5)
-        climate.maxTemperature(25)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(1.5)
-    }, 'tfg:rapeseed')
-
-	// Moon
-	event.climateRange(climate => {
-        climate.minHydration(0)
-        climate.maxHydration(40)
-        climate.minTemperature(-150)
-        climate.maxTemperature(15)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'betterend:amber_root')
+		climate.minHydration(20)
+		climate.maxHydration(80)
+		climate.minTemperature(5)
+		climate.maxTemperature(40)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'tfg:sunflower')
 
 	event.climateRange(climate => {
-        climate.minHydration(0)
-        climate.maxHydration(100)
-        climate.minTemperature(-80)
-        climate.maxTemperature(30)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'betterend:blossom_berry')
+		climate.minHydration(10)
+		climate.maxHydration(60)
+		climate.minTemperature(-5)
+		climate.maxTemperature(25)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(1.5)
+	}, 'tfg:rapeseed')
+
+	// Mars
+	event.climateRange(climate => {
+		climate.minHydration(0)
+		climate.maxHydration(40)
+		climate.minTemperature(-150)
+		climate.maxTemperature(15)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'betterend:amber_root')
 
 	event.climateRange(climate => {
-        climate.minHydration(0)
-        climate.maxHydration(60)
-        climate.minTemperature(-100)
-        climate.maxTemperature(30)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'betterend:cave_pumpkin_plant')
+		climate.minHydration(0)
+		climate.maxHydration(100)
+		climate.minTemperature(-80)
+		climate.maxTemperature(30)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'betterend:blossom_berry')
 
 	event.climateRange(climate => {
-        climate.minHydration(0)
-        climate.maxHydration(40)
-        climate.minTemperature(-150)
-        climate.maxTemperature(15)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'betterend:chorus_mushroom')
+		climate.minHydration(0)
+		climate.maxHydration(60)
+		climate.minTemperature(-100)
+		climate.maxTemperature(30)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'betterend:cave_pumpkin_plant')
 
 	event.climateRange(climate => {
-        climate.minHydration(0)
-        climate.maxHydration(100)
-        climate.minTemperature(-80)
-        climate.maxTemperature(30)
-        climate.hydrationWiggle(7.5)
-        climate.temperatureWiggle(5.5)
-    }, 'betterend:shadow_berry')
+		climate.minHydration(0)
+		climate.maxHydration(40)
+		climate.minTemperature(-150)
+		climate.maxTemperature(15)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'betterend:chorus_mushroom')
+
+	event.climateRange(climate => {
+		climate.minHydration(0)
+		climate.maxHydration(100)
+		climate.minTemperature(-80)
+		climate.maxTemperature(30)
+		climate.hydrationWiggle(7.5)
+		climate.temperatureWiggle(5.5)
+	}, 'betterend:shadow_berry')
 }
 
 const registerTFGFLPlanters = (event) => {

kubejs/startup_scripts/tfg/blocks.crops.js

@@ -127,7 +127,7 @@ const registerTFGCrops = (event) => {
 
     event.create('betterend:chorus_mushroom', 'tfc:crop')
         .translationKey('block.betterend.chorus_mushroom')
-        .soundType('crop')
+        .soundType('nether_wart')
         .nutrient('phosphorous')
         .stages(3)
         .hardness(0.4)
@@ -139,7 +139,7 @@ const registerTFGCrops = (event) => {
     event.create('betterend:chorus_mushroom_wild', 'tfc:wild_crop')
         .type('default')
         .translationKey('block.betterend.chorus_mushroom_wild')
-        .soundType('crop')
+        .soundType('nether_wart')
         .seeds('betterend:chorus_mushroom_seeds')
         .food('betterend:chorus_mushroom_product')
         .hardness(0.2)
@@ -165,4 +165,24 @@ const registerTFGCrops = (event) => {
         .hardness(0.2)
         .tagBoth('tfc:wild_crops')
         .tagItem('c:hidden_from_recipe_viewers')
+
+
+    event.create('betterend:bolux_mushroom', 'tfc:crop')
+        .soundType('nether_wart')
+        .nutrient('phosphorus')
+        .stages(3)
+        .hardness(0.4)
+        .deadBlock(dead => {
+            dead.hardness(0.2)
+            dead.soundType('crop')
+        })
+
+    event.create('betterend:bolux_mushroom_wild', 'tfc:wild_crop')
+        .type('default')
+        .soundType('nether_wart')
+        .seeds('betterend:bolux_mushroom_seeds')
+        .food('betterend:bolux_mushroom_product')
+        .hardness(0.2)
+        .tagBoth('tfc:wild_crops')
+        .tagItem('c:hidden_from_recipe_viewers')
 }