mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-21 11:43:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reading custom mantle flags from json

Browse Source
This commit is contained in:
Julian Krings 2025-07-10 16:41:46 +02:00
parent 11cfd85f6a
commit 6964b99744
No known key found for this signature in database
GPG Key ID: 208C6E08C3B718D2
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -36,7 +36,6 @@ import com.volmit.iris.util.data.DataProvider;
import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.IO;
import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.json.JSONObject;
import com.volmit.iris.util.mantle.flag.MantleFlag; 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.Position2;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.noise.CNG;
@ -244,9 +243,9 @@ public class IrisDimension extends IrisRegistrant {
@Desc("The Subterrain Fluid Layer Height") @Desc("The Subterrain Fluid Layer Height")
private int caveLavaHeight = 8; private int caveLavaHeight = 8;
@RegistryListFunction(ComponentFlagFunction.class) @RegistryListFunction(ComponentFlagFunction.class)
@ArrayType(type = ReservedFlag.class) @ArrayType(type = String.class)
@Desc("Collection of disabled components") @Desc("Collection of disabled components")
private KList<ReservedFlag> disabledComponents = new KList<>(); private KList<MantleFlag> disabledComponents = new KList<>();
@Desc("A list of globally applied pre-processors") @Desc("A list of globally applied pre-processors")
@ArrayType(type = IrisPreProcessors.class) @ArrayType(type = IrisPreProcessors.class)
private KList<IrisPreProcessors> globalPreProcessors = new KList<>(); private KList<IrisPreProcessors> globalPreProcessors = new KList<>();

2
core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlag.java
View File

@ -52,6 +52,6 @@ public sealed interface MantleFlag permits CustomFlag, ReservedFlag {
static MantleFlag of(int ordinal) { static MantleFlag of(int ordinal) {
if (ordinal < MIN_ORDINAL || ordinal > MAX_ORDINAL) if (ordinal < MIN_ORDINAL || ordinal > MAX_ORDINAL)
throw new IllegalArgumentException("Ordinal must be between " + MIN_ORDINAL + " and " + 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);
} }
} }

2
core/src/main/java/com/volmit/iris/util/mantle/flag/MantleFlagAdapter.java
View File

@ -8,7 +8,7 @@ import com.google.gson.stream.JsonWriter;
import java.io.IOException; import java.io.IOException;
public class MantleFlagAdapter extends TypeAdapter<MantleFlag> { public class MantleFlagAdapter extends TypeAdapter<MantleFlag> {
private static final String CUSTOM = "custom:"; private static final String CUSTOM = "CUSTOM:";
private static final int CUSTOM_LENGTH = CUSTOM.length(); private static final int CUSTOM_LENGTH = CUSTOM.length();
@Override @Override