better worldgen fix

AlexModGuy · Dec 26, 2023 · 18e13ab · 18e13ab
1 parent 4f360c7
commit 18e13ab
Show file tree

Hide file tree

Showing 28 changed files with 92 additions and 169 deletions.
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/cyclops_cave.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/cyclops_cave.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:cyclops_cave",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_dragon_cave.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_dragon_cave.json
@@ -2,7 +2,7 @@
   "feature": "iceandfire:fire_dragon_cave",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_dragon_roost.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_dragon_roost.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:fire_dragon_roost",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_lily.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/fire_lily.json
@@ -10,7 +10,7 @@
     },
     {
       "type": "minecraft:heightmap",
-      "heightmap": "MOTION_BLOCKING"
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "iceandfire:biome_custom"

diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/frost_lily.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/frost_lily.json
@@ -10,7 +10,7 @@
     },
     {
       "type": "minecraft:heightmap",
-      "heightmap": "MOTION_BLOCKING"
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "iceandfire:biome_custom"

diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/hydra_cave.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/hydra_cave.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:hydra_cave",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/ice_dragon_cave.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/ice_dragon_cave.json
@@ -2,7 +2,7 @@
   "feature": "iceandfire:ice_dragon_cave",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/ice_dragon_roost.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/ice_dragon_roost.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:ice_dragon_roost",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_dragon_cave.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_dragon_cave.json
@@ -2,7 +2,7 @@
   "feature": "iceandfire:lightning_dragon_cave",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_dragon_roost.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_dragon_roost.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:lightning_dragon_roost",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_lily.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/lightning_lily.json
@@ -10,7 +10,7 @@
     },
     {
       "type": "minecraft:heightmap",
-      "heightmap": "MOTION_BLOCKING"
+      "heightmap": "WORLD_SURFACE_WG"
     },
     {
       "type": "iceandfire:biome_custom"

diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/myrmex_hive_desert.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/myrmex_hive_desert.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:myrmex_hive_desert",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/myrmex_hive_jungle.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/myrmex_hive_jungle.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:myrmex_hive_jungle",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/pixie_village.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/pixie_village.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:pixie_village",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/siren_island.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/siren_island.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:siren_island",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_death_worm.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_death_worm.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_death_worm",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/...nerated/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_fire.json b/...nerated/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_fire.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_dragon_skeleton_fire",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/...enerated/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_ice.json b/...enerated/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_ice.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_dragon_skeleton_ice",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/...ed/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_lightning.json b/...ed/resources/data/iceandfire/worldgen/placed_feature/spawn_dragon_skeleton_lightning.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_dragon_skeleton_lightning",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_hippocampus.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_hippocampus.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_hippocampus",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_sea_serpent.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_sea_serpent.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_sea_serpent",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_stymphalian_bird.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_stymphalian_bird.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_stymphalian_bird",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_wandering_cyclops.json b/src/generated/resources/data/iceandfire/worldgen/placed_feature/spawn_wandering_cyclops.json
@@ -2,7 +2,11 @@
   "feature": "iceandfire:spawn_wandering_cyclops",
   "placement": [
     {
-      "type": "iceandfire:biome_custom"
+      "type": "minecraft:heightmap",
+      "heightmap": "WORLD_SURFACE_WG"
+    },
+    {
+      "type": "minecraft:biome"
     }
   ]
 }
diff --git a/src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java b/src/main/java/com/github/alexthe666/iceandfire/IceAndFire.java
@@ -3,7 +3,6 @@
 import com.github.alexthe666.iceandfire.block.IafBlockRegistry;
 import com.github.alexthe666.iceandfire.client.ClientProxy;
 import com.github.alexthe666.iceandfire.config.ConfigHolder;
-import com.github.alexthe666.iceandfire.datagen.DataGenerators;
 import com.github.alexthe666.iceandfire.entity.IafEntityRegistry;
 import com.github.alexthe666.iceandfire.entity.IafVillagerRegistry;
 import com.github.alexthe666.iceandfire.entity.tile.IafTileEntityRegistry;
@@ -13,7 +12,6 @@
 import com.github.alexthe666.iceandfire.message.*;
 import com.github.alexthe666.iceandfire.recipe.IafRecipeRegistry;
 import com.github.alexthe666.iceandfire.recipe.IafRecipeSerializers;
-import com.github.alexthe666.iceandfire.world.IafPlacementFilterRegistry;
 import com.github.alexthe666.iceandfire.world.IafProcessors;
 import com.github.alexthe666.iceandfire.world.IafWorldRegistry;
 import net.minecraft.core.Registry;
@@ -116,7 +114,6 @@ public IceAndFire() {
         IafBlockRegistry.BLOCKS.register(modBus);
         IafEntityRegistry.ENTITIES.register(modBus);
         IafTileEntityRegistry.TYPES.register(modBus);
-        IafPlacementFilterRegistry.PLACEMENT_MODIFIER_TYPES.register(modBus);
         IafWorldRegistry.FEATURES.register(modBus);
         IafWorldRegistry.STRUCTURES.register(modBus);
         IafContainerRegistry.CONTAINERS.register(modBus);