reduce structure counts and add exclusion zone

IAFEnvoy · Dec 11, 2024 · a3c2ec6 · a3c2ec6
1 parent 12227c5
commit a3c2ec6
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 37 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     // Architectury API. This is optional, and you can comment it out if you don't need it.
     modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version"
 
-    modImplementation "maven.modrinth:uranus:iyDFizmU"
+    modImplementation "maven.modrinth:uranus:r83GL5c6"
     modImplementation "maven.modrinth:jupiter:nhqjUZZy"
 
     modCompileOnly "dev.emi:emi-fabric:${emi_version}:api"

diff --git a/common/src/main/java/com/iafenvoy/iceandfire/mixin/EntityRenderersMixin.java b/common/src/main/java/com/iafenvoy/iceandfire/mixin/EntityRenderersMixin.java
diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/fire_dragon_cave.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/fire_dragon_cave.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 7824162,
-    "separation": 12,
-    "spacing": 16
+    "separation": 14,
+    "spacing": 20,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:ice_dragon_cave",
+        "iceandfire:lightning_dragon_cave"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/fire_dragon_roost.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/fire_dragon_roost.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 3747893,
-    "separation": 10,
-    "spacing": 16
+    "separation": 12,
+    "spacing": 18,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:ice_dragon_roost",
+        "iceandfire:lightning_dragon_roost"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/ice_dragon_cave.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/ice_dragon_cave.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 14032493,
-    "separation": 12,
-    "spacing": 16
+    "separation": 14,
+    "spacing": 20,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:fire_dragon_cave",
+        "iceandfire:lightning_dragon_cave"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/ice_dragon_roost.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/ice_dragon_roost.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 1897443,
-    "separation": 10,
-    "spacing": 16
+    "separation": 12,
+    "spacing": 18,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:fire_dragon_roost",
+        "iceandfire:lightning_dragon_roost"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/lightning_dragon_cave.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/lightning_dragon_cave.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 8901237,
-    "separation": 12,
-    "spacing": 16
+    "separation": 14,
+    "spacing": 20,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:fire_dragon_cave",
+        "iceandfire:ice_dragon_cave"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/data/iceandfire/worldgen/structure_set/lightning_dragon_roost.json b/common/src/main/resources/data/iceandfire/worldgen/structure_set/lightning_dragon_roost.json
@@ -2,8 +2,15 @@
   "placement": {
     "type": "minecraft:random_spread",
     "salt": 9031232,
-    "separation": 10,
-    "spacing": 16
+    "separation": 12,
+    "spacing": 18,
+    "exclusion_zone": {
+      "chunk_count": 6,
+      "other_set": [
+        "iceandfire:fire_dragon_roost",
+        "iceandfire:ice_dragon_roost"
+      ]
+    }
   },
   "structures": [
     {

diff --git a/common/src/main/resources/iceandfire.mixins.json b/common/src/main/resources/iceandfire.mixins.json
@@ -13,7 +13,6 @@
     "PointOfInterestTypesAccessor"
   ],
   "client": [
-    "EntityRenderersMixin",
     "GameRendererMixin",
     "InGameHudMixin",
     "LivingEntityRendererMixin",

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     common(project(path: ':common', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
 
-    modImplementation "maven.modrinth:uranus:iyDFizmU"
+    modImplementation "maven.modrinth:uranus:r83GL5c6"
     modImplementation "maven.modrinth:jupiter:nhqjUZZy"
 
     // CCA

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.2.0"))
     implementation(include("io.github.llamalad7:mixinextras-forge:0.2.0"))
 
-    modImplementation "maven.modrinth:uranus:ZOhc1xM8"
+    modImplementation "maven.modrinth:uranus:OWlhs81d"
     modImplementation "maven.modrinth:jupiter:quscWB5K"
 
     modLocalRuntime "dev.emi:emi-forge:${emi_version}"