1.21.8 icon replacing

Author: SubAt0m1c

build.gradle.kts

@@ -23,8 +23,8 @@ repositories {
 
 toolkitLoomHelper {
     useOneConfig {
-        version = "1.0.0-alpha.177"
-        loaderVersion = "1.1.0-alpha.53"
+        version = "1.0.0-alpha.181"
+        loaderVersion = "1.1.0-alpha.54"
 
         usePolyMixin = true
         polyMixinVersion = "0.8.4+build.7"

src/main/kotlin/org/polyfrost/polyplus/client/gui/FullscreenLockerUI.kt

@@ -5,6 +5,7 @@ import dev.deftu.omnicore.api.client.screen.OmniScreen
 import org.polyfrost.oneconfig.api.ui.v1.OCPolyUIBuilder
 import org.polyfrost.oneconfig.api.ui.v1.UIManager
 import org.polyfrost.polyplus.PolyPlusConstants
+import org.polyfrost.polyui.color.Colors
 import org.polyfrost.polyui.color.rgba
 import org.polyfrost.polyui.component.Drawable
 import org.polyfrost.polyui.component.extensions.disable
@@ -75,7 +76,7 @@ object FullscreenLockerUI {
                         TextInput(
                             placeholder = "polyplus.search.placeholder",
                             visibleSize = Vec2(210f, 12f)
-                        ).onChange { text: String ->
+                        ).onChange { text: Colors.Palette ->
                             // TODO: Filter cosmetics list based on search input
                             false
                         }.named("SearchInput"),

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

@@ -2,10 +2,10 @@ package org.polyfrost.polyplus.client.utils
 
 
 import dev.deftu.omnicore.api.client.OmniDesktop
+import org.lwjgl.BufferUtils
 import java.awt.image.BufferedImage
 import java.io.File
 import java.io.IOException
-import java.io.InputStream
 import java.nio.ByteBuffer
 import javax.imageio.ImageIO
 
@@ -84,7 +84,8 @@ object IconLoader {
      *
      * @return A ByteBuffer of pixel data at the indicated size.
      */
-    private fun loadInstance(image: BufferedImage, dimension: Int): ByteBuffer {
+    @JvmStatic
+    fun loadInstance(image: BufferedImage, dimension: Int): ByteBuffer {
         val scaledIcon = BufferedImage(dimension, dimension, BufferedImage.TYPE_INT_ARGB_PRE)
         val g = scaledIcon.createGraphics()
         val ratio = getIconRatio(image, scaledIcon)
@@ -138,16 +139,18 @@ object IconLoader {
      * @return A ByteBuffer that contains the pixel data of the supplied image.
      */
     fun convertToByteBuffer(image: BufferedImage): ByteBuffer {
-        val buffer = ByteArray(image.width * image.height * 4)
-        var counter = 0
-        for (i in 0..<image.height) for (j in 0..<image.width) {
-            val colorSpace = image.getRGB(j, i)
-            buffer[counter] = ((colorSpace shl 8) shr 24).toByte()
-            buffer[counter + 1] = ((colorSpace shl 16) shr 24).toByte()
-            buffer[counter + 2] = ((colorSpace shl 24) shr 24).toByte()
-            buffer[counter + 3] = (colorSpace shr 24).toByte()
-            counter += 4
+        val (width, height) = image.width to image.height
+        val buffer = BufferUtils.createByteBuffer(width * height * 4)
+
+        for (y in 0..<height) for (x in 0..<width) {
+            val colorSpace = image.getRGB(x, y)
+            val index = (y * width + x) * 4
+            buffer.put(index, ((colorSpace shr 16) and 0xFF).toByte())
+            buffer.put(index + 1, ((colorSpace shr 8) and 0xFF).toByte())
+            buffer.put(index + 2, (colorSpace and 0xFF).toByte())
+            buffer.put(index + 3, ((colorSpace shr 24) and 0xFF).toByte())
         }
-        return ByteBuffer.wrap(buffer)
+
+        return buffer
     }
 }

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

@@ -24,23 +24,39 @@ public class Mixin_ReplaceIcon {
 
     @Shadow @Final private Window window;
 
-    @Inject(method = "<init>", at = @At("TAIL"), cancellable = true)
+    @Inject(method = "<init>", at = @At("TAIL"))
     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);
-                }
+                GLFWImage image = GLFWImage.malloc();
+                int size = IconLoader.IMAGE_SIZES[i];
+
+                image.height(size).width(size).pixels(buffers[i]);
+
+                icons.put(i, image);
+            }
+
+            for (int i = 0; i < buffers.length; i++) {
+                int expected = IconLoader.IMAGE_SIZES[i]
+                        * IconLoader.IMAGE_SIZES[i] * 4;
+
+                System.out.println(
+                        "[PolyPlus] icon " + i +
+                                " expected=" + expected +
+                                " actual=" + buffers[i].remaining() +
+                                " direct=" + buffers[i].isDirect()
+                );
             }
 
-            GLFW.glfwSetWindowIcon(this.window.getWindow(), icons);
-            ci.cancel();
+
+            Minecraft.getInstance().execute(() -> {
+                GLFW.glfwSetWindowIcon(this.window.getWindow(), icons);
+
+                icons.forEach(GLFWImage::free);
+                icons.free();
+            });
         } catch (Exception e) {
             e.printStackTrace();
         }