mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-02-16 10:30:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix world creation

Browse Source
This commit is contained in:
Julian Krings
2024-08-20 16:25:05 +02:00
parent 055ddc7c9b
commit 2262e19cd1
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nms/v1_19_R1/src/main/java/com/volmit/iris/core/nms/v1_19_R1/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_19_R2/src/main/java/com/volmit/iris/core/nms/v1_19_R2/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_19_R3/src/main/java/com/volmit/iris/core/nms/v1_19_R3/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_20_R1/src/main/java/com/volmit/iris/core/nms/v1_20_R1/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_20_R2/src/main/java/com/volmit/iris/core/nms/v1_20_R2/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_20_R3/src/main/java/com/volmit/iris/core/nms/v1_20_R3/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_20_R4/src/main/java/com/volmit/iris/core/nms/v1_20_R4/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {

6
nms/v1_21_R1/src/main/java/com/volmit/iris/core/nms/v1_21_R1/NMSBinding.java
View File

@@ -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 <T> Optional<T> decode(Codec<T> codec, String json) {