Fixed version selection for 1.21.3

r3back · r3back · commit e99a5bac0cee · 2024-12-14T13:57:26.000-03:00
diff --git a/api/src/main/java/com/qualityplus/assistant/api/nms/NMS.java b/api/src/main/java/com/qualityplus/assistant/api/nms/NMS.java
@@ -18,14 +18,6 @@
  * NMS Interface
  */
 public interface NMS {
-    /**
-     * Set texture to item stack
-     *
-     * @param itemStack {@link ItemStack}
-     * @param texture   {@link String}
-     * @return {@link ItemStack}
-     */
-    public ItemStack setTexture(final ItemStack itemStack, final String texture);
     /**
      * Set block age
      *
@@ -205,6 +197,14 @@ public void sendParticles(final World world, final String particle,
                               final float offsetY, final float offsetZ,
                               final float data, final int amount);
 
+    /**
+     *
+     * @return if new nbt api resolver should be used
+     */
+    public default boolean isNewNBTAPIResolver() {
+        return false;
+    }
+
     /**
      * Ender Dragon Parts representation
      */
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.github.r3back"
-version = "3.2.24"
+version = "3.2.25"
 
 ext.set("mojangUnmappedVersions", setOf("1_21_R2", "1_21_R1", "v1_20_R4", "v1_20_R3","v1_20_R2", "v1_20_R1", "v1_19_R1", "v1_19_R2", "v1_18_R1", "v1_18_R2", "v1_17_R1"))
 
diff --git a/nms/nms-commons/src/main/java/com/qualityplus/assistant/base/nms/AbstractNMS.java b/nms/nms-commons/src/main/java/com/qualityplus/assistant/base/nms/AbstractNMS.java
@@ -2,8 +2,6 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
 import com.qualityplus.assistant.api.nms.NMS;
 import com.qualityplus.assistant.api.util.CropUtil;
 import com.qualityplus.assistant.base.event.ActionBarMessageEvent;
@@ -14,12 +12,6 @@
 import org.bukkit.boss.BossBar;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -37,65 +29,6 @@ public abstract class AbstractNMS implements NMS {
     private final Map<UUID, Long> disabled = new HashMap<>();
     private final Map<UUID, Long> enabled = new HashMap<>();
     protected static BossBar bossBar;
-    private static Method metaSetProfileMethod;
-    private static Field metaProfileField;
-
-    /**
-     *
-     * @param itemStack {@link ItemStack}
-     * @param texture   {@link String}
-     * @return {@link ItemStack}
-     */
-    @Override
-    public ItemStack setTexture(final ItemStack itemStack, final String texture) {
-        try {
-            final SkullMeta meta = (SkullMeta) itemStack.getItemMeta();
-
-            mutateItemMeta(meta, texture);
-            itemStack.setItemMeta(meta);
-
-            return itemStack;
-        } catch (final NullPointerException e) {
-            e.printStackTrace();
-        }
-
-        return itemStack;
-    }
-
-    private void mutateItemMeta(final SkullMeta meta, final String b64) {
-        try {
-            if (metaSetProfileMethod == null) {
-                metaSetProfileMethod = meta.getClass().getDeclaredMethod("setProfile", GameProfile.class);
-                metaSetProfileMethod.setAccessible(true);
-            }
-            metaSetProfileMethod.invoke(meta, makeProfile(b64));
-        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
-            // if in an older API where there is no setProfile method,
-            // we set the profile field directly.
-            try {
-                if (metaProfileField == null) {
-                    metaProfileField = meta.getClass().getDeclaredField("profile");
-                    metaProfileField.setAccessible(true);
-                }
-                metaProfileField.set(meta, makeProfile(b64));
-
-            } catch (NoSuchFieldException | IllegalAccessException ex2) {
-                ex2.printStackTrace();
-            }
-        }
-    }
-
-
-    private static GameProfile makeProfile(final String b64) {
-        // random uuid based on the b64 string
-        final UUID id = new UUID(
-                b64.substring(b64.length() - 20).hashCode(),
-                b64.substring(b64.length() - 10).hashCode()
-        );
-        final GameProfile profile = new GameProfile(id, "Player");
-        profile.getProperties().put("textures", new Property("textures", b64));
-        return profile;
-    }
 
     @Override
     public void sendActionBar(final Player player, final String message) {
diff --git a/nms/v1_20_R3/src/main/java/com/qualityplus/assistant/base/nms/v1_20_R3.java b/nms/v1_20_R3/src/main/java/com/qualityplus/assistant/base/nms/v1_20_R3.java
@@ -60,6 +60,11 @@
 public final class v1_20_R3 extends AbstractNMS {
     private @Getter @Inject Plugin plugin;
 
+    @Override
+    public boolean isNewNBTAPIResolver() {
+        return true;
+    }
+
     @Override
     public void setBlockAge(final Block block, final int age) {
         if (block.getBlockData() instanceof Ageable) {
diff --git a/nms/v1_20_R4/src/main/java/com/qualityplus/assistant/base/nms/v1_20_R4.java b/nms/v1_20_R4/src/main/java/com/qualityplus/assistant/base/nms/v1_20_R4.java
@@ -60,6 +60,11 @@
 public final class v1_20_R4 extends AbstractNMS {
     private @Getter @Inject Plugin plugin;
 
+    @Override
+    public boolean isNewNBTAPIResolver() {
+        return true;
+    }
+
     @Override
     public void setBlockAge(final Block block, final int age) {
         if (block.getBlockData() instanceof Ageable) {
diff --git a/nms/v1_21_R1/src/main/java/com/qualityplus/assistant/base/nms/v1_21_R1.java b/nms/v1_21_R1/src/main/java/com/qualityplus/assistant/base/nms/v1_21_R1.java
@@ -60,6 +60,11 @@
 public final class v1_21_R1 extends AbstractNMS {
     private @Getter @Inject Plugin plugin;
 
+    @Override
+    public boolean isNewNBTAPIResolver() {
+        return true;
+    }
+
     @Override
     public void setBlockAge(final Block block, final int age) {
         if (block.getBlockData() instanceof Ageable) {
diff --git a/nms/v1_21_R2/src/main/java/com/qualityplus/assistant/base/nms/v1_21_R2.java b/nms/v1_21_R2/src/main/java/com/qualityplus/assistant/base/nms/v1_21_R2.java
@@ -47,6 +47,8 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -59,6 +61,13 @@
  */
 public final class v1_21_R2 extends AbstractNMS {
     private @Getter @Inject Plugin plugin;
+    private static Method metaSetProfileMethod;
+    private static Field metaProfileField;
+
+    @Override
+    public boolean isNewNBTAPIResolver() {
+        return true;
+    }
 
     @Override
     public void setBlockAge(final Block block, final int age) {
diff --git a/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java b/plugin/src/main/java/com/qualityplus/assistant/base/factory/NMSFactory.java
@@ -63,6 +63,7 @@ public final class NMSFactory {
             .put("1.21.3", MinecraftVersion.V1_21_R2)
             .build();
 
+    private static final String RECOGNIZED_MC_VERSION_MESSAGE = "Successfully recognized MC Version %s mapped with version %s";
     private static final String RECOGNIZED_VERSION_MESSAGE = "Successfully recognized Version %s";
     private static final String UNSUPPORTED_VERSION_MESSAGE = "Unsupported Version %s";
     private static final String DISABLING_PLUGIN_MESSAGE = "Disabling Plugin...";
@@ -118,13 +119,18 @@ public TabHandler configureTab() {
      * @return {@link MinecraftVersion}
      */
     private MinecraftVersion getMcVersion() {
-        final String version = Bukkit.getServer().getVersion();
+        final String[] versionSplit = Bukkit.getServer().getVersion().split("-");
 
-        for (final Map.Entry<String, MinecraftVersion> nmsEntry : NEW_NMS_VERSIONS.entrySet()) {
-            if (!version.startsWith(nmsEntry.getKey())) {
-                continue;
+        if (versionSplit.length > 1) {
+            for (final Map.Entry<String, MinecraftVersion> nmsEntry : NEW_NMS_VERSIONS.entrySet()) {
+                final String version = versionSplit[0];
+                if (!version.equals(nmsEntry.getKey())) {
+                    continue;
+                }
+                this.logger.info(String.format(RECOGNIZED_MC_VERSION_MESSAGE, version, nmsEntry.getValue()));
+
+                return nmsEntry.getValue();
             }
-            return nmsEntry.getValue();
         }
 
         final String nmsVersion = Bukkit.getServer().getClass()
diff --git a/plugin/src/main/java/com/qualityplus/assistant/util/itemstack/ItemStackUtils.java b/plugin/src/main/java/com/qualityplus/assistant/util/itemstack/ItemStackUtils.java
@@ -7,6 +7,8 @@
 import com.qualityplus.assistant.api.util.IPlaceholder;
 import com.qualityplus.assistant.inventory.Item;
 import com.qualityplus.assistant.util.StringUtils;
+import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.WordUtils;
 import org.bukkit.enchantments.Enchantment;
@@ -20,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -356,12 +359,33 @@ public void parseWrappedLore(final ItemStack itemStack, final LoreWrapper loreWr
 
     private ItemStack parseTexture(final ItemStack itemStack, final Item item) {
         try {
-            return TheAssistantPlugin.getAPI().getNms().setTexture(itemStack, item.getHeadData());
+            final String textureValue = item.getHeadData();
+            final UUID uuid = UUID.randomUUID();
+            if (TheAssistantPlugin.getAPI().getNms().isNewNBTAPIResolver()) {
+                NBT.modifyComponents(itemStack, nbt -> {
+                    final ReadWriteNBT profileNbt = nbt.getOrCreateCompound("minecraft:profile");
+                    profileNbt.setUUID("id", uuid);
+                    final ReadWriteNBT propertiesNbt = profileNbt.getCompoundList("properties").addCompound();
+                    propertiesNbt.setString("name", "textures");
+                    propertiesNbt.setString("value", textureValue);
+                });
+            } else {
+                NBT.modify(itemStack, nbt -> {
+                    final ReadWriteNBT skullOwnerCompound = nbt.getOrCreateCompound("SkullOwner");
+
+                    skullOwnerCompound.setUUID("Id", UUID.randomUUID());
+
+                    skullOwnerCompound.getOrCreateCompound("Properties")
+                            .getCompoundList("textures")
+                            .addCompound()
+                            .setString("Value", textureValue);
+                });
+            }
+            return itemStack;
         } catch (final NullPointerException e) {
             e.printStackTrace();
             return itemStack;
         }
-
     }
 
     private void parseEnchantment(final ItemStack itemStack, final Item item) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ plugins {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "com.github.r3back"`
`11`		`-version = "3.2.24"`
	`11`	`+version = "3.2.25"`
`12`	`12`
`13`	`13`	`ext.set("mojangUnmappedVersions", setOf("1_21_R2", "1_21_R1", "v1_20_R4", "v1_20_R3","v1_20_R2", "v1_20_R1", "v1_19_R1", "v1_19_R2", "v1_18_R1", "v1_18_R2", "v1_17_R1"))`
`14`	`14`