Merge branch 'Gecolay:main' into main

Winds-Studio · Mar 27, 2024 · 70afd87 · 70afd87
2 parents 0b7ec09 + 9ebc63f
commit 70afd87
Show file tree

Hide file tree

Showing 16 changed files with 132 additions and 112 deletions.
diff --git a/core/src/main/java/dev/geco/gsit/GSitMain.java b/core/src/main/java/dev/geco/gsit/GSitMain.java
@@ -322,8 +322,9 @@ private boolean connectDatabase(CommandSender Sender) {
     private boolean versionCheck() {
 
         boolean baseMissing = !supportsSpigotMountFeature() && !supportsBukkitMountFeature();
+        boolean internalMissing = !getSVManager().isAvailable();
 
-        if(baseMissing || !getSVManager().isNewerOrVersion(13, 0) || (getSVManager().isNewerOrVersion(17, 0) && !getSVManager().hasPackageClass("objects.SeatEntity"))) {
+        if(baseMissing || !getSVManager().isNewerOrVersion(13, 0) || (getSVManager().isNewerOrVersion(17, 0) && internalMissing)) {
 
             getMManager().sendMessage(Bukkit.getConsoleSender(), "Plugin.plugin-version", "%Version%", baseMissing ? "outdated-server" : getSVManager().getServerVersion());
 

diff --git a/core/src/main/java/dev/geco/gsit/manager/SVManager.java b/core/src/main/java/dev/geco/gsit/manager/SVManager.java
@@ -10,9 +10,11 @@ public class SVManager {
 
     private final GSitMain GPM;
 
-    private final String SERVER_VERSION;
+    private final String LATEST = "v1_20_3";
 
-    public final String PACKAGE_PATH;
+    private final String SERVER_VERSION;
+    private String PACKAGE_PATH;
+    private boolean AVAILABLE = true;
 
     protected final HashMap<String, String> VERSION_MAPPING = new HashMap<>(); {
 
@@ -26,15 +28,19 @@ public SVManager(GSitMain GPluginMain) {
         GPM = GPluginMain;
         String version = Bukkit.getServer().getBukkitVersion();
         SERVER_VERSION = version.substring(0, version.indexOf('-'));
-        PACKAGE_PATH = GPM.getClass().getPackage().getName() + ".mcv." + getPackageVersion() + ".";
+        PACKAGE_PATH = GPM.getClass().getPackage().getName() + ".mcv." + getPackageVersion();
+        if(hasPackageClass("objects.SeatEntity")) return;
+        PACKAGE_PATH += "_m";
+        if(hasPackageClass("objects.SeatEntity")) return;
+        PACKAGE_PATH = GPM.getClass().getPackage().getName() + ".mcv." + LATEST;
+        if(hasPackageClass("objects.SeatEntity")) return;
+        PACKAGE_PATH += "_m";
+        if(!hasPackageClass("objects.SeatEntity")) AVAILABLE = false;
     }
 
     public String getServerVersion() { return SERVER_VERSION; }
 
-    public String getPackageVersion() {
-        String package_version = "v" + SERVER_VERSION.replace(".", "_");
-        return VERSION_MAPPING.getOrDefault(package_version, package_version);
-    }
+    public boolean isAvailable() { return AVAILABLE; }
 
     public boolean isNewerOrVersion(int Version, int SubVersion) {
         String[] version = SERVER_VERSION.split("\\.");
@@ -48,7 +54,7 @@ public boolean isVersion(int Version, int SubVersion) {
 
     public Object getPackageObject(String ClassName, Object... Objects) {
         try {
-            Class<?> mcvClass = Class.forName(PACKAGE_PATH + ClassName);
+            Class<?> mcvClass = Class.forName(PACKAGE_PATH + "." + ClassName);
             if(Objects.length == 0) return mcvClass.getConstructor().newInstance();
             Class<?>[] classes = Arrays.stream(Objects).map(Object::getClass).toArray(Class<?>[]::new);
             return mcvClass.getConstructor(classes).newInstance(Objects);
@@ -58,10 +64,15 @@ public Object getPackageObject(String ClassName, Object... Objects) {
 
     public boolean hasPackageClass(String ClassName) {
         try {
-            Class.forName(PACKAGE_PATH + ClassName);
+            Class.forName(PACKAGE_PATH + "." + ClassName);
             return true;
         } catch (Throwable ignored) { }
         return false;
     }
 
+    private String getPackageVersion() {
+        String package_version = "v" + SERVER_VERSION.replace(".", "_");
+        return VERSION_MAPPING.getOrDefault(package_version, package_version);
+    }
+
 }
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -106,6 +106,11 @@
             <artifactId>v1_20_3</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>dev.geco.gsit</groupId>
+            <artifactId>v1_20_3_m</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -55,6 +55,7 @@
         <module>v1_20</module>
         <module>v1_20_2</module>
         <module>v1_20_3</module>
+        <module>v1_20_3_m</module>
         <module>dist</module>
     </modules>
 

diff --git a/v1_17/pom.xml b/v1_17/pom.xml
@@ -43,6 +43,11 @@
                                     <pattern>${project.groupId}.mcv.x</pattern>
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

diff --git a/v1_17_1/pom.xml b/v1_17_1/pom.xml
@@ -43,6 +43,11 @@
                                     <pattern>${project.groupId}.mcv.x</pattern>
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

diff --git a/v1_18/pom.xml b/v1_18/pom.xml
@@ -44,8 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_18_2/pom.xml b/v1_18_2/pom.xml
@@ -44,12 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_19/pom.xml b/v1_19/pom.xml
@@ -44,12 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_19_1/pom.xml b/v1_19_1/pom.xml
@@ -44,12 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_19_3/pom.xml b/v1_19_3/pom.xml
@@ -44,16 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_19_4/pom.xml b/v1_19_4/pom.xml
@@ -44,20 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R2</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_20/pom.xml b/v1_20/pom.xml
@@ -44,24 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R2</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R3</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_20_2/pom.xml b/v1_20_2/pom.xml
@@ -44,24 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R2</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R3</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>

diff --git a/v1_20_3/pom.xml b/v1_20_3/pom.xml
@@ -44,28 +44,9 @@
                                     <shadedPattern>${project.groupId}.mcv.${project.artifactId}</shadedPattern>
                                 </relocation>
                                 <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_17_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_18_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R1</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R2</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_19_R3</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.bukkit.craftbukkit.v1_20_R2</pattern>
-                                    <shadedPattern>org.bukkit.craftbukkit.${mcv.version}</shadedPattern>
+                                    <pattern>org/bukkit/craftbukkit/v1_[^/]+/</pattern>
+                                    <shadedPattern>org/bukkit/craftbukkit/${mcv.version}/</shadedPattern>
+                                    <rawString>true</rawString>
                                 </relocation>
                             </relocations>
                         </configuration>