feat: remove image process

Author: toxicity188

api/src/main/java/kr/toxicity/model/api/data/blueprint/BlueprintImage.java

@@ -10,20 +10,18 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.image.BufferedImage;
-
 /**
  * Blueprint image.
  * @param name image name
- * @param image buffered image
+ * @param image image
  * @param mcmeta mcmeta
  */
-public record BlueprintImage(@NotNull String name, @NotNull BufferedImage image, @Nullable JsonObject mcmeta) {
+public record BlueprintImage(@NotNull String name, byte[] image, @Nullable JsonObject mcmeta) {
     /**
      * Gets estimated size
      * @return estimated size
      */
     public long estimatedSize() {
-        return 4L * image.getWidth() * image.getHeight();
+        return image.length;
     }
 }

api/src/main/java/kr/toxicity/model/api/data/blueprint/BlueprintTexture.java

@@ -14,18 +14,20 @@
 import kr.toxicity.model.api.util.json.JsonObjectBuilder;
 import org.jetbrains.annotations.NotNull;
 
-import java.awt.image.BufferedImage;
-
 /**
  * Texture of the model
  * @param name texture name
  * @param image image
+ * @param width original width
+ * @param height original height
  * @param uvWidth uv width
  * @param uvHeight uv height
  */
 public record BlueprintTexture(
         @NotNull String name,
-        @NotNull BufferedImage image,
+        byte[] image,
+        int width,
+        int height,
         int uvWidth,
         int uvHeight
 ) {
@@ -35,11 +37,11 @@ public record BlueprintTexture(
      */
     public boolean isAnimatedTexture() {
         if (uvWidth > 0 && uvHeight > 0) {
-            var h = (float) image.getHeight() / uvHeight;
-            var w = (float) image.getWidth() / uvWidth;
+            var h = (float) height / uvHeight;
+            var w = (float) width / uvWidth;
             return h > w;
         } else {
-            return image.getHeight() / image.getWidth() > 1;
+            return height > 0 && width > 0 && height / width > 1;
         }
     }
 
@@ -108,6 +110,6 @@ public boolean hasUVSize() {
      */
     public @NotNull ModelResolution resolution(@NotNull ModelResolution resolution) {
         if (!hasUVSize()) return resolution;
-        return resolution.width() == image.getWidth() && resolution.height() == image.getHeight() ? resolution : new ModelResolution(uvWidth, uvHeight);
+        return resolution.width() == width && resolution.height() == height ? resolution : new ModelResolution(uvWidth, uvHeight);
     }
 }

api/src/main/java/kr/toxicity/model/api/data/raw/ModelTexture.java

@@ -11,9 +11,6 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.util.Base64;
 
 /**
@@ -39,17 +36,11 @@ public record ModelTexture(
      * @return converted textures
      */
     public @NotNull BlueprintTexture toBlueprint() {
-        BufferedImage image;
-        try (
-                var input = new ByteArrayInputStream(Base64.getDecoder().decode(source().split(",")[1]))
-        ) {
-            image = ImageIO.read(input);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
         return new BlueprintTexture(
                 name().split("\\.")[0],
-                image,
+                Base64.getDecoder().decode(source().split(",")[1]),
+                width(),
+                height(),
                 uvWidth(),
                 uvHeight()
         );

api/src/main/java/kr/toxicity/model/api/player/PlayerLimb.java

@@ -16,7 +16,6 @@
 import lombok.RequiredArgsConstructor;
 import org.bukkit.entity.ItemDisplay;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.joml.Vector3f;
 
 import java.util.function.Function;
@@ -194,7 +193,7 @@ public enum PlayerLimb {
     private final @NotNull Vector3f slimScale;
     private final @NotNull Vector3f offset;
     private final @NotNull Vector3f slimOffset;
-    private final @Nullable Function<SkinData, TransformedItemStack> skinMapper;
+    private final @NotNull Function<SkinData, TransformedItemStack> skinMapper;
     private final @NotNull ItemDisplay.ItemDisplayTransform transform;
 
     @Getter
@@ -208,7 +207,7 @@ public enum PlayerLimb {
     public @NotNull TransformedItemStack createItem(@NotNull RenderSource.Profiled profiled) {
         var profile = profiled.profile();
         var manager = BetterModel.plugin().skinManager();
-        if (skinMapper != null && manager.supported()) {
+        if (manager.supported()) {
             return skinMapper.apply(manager.getOrRequest(profile));
         }
         var isSlim = profiled.slim();

api/src/main/java/kr/toxicity/model/api/tracker/EntityTracker.java

@@ -82,7 +82,9 @@ public EntityTracker(@NotNull EntityTrackerRegistry registry, @NotNull RenderPip
                 .ifPresent(bone -> {
                     var box = bone.getGroup().getHitBox();
                     if (box == null) return;
-                    var shadow = BetterModel.plugin().nms().create(entity.getLocation(), d -> d.moveDuration(1));
+                    var shadow = BetterModel.plugin().nms().create(entity.getLocation(), d -> {
+                        if (entity instanceof Player) d.moveDuration(1);
+                    });
                     var baseScale = (float) (box.box().x() + box.box().z()) / 4F;
                     tick(((t, s) -> {
                         var wPos = bone.hitBoxPosition();

core/src/main/kotlin/kr/toxicity/model/manager/EntityManagerImpl.kt

@@ -18,7 +18,6 @@ import kr.toxicity.model.api.nms.ModelInteractionHand
 import kr.toxicity.model.api.pack.PackZipper
 import kr.toxicity.model.api.tracker.EntityTracker
 import kr.toxicity.model.api.tracker.EntityTrackerRegistry
-import kr.toxicity.model.api.tracker.TrackerUpdateAction
 import kr.toxicity.model.util.PLUGIN
 import kr.toxicity.model.util.registerListener
 import org.bukkit.entity.Entity
@@ -31,7 +30,6 @@ import org.bukkit.event.player.PlayerChangedWorldEvent
 import org.bukkit.event.player.PlayerInteractAtEntityEvent
 import org.bukkit.event.player.PlayerInteractEntityEvent
 import org.bukkit.event.player.PlayerQuitEvent
-import org.bukkit.event.player.PlayerToggleSneakEvent
 import org.bukkit.event.world.EntitiesLoadEvent
 import org.bukkit.event.world.EntitiesUnloadEvent
 import org.bukkit.inventory.EquipmentSlot
@@ -166,13 +164,6 @@ object EntityManagerImpl : EntityManager, GlobalManager {
                 it.damageTint()
             }
         }
-        @EventHandler
-        fun PlayerToggleSneakEvent.sneak() {
-            BetterModel.registryOrNull(player)?.trackers()?.forEach {
-                it.update(TrackerUpdateAction.moveDuration(0))
-                it.task { it.update(TrackerUpdateAction.moveDuration(3)) }
-            }
-        }
     }
     private val platformListener = if (BetterModel.IS_PAPER) PaperListener() else SpigotListener()
 

core/src/main/kotlin/kr/toxicity/model/manager/ModelManagerImpl.kt

@@ -112,7 +112,7 @@ object ModelManagerImpl : ModelManager, GlobalManager {
         val blueprint: ModelBlueprint
     ) {
         val jsonSize = size - blueprint.textures.sumOf {
-            it.image.height * it.image.width * 4
+            it.image.size
         }
     }
 
@@ -228,7 +228,7 @@ object ModelManagerImpl : ModelManager, GlobalManager {
                 }
                 if (hasTexture) load.buildImage(textures.obfuscator()).forEach { image ->
                     textures.add("${image.name}.png", image.estimatedSize()) {
-                        image.image.toByteArray()
+                        image.toByteArray()
                     }
                     image.mcmeta()?.let { meta ->
                         textures.add("${image.name}.png.mcmeta", -1) {

core/src/main/kotlin/kr/toxicity/model/util/Buffers.kt

@@ -7,21 +7,16 @@
 package kr.toxicity.model.util
 
 import com.google.gson.JsonElement
+import kr.toxicity.model.api.data.blueprint.BlueprintImage
 import kr.toxicity.model.api.data.raw.ModelData
-import java.awt.image.RenderedImage
 import java.io.ByteArrayOutputStream
 import java.io.OutputStreamWriter
 import java.nio.charset.StandardCharsets
-import javax.imageio.ImageIO
 
 private val IO_BUFFER = ThreadLocal.withInitial { ByteArrayOutputStream(1024) }
 
-fun RenderedImage.toByteArray(): ByteArray {
-    return IO_BUFFER.get().let { buffer ->
-        buffer.reset()
-        ImageIO.write(this, "png", buffer)
-        buffer.toByteArray()
-    }
+fun BlueprintImage.toByteArray(): ByteArray {
+    return image
 }
 
 fun JsonElement.toByteArray(): ByteArray {

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/HitBoxImpl.kt

@@ -40,6 +40,7 @@ import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
 import org.bukkit.Bukkit
 import org.bukkit.Color
+import org.bukkit.Location
 import org.bukkit.Particle
 import org.bukkit.craftbukkit.CraftServer
 import org.bukkit.craftbukkit.entity.CraftArmorStand
@@ -70,7 +71,10 @@ internal class HitBoxImpl(
     private var onFly = false
 
     val craftEntity: HitBox by lazy {
-        object : CraftArmorStand(Bukkit.getServer() as CraftServer, this), HitBox by this {}
+        object : CraftArmorStand(Bukkit.getServer() as CraftServer, this), HitBox by this {
+            override fun getLocation(): Location = interaction.bukkitEntity.location
+            override fun getLocation(loc: Location?): Location? = interaction.bukkitEntity.getLocation(loc)
+        }
     }
     private val _rotatedSource = FunctionUtil.throttleTick(Supplier {
         source.rotate(Quaterniond(bone.hitBoxViewRotation()))

nms/v1_20_R4/src/main/kotlin/kr/toxicity/model/nms/v1_20_R4/ModelNametagImpl.kt

@@ -44,7 +44,7 @@ internal class ModelNametagImpl(
         EntityType.TEXT_DISPLAY,
         MinecraftServer.getServer().overworld()
     ).apply {
-        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 1
+        entityData[Display.DATA_POS_ROT_INTERPOLATION_DURATION_ID] = 3
         setTransformation(emptyTransformation)
         billboardConstraints = Display.BillboardConstraints.CENTER
     }