Abstract Packet System (#1839)

* update translations manually to reset crowdin * Update typo in worldguard compatibility. * Remove outdated platform spec. * Initialize PacketHandler interface. * Implemented PacketHandler API for 1.21. - This adds a PacketHandler and PacketFactory class. - This also adds two new events for when the handler is loaded and initialized which are cancellable. - Everything is implemented except for the chunk load/unload listener. * Finish Adding new Packet System. * Update poms that were modified in merge. * Update poms that were modified in merge. * Update TNEConversion
QuickShop-Community · Jan 27, 2025 · 58d8e46 · 58d8e46
1 parent 4f93811
commit 58d8e46
Show file tree

Hide file tree

Showing 117 changed files with 1,746 additions and 2,288 deletions.
diff --git a/.changelog/6.2.0.9.md b/.changelog/6.2.0.9.md
@@ -0,0 +1,34 @@
+# 6.2.0.9
+
+## Major Changes
+
+### Introduction of the Revamped Packet System
+1. **About**:
+    - A modular and scalable system for managing packets related to virtual display items in Minecraft.
+    - Supports both ProtocolLib and PacketEvents libraries for greater flexibility.
+
+2. **Custom Packet Factories**:
+    - Modular implementation of `PacketFactory` for game versions 1.20.x and 1.21.x.
+    - Packet types:
+        - **Spawn Packet**: Spawns a virtual item entity at a specific location.
+        - **Metadata Packet**: Updates the visual properties of virtual items.
+        - **Velocity Packet**: Adds motion/velocity to entities (currently optional).
+        - **Destroy Packet**: Removes the entity from the client view.
+
+4. **Error Handling and Logging**:
+    - Enhanced debug logs to trace packet-related issues.
+    - Detailed error messages for missing factories or unregistered listeners.
+
+#### Improvements:
+- Better modular design to facilitate support for future Minecraft versions.
+
+#### Deprecations:
+- Legacy packet handling mechanisms replaced with this new Packet System.
+
+## Minor Changes
+
+## Fixes
+- readded the /qs history permissions to the default quickshop.player
+
+## Version Changes
+- Removed support for 1.18 and 1.19. These versions had minimal usage.
diff --git a/.gitignore b/.gitignore
@@ -119,4 +119,4 @@ run/
 .run
 /${rootDir}/
 .${rootDir}/
-.paper-nms/
+/.paper-nms/
diff --git a/addon/bluemap/pom.xml b/addon/bluemap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/...rc/main/java/com/ghostchu/quickshop/addon/discordsrv/listener/QuickShopEventListener.java b/...rc/main/java/com/ghostchu/quickshop/addon/discordsrv/listener/QuickShopEventListener.java
@@ -5,11 +5,11 @@
 import com.ghostchu.quickshop.addon.discordsrv.bean.NotificationFeature;
 import com.ghostchu.quickshop.addon.discordsrv.database.DiscordDatabaseHelper;
 import com.ghostchu.quickshop.addon.discordsrv.wrapper.JDAWrapper;
-import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.event.details.ShopOwnershipTransferEvent;
 import com.ghostchu.quickshop.api.event.details.ShopPlayerGroupSetEvent;
 import com.ghostchu.quickshop.api.event.details.ShopPriceChangeEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.obj.QUser;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.obj.QUserImpl;

diff --git a/...cordsrv/src/main/java/com/ghostchu/quickshop/addon/discordsrv/message/MessageFactory.java b/...cordsrv/src/main/java/com/ghostchu/quickshop/addon/discordsrv/message/MessageFactory.java
@@ -1,12 +1,12 @@
 package com.ghostchu.quickshop.addon.discordsrv.message;
 
 import com.ghostchu.quickshop.QuickShop;
-import com.ghostchu.quickshop.api.event.modification.ShopCreateEvent;
-import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.event.details.ShopOwnershipTransferEvent;
 import com.ghostchu.quickshop.api.event.details.ShopPlayerGroupSetEvent;
 import com.ghostchu.quickshop.api.event.details.ShopPriceChangeEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopCreateEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.obj.QUser;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.common.util.CommonUtil;

diff --git a/addon/discount/pom.xml b/addon/discount/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>
@@ -65,11 +65,5 @@
             <version>${depend.commons.lang3}</version>
             <scope>provided</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>net.kyori</groupId>-->
-        <!--            <artifactId>adventure-text-serializer-plain</artifactId>-->
-        <!--            <version>4.12.0</version>-->
-        <!--            <scope>provided</scope>-->
-        <!--        </dependency>-->
     </dependencies>
 </project>
diff --git a/...n/discount/src/main/java/com/ghostchu/quickshop/addon/discount/listener/MainListener.java b/...n/discount/src/main/java/com/ghostchu/quickshop/addon/discount/listener/MainListener.java
@@ -3,8 +3,8 @@
 import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.addon.discount.DiscountCode;
 import com.ghostchu.quickshop.addon.discount.Main;
-import com.ghostchu.quickshop.api.event.general.ShopInfoPanelEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopPurchaseEvent;
+import com.ghostchu.quickshop.api.event.general.ShopInfoPanelEvent;
 import com.ghostchu.quickshop.api.obj.QUser;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.util.Util;

diff --git a/addon/displaycontrol/pom.xml b/addon/displaycontrol/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>
@@ -64,11 +64,5 @@
             <version>${depend.commons.lang3}</version>
             <scope>provided</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>net.kyori</groupId>-->
-        <!--            <artifactId>adventure-text-serializer-plain</artifactId>-->
-        <!--            <version>4.12.0</version>-->
-        <!--            <scope>provided</scope>-->
-        <!--        </dependency>-->
     </dependencies>
 </project>
diff --git a/addon/dynmap/pom.xml b/addon/dynmap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/dynmap/src/main/java/com/ghostchu/quickshop/addon/dynmap/Main.java b/addon/dynmap/src/main/java/com/ghostchu/quickshop/addon/dynmap/Main.java
@@ -2,14 +2,14 @@
 
 import com.ghostchu.quickshop.QuickShop;
 import com.ghostchu.quickshop.api.event.QSConfigurationReloadEvent;
-import com.ghostchu.quickshop.api.event.modification.ShopCreateSuccessEvent;
-import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.event.details.ShopItemChangeEvent;
 import com.ghostchu.quickshop.api.event.details.ShopNamingEvent;
 import com.ghostchu.quickshop.api.event.details.ShopOwnershipTransferEvent;
 import com.ghostchu.quickshop.api.event.details.ShopPriceChangeEvent;
-import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
 import com.ghostchu.quickshop.api.event.details.ShopTypeChangeEvent;
+import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopCreateSuccessEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopDeleteEvent;
 import com.ghostchu.quickshop.api.localization.text.TextManager;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.api.shop.ShopType;

diff --git a/addon/limited/pom.xml b/addon/limited/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>
@@ -65,11 +65,5 @@
             <version>${depend.commons.lang3}</version>
             <scope>provided</scope>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>net.kyori</groupId>-->
-        <!--            <artifactId>adventure-text-serializer-plain</artifactId>-->
-        <!--            <version>4.12.0</version>-->
-        <!--            <scope>provided</scope>-->
-        <!--        </dependency>-->
     </dependencies>
 </project>
diff --git a/addon/limited/src/main/java/com/ghostchu/quickshop/addon/limited/Main.java b/addon/limited/src/main/java/com/ghostchu/quickshop/addon/limited/Main.java
@@ -4,9 +4,9 @@
 import com.ghostchu.quickshop.addon.limited.command.SubCommand_Limit;
 import com.ghostchu.quickshop.api.command.CommandContainer;
 import com.ghostchu.quickshop.api.event.CalendarEvent;
-import com.ghostchu.quickshop.api.event.modification.ShopClickEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopPurchaseEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopClickEvent;
 import com.ghostchu.quickshop.api.localization.text.Text;
 import com.ghostchu.quickshop.api.shop.Shop;
 import com.ghostchu.quickshop.util.Util;
@@ -133,7 +133,7 @@ public void scheduleEvent(final CalendarEvent event) {
           shop.setExtra(this, manager);
           Log.debug("Limit data has been reset. Shop -> " + shop);
         }
-      } catch(IllegalArgumentException ignored) {
+      } catch(final IllegalArgumentException ignored) {
         Log.debug("Limit data failed to reset. Shop -> " + shop + " type " + manager.getString("period") + " not exists.");
         manager.set("period", null);
         shop.setExtra(this, manager);

diff --git a/addon/list/pom.xml b/addon/list/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/plan/pom.xml b/addon/plan/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/reremake-migrator/pom.xml b/addon/reremake-migrator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/shopitemonly/pom.xml b/addon/shopitemonly/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
@@ -34,6 +34,10 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>jitpack</id>
+            <url>https://jitpack.io</url>
+        </repository>
         <repository>
             <id>alex9849</id>
             <url>https://nexus.alex9849.net/repository/maven-releases/</url>

diff --git a/compatibility/angelchest/pom.xml b/compatibility/angelchest/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/bungeecord-geyser/pom.xml b/compatibility/bungeecord-geyser/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/chestprotect/pom.xml b/compatibility/chestprotect/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/compatibility/ecoenchants/pom.xml b/compatibility/ecoenchants/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/...lity/ecoenchants/src/main/java/com/ghostchu/quickshop/compatibility/ecoenchants/Main.java b/...lity/ecoenchants/src/main/java/com/ghostchu/quickshop/compatibility/ecoenchants/Main.java
@@ -1,8 +1,8 @@
 package com.ghostchu.quickshop.compatibility.ecoenchants;
 
 import com.ghostchu.quickshop.QuickShop;
-import com.ghostchu.quickshop.api.event.display.ItemPreviewComponentPrePopulateEvent;
 import com.ghostchu.quickshop.api.event.QSConfigurationReloadEvent;
+import com.ghostchu.quickshop.api.event.display.ItemPreviewComponentPrePopulateEvent;
 import com.ghostchu.quickshop.compatibility.CompatibilityModule;
 import com.ghostchu.quickshop.util.logger.Log;
 import com.willfp.eco.core.display.DisplayProperties;

diff --git a/compatibility/elitemobs/pom.xml b/compatibility/elitemobs/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>
@@ -35,6 +35,14 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>sonatype-snapshot</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
         <repository>
             <id>magmaguy-repo-releases</id>
             <name>MagmaGuy's Repository</name>

diff --git a/...tibility/elitemobs/src/main/java/com/ghostchu/quickshop/compatibility/elitemobs/Main.java b/...tibility/elitemobs/src/main/java/com/ghostchu/quickshop/compatibility/elitemobs/Main.java
@@ -1,9 +1,9 @@
 package com.ghostchu.quickshop.compatibility.elitemobs;
 
 import com.ghostchu.quickshop.QuickShop;
-import com.ghostchu.quickshop.api.event.modification.ShopCreateEvent;
 import com.ghostchu.quickshop.api.event.details.ShopItemChangeEvent;
 import com.ghostchu.quickshop.api.event.economy.ShopPurchaseEvent;
+import com.ghostchu.quickshop.api.event.modification.ShopCreateEvent;
 import com.ghostchu.quickshop.api.obj.QUser;
 import com.ghostchu.quickshop.compatibility.CompatibilityModule;
 import com.magmaguy.elitemobs.api.utils.EliteItemManager;

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>6.2.0.8</version>
+        <version>6.2.0.9-SNAPSHOT-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>