From d7d507589d2908663e1af47db5ee71c803cb970f Mon Sep 17 00:00:00 2001 From: skirazavr Date: Tue, 9 Jun 2026 17:05:52 +0300 Subject: [PATCH 1/2] Ignore client enum extensions on dedicated server --- .../fml/common/asm/enumextension/RuntimeEnumExtender.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java b/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java index e413dbcf7..b8f89d63c 100644 --- a/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java +++ b/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java @@ -16,10 +16,12 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; +import net.neoforged.api.distmarker.Dist; import net.neoforged.fml.ModLoader; import net.neoforged.fml.ModLoadingIssue; import net.neoforged.fml.common.asm.ListGeneratorAdapter; import net.neoforged.fml.jarcontents.JarResource; +import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.neoforgespi.language.IModInfo; import net.neoforged.neoforgespi.transformation.ClassProcessor; import net.neoforged.neoforgespi.transformation.ClassProcessorIds; @@ -499,6 +501,9 @@ public static void loadEnumPrototypes(Map paths) { .stream() .map(entry -> EnumPrototype.load(entry.getKey(), entry.getValue())) .flatMap(List::stream) + .filter(proto -> + FMLEnvironment.getDist() != Dist.DEDICATED_SERVER + || !proto.enumName().startsWith("net/minecraft/client/")) .sorted() .reduce( new HashMap<>(), From 31a2a36eb474f0f53e7b8f62d54782187ed8fbc8 Mon Sep 17 00:00:00 2001 From: skirazavr Date: Tue, 9 Jun 2026 17:12:49 +0300 Subject: [PATCH 2/2] Fix formatting --- .../fml/common/asm/enumextension/RuntimeEnumExtender.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java b/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java index b8f89d63c..e4f2b673d 100644 --- a/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java +++ b/loader/src/main/java/net/neoforged/fml/common/asm/enumextension/RuntimeEnumExtender.java @@ -501,9 +501,8 @@ public static void loadEnumPrototypes(Map paths) { .stream() .map(entry -> EnumPrototype.load(entry.getKey(), entry.getValue())) .flatMap(List::stream) - .filter(proto -> - FMLEnvironment.getDist() != Dist.DEDICATED_SERVER - || !proto.enumName().startsWith("net/minecraft/client/")) + .filter(proto -> FMLEnvironment.getDist() != Dist.DEDICATED_SERVER + || !proto.enumName().startsWith("net/minecraft/client/")) .sorted() .reduce( new HashMap<>(),