Switch to official LWJGL 3.3.5

Author: kappa-maintainer

build.gradle

@@ -245,8 +245,8 @@ project(':cleanroom') {
         // Do not change the order unless it is required so
         lwjglLibraries = [
             [
-                'lwjgl3-glfw', 'lwjgl3-jemalloc', 'lwjgl3-openal',
-                'lwjgl3-opengl', 'lwjgl3-stb', 'lwjgl3-tinyfd', 'lwjgl3'
+                'lwjgl-glfw', 'lwjgl-jemalloc', 'lwjgl-openal',
+                'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-tinyfd', 'lwjgl'
             ],
 
             [
@@ -290,7 +290,7 @@ project(':cleanroom') {
                 environment 'FORGE_GROUP', project.group
                 environment 'FORGE_VERSION', props.last_forge_version
 
-                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true' + '-Djava.system.class.loader=net.minecraft.launchwrapper.LaunchClassLoader'
+                jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true'
                 //jvmArgs jvm_arguments
 
                 // Lazily supply the Mappings target, createSrg2Mcp.getMappings() doesn't get populated until later
@@ -416,12 +416,14 @@ project(':cleanroom') {
     }
 
     dependencies {
+        compileOnly "com.cleanroommc:lwjglx:1.0.0"
+        installer "com.cleanroommc:lwjglxx:1.0.0"
         lwjglLibraries[0].each {
-            installer "org.lwjgl3:$it:$props.lwjgl_version"
-            runtimeOnly "org.lwjgl3:$it::$lwjglArch"
+            installer "org.lwjgl:$it:$props.lwjgl_version"
+            runtimeOnly "org.lwjgl:$it::$lwjglArch"
 
             lwjglLibraries[1].each { arch ->
-                lwjglNatives "org.lwjgl3:$it:$props.lwjgl_version:$arch"
+                lwjglNatives "org.lwjgl:$it:$props.lwjgl_version:$arch"
             }
         }
 
@@ -435,7 +437,7 @@ project(':cleanroom') {
         installer "org.ow2.asm:asm-deprecated:$props.asm_deprecated"
 
         //installer "com.cleanroommc:bouncepad:$props.bouncepad_version"
-        installer "top.outlands:foundation:0.14.1"
+        installer "top.outlands:foundation:0.14.2"
         installer 'org.burningwave:jvm-driver:8.16.1'
         installer 'io.github.toolfactory:jvm-driver:9.7.1'
         installer 'io.github.toolfactory:narcissus:1.0.7'

gradle.properties

@@ -19,7 +19,7 @@ installer_tools_version = 1.4.1
 asm_version = 9.7.1
 asm_deprecated = 7.1
 netty_version = 4.1.114.Final
-lwjgl_version = 3.3.4-27-CLEANROOM
+lwjgl_version = 3.3.5
 
 # Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.

patches/minecraft/net/minecraft/client/gui/GuiTextField.java.patch

@@ -0,0 +1,17 @@
+--- before/net/minecraft/client/gui/GuiTextField.java
++++ after/net/minecraft/client/gui/GuiTextField.java
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.gui;
+ 
++import com.cleanroommc.client.IMEHandler;
+ import com.google.common.base.Predicate;
+ import com.google.common.base.Predicates;
+ import net.minecraft.client.Minecraft;
+@@ -631,6 +632,7 @@
+         }
+ 
+         this.field_146213_o = p_146195_1_;
++        IMEHandler.setIME(this.field_146213_o);
+ 
+         if (Minecraft.func_71410_x().field_71462_r != null)
+         {

src/main/java/com/cleanroommc/client/IMEHandler.java

@@ -0,0 +1,7 @@
+package com.cleanroommc.client;
+
+public class IMEHandler {
+    public static void setIME(boolean active) {
+
+    }
+}

src/main/java/net/minecraftforge/client/ForgeClientHandler.java

@@ -19,7 +19,12 @@
 
 package net.minecraftforge.client;
 
+import com.cleanroommc.client.IMEHandler;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.client.gui.GuiScreenBook;
+import net.minecraft.client.gui.inventory.GuiEditSign;
 import net.minecraftforge.client.event.ColorHandlerEvent;
+import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.ForgeModContainer;
@@ -46,4 +51,24 @@ public static void registerItemHandlers(ColorHandlerEvent.Item event)
             event.getItemColors().registerItemColorHandler(new FluidContainerColorer(), ForgeModContainer.getInstance().universalBucket);
         }
     }
+
+    @SubscribeEvent
+    public static void didChangeGui(GuiOpenEvent event) {
+        boolean canInput;
+        if (event.getGui() == null) {
+            // Ignore null GuiScreens
+            canInput = false;
+        } else if (event.getGui() instanceof GuiChat) {
+            // Skip, this should be handled by Focus
+            return;
+        } else {
+            // Vanilla GuiScreens
+            canInput = event.getGui() instanceof GuiScreenBook
+                    || event.getGui() instanceof GuiEditSign;
+
+            // TODO: Force enable map
+        }
+
+        IMEHandler.setIME(canInput);
+    }
 }

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -20,8 +20,6 @@
 package net.minecraftforge.client;
 
 import static net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType.BOSSINFO;
-import static net.minecraftforge.common.ForgeVersion.Status.BETA;
-import static net.minecraftforge.common.ForgeVersion.Status.BETA_OUTDATED;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -81,7 +79,6 @@
 import net.minecraft.client.renderer.vertex.VertexFormatElement.EnumUsage;
 import net.minecraft.client.resources.FoliageColorReloadListener;
 import net.minecraft.client.resources.GrassColorReloadListener;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.client.resources.IResourceManagerReloadListener;
 import net.minecraft.client.resources.LanguageManager;
 import net.minecraft.client.settings.GameSettings;
@@ -103,7 +100,6 @@
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.registry.IRegistry;
-import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
@@ -130,8 +126,6 @@
 import net.minecraftforge.client.resource.VanillaResourceType;
 import net.minecraftforge.client.model.pipeline.QuadGatheringTransformer;
 import net.minecraftforge.common.ForgeModContainer;
-import net.minecraftforge.common.ForgeVersion;
-import net.minecraftforge.common.ForgeVersion.Status;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.model.IModelPart;
 import net.minecraftforge.common.model.ITransformation;

src/main/java/net/minecraftforge/client/model/ModelLoader.java

@@ -108,6 +108,7 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
+import org.lwjgl.util.vector.Vector3f;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -466,7 +467,7 @@ private IBakedModel bakeNormal(ModelBlock model, IModelState perState, final IMo
                 {
                     transformation = transformation.compose(newTransforms.get(i));
                     BlockPartRotation rot = part.partRotation;
-                    if(rot == null) rot = new BlockPartRotation(new org.lwjgl.util.vector.Vector3f(), EnumFacing.Axis.Y, 0, false);
+                    if(rot == null) rot = new BlockPartRotation(new Vector3f(), EnumFacing.Axis.Y, 0, false);
                     part = new BlockPart(part.positionFrom, part.positionTo, part.mapFaces, rot, part.shade);
                 }
                 for(Map.Entry<EnumFacing, BlockPartFace> e : part.mapFaces.entrySet())

src/main/java/net/minecraftforge/fml/common/asm/transformers/JavaxTransformer.java

@@ -0,0 +1,82 @@
+package net.minecraftforge.fml.common.asm.transformers;
+
+import net.minecraft.launchwrapper.IClassTransformer;
+import net.minecraft.launchwrapper.Launch;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.commons.ClassRemapper;
+import org.objectweb.asm.commons.Remapper;
+import org.objectweb.asm.tree.ClassNode;
+
+import java.io.IOException;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class LWJGLTransformer implements IClassTransformer {
+    private static final LWJGLXRemapper INSTANCE = new LWJGLXRemapper();
+    @Override
+    public byte[] transform(String s, String s1, byte[] bytes) {
+        if (!s1.startsWith("org.lwjgl.")) {
+            return bytes;
+        }
+        String lwjglxName = s.replace("org.lwjgl.", "org.lwjglx.");
+        byte[] lwjglxBytes;
+        try {
+            lwjglxBytes = Launch.classLoader.testGetClassBytes(lwjglxName);
+        } catch (IOException e) {
+            return bytes;
+        }
+        if (lwjglxBytes == null) {
+            return bytes;
+        }
+        ClassReader lwjglxReader = new ClassReader(lwjglxBytes);
+        ClassWriter writer = new ClassWriter(0);
+        ClassVisitor classVisitor = new ClassRemapper(writer, INSTANCE);
+        lwjglxReader.accept(classVisitor, 0);
+        lwjglxBytes = writer.toByteArray();
+        if (bytes == null) {
+            return lwjglxBytes;
+        }
+
+        ClassNode lwjglNode = new ClassNode();
+        ClassReader lwjglReader = new ClassReader(bytes);
+        lwjglReader.accept(lwjglNode, 0);
+
+        lwjglxReader = new ClassReader(lwjglxBytes);
+        ClassNode lwjglxNode = new ClassNode();
+        lwjglxReader.accept(lwjglxNode, 0);
+        Set<String> methods = lwjglNode.methods.stream().map(m -> m.name + m.desc).collect(Collectors.toSet());
+        lwjglxNode.methods.forEach(m -> {
+            if (!methods.contains(m.name + m.desc)) {
+                lwjglNode.methods.add(m);
+            }
+        });
+        Set<String> fields = lwjglNode.fields.stream().map(f -> f.name + f.desc).collect(Collectors.toSet());
+        lwjglxNode.fields.forEach(f -> {
+            if (!fields.contains(f.name + f.desc)) {
+                lwjglNode.fields.add(f);
+            }
+        });
+        ClassWriter out = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        lwjglNode.accept(out);
+        return out.toByteArray();
+    }
+
+    static class LWJGLXRemapper extends Remapper {
+
+        @Override
+        public String map(String typeName) {
+            if (typeName == null) {
+                return null;
+            }
+            if (typeName.startsWith("org/lwjgl3/") || typeName.startsWith("org/lwjglx/")) {
+                return "org/lwjgl/" + typeName.substring(11);
+            }
+
+            return typeName;
+        }
+
+    }
+
+}

src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java

@@ -33,7 +33,7 @@ public String[] getASMTransformerClass()
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.EventSubscriberTransformer",
                              "net.minecraftforge.fml.common.asm.transformers.SoundEngineFixTransformer",
-                             //"net.minecraftforge.fml.common.asm.transformers.JavaxTransformer",
+                             "net.minecraftforge.fml.common.asm.transformers.LWJGLTransformer",
                             };
     }