From 6964b99744535e995cd4990fffddb75ee3bb9f90 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 10 Jul 2025 16:41:46 +0200 Subject: [PATCH] fix reading custom mantle flags from json --- .../java/com/volmit/iris/engine/object/IrisDimension.java | 5 ++--- .../java/com/volmit/iris/util/mantle/flag/MantleFlag.java | 2 +- .../com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 0688f3ea9..704d0b014 100644 --- a/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -36,7 +36,6 @@ import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.mantle.flag.MantleFlag; -import com.volmit.iris.util.mantle.flag.ReservedFlag; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; @@ -244,9 +243,9 @@ public class IrisDimension extends IrisRegistrant { @Desc("The Subterrain Fluid Layer Height") private int caveLavaHeight = 8; @RegistryListFunction(ComponentFlagFunction.class) - @ArrayType(type = ReservedFlag.class) + @ArrayType(type = String.class) @Desc("Collection of disabled components") - private KList disabledComponents = new KList<>(); + private KList disabledComponents = new KList<>(); @Desc("A list of globally applied pre-processors") @ArrayType(type = IrisPreProcessors.class) private KList globalPreProcessors = new KList<>(); diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java index 4e5b86c25..965bf6780 100644 --- a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java +++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java @@ -52,6 +52,6 @@ public sealed interface MantleFlag permits CustomFlag, ReservedFlag { static MantleFlag of(int ordinal) { if (ordinal < MIN_ORDINAL || ordinal > MAX_ORDINAL) throw new IllegalArgumentException("Ordinal must be between " + MIN_ORDINAL + " and " + MAX_ORDINAL); - return new CustomFlag("custom:"+ordinal, ordinal); + return new CustomFlag("CUSTOM:"+ordinal, ordinal); } } diff --git a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java index 12f889211..c56916df8 100644 --- a/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java +++ b/core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java @@ -8,7 +8,7 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; public class MantleFlagAdapter extends TypeAdapter { - private static final String CUSTOM = "custom:"; + private static final String CUSTOM = "CUSTOM:"; private static final int CUSTOM_LENGTH = CUSTOM.length(); @Override