diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java index 290cacb1c0..1ab63857e5 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java @@ -96,14 +96,14 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo // Find resource directories for every mod in this group var paths = new LinkedHashSet(); - for (var modid : modids) { + for (var modid : modids.stream().sorted().toList()) { var rsc = path.resolve(modid); if (Files.exists(rsc)) paths.add(rsc); } var root = memory.getPath(modids.iterator().next()); // use the first modid as our root - buildModsToml(paths, modids, root); + buildModsToml(paths, modids, root, pkg.startsWith("net/minecraftforge/debug/client/")); buildPackMeta(paths, root); moveModuleInfo(paths, root); @@ -187,7 +187,7 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo } // Builds or update the mods.toml file for all @Mods in this package - private static void buildModsToml(Set resources, Set modids, Path root) { + private static void buildModsToml(Set resources, Set modids, Path root, boolean clientOnly) { var toml = resources.stream() .map(p -> p.resolve(MODS_TOML)) .filter(Files::exists) @@ -205,7 +205,8 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo var defaults = Map.of( "modLoader", "javafml", "loaderVersion", "[0,)", - "license", "Doesnt fucking matter" + "license", "Doesnt fucking matter", + "clientSideOnly", clientOnly ); for (var key : defaults.keySet()) { diff --git a/src/main/java/net/minecraftforge/client/gui/LoadingErrorScreen.java b/src/main/java/net/minecraftforge/client/gui/LoadingErrorScreen.java index c47f22193d..d1a117c134 100644 --- a/src/main/java/net/minecraftforge/client/gui/LoadingErrorScreen.java +++ b/src/main/java/net/minecraftforge/client/gui/LoadingErrorScreen.java @@ -78,7 +78,7 @@ public class LoadingErrorScreen extends ErrorScreen { private void drawMultiLineCenteredString(GuiGraphics guiGraphics, Font fr, Component str, int x, int y) { for (FormattedCharSequence s : fr.split(str, this.width)) { - guiGraphics.drawString(fr, s, x - fr.width(s) / 2, y, 0xFFFFFF); + guiGraphics.drawString(fr, s, x - fr.width(s) / 2, y, 0xFFFFFFFF); y += fr.lineHeight; } } @@ -134,9 +134,9 @@ public class LoadingErrorScreen extends ErrorScreen { int y = top + 2; for (var string : strings) { if (center) - guiGraphics.drawString(font, string, left + (width / 2) - (font.width(string) / 2), y, 0xFFFFFF, false); + guiGraphics.drawString(font, string, left + (width / 2) - (font.width(string) / 2), y, 0xFFFFFFFF, false); else - guiGraphics.drawString(font, string, left + 5, y, 0xFFFFFF, false); + guiGraphics.drawString(font, string, left + 5, y, 0xFFFFFFFF, false); y += font.lineHeight; } } diff --git a/src/test/resources/additional_model/META-INF/mods.toml b/src/test/resources/additional_model/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/additional_model/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/client_command_test/META-INF/mods.toml b/src/test/resources/client_command_test/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/client_command_test/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/custom_gui_event_test/META-INF/mods.toml b/src/test/resources/custom_gui_event_test/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/custom_gui_event_test/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/gui_layer_test/META-INF/mods.toml b/src/test/resources/gui_layer_test/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/gui_layer_test/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/late_bound_id_mapper/META-INF/mods.toml b/src/test/resources/late_bound_id_mapper/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/late_bound_id_mapper/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/model_render_type/META-INF/mods.toml b/src/test/resources/model_render_type/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/model_render_type/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/obj_model_test/META-INF/mods.toml b/src/test/resources/obj_model_test/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/obj_model_test/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file diff --git a/src/test/resources/pip_test/META-INF/mods.toml b/src/test/resources/pip_test/META-INF/mods.toml deleted file mode 100644 index c361869e8e..0000000000 --- a/src/test/resources/pip_test/META-INF/mods.toml +++ /dev/null @@ -1 +0,0 @@ -clientSideOnly=true \ No newline at end of file