From a3c2ec6d516ba671e6b0ac49740358b8caa8ac5e Mon Sep 17 00:00:00 2001 From: IAFEnvoy Date: Wed, 11 Dec 2024 14:11:50 +0800 Subject: [PATCH] reduce structure counts and add exclusion zone --- common/build.gradle | 2 +- .../mixin/EntityRenderersMixin.java | 21 ------------------- .../structure_set/fire_dragon_cave.json | 11 ++++++++-- .../structure_set/fire_dragon_roost.json | 11 ++++++++-- .../structure_set/ice_dragon_cave.json | 11 ++++++++-- .../structure_set/ice_dragon_roost.json | 11 ++++++++-- .../structure_set/lightning_dragon_cave.json | 11 ++++++++-- .../structure_set/lightning_dragon_roost.json | 11 ++++++++-- .../src/main/resources/iceandfire.mixins.json | 1 - fabric/build.gradle | 2 +- forge/build.gradle | 2 +- 11 files changed, 57 insertions(+), 37 deletions(-) delete mode 100644 common/src/main/java/com/iafenvoy/iceandfire/mixin/EntityRenderersMixin.java diff --git a/common/build.gradle b/common/build.gradle index eef536a..e4aa72d 100644 --- 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 deleted file mode 100644 index 506813c..0000000 --- a/common/src/main/java/com/iafenvoy/iceandfire/mixin/EntityRenderersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.iafenvoy.iceandfire.mixin; - -import com.iafenvoy.uranus.client.model.util.TabulaModelHandlerHelper; -import net.minecraft.client.render.entity.EntityRenderer; -import net.minecraft.client.render.entity.EntityRendererFactory; -import net.minecraft.client.render.entity.EntityRenderers; -import net.minecraft.entity.EntityType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.Map; - -@Mixin(EntityRenderers.class) -public class EntityRenderersMixin { - @Inject(method = "reloadEntityRenderers", at = @At("HEAD")) - private static void onReload(EntityRendererFactory.Context ctx, CallbackInfoReturnable, EntityRenderer>> cir) { - new TabulaModelHandlerHelper().reload(ctx.getResourceManager()); - } -} 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 index ae2a15c..13b3229 100644 --- 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 index abb6980..052ae60 100644 --- 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 index 1106869..89ee5d1 100644 --- 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 index 8166374..c026779 100644 --- 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 index a0e3795..7c6df0a 100644 --- 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 index 6a1dfa8..ceea793 100644 --- 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 index dd0772b..d4536d1 100644 --- 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 index c0a52b4..c7b2382 100644 --- 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 index 954dc92..61cd7e8 100644 --- 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}"