Merge branch '1.21' into 1.21

.github/workflows/build.yml

@@ -5,7 +5,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17]
+        java: [21]
         os: [ubuntu-20.04, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -23,7 +23,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts

build.gradle

@@ -2,8 +2,8 @@ plugins {
 	id 'fabric-loom' version '1.6-SNAPSHOT'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -30,7 +30,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/io/github/foundationgames/animatica/animation/AnimatedTexture.java

@@ -3,22 +3,32 @@
 import com.google.common.collect.ImmutableList;
 import io.github.foundationgames.animatica.Animatica;
 import io.github.foundationgames.animatica.util.TextureUtil;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.client.texture.NativeImageBackedTexture;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class AnimatedTexture extends NativeImageBackedTexture {
+    public static final ExecutorService EXECUTORS = Executors.newFixedThreadPool(4);
+
     public final Animation[] anims;
     private final NativeImage original;
     private int frame = 0;
 
+    private CompletableFuture<Void> frameWaitingOn = null;
+
     public static Optional<AnimatedTexture> tryCreate(ResourceManager resources, Identifier targetTexId, List<AnimationMeta> anims) {
         try (var targetTexResource = resources.getResourceOrThrow(targetTexId).getInputStream()) {
             return Optional.of(new AnimatedTexture(resources, anims, NativeImage.read(targetTexResource)));
@@ -36,7 +46,7 @@ public AnimatedTexture(ResourceManager resources, List<AnimationMeta> metas, Nat
         }
         this.original = image;
 
-        updateAndDraw(this.getImage(), true);
+        updateAndDraw(this.getImage(), true, MinecraftClient.getInstance());
         this.upload();
     }
 
@@ -50,7 +60,15 @@ public boolean canLoop() {
         return true;
     }
 
-    public boolean updateAndDraw(NativeImage image, boolean force) {
+    private @Nullable CompletableFuture<Void> getFrameWaitingOn() {
+        if (this.frameWaitingOn != null && this.frameWaitingOn.isDone()) {
+            this.frameWaitingOn = null;
+        }
+
+        return this.frameWaitingOn;
+    }
+
+    public void updateAndDraw(NativeImage image, boolean force, Executor exec) {
         boolean changed = false;
 
         if (canLoop()) {
@@ -69,31 +87,34 @@ public boolean updateAndDraw(NativeImage image, boolean force) {
         }
 
         if (changed || force) {
-            image.copyFrom(this.original);
+            // Skip if still waiting for a frame to finish
+            if (this.getFrameWaitingOn() == null) {
+                this.frameWaitingOn = CompletableFuture.supplyAsync(() -> {
+                    image.copyFrom(this.original);
+
+                    Phase phase;
+                    for (var anim : anims) {
+                        phase = anim.getCurrentPhase();
+                        if (phase instanceof InterpolatedPhase iPhase) {
+                            TextureUtil.blendCopy(anim.sourceTexture, 0, iPhase.prevV, 0, iPhase.v, anim.width, anim.height, image, anim.targetX, anim.targetY, iPhase.blend.getBlend(anim.getPhaseFrame()));
+                        } else {
+                            TextureUtil.copy(anim.sourceTexture, 0, phase.v, anim.width, anim.height, image, anim.targetX, anim.targetY);
+                        }
+                    }
 
-            Phase phase;
-            for (var anim : anims) {
-                phase = anim.getCurrentPhase();
-                if (phase instanceof InterpolatedPhase iPhase) {
-                    TextureUtil.blendCopy(anim.sourceTexture, 0, iPhase.prevV, 0, iPhase.v, anim.width, anim.height, image, anim.targetX, anim.targetY, iPhase.blend.getBlend(anim.getPhaseFrame()));
-                } else {
-                    TextureUtil.copy(anim.sourceTexture, 0, phase.v, anim.width, anim.height, image, anim.targetX, anim.targetY);
-                }
+                    return null;
+                }, exec).thenAccept(v -> MinecraftClient.getInstance().execute(this::upload));
             }
         }
 
         for (var anim : anims) {
             anim.advance();
         }
         frame++;
-
-        return changed;
     }
 
     public void tick() {
-        if (this.updateAndDraw(this.getImage(), false)) {
-            this.upload();
-        }
+        this.updateAndDraw(this.getImage(), false, EXECUTORS);
     }
 
     @Override

src/main/java/io/github/foundationgames/animatica/mixin/NativeImageAccessor.java

@@ -0,0 +1,11 @@
+package io.github.foundationgames.animatica.mixin;
+
+import net.minecraft.client.texture.NativeImage;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(NativeImage.class)
+public interface NativeImageAccessor {
+    @Accessor("pointer")
+    long getPointer();
+}

src/main/java/io/github/foundationgames/animatica/util/TextureUtil.java

@@ -1,9 +1,12 @@
 package io.github.foundationgames.animatica.util;
 
+import io.github.foundationgames.animatica.mixin.NativeImageAccessor;
 import net.minecraft.client.texture.NativeImage;
 import net.minecraft.util.math.MathHelper;
+import org.lwjgl.system.MemoryUtil;
 
 public enum TextureUtil {;
+    private static final long SIZEOF_INT = 4;
 
     /**
      * Copy a section of an image into another image
@@ -18,20 +21,20 @@ public enum TextureUtil {;
      * @param dv The v coordinate on the destination image to place the selection at
      */
     public static void copy(NativeImage src, int u, int v, int w, int h, NativeImage dest, int du, int dv) {
-        // iterate through the entire section of the image to be copied over
-        for (int rx = 0; rx < w; rx++) {
-            for (int ry = 0; ry < h; ry++) {
-                // the current x/y coordinates in the source image
-                int srcX = u + rx;
-                int srcY = v + ry;
-                // the corresponding target x/y coordinates in the target image
-                int trgX = du + rx;
-                int trgY = dv + ry;
-
-                // set the color of the target pixel on the destination image
-                // to the color from the corresponding pixel on the source image
-                dest.setColor(trgX, trgY, src.getColor(srcX, srcY));
-            }
+        w = MathHelper.clamp(dest.getWidth() - du, 0, w);
+        h = MathHelper.clamp(dest.getHeight() - dv, 0, h);
+
+        long srcPtr = ((NativeImageAccessor)(Object)src).getPointer();
+        long dstPtr = ((NativeImageAccessor)(Object)dest).getPointer();
+
+        for (int row = 0; row < h; row++) {
+            int srcRowIdx = ((v + row) * src.getWidth()) + u;
+            var srcRow = MemoryUtil.memIntBuffer(srcPtr + (srcRowIdx * SIZEOF_INT), w);
+
+            int trgRowIdx = ((dv + row) * dest.getWidth()) + du;
+            var trgRow = MemoryUtil.memIntBuffer(dstPtr + (trgRowIdx * SIZEOF_INT), w);
+
+            MemoryUtil.memCopy(srcRow, trgRow);
         }
     }
 
@@ -52,22 +55,24 @@ public static void copy(NativeImage src, int u, int v, int w, int h, NativeImage
      *              second (0 = solid first image, 1 = solid second image)
      */
     public static void blendCopy(NativeImage src, int u0, int v0, int u1, int v1, int w, int h, NativeImage dest, int du, int dv, float blend) {
-        // iterate through the entire section of the image to be copied over
-        for (int rx = 0; rx < w; rx++) {
-            for (int ry = 0; ry < h; ry++) {
-                // the first set of x/y coordinates in the source image
-                int srcX0 = u0 + rx;
-                int srcY0 = v0 + ry;
-                // the second set of x/y coordinates in the source image
-                int srcX1 = u1 + rx;
-                int srcY1 = v1 + ry;
-                // the corresponding target x/y coordinates in the target image
-                int trgX = du + rx;
-                int trgY = dv + ry;
-
-                // set the color of the target pixel on the destination image to a blend
-                // of the colors from the corresponding pixels on the source image
-                dest.setColor(trgX, trgY, lerpColor(src.getFormat(), src.getColor(srcX0, srcY0), src.getColor(srcX1, srcY1), blend));
+        w = MathHelper.clamp(dest.getWidth() - du, 0, w);
+        h = MathHelper.clamp(dest.getHeight() - dv, 0, h);
+
+        long srcPtr = ((NativeImageAccessor)(Object)src).getPointer();
+        long dstPtr = ((NativeImageAccessor)(Object)dest).getPointer();
+
+        for (int row = 0; row < h; row++) {
+            int src0RowIdx = ((v0 + row) * src.getWidth()) + u0;
+            var src0Row = MemoryUtil.memIntBuffer(srcPtr + (src0RowIdx * SIZEOF_INT), w);
+
+            int src1RowIdx = ((v1 + row) * src.getWidth()) + u1;
+            var src1Row = MemoryUtil.memIntBuffer(srcPtr + (src1RowIdx * SIZEOF_INT), w);
+
+            int trgRowIdx = ((dv + row) * dest.getWidth()) + du;
+            var trgRow = MemoryUtil.memIntBuffer(dstPtr + (trgRowIdx * SIZEOF_INT), w);
+
+            for (int col = 0; col < w; col++) {
+                trgRow.put(col, lerpColor(src.getFormat(), src0Row.get(col), src1Row.get(col), blend));
             }
         }
     }

src/main/resources/animatica.mixins.json

@@ -4,8 +4,9 @@
   "package": "io.github.foundationgames.animatica.mixin",
   "compatibilityLevel": "JAVA_16",
   "client": [
-    "RenderSystemMixin",
     "IdentifierMixin",
+    "NativeImageAccessor",
+    "RenderSystemMixin",
     "VideoOptionsScreenMixin"
   ],
   "injectors": {

src/main/resources/assets/animatica/lang/be_by.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Карыстальніцкія Анімацыі"
+}

src/main/resources/assets/animatica/lang/es_mx.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Animaciones personalizadas"
+}

src/main/resources/assets/animatica/lang/it_it.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Animazioni Personalizzate"
+}

src/main/resources/assets/animatica/lang/ko_kr.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "사용자 지정 애니메이션"
+}

src/main/resources/assets/animatica/lang/pl_pl.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Niestandardowe animacje"
+}

src/main/resources/assets/animatica/lang/ru_ru.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Пользов. анимации"
+}

src/main/resources/assets/animatica/lang/uk_ua.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Власні анімації"
+}

src/main/resources/assets/animatica/lang/vi_vn.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "Hoạt hình tùy chỉnh"
+}

src/main/resources/assets/animatica/lang/zh_cn.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "自定义动画"
+}

src/main/resources/assets/animatica/lang/zh_tw.json

@@ -0,0 +1,3 @@
+{
+    "option.animatica.animated_textures": "自訂動畫"
+}

src/main/resources/fabric.mod.json

@@ -28,7 +28,7 @@
   "depends": {
     "fabricloader": ">=0.11.3",
     "fabric": "*",
-    "minecraft": ["1.21.x"],
-    "java": ">=16"
+    "minecraft": ">=1.21",
+    "java": ">=21"
   }
 }