Motschen/MidnightLib
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightLib.git synced 2025-12-16 01:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash on servers

Browse Source 
- This makes overriding the screen less flexible, but out of all options, this was the best way to do it. Previously, the `@EnvType` annotation took care of keeping this out of the server code, but NeoForge decided to break perfectly functional behaviour once again, requiring me to remove the annotations 🫠
This commit is contained in:
Martin Prokoph
2025-10-03 14:55:40 +02:00
parent c07c466398
commit 3db1c1eb23
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
View File

@@ -37,7 +37,7 @@ public abstract class MidnightConfig {
private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)");
private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)");
private static final Gson gson = new GsonBuilder()
.excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE)
.excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).excludeFieldsWithModifiers(Modifier.FINAL)
.addSerializationExclusionStrategy(new ExclusionStrategy() {
public boolean shouldSkipClass(Class<?> clazz) { return false; }
public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; }
@@ -70,13 +70,12 @@ public abstract class MidnightConfig {
MidnightConfig instance = createInstance(modid, config);
for (Field field : config.getFields()) {
EntryInfo info = new EntryInfo(field, modid);
//noinspection ConstantValue
if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class))
&& !field.isAnnotationPresent(Server.class)
&& !field.isAnnotationPresent(Hidden.class)
&& PlatformFunctions.isClientEnv())
instance.addClientEntry(field, info);
instance.addClientEntry(field, new EntryInfo(field, modid));
}
instance.loadValuesFromJson();
}
@@ -212,10 +211,10 @@ public abstract class MidnightConfig {
public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {
}
public static Screen getScreen(Screen parent, String modid) {
public static MidnightConfigScreen getScreen(Screen parent, String modid) {
return configInstances.get(modid).getScreen(parent);
}
public Screen getScreen(Screen parent) {
public MidnightConfigScreen getScreen(Screen parent) {
return new MidnightConfigScreen(parent, modid);
}