update for 1.17.1

nimueller · Jul 27, 2021 · 7fa2608 · 7fa2608
1 parent 768c21e
commit 7fa2608
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 263 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,8 +19,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_16
+    targetCompatibility = JavaVersion.VERSION_16
 }
 
 minecraft {

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-minecraftVersion=1.16.5
-modVersion=1.2.0
-forgeVersion=36.0.0
+minecraftVersion=1.17.1
+modVersion=1.3.0
+forgeVersion=37.0.8
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         maven("https://maven.minecraftforge.net")
+        mavenCentral()
     }
     resolutionStrategy {
         eachPlugin {

diff --git a/src/main/java/de/nekeras/borderless/BorderlessWindow.java b/src/main/java/de/nekeras/borderless/BorderlessWindow.java
@@ -5,14 +5,14 @@
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ExtensionPoint;
+import net.minecraftforge.fml.IExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.network.FMLNetworkConstants;
-import org.apache.commons.lang3.tuple.Pair;
+import net.minecraftforge.fmlclient.ConfigGuiHandler;
+import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -37,9 +37,8 @@ public BorderlessWindow() {
         ModLoadingContext context = ModLoadingContext.get();
 
         log.info("Enable server compatibility");
-        context.registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(
-                () -> FMLNetworkConstants.IGNORESERVERONLY,
-                (a, b) -> true));
+        context.registerExtensionPoint(IExtensionPoint.DisplayTest.class, () ->
+                new IExtensionPoint.DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 
         log.info("Register client configuration");
         context.registerConfig(ModConfig.Type.CLIENT, Config.CONFIG_SPEC);
@@ -52,8 +51,8 @@ public static void onClientSetup(@Nonnull FMLClientSetupEvent event) {
         ModLoadingContext context = ModLoadingContext.get();
 
         log.info("Register client configuration screen");
-        context.registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () ->
-                (mc, modListScreen) -> new ConfigScreen(modListScreen));
+        context.registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, () ->
+                new ConfigGuiHandler.ConfigGuiFactory((mc, modListScreen) -> new ConfigScreen(modListScreen)));
 
         log.info("Enqueue initialization work to main thread");
         event.enqueueWork(de.nekeras.borderless.client.FullscreenDisplayModeHolder::initMinecraft);

diff --git a/src/main/java/de/nekeras/borderless/client/DesktopEnvironment.java b/src/main/java/de/nekeras/borderless/client/DesktopEnvironment.java
@@ -65,12 +65,9 @@ public FullscreenDisplayMode getBestFullscreenDisplayMode() {
         DesktopEnvironment current = null;
 
         switch (Platform.get()) {
-            case WINDOWS:
-                current = WINDOWS;
-                break;
-            case LINUX:
+            case WINDOWS -> current = WINDOWS;
+            case LINUX -> {
                 String result = System.getenv(LINUX_WINDOW_SYSTEM_VARIABLE);
-
                 if (X11_NAME.equalsIgnoreCase(result)) {
                     current = X11;
                 } else if (WAYLAND_NAME.equalsIgnoreCase(result)) {
@@ -79,11 +76,8 @@ public FullscreenDisplayMode getBestFullscreenDisplayMode() {
                     current = GENERIC;
                     log.warn("Unknown window system: {}", result);
                 }
-
-                break;
-            case MACOSX:
-                current = GENERIC;
-                break;
+            }
+            case MACOSX -> current = GENERIC;
         }
 
         CURRENT = current;

diff --git a/src/main/java/de/nekeras/borderless/client/FullscreenDisplayModeHolder.java b/src/main/java/de/nekeras/borderless/client/FullscreenDisplayModeHolder.java
@@ -1,18 +1,16 @@
 package de.nekeras.borderless.client;
 
+import com.mojang.blaze3d.platform.Window;
 import de.nekeras.borderless.client.fullscreen.FullscreenDisplayMode;
 import de.nekeras.borderless.client.listener.SizeChangedWindowEventListener;
 import de.nekeras.borderless.config.Config;
-import net.minecraft.client.MainWindow;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Optional;
 
 /**
  * Singleton class holding the current fullscreen display mode.
@@ -21,7 +19,7 @@
 public class FullscreenDisplayModeHolder {
 
     private static final Logger log = LogManager.getLogger();
-    private static final MainWindow window = Minecraft.getInstance().getWindow();
+    private static final Window window = Minecraft.getInstance().getWindow();
     private static FullscreenDisplayMode currentMode;
 
     /**
@@ -36,17 +34,6 @@ public static void initMinecraft() {
         FullscreenDisplayModeHolder.setFullscreenDisplayModeFromConfig();
     }
 
-    /**
-     * The fullscreen mode that is applied instead of the native fullscreen once the user hits
-     * F11 or switches to fullscreen in the video settings.
-     *
-     * @return The fullscreen mode
-     */
-    @Nonnull
-    public static Optional<FullscreenDisplayMode> getFullscreenDisplayMode() {
-        return Optional.ofNullable(currentMode);
-    }
-
     /**
      * The fullscreen mode that is applied instead of the native fullscreen once the user hits
      * F11 or switches to fullscreen in the video settings.

diff --git a/src/main/java/de/nekeras/borderless/client/GlfwUtils.java b/src/main/java/de/nekeras/borderless/client/GlfwUtils.java
@@ -1,7 +1,7 @@
 package de.nekeras.borderless.client;
 
-import net.minecraft.client.MainWindow;
-import net.minecraft.client.Monitor;
+import com.mojang.blaze3d.platform.Monitor;
+import com.mojang.blaze3d.platform.Window;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.logging.log4j.LogManager;
@@ -48,7 +48,7 @@ public static String getMonitorName(@Nonnull Monitor monitor) {
      * @return The monitor wrapped in an {@link Optional}.
      */
     @Nonnull
-    public static Optional<Monitor> tryGetMonitor(@Nonnull MainWindow window) {
+    public static Optional<Monitor> tryGetMonitor(@Nonnull Window window) {
         Monitor monitor = window.findBestMonitor();
 
         if (monitor == null) {
@@ -64,7 +64,7 @@ public static Optional<Monitor> tryGetMonitor(@Nonnull MainWindow window) {
      * @param window    The window
      * @param attribute The attribute
      */
-    public static void enableWindowAttribute(@Nonnull MainWindow window, @Nonnull GlfwWindowAttribute attribute) {
+    public static void enableWindowAttribute(@Nonnull Window window, @Nonnull GlfwWindowAttribute attribute) {
         log.info("Enable window attribute {}", attribute.name());
         GLFW.glfwSetWindowAttrib(window.getWindow(), attribute.getBit(), GLFW.GLFW_TRUE);
     }
@@ -75,7 +75,7 @@ public static void enableWindowAttribute(@Nonnull MainWindow window, @Nonnull Gl
      * @param window    The window
      * @param attribute The attribute
      */
-    public static void disableWindowAttribute(@Nonnull MainWindow window, @Nonnull GlfwWindowAttribute attribute) {
+    public static void disableWindowAttribute(@Nonnull Window window, @Nonnull GlfwWindowAttribute attribute) {
         log.info("Enable window attribute {}", attribute.name());
         GLFW.glfwSetWindowAttrib(window.getWindow(), attribute.getBit(), GLFW.GLFW_FALSE);
     }
@@ -85,7 +85,7 @@ public static void disableWindowAttribute(@Nonnull MainWindow window, @Nonnull G
      *
      * @param window The window
      */
-    public static void applyDefaultWindowAttributes(@Nonnull MainWindow window) {
+    public static void applyDefaultWindowAttributes(@Nonnull Window window) {
         log.info("Resetting window attributes");
 
         for (GlfwWindowAttribute attribute : GlfwWindowAttribute.values()) {

diff --git a/src/main/java/de/nekeras/borderless/client/ReflectionUtils.java b/src/main/java/de/nekeras/borderless/client/ReflectionUtils.java
@@ -1,10 +1,10 @@
 package de.nekeras.borderless.client;
 
+import com.mojang.blaze3d.platform.Window;
+import com.mojang.blaze3d.platform.WindowEventHandler;
 import de.nekeras.borderless.util.AccessibleFieldDelegate;
-import net.minecraft.client.MainWindow;
-import net.minecraft.client.gui.screen.VideoSettingsScreen;
-import net.minecraft.client.gui.widget.list.OptionsRowList;
-import net.minecraft.client.renderer.IWindowEventListener;
+import net.minecraft.client.gui.components.OptionsList;
+import net.minecraft.client.gui.screens.VideoSettingsScreen;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.lwjgl.glfw.GLFWFramebufferSizeCallbackI;
@@ -21,10 +21,10 @@
 @OnlyIn(Dist.CLIENT)
 public final class ReflectionUtils {
 
-    private static final AccessibleFieldDelegate<MainWindow, IWindowEventListener> windowEventListenerAccessor =
-            makeFieldAccessible(MainWindow.class, IWindowEventListener.class);
-    private static final AccessibleFieldDelegate<VideoSettingsScreen, OptionsRowList> optionsRowListAccessor =
-            tryMakeFieldAccessible(VideoSettingsScreen.class, OptionsRowList.class, thisRef -> null);
+    private static final AccessibleFieldDelegate<Window, WindowEventHandler> windowEventListenerAccessor =
+            makeFieldAccessible(Window.class, WindowEventHandler.class);
+    private static final AccessibleFieldDelegate<VideoSettingsScreen, OptionsList> optionsListAccessor =
+            tryMakeFieldAccessible(VideoSettingsScreen.class, OptionsList.class, thisRef -> null);
 
     private ReflectionUtils() {
     }
@@ -36,6 +36,7 @@ private ReflectionUtils() {
      * @param fieldType The field to access
      * @throws IllegalStateException If there is no such field of type <code>F</code>
      */
+    @SuppressWarnings("SameParameterValue") // might be needed in future
     @Nonnull
     private static <C, F> AccessibleFieldDelegate<C, F> makeFieldAccessible(@Nonnull Class<C> inClass, @Nonnull Class<F> fieldType) {
         try {
@@ -53,9 +54,10 @@ private static <C, F> AccessibleFieldDelegate<C, F> makeFieldAccessible(@Nonnull
      * @param fieldType       The field to access
      * @param defaultSupplier The supplier which is called in when retrieving the value if the field was not found
      */
+    @SuppressWarnings("SameParameterValue") // might be needed in future
     @Nonnull
     private static <C, F> AccessibleFieldDelegate<C, F> tryMakeFieldAccessible(@Nonnull Class<C> inClass, @Nonnull Class<F> fieldType, @Nonnull Function<C, F> defaultSupplier) {
-        return new AccessibleFieldDelegate<C, F>(inClass, fieldType, defaultSupplier);
+        return new AccessibleFieldDelegate<>(inClass, fieldType, defaultSupplier);
     }
 
     /**
@@ -79,9 +81,9 @@ public static boolean isCalledByGlfwCallback() {
      *                       {@link IWindowEventListener} field in the {@link MainWindow} instance
      *                       and returns a new value that should be assigned
      */
-    public static void updateWindowEventListener(@Nonnull MainWindow window, @Nonnull Function<IWindowEventListener, IWindowEventListener> updateSupplier) {
-        IWindowEventListener oldListener = windowEventListenerAccessor.getValue(window);
-        IWindowEventListener newListener = updateSupplier.apply(oldListener);
+    public static void updateWindowEventListener(@Nonnull Window window, @Nonnull Function<WindowEventHandler, WindowEventHandler> updateSupplier) {
+        WindowEventHandler oldListener = windowEventListenerAccessor.getValue(window);
+        WindowEventHandler newListener = updateSupplier.apply(oldListener);
         windowEventListenerAccessor.setValue(window, newListener);
     }
 
@@ -93,7 +95,7 @@ public static void updateWindowEventListener(@Nonnull MainWindow window, @Nonnul
      * @return The options row list if it exists
      */
     @Nonnull
-    public static Optional<OptionsRowList> getOptionsRowList(@Nonnull VideoSettingsScreen screen) {
-        return Optional.ofNullable(optionsRowListAccessor.getValue(screen));
+    public static Optional<OptionsList> getOptionsList(@Nonnull VideoSettingsScreen screen) {
+        return Optional.ofNullable(optionsListAccessor.getValue(screen));
     }
 }
diff --git a/src/main/java/de/nekeras/borderless/client/fullscreen/BorderlessFullscreenDisplay.java b/src/main/java/de/nekeras/borderless/client/fullscreen/BorderlessFullscreenDisplay.java
@@ -1,10 +1,10 @@
 package de.nekeras.borderless.client.fullscreen;
 
+import com.mojang.blaze3d.platform.Monitor;
+import com.mojang.blaze3d.platform.VideoMode;
+import com.mojang.blaze3d.platform.Window;
 import de.nekeras.borderless.client.GlfwUtils;
 import de.nekeras.borderless.client.GlfwWindowAttribute;
-import net.minecraft.client.MainWindow;
-import net.minecraft.client.Monitor;
-import net.minecraft.client.renderer.VideoMode;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.logging.log4j.LogManager;
@@ -23,7 +23,7 @@ public class BorderlessFullscreenDisplay implements FullscreenDisplayMode {
     private static final Logger log = LogManager.getLogger();
 
     @Override
-    public void apply(@Nonnull MainWindow window) {
+    public void apply(@Nonnull Window window) {
         FullscreenDisplayMode.super.apply(window);
 
         Monitor monitor = GlfwUtils.tryGetMonitor(window).orElse(null);
@@ -46,7 +46,7 @@ public void apply(@Nonnull MainWindow window) {
     }
 
     @Override
-    public void reset(@Nonnull MainWindow window) {
+    public void reset(@Nonnull Window window) {
         FullscreenDisplayMode.super.reset(window);
 
         if (window.isFullscreen()) {

diff --git a/src/main/java/de/nekeras/borderless/client/fullscreen/FullscreenDisplayMode.java b/src/main/java/de/nekeras/borderless/client/fullscreen/FullscreenDisplayMode.java
@@ -1,7 +1,7 @@
 package de.nekeras.borderless.client.fullscreen;
 
+import com.mojang.blaze3d.platform.Window;
 import de.nekeras.borderless.client.GlfwUtils;
-import net.minecraft.client.MainWindow;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -45,7 +45,7 @@ public interface FullscreenDisplayMode {
      *
      * @param window The window
      */
-    default void apply(@Nonnull MainWindow window) {
+    default void apply(@Nonnull Window window) {
         GlfwUtils.applyDefaultWindowAttributes(window);
     }
 
@@ -55,7 +55,7 @@ default void apply(@Nonnull MainWindow window) {
      *
      * @param window The window
      */
-    default void reset(@Nonnull MainWindow window) {
+    default void reset(@Nonnull Window window) {
         GlfwUtils.applyDefaultWindowAttributes(window);
     }
 }
diff --git a/src/main/java/de/nekeras/borderless/client/fullscreen/NativeFullscreenDisplay.java b/src/main/java/de/nekeras/borderless/client/fullscreen/NativeFullscreenDisplay.java
@@ -1,6 +1,5 @@
 package de.nekeras.borderless.client.fullscreen;
 
-import net.minecraft.client.MainWindow;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 

diff --git a/src/main/java/de/nekeras/borderless/client/fullscreen/NativeNonIconifyFullscreenDisplay.java b/src/main/java/de/nekeras/borderless/client/fullscreen/NativeNonIconifyFullscreenDisplay.java
@@ -1,8 +1,8 @@
 package de.nekeras.borderless.client.fullscreen;
 
+import com.mojang.blaze3d.platform.Window;
 import de.nekeras.borderless.client.GlfwUtils;
 import de.nekeras.borderless.client.GlfwWindowAttribute;
-import net.minecraft.client.MainWindow;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -15,7 +15,7 @@
 public class NativeNonIconifyFullscreenDisplay implements FullscreenDisplayMode {
 
     @Override
-    public void apply(@Nonnull MainWindow window) {
+    public void apply(@Nonnull Window window) {
         FullscreenDisplayMode.super.apply(window);
 
         GlfwUtils.disableWindowAttribute(window, GlfwWindowAttribute.AUTO_ICONIFY);

diff --git a/src/main/java/de/nekeras/borderless/client/fullscreen/NativeWindowedFullscreenDisplay.java b/src/main/java/de/nekeras/borderless/client/fullscreen/NativeWindowedFullscreenDisplay.java
@@ -1,10 +1,10 @@
 package de.nekeras.borderless.client.fullscreen;
 
+import com.mojang.blaze3d.platform.Monitor;
+import com.mojang.blaze3d.platform.VideoMode;
+import com.mojang.blaze3d.platform.Window;
 import de.nekeras.borderless.client.GlfwUtils;
 import de.nekeras.borderless.client.GlfwWindowAttribute;
-import net.minecraft.client.MainWindow;
-import net.minecraft.client.Monitor;
-import net.minecraft.client.renderer.VideoMode;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import org.apache.logging.log4j.LogManager;
@@ -23,7 +23,7 @@ public class NativeWindowedFullscreenDisplay implements FullscreenDisplayMode {
     private static final Logger log = LogManager.getLogger();
 
     @Override
-    public void apply(@Nonnull MainWindow window) {
+    public void apply(@Nonnull Window window) {
         FullscreenDisplayMode.super.apply(window);
 
         GlfwUtils.disableWindowAttribute(window, GlfwWindowAttribute.AUTO_ICONIFY);
@@ -38,13 +38,13 @@ public void apply(@Nonnull MainWindow window) {
     }
 
     @Override
-    public void reset(@Nonnull MainWindow window) {
+    public void reset(@Nonnull Window window) {
         FullscreenDisplayMode.super.reset(window);
 
         GLFW.glfwSetWindowFocusCallback(window.getWindow(), null);
     }
 
-    private void onFocusGained(@Nonnull MainWindow window) {
+    private void onFocusGained(@Nonnull Window window) {
         Monitor monitor = GlfwUtils.tryGetMonitor(window).orElse(null);
 
         if (monitor == null) {
@@ -57,7 +57,7 @@ private void onFocusGained(@Nonnull MainWindow window) {
         }
     }
 
-    private void onFocusLost(@Nonnull MainWindow window) {
+    private void onFocusLost(@Nonnull Window window) {
         GLFW.glfwSetWindowMonitor(window.getWindow(), 0,
                 window.getX(), window.getY(),
                 window.getWidth(), window.getHeight(), GLFW.GLFW_DONT_CARE);