Fix ancient towers, add corrupted_end, etc

DeathShadez · DeathShadez · commit 4149f62092d6 · 2023-07-15T23:19:38.000-04:00
diff --git a/README.md b/README.md
@@ -6,7 +6,9 @@ Part of this pack uses resources from Astrash's Aeropelago pack, found [here](ht
 As of Terra version 6.2, there is no easy way to set generators on the Fabric and Forge platform implementations other than the overworld.  
 Due to this, the only platform that you can easily use this pack on is the Bukkit version.  Please keep this in mind before creating issues related to the Fabric or Forge platforms.
 
-### This pack is a WORK IN PROGRESS.  It is currently survival ready however it is not feature complete.  Expect frequent changes which may be incompatible (i.e, cause chunk borders) with older versions of the pack.
+### This pack is a WORK IN PROGRESS.  It is currently survival ready however it is not feature complete.  Expect frequent changes which may be incompatible (i.e, cause chunk borders) with older versions of the pack. 
+
+### ADDITIONAL NOTE: There are no loot tables for dungeons at the moment.
 
 ## INSTALLATION
 Follow this [installation guide](https://terra.polydev.org/install/index.html) for your particular platform.
diff --git a/biome-providers/stages/aether_distribution.yml b/biome-providers/stages/aether_distribution.yml
@@ -25,10 +25,10 @@ stages:
       - AETHER_CLOUDLANDS: 1
     to: 
       aether_highlands:
-      - AETHER_HIGHLANDS: 2
-      - AETHER_HIGHLANDS_FOREST: 2
-      - AETHER_MOUNTAINS: 2
-      - AETHER_BRISTLED_FOREST: 2
+      - AETHER_HIGHLANDS: 1
+      - AETHER_HIGHLANDS_FOREST: 1
+      - AETHER_MOUNTAINS: 1
+      - AETHER_BRISTLED_FOREST: 1
       - AETHER_ANCIENT_WASTES: 1
-      - AETHER_JAGGED_PEAKS: 2
-      - AETHER_RUGGED_CLIFFS: 2
+      - AETHER_JAGGED_PEAKS: 1
+      - AETHER_RUGGED_CLIFFS: 1
diff --git a/biome-providers/stages/end_distribution.yml b/biome-providers/stages/end_distribution.yml
@@ -23,6 +23,7 @@ stages:
       - AMETHYST_END: 1
       - TAINTED_END: 1
       - CRYING_END: 1
+      - CORRUPTED_END: 1
       - PEARLESCENT_END: 1
     to: 
       shattered_end:
diff --git a/biomes/abstract/aether.yml b/biomes/abstract/aether.yml
@@ -25,5 +25,5 @@ features:
   postprocessors:
     - HANGING_LANTERNS
   structures:
-    - MOB_SPAWNERS
+    - SPAWNER_DUNGEONS_NORMAL
     - MINESHAFTS
diff --git a/biomes/aether/aether_azure_forest.yml b/biomes/aether/aether_azure_forest.yml
@@ -2,6 +2,7 @@ id: AETHER_AZURE_FOREST
 type: BIOME
 extends: [ AETHER, AETHER_FOREST, EQ_DEFAULT]
 color: $biomes/colors.yml:AETHER_AZURE_FOREST
+vanilla: minecraft:the_end
 
 colors:
   grass: 0x3ccfad
diff --git a/biomes/aether/aether_bumpy.yml b/biomes/aether/aether_bumpy.yml
@@ -2,6 +2,7 @@ id: AETHER_BUMPY
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_BUMPY
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_cloudlands.yml b/biomes/aether/aether_cloudlands.yml
@@ -2,6 +2,7 @@ id: AETHER_CLOUDLANDS
 type: BIOME
 vanilla: minecraft:the_void
 color: $biomes/colors.yml:AETHER_CLOUDLANDS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_crimson_heights.yml b/biomes/aether/aether_crimson_heights.yml
@@ -2,6 +2,7 @@ id: AETHER_CRIMSON_HEIGHTS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_CRIMSON_HEIGHTS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_discus_aether.yml b/biomes/aether/aether_discus_aether.yml
@@ -2,6 +2,7 @@ id: AETHER_DISCUS_AETHER
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_DISCUS_AETHER
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_driftlands.yml b/biomes/aether/aether_driftlands.yml
@@ -2,6 +2,7 @@ id: AETHER_DRIFTLANDS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_DRIFTLANDS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_forest.yml b/biomes/aether/aether_forest.yml
@@ -2,9 +2,9 @@ id: AETHER_FOREST
 type: BIOME
 extends: [ AETHER, AETHER_PLAINS, EQ_DEFAULT]
 color: $biomes/colors.yml:AETHER_FOREST
+vanilla: minecraft:the_end
 
 features:
-
   flora:
     - GRASS
     - MIXED_FLOWER_COVER
diff --git a/biomes/aether/aether_lavender_driftlands.yml b/biomes/aether/aether_lavender_driftlands.yml
@@ -2,6 +2,7 @@ id: AETHER_LAVENDER_DRIFTLANDS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_LAVENDER_DRIFTLANDS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/aether_lush_forest.yml b/biomes/aether/aether_lush_forest.yml
@@ -2,6 +2,7 @@ id: AETHER_LUSH_FOREST
 type: BIOME
 extends: [ AETHER, AETHER_FOREST, EQ_DEFAULT]
 color: $biomes/colors.yml:AETHER_LUSH_FOREST
+vanilla: minecraft:the_end
 
 colors:
   grass: 0x779234
diff --git a/biomes/aether/aether_plains.yml b/biomes/aether/aether_plains.yml
@@ -2,6 +2,7 @@ id: AETHER_PLAINS
 type: BIOME
 extends: [ AETHER, EQ_DEFAULT ]
 color: $biomes/colors.yml:AETHER_PLAINS
+vanilla: minecraft:the_end
 
 colors:
   grass: 0xd2de85
diff --git a/biomes/aether/aether_webbed_forest.yml b/biomes/aether/aether_webbed_forest.yml
@@ -2,6 +2,7 @@ id: AETHER_WEBBED_FOREST
 type: BIOME
 extends: [ AETHER, AETHER_PLAINS, EQ_DEFAULT]
 color: $biomes/colors.yml:AETHER_WEBBED_FOREST
+vanilla: minecraft:the_end
 
 colors:
   grass: 0x4c5e3f
diff --git a/biomes/aether/highlands/aether_ancient_wastes.yml b/biomes/aether/highlands/aether_ancient_wastes.yml
@@ -2,6 +2,7 @@ id: AETHER_ANCIENT_WASTES
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_ANCIENT_WASTES
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/highlands/aether_bristled_forest.yml b/biomes/aether/highlands/aether_bristled_forest.yml
@@ -2,6 +2,7 @@ id: AETHER_BRISTLED_FOREST
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_BRISTLED_FOREST
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/highlands/aether_highlands.yml b/biomes/aether/highlands/aether_highlands.yml
@@ -2,6 +2,7 @@ id: AETHER_HIGHLANDS
 type: BIOME
 extends: [ AETHER, EQ_DEFAULT]
 color: $biomes/colors.yml:AETHER_HIGHLANDS
+vanilla: minecraft:the_end
 
 colors:
   grass: 0x9edbca
diff --git a/biomes/aether/highlands/aether_highlands_forest.yml b/biomes/aether/highlands/aether_highlands_forest.yml
@@ -2,6 +2,7 @@ id: AETHER_HIGHLANDS_FOREST
 type: BIOME
 extends: [ AETHER, EQ_DEFAULT ]
 color: $biomes/colors.yml:AETHER_HIGHLANDS_FOREST
+vanilla: minecraft:the_end
 
 colors:
   grass: 0x9edbca
diff --git a/biomes/aether/highlands/aether_jagged_peaks.yml b/biomes/aether/highlands/aether_jagged_peaks.yml
@@ -2,6 +2,7 @@ id: AETHER_JAGGED_PEAKS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_JAGGED_PEAKS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/highlands/aether_mountains.yml b/biomes/aether/highlands/aether_mountains.yml
@@ -2,6 +2,7 @@ id: AETHER_MOUNTAINS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_MOUNTAINS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/aether/highlands/aether_rugged_cliffs.yml b/biomes/aether/highlands/aether_rugged_cliffs.yml
@@ -2,6 +2,7 @@ id: AETHER_RUGGED_CLIFFS
 type: BIOME
 extends: [ AETHER ]
 color: $biomes/colors.yml:AETHER_RUGGED_CLIFFS
+vanilla: minecraft:the_end
 
 terrain:
   sampler:
diff --git a/biomes/colors.yml b/biomes/colors.yml
@@ -1,6 +1,11 @@
 # aether highlands
 AETHER_HIGHLANDS: 0x99bbff
 AETHER_HIGHLANDS_FOREST: 0x003300
+AETHER_BRISTLED_FOREST: 0xEADDCA
+AETHER_RUGGED_CLIFFS: 0x2EFF2E
+AETHER_ANCIENT_WASTES: 0x444444
+AETHER_MOUNTAINS: 0x95e674
+AETHER_JAGGED_PEAKS: 0x95e679
 
 # aether biomes
 AETHER_AZURE_FOREST: 0x3c79cf
@@ -13,12 +18,7 @@ AETHER_LUSH_FOREST: 0x00b300
 AETHER_PLAINS: 0x4d9900
 AETHER_WEBBED_FOREST: 0x4c5e3f
 AETHER_CLOUDLANDS: 0xc9c9c9
-AETHER_MOUNTAINS: 0x95e674
-AETHER_JAGGED_PEAKS: 0x95e679
 AETHER_DISCUS_AETHER: 0xB0da9f
-AETHER_ANCIENT_WASTES: 0x444444
-AETHER_BRISTLED_FOREST: 0xEADDCA
-AETHER_RUGGED_CLIFFS: 0x2EFF2E
 
 # end biomes
 CHORUVE_FOREST: 0xff4d88
@@ -33,6 +33,7 @@ SHATTERED_FOREST: 0xaf5fb9
 WARPED_BARRENS: 0x009973
 AMETHYST_END: 0xf9c7e1
 CRYING_END: 0x7d08c8
+CORRUPTED_END: 0x822479
 PEARLESCENT_END: 0xadbaae
 CRAGGY_END: 0x2c3333
 TAINTED_END: 0x001514
diff --git a/biomes/end/corrupted_end.yml b/biomes/end/corrupted_end.yml
@@ -0,0 +1,52 @@
+id: CORRUPTED_END
+type: BIOME
+extends: [ END ]
+vanilla: minecraft:end_highlands
+color: $biomes/colors.yml:CORRUPTED_END
+
+terrain:
+  sampler:
+    type: EXPRESSION
+    expression: |
+      -1+threshold+
+      lerp(y, max, 0, max-taper,
+        max(
+          lerp(y, min-undercarriageTranslate, 0, min-undercarriageTranslate+taper,
+            ((simplex(x,z)+2)*simplex3(x, y*flatness, z)) * 2
+          ),
+          lerp(y, min, 0, min+taper,
+            simplex3(x, (y-undercarriageTranslate)*flatness, z) * undercarriageMask(x, y/5, z)
+          )
+        )
+      )
+    variables:
+      threshold: ${meta.yml:terrain-configuration.island-threshold}
+      max: ${meta.yml:terrain-configuration.island-max-height}
+      min: ${meta.yml:terrain-configuration.island-min-height}
+      taper: ${meta.yml:terrain-configuration.island-taper}
+      flatness: ${meta.yml:terrain-configuration.island-flatness}
+      undercarriageTranslate: ${meta.yml:terrain-configuration.island-undercarriage-translate}
+    samplers:
+      simplex3:
+        dimensions: 3
+        type: PROBABILITY
+        sampler:
+          type: FBM
+          octaves: 5
+          sampler:
+            type: CELLULAR
+            return: CellValue
+            frequency: 0.01 / ${meta.yml:terrain-configuration.island-scale}
+      undercarriageMask:
+        dimensions: 3
+        type: PROBABILITY
+        sampler:
+          type: RIDGED
+          octaves: 3
+          gain: 1
+          sampler:
+            type: CELLULAR
+            frequency: 0.05 / ${meta.yml:terrain-configuration.island-scale}
+
+palette:
+  - CORRUPTED_END: 319
diff --git a/biomes/end/end_wastes.yml b/biomes/end/end_wastes.yml
@@ -1,7 +1,7 @@
 id: END_WASTES
 type: BIOME
 extends: [ END, EQ_DEFAULT ]
-vanilla: minecraft:end_midlands
+vanilla: minecraft:end_barrens
 color: $biomes/colors.yml:END_WASTES
 
 palette:
diff --git a/biomes/void/starfield.yml b/biomes/void/starfield.yml
@@ -7,4 +7,6 @@ color: $biomes/colors.yml:STARFIELD
 features:
   trees:
     - VOIDSTARS
+#  preprocessors:
+#    - STAR_TRAIL
 
diff --git a/features/aether/structures/spawner_dungeons_normal.yml b/features/aether/structures/spawner_dungeons_normal.yml
@@ -1,4 +1,4 @@
-id: MOB_SPAWNERS
+id: SPAWNER_DUNGEONS_NORMAL
 type: FEATURE
 
 distributor:
@@ -10,10 +10,13 @@ distributor:
 locator:
   type: AND
   locators:
+    - type: RANDOM
+      height: &range
+        min: 75
+        max: 255
+      amount: 1
     - type: PATTERN
-      range: &range
-        min: 175
-        max: 200
+      range: *range
       pattern:
         type: MATCH_SOLID
         offset: 5
@@ -31,4 +34,4 @@ locator:
 structures:
   distribution:
     type: CONSTANT
-  structures: mob_spawner
+  structures: spawner_dungeon_normal
diff --git a/features/end/vegetation/trees/levitating_pillars.yml b/features/end/vegetation/trees/levitating_pillars.yml
@@ -0,0 +1,36 @@
+id: LEVITATING_PILLARS
+type: FEATURE
+
+distributor:
+  type: PADDED_GRID
+  width: 16
+  padding: 17
+  salt: 9443
+
+locator:
+  type: AND
+  locators:
+    - type: TOP
+      range: &range
+        min: 64
+        max: 319
+    - type: PATTERN
+      range: *range
+      pattern:
+        type: MATCH_SOLID
+        offset: -1
+    - type: PATTERN
+      range: *range
+      pattern:
+        type: MATCH_AIR
+        offset: 0
+    - type: PATTERN
+      range: *range
+      pattern:
+        type: MATCH_AIR
+        offset: 10
+
+structures:
+  distribution:
+    type: CONSTANT
+  structures: levitating_pillar
diff --git a/features/void/star_trail.yml b/features/void/star_trail.yml
diff --git a/pack.yml b/pack.yml
diff --git a/palettes/end/corrupted_end.yml b/palettes/end/corrupted_end.yml
diff --git a/structures/aether/blank.tesf b/structures/aether/blank.tesf
diff --git a/structures/aether/spawner_dungeon_normal.tesf b/structures/aether/spawner_dungeon_normal.tesf
diff --git a/structures/aether/spawner_dungeon_normal_sc.schem b/structures/aether/spawner_dungeon_normal_sc.schem
diff --git a/structures/aether/structures/ruins/ancient_tower/ancient_tower_room.tesf b/structures/aether/structures/ruins/ancient_tower/ancient_tower_room.tesf
diff --git a/structures/aether/structures/ruins/ancient_tower/rooms/empty_room.schem b/structures/aether/structures/ruins/ancient_tower/rooms/empty_room.schem
diff --git a/structures/aether/structures/ruins/ancient_tower/rooms/end_gateway_room.schem b/structures/aether/structures/ruins/ancient_tower/rooms/end_gateway_room.schem
diff --git a/structures/aether/structures/ruins/ancient_tower/rooms/library_room.schem b/structures/aether/structures/ruins/ancient_tower/rooms/library_room.schem
diff --git a/structures/aether/structures/ruins/ancient_tower/rooms/vex_spawner_room.schem b/structures/aether/structures/ruins/ancient_tower/rooms/vex_spawner_room.schem
diff --git a/structures/end/trees/pillars/levitating_pillar.tesf b/structures/end/trees/pillars/levitating_pillar.tesf
