remove classic variant

FancyMcPlugins · Nov 23, 2024 · d3263cb · d3263cb
1 parent 8f49649
commit d3263cb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/api/src/main/java/de/oliver/fancynpcs/api/skins/SkinData.java b/api/src/main/java/de/oliver/fancynpcs/api/skins/SkinData.java
@@ -54,6 +54,5 @@ public void setTextureSignature(String textureSignature) {
     public enum SkinVariant {
         AUTO,
         SLIM,
-        CLASSIC
     }
 }
diff --git a/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java b/src/main/java/de/oliver/fancynpcs/NpcManagerImpl.java
@@ -288,7 +288,7 @@ public void loadNpcs() {
                 String signature = npcConfig.getString("npcs." + id + ".skin.signature");
 
                 if (value != null && !value.isEmpty() && signature != null && !signature.isEmpty()) {
-                    SkinData oldSkin = new SkinData(skinIdentifier, SkinData.SkinVariant.CLASSIC, value, signature);
+                    SkinData oldSkin = new SkinData(skinIdentifier, SkinData.SkinVariant.AUTO, value, signature);
                     FancyNpcs.getInstance().getSkinManagerImpl().getFileCache().addSkin(oldSkin);
                     FancyNpcs.getInstance().getSkinManagerImpl().getMemCache().addSkin(oldSkin);
                 }

diff --git a/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java b/src/main/java/de/oliver/fancynpcs/skins/SkinManagerImpl.java
@@ -112,7 +112,7 @@ public SkinData getByUUID(UUID uuid, SkinData.SkinVariant variant) {
 
         SkinData skinData = new SkinData(
                 uuid.toString(),
-                SkinData.SkinVariant.CLASSIC,
+                variant,
                 skinInfo.texture().data().value(),
                 skinInfo.texture().data().signature()
         );
@@ -140,7 +140,7 @@ public SkinData getByUsername(String username, SkinData.SkinVariant variant) {
 
         SkinData skinData = new SkinData(
                 uuid.toString(),
-                SkinData.SkinVariant.CLASSIC,
+                variant,
                 skinInfo.texture().data().value(),
                 skinInfo.texture().data().signature()
         );
@@ -173,7 +173,7 @@ public SkinData getByURL(String url, SkinData.SkinVariant variant) {
 
         SkinData skinData = new SkinData(
                 url,
-                SkinData.SkinVariant.CLASSIC,
+                variant,
                 skinInfo.texture().data().value(),
                 skinInfo.texture().data().signature()
         );
@@ -205,7 +205,7 @@ public SkinData getByFile(String filePath, SkinData.SkinVariant variant) {
 
         SkinData skinData = new SkinData(
                 filePath,
-                SkinData.SkinVariant.CLASSIC,
+                variant,
                 skinInfo.texture().data().value(),
                 skinInfo.texture().data().signature()
         );

diff --git a/src/main/java/de/oliver/fancynpcs/tests/impl/api/skin/SkinManagerTest.java b/src/main/java/de/oliver/fancynpcs/tests/impl/api/skin/SkinManagerTest.java
@@ -28,7 +28,7 @@ public void testSkinByUUID(Player player) {
 
         expect(skin).toBeDefined();
         expect(skin.getIdentifier()).toEqual(player.getUniqueId().toString());
-        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.CLASSIC);
+        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.AUTO);
         expect(skin.getTextureValue()).toBeDefined();
         expect(skin.getTextureValue().length()).toBeGreaterThan(0);
         expect(skin.getTextureSignature()).toBeDefined();
@@ -41,7 +41,7 @@ public void testSkinByUsername(Player player) {
 
         expect(skin).toBeDefined();
         expect(skin.getIdentifier()).toEqual(player.getName());
-        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.CLASSIC);
+        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.AUTO);
         expect(skin.getTextureValue()).toBeDefined();
         expect(skin.getTextureValue().length()).toBeGreaterThan(0);
         expect(skin.getTextureSignature()).toBeDefined();
@@ -53,7 +53,7 @@ public void testSkinByURL(Player player) {
 
         expect(skin).toBeDefined();
         expect(skin.getIdentifier()).toEqual("https://s.namemc.com/i/de7d8a3ffd1f584c.png");
-        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.CLASSIC);
+        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.AUTO);
         expect(skin.getTextureValue()).toBeDefined();
         expect(skin.getTextureValue().length()).toBeGreaterThan(0);
         expect(skin.getTextureSignature()).toBeDefined();
@@ -67,7 +67,7 @@ public void testSkinByFile(Player player) {
 
         expect(skin).toBeDefined();
         expect(skin.getIdentifier()).toEqual("plugins/FancyNpcs/testskin.png");
-        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.CLASSIC);
+        expect(skin.getVariant()).toEqual(SkinData.SkinVariant.AUTO);
         expect(skin.getTextureValue()).toBeDefined();
         expect(skin.getTextureValue().length()).toBeGreaterThan(0);
         expect(skin.getTextureSignature()).toBeDefined();
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,5 @@ public void setTextureSignature(String textureSignature) { @@
         public enum SkinVariant {
             AUTO,
             SLIM,
-            CLASSIC
         }
     }