buffed underground bastion and fixed icy ruins

TelepathicGrunt · TelepathicGrunt · commit 389b281ff164 · 2022-10-01T11:43:46.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,4 +2,14 @@
 
 #### Villages:
 Ocean Village now added! Spawns only in deep ocean biomes. Explore the bottom of the sea to see this village's tragic ending!
- Can be located with Dolphins
+ Can be located with Dolphins
+
+#### Bastions:
+Underground Bastions are now a bit more common
+
+#### Ruins:
+Land Ruins chests now has an increased chance of having a map to an Underground Bastion
+
+Fixed all 4 Land Ruins types having difficulty spawning
+
+Fixed Icy Land Ruins placing snow layers on top of invalid blocks. Powder Snow may sometimes be two blocks deep now.
diff --git a/src/main/java/com/telepathicgrunt/repurposedstructures/world/features/StructurePowderSnow.java b/src/main/java/com/telepathicgrunt/repurposedstructures/world/features/StructurePowderSnow.java
@@ -6,6 +6,7 @@
 import com.telepathicgrunt.repurposedstructures.world.features.configs.StructureRangeConfig;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SnowLayerBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -79,18 +80,26 @@ else if (stage == 8) {
                             chosenBlock = Blocks.SNOW.defaultBlockState().setValue(SnowLayerBlock.LAYERS, (int) Doubles.constrainToRange(stage, 1, 8));
                         }
 
-                        if (!isSnowLayer && !chosenBlock.canSurvive(context.level(), mutable)) {
+                        if (currentState.is(Blocks.SNOW) && !chosenBlock.canSurvive(context.level(), mutable)) {
                             mutable.move(Direction.DOWN);
                             BlockState belowState = context.level().getBlockState(mutable);
-                            if (belowState.is(Blocks.DIRT_PATH) || belowState.is(Blocks.ICE) || (belowState.is(Blocks.POWDER_SNOW))) {
+                            if (belowState.is(Blocks.DIRT_PATH) || belowState.is(BlockTags.DIRT) || belowState.is(BlockTags.ICE) || (belowState.is(Blocks.POWDER_SNOW))) {
                                 context.level().setBlock(mutable, Blocks.SNOW_BLOCK.defaultBlockState(), 3);
                             }
                             mutable.move(Direction.UP);
                         }
 
-                        if (isSnowLayer || Blocks.SNOW.canSurvive(Blocks.SNOW.defaultBlockState(), context.level(), mutable)) {
+                        if (Blocks.SNOW.canSurvive(Blocks.SNOW.defaultBlockState(), context.level(), mutable)) {
                             context.level().setBlock(mutable, chosenBlock, 3);
                         }
+
+                        if (currentState.is(Blocks.SNOW_BLOCK) || currentState.is(Blocks.POWDER_SNOW)) {
+                            mutable.move(Direction.DOWN);
+                            BlockState belowState = context.level().getBlockState(mutable);
+                            if (belowState.is(Blocks.DIRT_PATH) || belowState.is(BlockTags.DIRT) || belowState.is(BlockTags.ICE)) {
+                                context.level().setBlock(mutable, Blocks.POWDER_SNOW.defaultBlockState(), 3);
+                            }
+                        }
                     }
                 }
             }
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_cold/large.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_cold/large.json
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "rolls": 2,
+      "rolls": 3,
       "entries": [
         {
           "name": "minecraft:fishing_rod",
@@ -215,7 +215,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_cold/small.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_cold/small.json
@@ -95,7 +95,7 @@
       ]
     },
     {
-      "rolls": 1,
+      "rolls": 2,
       "entries": [
         {
           "name": "minecraft:fishing_rod",
@@ -190,7 +190,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_hot/large.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_hot/large.json
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "rolls": 2,
+      "rolls": 3,
       "entries": [
         {
           "name": "minecraft:compass",
@@ -200,7 +200,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_hot/small.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_hot/small.json
@@ -110,7 +110,7 @@
       ]
     },
     {
-      "rolls": 1,
+      "rolls": 2,
       "entries": [
         {
           "name": "minecraft:compass",
@@ -205,7 +205,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_icy/large.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_icy/large.json
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "rolls": 2,
+      "rolls": 3,
       "entries": [
         {
           "name": "minecraft:stone_shovel",
@@ -205,7 +205,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_icy/small.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_icy/small.json
@@ -95,7 +95,7 @@
       ]
     },
     {
-      "rolls": 1,
+      "rolls": 2,
       "entries": [
         {
           "name": "minecraft:stone_shovel",
@@ -200,7 +200,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_warm/large.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_warm/large.json
@@ -105,7 +105,7 @@
       ]
     },
     {
-      "rolls": 2,
+      "rolls": 3,
       "entries": [
         {
           "name": "minecraft:fishing_rod",
@@ -195,7 +195,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_warm/small.json b/src/main/resources/data/repurposed_structures/loot_tables/chests/ruins/land_warm/small.json
@@ -95,7 +95,7 @@
       ]
     },
     {
-      "rolls": 1,
+      "rolls": 2,
       "entries": [
         {
           "name": "minecraft:fishing_rod",
@@ -170,7 +170,7 @@
         {
           "name": "minecraft:map",
           "type": "minecraft:item",
-          "weight": 1,
+          "weight": 2,
           "functions": [
             {
               "function": "minecraft:exploration_map",
diff --git a/src/main/resources/data/repurposed_structures/worldgen/processor_list/ruins/land_icy_randomize.json b/src/main/resources/data/repurposed_structures/worldgen/processor_list/ruins/land_icy_randomize.json
@@ -32,10 +32,23 @@
             "Properties": {
               "snowy": "false"
             },
-            "Name": "minecraft:grass_block"
+            "Name": "minecraft:blue_ice"
           },
           "input_predicate": {
-            "block": "minecraft:dirt_path",
+            "block": "minecraft:grass_block",
+            "probability": 0.05,
+            "predicate_type": "minecraft:random_block_match"
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          }
+        },
+        {
+          "output_state": {
+            "Name": "minecraft:powder_snow"
+          },
+          "input_predicate": {
+            "block": "minecraft:grass_block",
             "probability": 0.1,
             "predicate_type": "minecraft:random_block_match"
           },
@@ -45,14 +58,11 @@
         },
         {
           "output_state": {
-            "Properties": {
-              "snowy": "false"
-            },
-            "Name": "minecraft:blue_ice"
+            "Name": "minecraft:snow_block"
           },
           "input_predicate": {
             "block": "minecraft:grass_block",
-            "probability": 0.05,
+            "probability": 0.2,
             "predicate_type": "minecraft:random_block_match"
           },
           "location_predicate": {
@@ -64,7 +74,7 @@
             "Name": "minecraft:powder_snow"
           },
           "input_predicate": {
-            "block": "minecraft:grass_block",
+            "block": "minecraft:dirt_path",
             "probability": 0.1,
             "predicate_type": "minecraft:random_block_match"
           },
@@ -77,7 +87,7 @@
             "Name": "minecraft:snow_block"
           },
           "input_predicate": {
-            "block": "minecraft:grass_block",
+            "block": "minecraft:dirt_path",
             "probability": 0.2,
             "predicate_type": "minecraft:random_block_match"
           },
@@ -87,11 +97,11 @@
         },
         {
           "output_state": {
-            "Name": "minecraft:powder_snow"
+            "Name": "minecraft:cracked_stone_bricks"
           },
           "input_predicate": {
             "block": "minecraft:dirt_path",
-            "probability": 0.1,
+            "probability": 0.75,
             "predicate_type": "minecraft:random_block_match"
           },
           "location_predicate": {
@@ -100,12 +110,11 @@
         },
         {
           "output_state": {
-            "Name": "minecraft:snow_block"
+            "Name": "minecraft:stone_bricks"
           },
           "input_predicate": {
             "block": "minecraft:dirt_path",
-            "probability": 0.2,
-            "predicate_type": "minecraft:random_block_match"
+            "predicate_type": "minecraft:block_match"
           },
           "location_predicate": {
             "predicate_type": "minecraft:always_true"
diff --git a/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_cold.json b/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_cold.json
@@ -2,8 +2,8 @@
   "type": "repurposed_structures:generic_jigsaw_structure",
   "start_pool": "repurposed_structures:ruins/land_cold/start_pool",
   "size": 2,
-  "terrain_height_radius_check": 2,
-  "allowed_terrain_height_range": 5,
+  "terrain_height_radius_check": 1,
+  "allowed_terrain_height_range": 8,
   "cannot_spawn_in_liquid": true,
   "biomes": "#repurposed_structures:has_structure/ruins/land_cold",
   "step": "surface_structures",
diff --git a/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_hot.json b/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_hot.json
@@ -2,8 +2,8 @@
   "type": "repurposed_structures:generic_jigsaw_structure",
   "start_pool": "repurposed_structures:ruins/land_hot/start_pool",
   "size": 2,
-  "terrain_height_radius_check": 2,
-  "allowed_terrain_height_range": 5,
+  "terrain_height_radius_check": 1,
+  "allowed_terrain_height_range": 8,
   "cannot_spawn_in_liquid": true,
   "biomes": "#repurposed_structures:has_structure/ruins/land_hot",
   "step": "surface_structures",
diff --git a/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_icy.json b/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_icy.json
@@ -2,8 +2,8 @@
   "type": "repurposed_structures:generic_jigsaw_structure",
   "start_pool": "repurposed_structures:ruins/land_icy/start_pool",
   "size": 2,
-  "terrain_height_radius_check": 2,
-  "allowed_terrain_height_range": 5,
+  "terrain_height_radius_check": 1,
+  "allowed_terrain_height_range": 8,
   "cannot_spawn_in_liquid": true,
   "biomes": "#repurposed_structures:has_structure/ruins/land_icy",
   "step": "surface_structures",
diff --git a/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_warm.json b/src/main/resources/data/repurposed_structures/worldgen/structure/ruins_land_warm.json
@@ -2,8 +2,8 @@
   "type": "repurposed_structures:generic_jigsaw_structure",
   "start_pool": "repurposed_structures:ruins/land_warm/start_pool",
   "size": 2,
-  "terrain_height_radius_check": 2,
-  "allowed_terrain_height_range": 5,
+  "terrain_height_radius_check": 1,
+  "allowed_terrain_height_range": 8,
   "cannot_spawn_in_liquid": true,
   "biomes": "#repurposed_structures:has_structure/ruins/land_warm",
   "step": "surface_structures",
diff --git a/src/main/resources/data/repurposed_structures/worldgen/structure_set/bastions_overworld.json b/src/main/resources/data/repurposed_structures/worldgen/structure_set/bastions_overworld.json
@@ -8,8 +8,8 @@
   "placement": {
     "type": "repurposed_structures:advanced_random_spread",
     "salt": 618127296,
-    "spacing": 180,
-    "separation": 90,
+    "spacing": 135,
+    "separation": 75,
     "super_exclusion_zone": {
       "chunk_count": 7,
       "other_set": "#repurposed_structures:underground_bastion_avoid"

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.telepathicgrunt.repurposedstructures.world.features.configs.StructureRangeConfig;`
`7`	`7`	`import net.minecraft.core.BlockPos;`
`8`	`8`	`import net.minecraft.core.Direction;`
	`9`	`+import net.minecraft.tags.BlockTags;`
`9`	`10`	`import net.minecraft.world.level.block.Blocks;`
`10`	`11`	`import net.minecraft.world.level.block.SnowLayerBlock;`
`11`	`12`	`import net.minecraft.world.level.block.state.BlockState;`
`@@ -79,18 +80,26 @@ else if (stage == 8) {`
`79`	`80`	`chosenBlock = Blocks.SNOW.defaultBlockState().setValue(SnowLayerBlock.LAYERS, (int) Doubles.constrainToRange(stage, 1, 8));`
`80`	`81`	`}`
`81`	`82`
`82`		`- if (!isSnowLayer && !chosenBlock.canSurvive(context.level(), mutable)) {`
	`83`	`+ if (currentState.is(Blocks.SNOW) && !chosenBlock.canSurvive(context.level(), mutable)) {`
`83`	`84`	`mutable.move(Direction.DOWN);`
`84`	`85`	`BlockState belowState = context.level().getBlockState(mutable);`
`85`		`- if (belowState.is(Blocks.DIRT_PATH) \|\| belowState.is(Blocks.ICE) \|\| (belowState.is(Blocks.POWDER_SNOW))) {`
	`86`	`+ if (belowState.is(Blocks.DIRT_PATH) \|\| belowState.is(BlockTags.DIRT) \|\| belowState.is(BlockTags.ICE) \|\| (belowState.is(Blocks.POWDER_SNOW))) {`
`86`	`87`	`context.level().setBlock(mutable, Blocks.SNOW_BLOCK.defaultBlockState(), 3);`
`87`	`88`	`}`
`88`	`89`	`mutable.move(Direction.UP);`
`89`	`90`	`}`
`90`	`91`
`91`		`- if (isSnowLayer \|\| Blocks.SNOW.canSurvive(Blocks.SNOW.defaultBlockState(), context.level(), mutable)) {`
	`92`	`+ if (Blocks.SNOW.canSurvive(Blocks.SNOW.defaultBlockState(), context.level(), mutable)) {`
`92`	`93`	`context.level().setBlock(mutable, chosenBlock, 3);`
`93`	`94`	`}`
	`95`	`+`
	`96`	`+ if (currentState.is(Blocks.SNOW_BLOCK) \|\| currentState.is(Blocks.POWDER_SNOW)) {`
	`97`	`+ mutable.move(Direction.DOWN);`
	`98`	`+ BlockState belowState = context.level().getBlockState(mutable);`
	`99`	`+ if (belowState.is(Blocks.DIRT_PATH) \|\| belowState.is(BlockTags.DIRT) \|\| belowState.is(BlockTags.ICE)) {`
	`100`	`+ context.level().setBlock(mutable, Blocks.POWDER_SNOW.defaultBlockState(), 3);`
	`101`	`+ }`
	`102`	`+ }`
`94`	`103`	`}`
`95`	`104`	`}`
`96`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`]`
`106`	`106`	`},`
`107`	`107`	`{`
`108`		`- "rolls": 2,`
	`108`	`+ "rolls": 3,`
`109`	`109`	`"entries": [`
`110`	`110`	`{`
`111`	`111`	`"name": "minecraft:fishing_rod",`
`@@ -215,7 +215,7 @@`
`215`	`215`	`{`
`216`	`216`	`"name": "minecraft:map",`
`217`	`217`	`"type": "minecraft:item",`
`218`		`- "weight": 1,`
	`218`	`+ "weight": 2,`
`219`	`219`	`"functions": [`
`220`	`220`	`{`
`221`	`221`	`"function": "minecraft:exploration_map",`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@`
`95`	`95`	`]`
`96`	`96`	`},`
`97`	`97`	`{`
`98`		`- "rolls": 1,`
	`98`	`+ "rolls": 2,`
`99`	`99`	`"entries": [`
`100`	`100`	`{`
`101`	`101`	`"name": "minecraft:fishing_rod",`
`@@ -190,7 +190,7 @@`
`190`	`190`	`{`
`191`	`191`	`"name": "minecraft:map",`
`192`	`192`	`"type": "minecraft:item",`
`193`		`- "weight": 1,`
	`193`	`+ "weight": 2,`
`194`	`194`	`"functions": [`
`195`	`195`	`{`
`196`	`196`	`"function": "minecraft:exploration_map",`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@`
`110`	`110`	`]`
`111`	`111`	`},`
`112`	`112`	`{`
`113`		`- "rolls": 1,`
	`113`	`+ "rolls": 2,`
`114`	`114`	`"entries": [`
`115`	`115`	`{`
`116`	`116`	`"name": "minecraft:compass",`
`@@ -205,7 +205,7 @@`
`205`	`205`	`{`
`206`	`206`	`"name": "minecraft:map",`
`207`	`207`	`"type": "minecraft:item",`
`208`		`- "weight": 1,`
	`208`	`+ "weight": 2,`
`209`	`209`	`"functions": [`
`210`	`210`	`{`
`211`	`211`	`"function": "minecraft:exploration_map",`