venus

CHANGELOG.md

@@ -14,6 +14,7 @@
 - Renamed Thorium (the non-isotope one) to Thorianite to better indicate that it's only an ore @Pyritie
 - Added a way to get wax and latex in the steam age for those of you starting on mars @Pyritie
 - Changed the Rover's step height from 1 block to 1.2 blocks (about 4 extra 'pixels') @Pyritie
+- Fixed/improved behaviour of GregTech solar things on non-overworld dimensions, so rain in the overworld doesn't stop the solar array from working on the moon, and mars sandstorms affect solar things as well (#2140) @Pyritie
 ### Bug fixes
 - Fixed missing crafting table recipes for greate gearboxes (#2577) @Pyritie
 - Fixed crashing when attaching shafts to a steam engine (#2578, #2579) @Electrolyte220
@@ -24,6 +25,8 @@
 - Fixed being able to put liquid metals into the new molds that didn't have a recipe @Pyritie
 - Added some grain nutrition to oatmeal @Pyritie
 - Fixed hot-protection chestplates not fully protecting against GT hot ingots (#2598) @Pyritie
+- Fixed hermetic sandstone's appearance so it looks similar to TFC's raw sandstone @Pyritie
+- Fixed granite magma blocks not looking like granite @Pyritie
 ### Translation updates
 - Chinese (simplified) @jmecn
 - Russian @Petr211071

kubejs/data/tfg/worldgen/biome/venus/arachnoids.json

@@ -12,8 +12,6 @@
 		"fog_color": 9938052,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,
@@ -25,7 +23,7 @@
 			"options": {
 				"type": "minecraft:ash"
 			},
-			"probability": 0.1
+			"probability": 0.05
 		}
 	},
 	"features": [

kubejs/data/tfg/worldgen/biome/venus/fractured_pools.json

@@ -9,6 +9,9 @@
 			"tick_chance": 0.0111
 		},
 		"fog_color": 9938052,
+		"sky_color": 10465603,
+		"water_color": 8241044,
+		"water_fog_color": 10866612,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,
@@ -16,9 +19,12 @@
 			"sound": "tfg:ambient.venus_surface.mood",
 			"tick_delay": 6000
 		},
-		"sky_color": 10465603,
+		"particle": {
-		"water_color": 8241044,
+			"options": {
-		"water_fog_color": 10866612
+				"type": "minecraft:ash"
+			},
+			"probability": 0.05
+		}
 	},
 	"features": [
 		[

kubejs/data/tfg/worldgen/biome/venus/fumaroles.json

@@ -12,8 +12,6 @@
 		"fog_color": 10788996,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,

kubejs/data/tfg/worldgen/biome/venus/geysers.json

@@ -12,8 +12,6 @@
 		"fog_color": 9938052,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,
@@ -23,9 +21,9 @@
 		},
 		"particle": {
 			"options": {
-				"type": "minecraft:white_ash"
+				"type": "minecraft:ash"
 			},
-			"probability": 0.1
+			"probability": 0.07
 		}
 	},
 	"features": [

kubejs/data/tfg/worldgen/biome/venus/jagged_tablelands.json

@@ -12,8 +12,6 @@
 		"fog_color": 9938052,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,

kubejs/data/tfg/worldgen/biome/venus/salt_flats.json

@@ -12,8 +12,6 @@
 		"fog_color": 12237498,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,
@@ -90,34 +88,40 @@
 			"charge": 0.9
 		}
 	},
-	"creature_spawn_probability": 0.05,
+	"creature_spawn_probability": 0.07,
 	"spawners": {
 		"ambient": [],
 		"axolotls": [],
 		"creature": [
 			{
 				"type": "arthropocolypse:prairie_grasshopper",
-				"maxCount": 2,
+				"maxCount": 4,
-				"minCount": 1,
+				"minCount": 2,
 				"weight": 100
 			},
 			{
 				"type": "arthropocolypse:field_cricket",
-				"maxCount": 2,
+				"maxCount": 4,
-				"minCount": 1,
+				"minCount": 2,
-				"weight": 50
+				"weight": 100
 			},
 			{
 				"type": "arthropocolypse:wharf_roach",
 				"maxCount": 2,
 				"minCount": 1,
-				"weight": 100
+				"weight": 70
 			},
 			{
-				"type": "arthropocolypse:platerodrilus",
+				"type": "arthropocolypse:mealworm_beetle",
-				"maxCount": 1,
+				"maxCount": 4,
-				"minCount": 1,
+				"minCount": 2,
-				"weight": 70
+				"weight": 30
+			},
+			{
+				"type": "arthropocolypse:stag_beetle",
+				"maxCount": 4,
+				"minCount": 2,
+				"weight": 40
 			}
 		],
 		"misc": [],

kubejs/data/tfg/worldgen/biome/venus/scorching_volcanoes.json

@@ -12,8 +12,6 @@
 		"fog_color": 5450003,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,

kubejs/data/tfg/worldgen/biome/venus/stromatolite_beach.json

@@ -12,8 +12,6 @@
 		"fog_color": 10788996,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,

kubejs/data/tfg/worldgen/biome/venus/sulfuric_ravine.json

@@ -12,8 +12,6 @@
 		"fog_color": 11575877,
 		"water_color": 8241044,
 		"water_fog_color": 10866612,
-		"grass_color": 13758586,
-		"foliage_color": 11653213,
 		"ambient_sound": "tfg:ambient.venus_surface.loop",
 		"mood_sound": {
 			"block_search_extent": 8,
@@ -110,7 +108,13 @@
 				"type": "arthropocolypse:platerodrilus",
 				"maxCount": 3,
 				"minCount": 1,
-				"weight": 40
+				"weight": 20
+			},
+			{
+				"type": "arthropocolypse:prairie_grasshopper",
+				"maxCount": 3,
+				"minCount": 2,
+				"weight": 70
 			}
 		],
 		"misc": [],

kubejs/data/tfg/worldgen/configured_feature/venus/vein_manual/salt.json

@@ -180,19 +180,19 @@
 			"blocks": [
 				{
 					"block": "gtceu:rock_salt_indicator",
-					"weight": 10
+					"weight": 5
 				},
 				{
 					"block": "gtceu:rock_salt_bud_indicator",
-					"weight": 10
+					"weight": 5
 				},
 				{
 					"block": "gtceu:salt_indicator",
-					"weight": 25
+					"weight": 40
 				},
 				{
 					"block": "gtceu:salt_bud_indicator",
-					"weight": 25
+					"weight": 40
 				},
 				{
 					"block": "gtceu:lepidolite_indicator",

kubejs/data/tfg/worldgen/noise_settings/venus_noise.json

@@ -240,16 +240,6 @@
 	},
 
 
-
-
-
-
-
-
-
-
-
-
 	"surface_rule": {
 		"type": "minecraft:sequence",
 		"sequence": [
@@ -2782,12 +2772,56 @@
 									"type": "minecraft:stone_depth",
 									"offset": 0,
 									"surface_type": "ceiling",
-									"add_surface_depth": true,
+									"add_surface_depth": false,
 									"secondary_depth_range": 0
 								},
 								"then_run": {
-									"type": "minecraft:block",
+									"type": "minecraft:sequence",
-									"result_state": { "Name": "minecraft:tuff" }
+									"sequence": [
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.1,
+												"max_threshold": 0.2
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
+											}
+										},
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.2,
+												"max_threshold": 0.4
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" }
+											}
+										},
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.4,
+												"max_threshold": 0.5
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
+											}
+										},
+										{
+											"type": "minecraft:block",
+											"result_state": { "Name": "minecraft:tuff" }
+										}
+									]
 								}
 							},
 							{
@@ -2912,20 +2946,6 @@
 												"type": "minecraft:block",
 												"result_state": { "Name": "minecraft:tuff" }
 											}
-										},
-										{
-											"type": "minecraft:condition",
-											"if_true": {
-												"type": "minecraft:stone_depth",
-												"offset": 0,
-												"surface_type": "ceiling",
-												"add_surface_depth": true,
-												"secondary_depth_range": 0
-											},
-											"then_run": {
-												"type": "minecraft:block",
-												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
-											}
 										}
 									]
 								}
@@ -3052,20 +3072,6 @@
 												"type": "minecraft:block",
 												"result_state": { "Name": "minecraft:tuff" }
 											}
-										},
-										{
-											"type": "minecraft:condition",
-											"if_true": {
-												"type": "minecraft:stone_depth",
-												"offset": 0,
-												"surface_type": "ceiling",
-												"add_surface_depth": true,
-												"secondary_depth_range": 0
-											},
-											"then_run": {
-												"type": "minecraft:block",
-												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" }
-											}
 										}
 									]
 								}
@@ -3075,7 +3081,7 @@
 								"if_true": {
 									"type": "minecraft:noise_threshold",
 									"noise": "minecraft:powder_snow",
-									"min_threshold": 0.3,
+									"min_threshold": 0.4,
 									"max_threshold": 0.5
 								},
 								"then_run": {
@@ -3192,20 +3198,6 @@
 												"type": "minecraft:block",
 												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" }
 											}
-										},
-										{
-											"type": "minecraft:condition",
-											"if_true": {
-												"type": "minecraft:stone_depth",
-												"offset": 0,
-												"surface_type": "ceiling",
-												"add_surface_depth": true,
-												"secondary_depth_range": 0
-											},
-											"then_run": {
-												"type": "minecraft:block",
-												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
-											}
 										}
 									]
 								}
@@ -4245,6 +4237,64 @@
 					"then_run": {
 						"type": "minecraft:sequence",
 						"sequence": [
+							{
+								"type": "minecraft:condition",
+								"if_true": {
+									"type": "minecraft:stone_depth",
+									"offset": 0,
+									"surface_type": "ceiling",
+									"add_surface_depth": false,
+									"secondary_depth_range": 0
+								},
+								"then_run": {
+									"type": "minecraft:sequence",
+									"sequence": [
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.1,
+												"max_threshold": 0.2
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
+											}
+										},
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.2,
+												"max_threshold": 0.4
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/brown" }
+											}
+										},
+										{
+											"type": "minecraft:condition",
+											"if_true": {
+												"type": "minecraft:noise_threshold",
+												"noise": "minecraft:powder_snow",
+												"min_threshold": 0.4,
+												"max_threshold": 0.5
+											},
+											"then_run": {
+												"type": "minecraft:block",
+												"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/blue" }
+											}
+										},
+										{
+											"type": "minecraft:block",
+											"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" }
+										}
+									]
+								}
+							},
 							{
 								"type": "minecraft:condition",
 								"if_true": {
@@ -4544,7 +4594,7 @@
 								"if_true": {
 									"type": "minecraft:noise_threshold",
 									"noise": "minecraft:powder_snow",
-									"min_threshold": 0.3,
+									"min_threshold": 0.4,
 									"max_threshold": 0.5
 								},
 								"then_run": {
@@ -4818,20 +4868,6 @@
 									"type": "minecraft:block",
 									"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/green" }
 								}
-							},
-							{
-								"type": "minecraft:condition",
-								"if_true": {
-									"type": "minecraft:stone_depth",
-									"offset": 0,
-									"surface_type": "ceiling",
-									"add_surface_depth": true,
-									"secondary_depth_range": 0
-								},
-								"then_run": {
-									"type": "minecraft:block",
-									"result_state": { "Name": "tfg:sandstone/raw/fluorapatite/white" }
-								}
 							}
 						]
 					}

kubejs/server_scripts/gregtech/recipes.removes.js

@@ -689,6 +689,9 @@ function removeGTCEURecipes(event) {
 
 	removeMaceratorRecipe(event, 'macerate_wool')
 
+	removeMaceratorRecipe(event, 'macerate_enchanting_table')
+	event.remove({ id: 'gtceu:arc_furnace/arc_enchanting_table' })
+
 	event.remove({ id: 'gtceu:gas_collector/nether_air' })
 	event.remove({ id: 'gtceu:gas_collector/ender_air' })
 	// TODO: uncomment with venus update

kubejs/startup_scripts/tfg/worldgen/register_climates.js

@@ -238,16 +238,18 @@ TFCEvents.registerClimateModel(event => {
 			return calcCurrentTemp(avgTemp, 58, pos.y, calendarTicks, 10, 670, 1);
 		})
 
+		// Add a little variation for these
 		builder.setAverageTemperatureCalculation((level, pos) => {
 			return calcAverage(pos.z, global.VENUS_PLANET_SIZE, 454, 474);
 		})
 
 		builder.setAverageRainfallCalculation((level, pos) => {
-			return 300;
+			return calcAverage(pos.x, global.VENUS_PLANET_SIZE / 4, 250, 350);
 		})
 
 		builder.setAirFog((level, pos, calendarTicks) => 0)
 		builder.setWaterFog((level, pos, calendarTicks) => 0.6)
+		// Make up something for the wind. Apparently Venus irl is not very windy on the surface
 		builder.setWindVector((level, block, calendarTicks) => {
 			const strength = Math.max(0, Math.sin(calendarTicks / 10000)) * 0.2;