From 2262e19cd1fec6bcae9829b143edb39922c591f8 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Tue, 20 Aug 2024 16:25:05 +0200 Subject: [PATCH] fix world creation --- .../java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java | 6 +++--- .../java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java b/nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java index 36b6e3b53..a27f64c94 100644 --- a/nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java +++ b/nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java @@ -645,9 +645,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registry.DIMENSION_TYPE_REGISTRY, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -677,7 +677,7 @@ public class NMSBinding implements INMSBinding { if (base == null) throw new IllegalArgumentException("Base biome not found: " + biome.getKey()); var json = encode(net.minecraft.world.level.biome.Biome.NETWORK_CODEC, base); var clone = decode(net.minecraft.world.level.biome.Biome.NETWORK_CODEC, json.toString()).orElse(null); - return register(Registry.BIOME_REGISTRY, location, clone, false); + return register(Registry.BIOME_REGISTRY, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java b/nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java index b6237ed85..5984e6c3f 100644 --- a/nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java +++ b/nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java @@ -649,9 +649,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -681,7 +681,7 @@ public class NMSBinding implements INMSBinding { if (base == null) throw new IllegalArgumentException("Base biome not found: " + biome.getKey()); var json = encode(net.minecraft.world.level.biome.Biome.NETWORK_CODEC, base); var clone = decode(net.minecraft.world.level.biome.Biome.NETWORK_CODEC, json.toString()).orElse(null); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java b/nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java index eca6024b3..6d765f814 100644 --- a/nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java +++ b/nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java @@ -659,9 +659,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -699,7 +699,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java index 463f866fd..e6bff2cb3 100644 --- a/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java +++ b/nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java @@ -646,9 +646,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -686,7 +686,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java index e4c05ef8d..5d23a7263 100644 --- a/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java +++ b/nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java @@ -652,9 +652,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -692,7 +692,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java index 3310d9f3d..8797d3867 100644 --- a/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java +++ b/nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java @@ -684,9 +684,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -724,7 +724,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java index 84dcf4841..188df2c68 100644 --- a/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java +++ b/nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java @@ -701,9 +701,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> new ResourceLocation("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -741,7 +741,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) { diff --git a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java index 48718bdc2..3aa82c129 100644 --- a/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java +++ b/nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java @@ -696,9 +696,9 @@ public class NMSBinding implements INMSBinding { case THE_END -> ResourceLocation.fromNamespaceAndPath("minecraft", "the_end"); case CUSTOM -> throw new IllegalArgumentException("Cannot register custom dimension"); }; - var base = registry.getHolder(ResourceKey.create(Registries.DIMENSION_TYPE, baseLocation)).orElse(null); + var base = registry.get(baseLocation); if (base == null) return false; - var json = encode(DimensionType.CODEC, base).orElse(null); + var json = encode(DimensionType.DIRECT_CODEC, base).orElse(null); if (json == null) return false; var object = json.getAsJsonObject(); var height = dimension.getDimensionHeight(); @@ -736,7 +736,7 @@ public class NMSBinding implements INMSBinding { .specialEffects(base.getSpecialEffects()) .build(); - return register(Registries.BIOME, location, clone, false); + return register(Registries.BIOME, location, clone, replace); } private Optional decode(Codec codec, String json) {