feat(worldgen): 🌍Prune AdvancedRocketry planets

Merge planets with each other (merge world generation features and ore generations): - Novus (113) => Venus (102) - Philucka (115) => KELT-6a (121) - KELT-2ab (118) => Europa (106) - KELT-3 (119) => Mars (103) This would descrease dimensions flood and make planets more unique. This will only affect newly created worlds. Old worlds will still have removed planets.
Krutoy242 · Feb 27, 2024 · 552de66 · 552de66
1 parent 336aa83
commit 552de66
Show file tree

Hide file tree

Showing 26 changed files with 359 additions and 467 deletions.
diff --git a/config/BiomeTweaker/scripts/119 KELT-3.cfg → config/BiomeTweaker/scripts/103 Mars.cfg b/config/BiomeTweaker/scripts/119 KELT-3.cfg → config/BiomeTweaker/scripts/103 Mars.cfg
@@ -1,9 +1,4 @@
-
-
-########################################
-# 119 KELT-3
-########################################
-Tweaker.setWorld(119)
+Tweaker.setWorld(103)
 biome = forBiomes("advancedrocketry:hotdryrock")
 biome.set("height", 3.7)
 
@@ -17,4 +12,4 @@ biome.registerGenBlockRep("minecraft:stone", r)
 Tweaker.setPlacementStage("PRE_DECORATE")
 biome.registerGenBlockRep("minecraft:lava", "nuclearcraft:fluid_sulfur")
 biome.registerGenBlockRep("minecraft:water", "nuclearcraft:fluid_sodium")
-Tweaker.setPlacementStage("BIOME_BLOCKS")
+Tweaker.setPlacementStage("BIOME_BLOCKS")
diff --git a/config/BiomeTweaker/scripts/118 KELT-2ab.cfg → config/BiomeTweaker/scripts/106 Europa.cfg b/config/BiomeTweaker/scripts/118 KELT-2ab.cfg → config/BiomeTweaker/scripts/106 Europa.cfg
@@ -1,12 +1,8 @@
-########################################
-# 118 KELT-2ab
-########################################
-Tweaker.setWorld(118)
+Tweaker.setWorld(106)
 biome = forBiomes("minecraft:frozen_ocean")
 biome.set("waterColor", 9043887)
 biome.set("height", -1.5)
 biome.set("heightVariation", 3)
-# biome.set("height", 0.01)
 
 r = newBlockReplacement()
 b = forBlock("minecraft:water")
@@ -28,4 +24,4 @@ biome.registerGenBlockRep("minecraft:grass", "minecraft:ice")
 # biome.addSpawn("its_meow.betteranimalsplus.common.entity.EntityWalrus", "WATER_CREATURE", 10, 1, 2)
 # biome.addSpawn("its_meow.betteranimalsplus.common.entity.EntityWhale", "WATER_CREATURE", 10, 1, 2)
 # biome.addSpawn("com.github.alexthe666.iceandfire.entity.EntitySeaSerpent", "WATER_CREATURE", 10, 1, 2)
-# biome.addSpawn("com.github.alexthe666.iceandfire.entity.EntityHippocampus", "WATER_CREATURE", 17, 2, 6)
+# biome.addSpawn("com.github.alexthe666.iceandfire.entity.EntityHippocampus", "WATER_CREATURE", 17, 2, 6)
diff --git a/config/BiomeTweaker/scripts/113 Novus.cfg b/config/BiomeTweaker/scripts/113 Novus.cfg
diff --git a/config/BiomeTweaker/scripts/122 Kepler 0118.cfg b/config/BiomeTweaker/scripts/122 Kepler 0118.cfg
@@ -4,8 +4,9 @@
 Tweaker.setWorld(122)
 biome = forBiomes("biomesoplenty:volcanic_island")
 
+b = forBlock("nuclearcraft:ingot_block")
+b.setProperty("type", "graphite")
 br = newBlockReplacement()
-b = forBlock("astralsorcery:blockblackmarble")
 br.set("block", b)
 biome.registerGenBlockRep("minecraft:stone", br)
 # biome.addActualFillerBlock(b) # Defined by planetDefs.xml
@@ -24,4 +25,23 @@ biome.registerGenBlockRep("minecraft:stone", br)
 # br.set("block", b)
 # br.set("minY", 1)
 # br.set("maxY", 40)
-# biome.registerGenBlockRep("minecraft:water", br)
+# biome.registerGenBlockRep("minecraft:water", br)
+
+# BOP fluids tweaks working wrong
+# Tweaker.setPlacementStage("PRE_DECORATE")
+# biome.registerGenBlockRep("minecraft:lava", "advancedrocketry:enrichedlavafluid")
+# Tweaker.setPlacementStage("BIOME_BLOCKS")
+
+# biome.registerGenBlockRep(1000, "minecraft:stone", "minecraft:coal_block")
+
+b = forBlock("quark:basalt")
+
+coke = forBlock("immersiveengineering:stone_decoration")
+coke.setProperty("type", "coke")
+coke_br = newBlockReplacement()
+coke_br.set("block", coke)
+coke_br.set("minY", 1)
+coke_br.set("maxY", 80)
+biome.registerGenBlockRep(1, "quark:basalt", coke_br)
+biome.registerGenBlockRep(100, "quark:basalt", "minecraft:stone")
+biome.registerGenBlockRep(1000, "quark:basalt", "quark:basalt")
diff --git a/config/advRocketry/planetDefs.xml b/config/advRocketry/planetDefs.xml
@@ -33,23 +33,26 @@
 		</planet>
 		<planet name="Venus" DIMID="102" customIcon="lava">
 			<biomeIds>biomesoplenty:volcanic_island</biomeIds>
-			<skyColor>0,0,0</skyColor>
-			<fogColor>0.9,0.9,0.9</fogColor>
 			<atmosphereDensity>120</atmosphereDensity>
+			<fogColor>0.9,0.9,0.9</fogColor>
+			<generateCaves>true</generateCaves>
 			<gravitationalMultiplier>90</gravitationalMultiplier>
 			<orbitalDistance>72</orbitalDistance>
 			<rotationalPeriod>2784000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
+			<skyColor>0,0,0</skyColor>
 		</planet>
 		<planet name="Mars" DIMID="103" customIcon="marslike">
 			<biomeIds>advancedrocketry:hotdryrock</biomeIds>
-			<skyColor>1,0.2,0</skyColor>
-			<fogColor>0.9,0.6,0.1</fogColor>
 			<atmosphereDensity>0</atmosphereDensity>
-			<orbitalDistance>105</orbitalDistance>
+			<craterOres>stoneBaratol,blockStrontium90,blockBerkelium247</craterOres>
+			<fillerBlock>minecraft:stone:1</fillerBlock>
+			<fogColor>0.9,0.6,0.1</fogColor>
+			<generateCaves>true</generateCaves>
+			<generateCraters>true</generateCraters>
 			<gravitationalMultiplier>38</gravitationalMultiplier>
+			<orbitalDistance>105</orbitalDistance>
 			<rotationalPeriod>20000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
+			<skyColor>1,0.2,0</skyColor>
 		</planet>
 		<planet name="Jupiter" DIMID="104" customIcon="gasgiantred">
 			<GasGiant>true</GasGiant>
@@ -69,11 +72,11 @@
 			<planet name="Europa" DIMID="106" customIcon="waterworld">
 				<biomeIds>minecraft:frozen_ocean</biomeIds>
 				<atmosphereDensity>0</atmosphereDensity>
+				<generateCaves>true</generateCaves>
 				<gravitationalMultiplier>30</gravitationalMultiplier>
 				<orbitalDistance>90</orbitalDistance>
 				<orbitalPhi>90</orbitalPhi>
 				<rotationalPeriod>10000</rotationalPeriod>
-				<generateCaves>true</generateCaves>
 			</planet>
 		</planet>
 		<planet name="Saturn" DIMID="107" customIcon="gasgiantblue">
@@ -153,18 +156,6 @@
 			<rotationalPeriod>24000</rotationalPeriod>
 			<generateCaves>true</generateCaves>
 		</planet>
-		<planet name="Novus" DIMID="113" customIcon="lava">
-			<biomeIds>biomesoplenty:volcanic_island</biomeIds>
-			<skyColor>1,0,1</skyColor>
-			<fogColor>1,0,0.5</fogColor>
-			<atmosphereDensity>0</atmosphereDensity>
-			<gravitationalMultiplier>75</gravitationalMultiplier>
-			<orbitalDistance>80</orbitalDistance>
-			<rotationalPeriod>12000</rotationalPeriod>
-			<oceanBlock>tconstruct:molten_obsidian</oceanBlock>
-			<generateCaves>true</generateCaves>
-			<fillerBlock>nuclearcraft:ingot_block:8</fillerBlock>
-		</planet>
 		<planet name="Stella" DIMID="114" customIcon="earthlike">
 			<biomeIds>biomesoplenty:sacred_springs,biomesoplenty:mystic_grove</biomeIds>
 			<skyColor>1,0,1</skyColor>
@@ -175,16 +166,6 @@
 			<rotationalPeriod>12000</rotationalPeriod>
 			<generateCaves>true</generateCaves>
 		</planet>
-		<planet name="Philucka" DIMID="115" customIcon="marslike">
-			<biomeIds>advancedrocketry:stormland</biomeIds>
-			<skyColor>1,0,1</skyColor>
-			<fogColor>1,0,0.5</fogColor>
-			<atmosphereDensity>0</atmosphereDensity>
-			<gravitationalMultiplier>75</gravitationalMultiplier>
-			<orbitalDistance>100</orbitalDistance>
-			<rotationalPeriod>12000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
-		</planet>
 		<planet name="Hubble" DIMID="116" customIcon="gasgiantblue">
 			<skyColor>0.9,0.9,0.9</skyColor>
 			<fogColor>0.9,0.9,0.5</fogColor>
@@ -198,7 +179,9 @@
 			<rotationalPeriod>12000</rotationalPeriod>
 		</planet>
 	</star>
-	<star name="HD 42176" temp="145" x="-90" y="-33" numPlanets="0" numGasGiants="0" blackHole="true">
+	<star blackHole="false" name="Magnis Vulpes" temp="87" x="6" y="-142" numPlanets="5" numGasGiants="1">
+		<star temp="200" separation="10.0"/>
+		<star temp="100" separation="6.0"/>
 		<planet name="KELT-1b" DIMID="117" customIcon="gasgiantred">
 			<skyColor>0,1,0.5</skyColor>
 			<fogColor>0,0,1</fogColor>
@@ -212,33 +195,6 @@
 			<orbitalDistance>35</orbitalDistance>
 			<rotationalPeriod>4000</rotationalPeriod>
 		</planet>
-		<planet name="KELT-2ab" DIMID="118" customIcon="waterworld">
-			<biomeIds>minecraft:frozen_ocean</biomeIds>
-			<skyColor>1,0,1</skyColor>
-			<fogColor>1,0,0.5</fogColor>
-			<atmosphereDensity>0</atmosphereDensity>
-			<gravitationalMultiplier>120</gravitationalMultiplier>
-			<orbitalDistance>40</orbitalDistance>
-			<rotationalPeriod>8000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
-		</planet>
-		<planet name="KELT-3" DIMID="119" customIcon="marslike">
-			<biomeIds>advancedrocketry:hotdryrock</biomeIds>
-			<skyColor>1,0,1</skyColor>
-			<fogColor>1,0,0.5</fogColor>
-			<atmosphereDensity>0</atmosphereDensity>
-			<gravitationalMultiplier>120</gravitationalMultiplier>
-			<orbitalDistance>80</orbitalDistance>
-			<rotationalPeriod>8000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
-			<generateCraters>true</generateCraters>
-			<craterOres>stoneBaratol,blockStrontium90,blockBerkelium247</craterOres>
-			<fillerBlock>minecraft:stone:1</fillerBlock>
-		</planet>
-	</star>
-	<star blackHole="false" name="Magnis Vulpes" temp="87" x="6" y="-142" numPlanets="0" numGasGiants="0">
-		<star temp="200" separation="10.0"/>
-		<star temp="100" separation="6.0"/>
 		<planet name="KELT-4ab" DIMID="120" customIcon="iceworld">
 			<biomeIds>biomesoplenty:alps,iceandfire:glacier,biomesoplenty:alps_foothills,biomesoplenty:glacier</biomeIds>
 			<skyColor>0,1,0</skyColor>
@@ -251,7 +207,7 @@
 			<generateCaves>true</generateCaves>
 		</planet>
 		<planet name="KELT-6a" DIMID="121" customIcon="earthlike">
-			<biomeIds>advancedrocketry:alien_forest,biomesoplenty:ominous_woods</biomeIds>
+			<biomeIds>advancedrocketry:alien_forest,biomesoplenty:ominous_woods,advancedrocketry:stormland</biomeIds>
 			<skyColor>1,0,1</skyColor>
 			<fogColor>1,0,0.5</fogColor>
 			<atmosphereDensity>80</atmosphereDensity>
@@ -262,18 +218,19 @@
 		</planet>
 		<planet name="Kepler 0118" DIMID="122" customIcon="lava">
 			<biomeIds>biomesoplenty:volcanic_island</biomeIds>
-			<skyColor>0,1,0</skyColor>
+			<atmosphereDensity>0</atmosphereDensity>
+			<fillerBlock>quark:basalt</fillerBlock>
 			<fogColor>0,0,1</fogColor>
-			<hasRings>true</hasRings>
+			<generateCaves>true</generateCaves>
+			<generateCraters>true</generateCraters>
+			<generateGeodes>true</generateGeodes>
 			<generateVolcanos>true</generateVolcanos>
-			<atmosphereDensity>0</atmosphereDensity>
 			<gravitationalMultiplier>60</gravitationalMultiplier>
+			<hasRings>true</hasRings>
+			<oceanBlock>tconstruct:molten_obsidian</oceanBlock>
 			<orbitalDistance>130</orbitalDistance>
 			<rotationalPeriod>18000</rotationalPeriod>
-			<generateCaves>true</generateCaves>
-			<generateGeodes>true</generateGeodes>
-			<generateCraters>true</generateCraters>
-			<fillerBlock>astralsorcery:blockblackmarble</fillerBlock>
+			<skyColor>0,1,0</skyColor>
 		</planet>
 		<planet name="Kepler 0119" DIMID="123" customIcon="marslike">
 			<biomeIds>advancedrocketry:hotdryrock</biomeIds>

diff --git a/config/bettercaves-1_12_2/DIM102_config.cfg b/config/bettercaves-1_12_2/DIM102_config.cfg
@@ -16,9 +16,9 @@ general {
         }
 
         miscellaneous {
-            S:"Lava Block"=thermalfoundation:fluid_pyrotheum
+            S:"Lava Block"=advancedrocketry:enrichedlavafluid
+            S:"Water Block"=thermalfoundation:fluid_redstone
             I:"Liquid Altitude"=20
-            S:"Water Block"=minecraft:lava
         }
     }
 }

diff --git a/config/bettercaves-1_12_2/DIM113_config.cfg b/config/bettercaves-1_12_2/DIM113_config.cfg
diff --git a/config/cofh/world/00_minecraft.json b/config/cofh/world/00_minecraft.json
@@ -147,7 +147,7 @@
 			"max-height": 26,
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 		"diamond": {
@@ -246,7 +246,7 @@
 			},
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 		"silverfish": {
@@ -281,7 +281,7 @@
 			},
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 		"quartz": {

diff --git a/config/cofh/world/01_thermalfoundation_ores.json b/config/cofh/world/01_thermalfoundation_ores.json
@@ -117,7 +117,7 @@
 			"retrogen": "false",
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 		"copper_ocean": {

diff --git a/config/cofh/world/02_thermalfoundation_oil.json b/config/cofh/world/02_thermalfoundation_oil.json
@@ -117,7 +117,7 @@
 			},
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 		"oil_shale": {
@@ -151,7 +151,7 @@
 			"retrogen": "true",
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		}
 	}

diff --git a/config/cofh/world/04_actuallyadditions_ore.json b/config/cofh/world/04_actuallyadditions_ore.json
@@ -16,7 +16,7 @@
 			"max-height": 55,
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		},
 

diff --git a/config/cofh/world/05_immersiveengineering_ore.json b/config/cofh/world/05_immersiveengineering_ore.json
@@ -17,7 +17,7 @@
 			"retrogen": "false",
 			"dimension": {
 				"restriction": "blacklist",
-				"value": [-1,1,111,112,119,123]
+				"value": [-1,1,103,111,112,123]
 			}
 		}
 	}