Merge pull request #599 from Ghost-chu/hikari

Ghost-chu · web-flow · commit 0719d6d7e514 · 2022-12-16T00:47:00.000+08:00
3.5.0.3
diff --git a/addon/discordsrv/pom.xml b/addon/discordsrv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>
diff --git a/compatibility/advancedregionmarket/pom.xml b/compatibility/advancedregionmarket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/bentobox/pom.xml b/compatibility/bentobox/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/bungeecord/pom.xml b/compatibility/bungeecord/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/clearlag/pom.xml b/compatibility/clearlag/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/common/pom.xml b/compatibility/common/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/griefprevention/pom.xml b/compatibility/griefprevention/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/lands/pom.xml b/compatibility/lands/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/nocheatplus/pom.xml b/compatibility/nocheatplus/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/openinv/pom.xml b/compatibility/openinv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/plotsquared/pom.xml b/compatibility/plotsquared/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/residence/pom.xml b/compatibility/residence/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/superiorskyblock/pom.xml b/compatibility/superiorskyblock/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/towny/pom.xml b/compatibility/towny/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/velocity/pom.xml b/compatibility/velocity/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/worldedit/pom.xml b/compatibility/worldedit/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/compatibility/worldguard/pom.xml b/compatibility/worldguard/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
diff --git a/platform/quickshop-platform-interface/pom.xml b/platform/quickshop-platform-interface/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-paper/pom.xml b/platform/quickshop-platform-paper/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-spigot-abstract/pom.xml b/platform/quickshop-platform-spigot-abstract/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-spigot-v1_18_R1/pom.xml b/platform/quickshop-platform-spigot-v1_18_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-spigot-v1_18_R2/pom.xml b/platform/quickshop-platform-spigot-v1_18_R2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-spigot-v1_19_R1/pom.xml b/platform/quickshop-platform-spigot-v1_19_R1/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/platform/quickshop-platform-spigot-v1_19_R2/pom.xml b/platform/quickshop-platform-spigot-v1_19_R2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.ghostchu</groupId>
     <artifactId>quickshop-hikari</artifactId>
-    <version>3.5.0.2</version>
+    <version>3.5.0.3</version>
     <packaging>pom</packaging>
     <name>quickshop-hikari</name>
     <description>Another QuickShop fork</description>
diff --git a/quickshop-api/pom.xml b/quickshop-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>quickshop-hikari</artifactId>
         <groupId>com.ghostchu</groupId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/quickshop-bukkit/pom.xml b/quickshop-bukkit/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
     </parent>
 
     <artifactId>quickshop-bukkit</artifactId>
diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/display/VirtualDisplayItem.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/shop/display/VirtualDisplayItem.java
@@ -370,34 +370,51 @@ private static PacketContainer createFakeItemMetaPacket(int entityID, ItemStack
             PacketContainer fakeItemMetaPacket = PROTOCOL_MANAGER.createPacket(PacketType.Play.Server.ENTITY_METADATA);
             //Entity ID
             fakeItemMetaPacket.getIntegers().write(0, entityID);
+
             //List<DataWatcher$Item> Type are more complex
             //Create a DataWatcher
             WrappedDataWatcher wpw = new WrappedDataWatcher();
             //https://wiki.vg/index.php?title=Entity_metadata#Entity
             if (PLUGIN.getConfig().getBoolean("shop.display-item-use-name")) {
-                String itemName;
-                if (QuickShop.isTESTING()) {
-                    //Env Testing
-                    itemName = itemStack.getType().name();
-                } else {
-                    itemName = GsonComponentSerializer.gson().serialize(Util.getItemStackName(itemStack));
-                }
-                wpw.setObject(2, WrappedDataWatcher.Registry.getChatComponentSerializer(true), Optional.of(WrappedChatComponent.fromJson(itemName).getHandle()));
+                String itemName = GsonComponentSerializer.gson().serialize(Util.getItemStackName(itemStack));
+                wpw.setObject(2, WrappedDataWatcher.Registry.getChatComponentSerializer(true), Optional.of(WrappedChatComponent.fromText(itemName).getHandle()));
                 wpw.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(3, WrappedDataWatcher.Registry.get(Boolean.class)), true);
             }
-            if (VERSION.ordinal() <= GameVersion.v1_19_R2.ordinal()) {
-                //Must in the certain slot:https://wiki.vg/Entity_metadata#Item
+
+            //Must in the certain slot:https://wiki.vg/Entity_metadata#Item
+            //Is 1.17-?
+            if (VERSION.ordinal() < GameVersion.v1_17_R1.ordinal()) {
+//                if (version == GameVersion.v1_13_R1 || version == GameVersion.v1_13_R2) {
+//                    //For 1.13 is 6
+//                    wpw.setObject(6, WrappedDataWatcher.Registry.getItemStackSerializer(false), itemStack);
+//                } else {
+                //1.14-1.16 is 7
+                wpw.setObject(7, WrappedDataWatcher.Registry.getItemStackSerializer(false), itemStack);
+                // }
+            } else {
+                //1.17+ is 8
                 wpw.setObject(8, WrappedDataWatcher.Registry.getItemStackSerializer(false), itemStack);
-                //Add it
-                fakeItemMetaPacket.getWatchableCollectionModifier().write(0, wpw.getWatchableObjects());
-                return fakeItemMetaPacket;
             }
-            List<WrappedWatchableObject> wrappedWatchableObjects = wpw.getWatchableObjects();
-            List<WrappedDataValue> wrappedDataValues = new java.util.ArrayList<>(wrappedWatchableObjects.size());
-            for (WrappedWatchableObject watchableObject : wrappedWatchableObjects) {
-                wrappedDataValues.set(watchableObject.getIndex(), new WrappedDataValue(watchableObject.getHandle()));
+            //Add it
+            //For 1.19.2+, we need to use DataValue instead of WatchableObject
+            if (VERSION.ordinal() > GameVersion.v1_19_R1.ordinal()) {
+                //Check for new version protocolLib
+                try {
+                    Class.forName("com.comphenix.protocol.wrappers.WrappedDataValue");
+                } catch (ClassNotFoundException e) {
+                    throw new RuntimeException("Unable to initialize packet, ProtocolLib update needed", e);
+                }
+                //Convert List<WrappedWatchableObject> to List<WrappedDataValue>
+                List<WrappedWatchableObject> wrappedWatchableObjects = wpw.getWatchableObjects();
+                List<WrappedDataValue> wrappedDataValues = new java.util.LinkedList<>();
+                for (WrappedWatchableObject wrappedWatchableObject : wrappedWatchableObjects) {
+                    WrappedDataWatcher.WrappedDataWatcherObject watchableObject = wrappedWatchableObject.getWatcherObject();
+                    wrappedDataValues.add(new WrappedDataValue(watchableObject.getIndex(), watchableObject.getSerializer(), wrappedWatchableObject.getRawValue()));
+                }
+                fakeItemMetaPacket.getDataValueCollectionModifier().write(0, wrappedDataValues);
+            } else {
+                fakeItemMetaPacket.getWatchableCollectionModifier().write(0, wpw.getWatchableObjects());
             }
-            fakeItemMetaPacket.getDataValueCollectionModifier().write(0, wrappedDataValues);
             return fakeItemMetaPacket;
         }
 
diff --git a/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java b/quickshop-bukkit/src/main/java/com/ghostchu/quickshop/util/envcheck/EnvironmentChecker.java
@@ -1,5 +1,6 @@
 package com.ghostchu.quickshop.util.envcheck;
 
+import com.comphenix.protocol.ProtocolLibrary;
 import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.api.GameVersion;
 import com.ghostchu.quickshop.api.shop.display.DisplayType;
@@ -291,4 +292,20 @@ public ResultContainer virtualDisplaySupportTest() {
             return new ResultContainer(CheckResult.PASSED, "Passed checks");
         }
     }
+
+    @EnvCheckEntry(name = "ProtocolLib Incorrect Locate Test", priority = 7)
+    public ResultContainer protocolLibBadLocateTest() {
+        try {
+            Class.forName("com.comphenix.protocol.ProtocolLibrary");
+        } catch (ClassNotFoundException e) {
+            return new ResultContainer(CheckResult.SKIPPED, "ProtocolLib not detected.");
+        }
+        String stringClassLoader = ProtocolLibrary.getProtocolManager().getClass().getClassLoader().toString();
+        if (stringClassLoader.contains("pluginEnabled=true") && !stringClassLoader.contains("plugin=ProtocolLib")) {
+            QuickShop.getInstance().getLogger().warning("Warning! ProtocolLib seems provided by another plugin, This seems to be a wrong packaging problem, " +
+                    "QuickShop can't ensure the ProtocolLib is working correctly! Info: " + stringClassLoader);
+            return new ResultContainer(CheckResult.WARNING, "Incorrect locate: " + stringClassLoader);
+        }
+        return new ResultContainer(CheckResult.PASSED, stringClassLoader);
+    }
 }
diff --git a/quickshop-common/pom.xml b/quickshop-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>quickshop-hikari</artifactId>
         <groupId>com.ghostchu</groupId>
-        <version>3.5.0.2</version>
+        <version>3.5.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
