maybe 1.13 icon replacing

Author: SubAt0m1c

src/main/kotlin/org/polyfrost/polyplus/client/utils/IconLoader.kt

@@ -23,6 +23,12 @@ import javax.imageio.ImageIO
  * @author Chris Molini
  */
 object IconLoader {
+    @JvmField
+    val IMAGE_SIZES = when {
+        OmniDesktop.isWindows -> intArrayOf(16, 32)
+        OmniDesktop.isMac -> intArrayOf(128)
+        else -> intArrayOf(32)
+    }
     /*************************************************************************
      * Loads an icon in ByteBuffer form.
      *
@@ -61,17 +67,9 @@ object IconLoader {
 
     @JvmStatic
     fun load(image: BufferedImage): Array<ByteBuffer?> {
-        val buffers: Array<ByteBuffer?>
-        if (OmniDesktop.isWindows) {
-            buffers = arrayOfNulls(2)
-            buffers[0] = loadInstance(image, 16)
-            buffers[1] = loadInstance(image, 32)
-        } else if (OmniDesktop.isMac) {
-            buffers = arrayOfNulls(1)
-            buffers[0] = loadInstance(image, 128)
-        } else {
-            buffers = arrayOfNulls(1)
-            buffers[0] = loadInstance(image, 32)
+        val buffers: Array<ByteBuffer?> = arrayOfNulls(IMAGE_SIZES.size)
+        for (i in IMAGE_SIZES.indices) {
+            buffers[i] = loadInstance(image, IMAGE_SIZES[i])
         }
         return buffers
     }

versions/1.16.5-forge/src/main/java/org/polyfrost/polyplus/mixin/Mixin_ReplaceIcon.java

@@ -20,21 +20,30 @@
 import java.util.Objects;
 
 @Mixin(value = Minecraft.class, priority = Integer.MIN_VALUE)
-public class Mixin_ReplaceIcon { //todo: 1.13+
-//
-//    @Shadow @Final private Window window;
-//
-//    @Inject(method = "<init>", at = @At("TAIL"), cancellable = true)
-//    private void setWindowIcon(CallbackInfo ci) {
-//        try (InputStream stream = PolyPlusClient.class.getResourceAsStream("/assets/polyplus/PolyPlusIcon.png")) {
-//            GLFWImage.Buffer icons = GLFWImage.malloc(2);
-//            ByteBuffer[] buffers = IconLoader.load(ImageIO.read(Objects.requireNonNull(stream)));
-//            icons.put(0, buffers[0]);
-//            GLFW.glfwSetWindowIcon(this.window.getWindow(), icons);
-//            ci.cancel();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//    }
+public class Mixin_ReplaceIcon {
+
+    @Shadow @Final private Window window;
+
+    @Inject(method = "<init>", at = @At("TAIL"), cancellable = true)
+    private void setWindowIcon(CallbackInfo ci) {
+        try (InputStream stream = PolyPlusClient.class.getResourceAsStream("/assets/polyplus/PolyPlusIcon.png")) {
+            GLFWImage.Buffer icons = GLFWImage.malloc(2);
+            ByteBuffer[] buffers = IconLoader.load(ImageIO.read(Objects.requireNonNull(stream)));
+            for (int i = 0; i < buffers.length; i++) {
+                try (GLFWImage image = GLFWImage.malloc()) {
+                    int[] sizes = IconLoader.IMAGE_SIZES;
+                    image.height(sizes[i]);
+                    image.width(sizes[i]);
+                    image.pixels(buffers[i]);
+                    icons.put(i, image);
+                }
+            }
+
+            GLFW.glfwSetWindowIcon(this.window.getWindow(), icons);
+            ci.cancel();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }