refactor: Change lwjglx handling

.gitignore

@@ -13,6 +13,6 @@
 /logs/
 build/
 version.txt
-src/main/java/com/cleanroommc/common/CleanroomVersion.java
+src/main/java/com/cleanroommc/cleanroom/common/CleanroomVersion.java
 
 !/.idea/icon.svg

buildSrc/src/main/groovy/com/cleanroommc/gradle/helpers/tasks/GenVersionTask.groovy

@@ -14,7 +14,7 @@ abstract class GenVersionTask extends DefaultTask {
     @InputFile
     final File template = new File("${getProject().rootProject.projectDir}/templates/CleanroomVersion.java")
     @OutputFile
-    final File versionClass = new File("${getProject().rootProject.projectDir}/src/main/java/com/cleanroommc/common/CleanroomVersion.java")
+    final File versionClass = new File("${getProject().rootProject.projectDir}/src/main/java/com/cleanroommc/cleanroom/common/CleanroomVersion.java")
     @TaskAction
     void action() {
         versionClass.withWriter { def writer ->

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -1,5 +1,34 @@
 --- before/net/minecraft/client/Minecraft.java
 +++ after/net/minecraft/client/Minecraft.java
+@@ -204,17 +204,17 @@
+ import org.apache.commons.lang3.Validate;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.LWJGLException;
+-import org.lwjgl.Sys;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.ContextCapabilities;
+-import org.lwjgl.opengl.Display;
+-import org.lwjgl.opengl.DisplayMode;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.opengl.OpenGLException;
+-import org.lwjgl.opengl.PixelFormat;
+-import org.lwjgl.util.glu.GLU;
++import org.lwjglx.LWJGLException;
++import org.lwjglx.Sys;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.ContextCapabilities;
++import org.lwjglx.opengl.Display;
++import org.lwjglx.opengl.DisplayMode;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.opengl.OpenGLException;
++import org.lwjglx.opengl.PixelFormat;
++import org.lwjglx.util.glu.GLU;
+
+ @SideOnly(Side.CLIENT)
+ public class Minecraft implements IThreadListener, ISnooperInfo
 @@ -328,6 +328,7 @@
      public Minecraft(GameConfiguration gameConfig)
      {

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

@@ -140,7 +140,7 @@
 +        {
 +            return java.util.Collections.singletonList("");
 +        }
-+        com.ibm.icu.segmenter.Segments segments = com.cleanroommc.client.ICU4JInstances.SEGMENTER.segment(str);
++        com.ibm.icu.segmenter.Segments segments = com.cleanroommc.cleanroom.client.ICU4JInstances.SEGMENTER.segment(str);
 +        List<String> list = new java.util.ArrayList<>();
 +        StringBuilder line = new StringBuilder();
 +        StringBuilder seg = new StringBuilder();

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

@@ -0,0 +1,13 @@
+--- before/net/minecraft/client/gui/GuiChat.java
++++ after/net/minecraft/client/gui/GuiChat.java
+@@ -14,8 +14,8 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiChat extends GuiScreen implements ITabCompleter

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
++++ after/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java
+@@ -5,7 +5,7 @@
+ import net.minecraft.realms.Tezzelator;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiClickableScrolledSelectionListProxy extends GuiSlot

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiCommandBlock.java
++++ after/net/minecraft/client/gui/GuiCommandBlock.java
+@@ -13,7 +13,7 @@
+ import net.minecraft.util.math.BlockPos;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiCommandBlock extends GuiScreen implements ITabCompleter

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

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiCreateWorld.java
 +++ after/net/minecraft/client/gui/GuiCreateWorld.java
+@@ -12,7 +12,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.lang3.StringUtils;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiCreateWorld extends GuiScreen
 @@ -240,6 +240,8 @@
                      }
                  }

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

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiEnchantment.java
 +++ after/net/minecraft/client/gui/GuiEnchantment.java
+@@ -21,7 +21,7 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.util.glu.Project;
++import org.lwjglx.util.glu.Project;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiEnchantment extends GuiContainer
 @@ -179,7 +179,7 @@
                  FontRenderer fontrenderer = this.mc.standardGalacticFontRenderer;
                  int i2 = 6839882;

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiFlatPresets.java
++++ after/net/minecraft/client/gui/GuiFlatPresets.java
+@@ -23,7 +23,7 @@
+ import net.minecraft.world.gen.FlatLayerInfo;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiFlatPresets extends GuiScreen

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

@@ -1,5 +1,18 @@
 --- before/net/minecraft/client/gui/GuiMainMenu.java
 +++ after/net/minecraft/client/gui/GuiMainMenu.java
+@@ -34,9 +34,9 @@
+ import org.apache.commons.io.IOUtils;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Mouse;
+-import org.lwjgl.opengl.GLContext;
+-import org.lwjgl.util.glu.Project;
++import org.lwjglx.input.Mouse;
++import org.lwjglx.opengl.GLContext;
++import org.lwjglx.util.glu.Project;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiMainMenu extends GuiScreen
 @@ -77,6 +77,8 @@
      private GuiScreen realmsNotification;
      private int widthCopyright;

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

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiMultiplayer.java
 +++ after/net/minecraft/client/gui/GuiMultiplayer.java
+@@ -15,7 +15,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiMultiplayer extends GuiScreen
 @@ -41,6 +41,7 @@
      public GuiMultiplayer(GuiScreen parentScreen)
      {

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

@@ -8,14 +8,16 @@
  import java.util.List;
  import java.util.Map.Entry;
  import net.minecraft.block.Block;
-@@ -25,6 +26,7 @@
+@@ -25,7 +26,8 @@
  import net.minecraft.world.chunk.Chunk;
  import net.minecraftforge.fml.relauncher.Side;
  import net.minecraftforge.fml.relauncher.SideOnly;
-+import org.lwjgl.Sys;
- import org.lwjgl.opengl.Display;
+-import org.lwjgl.opengl.Display;
++import org.lwjglx.Sys;
++import org.lwjglx.opengl.Display;
 
  @SideOnly(Side.CLIENT)
+ public class GuiOverlayDebug extends Gui
 @@ -254,6 +256,7 @@
          long l = j - k;
          List<String> list = Lists.newArrayList(

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiRepair.java
++++ after/net/minecraft/client/gui/GuiRepair.java
+@@ -20,7 +20,7 @@
+ import net.minecraft.world.World;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiRepair extends GuiContainer implements IContainerListener

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

@@ -1,5 +1,16 @@
 --- before/net/minecraft/client/gui/GuiScreen.java
 +++ after/net/minecraft/client/gui/GuiScreen.java
+@@ -37,8 +37,8 @@
+ import org.apache.commons.lang3.StringUtils;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Keyboard;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiScreen extends Gui implements GuiYesNoCallback
 @@ -60,6 +60,7 @@
      private int touchValue;
      private URI clickedLinkURI;

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenAddServer.java
++++ after/net/minecraft/client/gui/GuiScreenAddServer.java
+@@ -9,7 +9,7 @@
+ import net.minecraft.util.StringUtils;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenAddServer extends GuiScreen

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

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiScreenBook.java
 +++ after/net/minecraft/client/gui/GuiScreenBook.java
+@@ -27,7 +27,7 @@
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.logging.log4j.LogManager;
+ import org.apache.logging.log4j.Logger;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenBook extends GuiScreen
 @@ -69,6 +69,7 @@
 
              if (this.bookTotalPages < 1)

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenCustomizePresets.java
++++ after/net/minecraft/client/gui/GuiScreenCustomizePresets.java
+@@ -12,7 +12,7 @@
+ import net.minecraft.world.gen.ChunkGeneratorSettings;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenCustomizePresets extends GuiScreen

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiScreenServerList.java
++++ after/net/minecraft/client/gui/GuiScreenServerList.java
+@@ -5,7 +5,7 @@
+ import net.minecraft.client.resources.I18n;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenServerList extends GuiScreen

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

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/GuiSlot.java
 +++ after/net/minecraft/client/gui/GuiSlot.java
+@@ -8,7 +8,7 @@
+ import net.minecraft.util.math.MathHelper;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiSlot
 @@ -186,27 +186,8 @@
              GlStateManager.disableFog();
              Tessellator tessellator = Tessellator.getInstance();

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

@@ -3,7 +3,7 @@
 @@ -1,5 +1,6 @@
  package net.minecraft.client.gui;
 
-+import com.cleanroommc.client.IMEHandler;
++import com.cleanroommc.cleanroom.client.IMEHandler;
  import com.google.common.base.Predicate;
  import com.google.common.base.Predicates;
  import net.minecraft.client.Minecraft;

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

@@ -1,12 +1,19 @@
 --- before/net/minecraft/client/gui/GuiUtilRenderComponents.java
 +++ after/net/minecraft/client/gui/GuiUtilRenderComponents.java
-@@ -56,13 +56,14 @@
+@@ -1,5 +1,6 @@
+ package net.minecraft.client.gui;
+
++import com.cleanroommc.cleanroom.client.ICU4JInstances;
+ import com.google.common.collect.Lists;
+ import java.util.List;
+ import net.minecraft.client.Minecraft;
+@@ -56,13 +57,14 @@
 
                  if (s3 != null && !s3.isEmpty())
                  {
 -                    int l = s2.lastIndexOf(32);
-+                    com.cleanroommc.client.ICU4JInstances.BREAK_ITERATOR.setText(s4);
-+                    int l = com.cleanroommc.client.ICU4JInstances.BREAK_ITERATOR.preceding(s2.length());
++                    ICU4JInstances.BREAK_ITERATOR.setText(s4);
++                    int l = ICU4JInstances.BREAK_ITERATOR.preceding(s2.length());
 
                      if (l >= 0 && fontRendererIn.getStringWidth(s4.substring(0, l)) > 0)
                      {
@@ -17,7 +24,7 @@
                          {
                              l++;
                          }
-@@ -74,6 +75,8 @@
+@@ -74,6 +76,8 @@
                          s2 = "";
                          s3 = s4;
                      }

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

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/GuiWorldEdit.java
++++ after/net/minecraft/client/gui/GuiWorldEdit.java
+@@ -8,7 +8,7 @@
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+ import org.apache.commons.io.FileUtils;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiWorldEdit extends GuiScreen

patches/minecraft/net/minecraft/client/gui/achievement/GuiStats.java.patch

@@ -0,0 +1,11 @@
+--- before/net/minecraft/client/gui/achievement/GuiStats.java
++++ after/net/minecraft/client/gui/achievement/GuiStats.java
+@@ -29,7 +29,7 @@
+ import net.minecraft.stats.StatisticsManager;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiStats extends GuiScreen implements IProgressMeter

patches/minecraft/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java.patch

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java
 +++ after/net/minecraft/client/gui/advancements/GuiScreenAdvancements.java
+@@ -16,7 +16,7 @@
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Mouse;
++import org.lwjglx.input.Mouse;
+
+ @SideOnly(Side.CLIENT)
+ public class GuiScreenAdvancements extends GuiScreen implements ClientAdvancementManager.IListener
 @@ -29,6 +29,7 @@
      private int scrollMouseX;
      private int scrollMouseY;

patches/minecraft/net/minecraft/client/gui/inventory/GuiContainer.java.patch

@@ -1,5 +1,14 @@
 --- before/net/minecraft/client/gui/inventory/GuiContainer.java
 +++ after/net/minecraft/client/gui/inventory/GuiContainer.java
+@@ -20,7 +20,7 @@
+ import net.minecraft.util.text.TextFormatting;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+-import org.lwjgl.input.Keyboard;
++import org.lwjglx.input.Keyboard;
+
+ @SideOnly(Side.CLIENT)
+ public abstract class GuiContainer extends GuiScreen
 @@ -118,6 +118,7 @@
          RenderHelper.disableStandardItemLighting();
          this.drawGuiContainerForegroundLayer(mouseX, mouseY);