Merge pull request #246 from 3arthqu4ke/245-1215-lwjgl

1.21.5 Support

Author: 3arthqu4ke

headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/command/download/InstallerService.java

@@ -13,6 +13,7 @@
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.function.Predicate;
 
 public class InstallerService {
     private final Map<Modlauncher, ModLauncherCommand> modLauncherCommands = new EnumMap<>(Modlauncher.class);
@@ -24,8 +25,10 @@ public InstallerService(Launcher launcher) {
         // TODO: this is super bad!!!
         this.downloadCommand = findCommand(launcher, DownloadCommand.class, DownloadCommand::new);
         this.modLauncherCommands.put(Modlauncher.FABRIC, findCommand(launcher, FabricCommand.class, FabricCommand::new));
-        this.modLauncherCommands.put(Modlauncher.LEXFORGE, findCommand(launcher, ForgeCommand.class, ForgeCommand::lexforge));
-        this.modLauncherCommands.put(Modlauncher.NEOFORGE, findCommand(launcher, ForgeCommand.class, ForgeCommand::neoforge));
+        this.modLauncherCommands.put(Modlauncher.LEXFORGE, findCommand(launcher, ForgeCommand.class, ForgeCommand::lexforge,
+                c -> "lexforge".equalsIgnoreCase(c.getName()) || "forge".equalsIgnoreCase(c.getName())));
+        this.modLauncherCommands.put(Modlauncher.NEOFORGE, findCommand(launcher, ForgeCommand.class, ForgeCommand::neoforge,
+                c -> "neoforge".equalsIgnoreCase(c.getName())));
     }
 
     public void install(VersionArgument versionArgument, String... args) throws CommandException {
@@ -56,8 +59,16 @@ public void installModLauncher(VersionArgument versionArgument, String... args)
     }
 
     private <C extends Command> @Nullable C findCommand(Launcher launcher, Class<C> clazz, Function<Launcher, C> fallback) {
+        return findCommand(launcher, clazz, fallback, null);
+    }
+
+    private <C extends Command> @Nullable C findCommand(Launcher launcher, Class<C> clazz, Function<Launcher, C> fallback, @Nullable Predicate<C> predicate) {
         for (Command command : launcher.getCommandLine().getCommandContext()) {
             if (clazz.isAssignableFrom(command.getClass())) {
+                if (predicate != null && !predicate.test((clazz.cast(command)))) {
+                    continue;
+                }
+
                 return clazz.cast(command);
             }
         }

headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/ProcessFactory.java

@@ -187,7 +187,9 @@ protected List<Target> processLibraries(LaunchOptions options, Version version,
         }
 
         libPaths.clear();
-        try (Progressbar progressbar = options.getLauncher().getCommandLine().displayProgressBar(new Progressbar.Configuration("Downloading Libraries", librariesTODownload))) {
+        try (Progressbar progressbar = librariesTODownload == 0
+                ? Progressbar.dummy()
+                : options.getLauncher().getCommandLine().displayProgressBar(new Progressbar.Configuration("Downloading Libraries", librariesTODownload))) {
             libraryDownloader.setShouldLog(progressbar.isDummy());
             for (val library : version.getLibraries()) {
                 if (library.getRule().apply(os, features) == Rule.Action.ALLOW) {

headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/LwjglProperties.java

@@ -2,6 +2,7 @@
 
 public interface LwjglProperties {
     String DISPLAY_UPDATE = "hmc.lwjgl.update_sleep";
+    String GL_TEXTURE_INTERNAL_FORMAT = "hmc.lwjgl.gltextureinternalformat";
     String TEXTURE_SIZE = "hmc.lwjgl.texturesize";
     String FULLSCREEN = "hmc.lwjgl.fullscreen";
     String SCREEN_WIDTH = "hmc.lwjgl.screenwidth";

headlessmc-lwjgl/src/main/java/me/earth/headlessmc/lwjgl/redirections/LwjglRedirections.java

@@ -15,6 +15,10 @@
 // TODO: redirect Keyboard and Mouse?
 @UtilityClass
 public class LwjglRedirections {
+    public static final int GL_TEXTURE_WIDTH = 4096;
+    public static final int GL_TEXTURE_INTERNAL_FORMAT_CONST = 4099;
+    public static final int GL_TEXTURE_INTERNAL_FORMAT = Integer.parseInt(
+        System.getProperty(LwjglProperties.GL_TEXTURE_INTERNAL_FORMAT, "32856")); //RGBA8
     public static final int TEXTURE_SIZE = Integer.parseInt(
         System.getProperty(LwjglProperties.TEXTURE_SIZE, "1024"));
     public static final boolean FULLSCREEN = Boolean.parseBoolean(
@@ -110,7 +114,18 @@ public static void register(RedirectionManager manager) {
             -> System.nanoTime() / 1000000L);
 
         manager.redirect("Lorg/lwjgl/opengl/GL11;glGetTexLevelParameteri(III)I",
-                         of(TEXTURE_SIZE));
+                (obj, desc, type, args) -> {
+                    if ((int) args[2] == GL_TEXTURE_INTERNAL_FORMAT_CONST) {
+                        // Neoforge 1.21.5
+                        // Couldn't find a matching vanilla TextureFormat for OpenGL internal format id
+                        // com.mojang.blaze3d.opengl.GlDevice
+                        return GL_TEXTURE_INTERNAL_FORMAT;
+                    } else if ((int) args[2] == GL_TEXTURE_WIDTH && (int) args[1]/*level*/ > 0) {
+                        return 0; // otherwise Neoforge 1.21.5 gets caught in an endless loop of checking width != 0; for higher levels
+                    }
+
+                    return TEXTURE_SIZE;
+                });
         manager.redirect("Lorg/lwjgl/opengl/GL11;glGenLists(I)I", of(-1));
 
         manager.redirect(
@@ -278,6 +293,17 @@ public static void register(RedirectionManager manager) {
         // 1.20.4 (3?)
         MemReallocRedirections.redirect(manager);
 
+        // 1.21.5
+        manager.redirect(
+            "Lorg/lwjgl/opengl/GL30;glMapBufferRange(IJJI)Ljava/nio/ByteBuffer;",
+            (obj, desc, type, args) -> ByteBuffer.wrap(new byte[(int) ((long) args[2])])
+        );
+
+        manager.redirect(
+            "Lorg/lwjgl/system/MemoryUtil;memByteBufferSafe(JI)Ljava/nio/ByteBuffer;",
+            (obj, desc, type, args) -> ByteBuffer.wrap(new byte[(int) args[1]])
+        );
+
         // Embeddium
         // https://github.com/3arthqu4ke/headlessmc/issues/208
         // manager.redirect("Lorg/lwjgl/opengl/GL32C;glFenceSync(II)J", of(1L));