Merge pull request #50 from myth-MC/dev/0.6.8

U8092 · web-flow · commit 468f060c367c · 2024-11-28T20:37:14.000+01:00
0.6.8
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.6.7
+0.6.8
diff --git a/api-bukkit/pom.xml b/api-bukkit/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>0.6.7</version>
+        <version>0.6.8</version>
     </parent>
 
     <artifactId>banco-api-bukkit</artifactId>
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>0.6.7</version>
+        <version>0.6.8</version>
     </parent>
 
     <artifactId>banco-api</artifactId>
diff --git a/platform-bukkit/pom.xml b/platform-bukkit/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>0.6.7</version>
+        <version>0.6.8</version>
     </parent>
 
     <artifactId>banco-platform-bukkit</artifactId>
@@ -19,50 +19,6 @@
 
     <build>
         <finalName>${project.parent.name}-legacy-${project.parent.version}</finalName>
-        <defaultGoal>clean package</defaultGoal>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
-
-                <configuration>
-                    <relocations>
-                        <relocation>
-                            <pattern>de.exlll</pattern>
-                            <shadedPattern>ovh.mythmc.banco.libs.de.exlll</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.snakeyaml</pattern>
-                            <shadedPattern>ovh.mythmc.banco.libs.org.snakeyaml</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>ovh.mythmc.banco.libs.org.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>net.kyori</pattern>
-                            <shadedPattern>ovh.mythmc.banco.libs.net.kyori</shadedPattern>
-                        </relocation>
-                    </relocations>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
     </build>
 
     <repositories>
@@ -86,16 +42,11 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.kyori</groupId>
-            <artifactId>adventure-api</artifactId>
-            <version>4.17.0</version>
-        </dependency>
-
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bukkit</artifactId>
             <version>4.3.2</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
diff --git a/platform-bukkit/src/main/java/ovh/mythmc/banco/bukkit/BancoBukkit.java b/platform-bukkit/src/main/java/ovh/mythmc/banco/bukkit/BancoBukkit.java
@@ -75,9 +75,6 @@ public void enable() {
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI"))
             new BancoPlaceholderExpansion();
 
-        vaultImpl = new BancoVaultHook();
-        vaultImpl.hook(getPlugin());
-
         new BancoHelperImpl(); // BancoHelper.get()
 
         adventure = BukkitAudiences.create(getPlugin());
diff --git a/platform-bukkit/src/main/resources/plugin.yml b/platform-bukkit/src/main/resources/plugin.yml
@@ -6,10 +6,12 @@ api-version: 1.20
 main: ovh.mythmc.banco.bukkit.BancoBukkitPlugin
 softdepend: [ PlaceholderAPI, social ]
 loadbefore:
-  - Essentials
-  - CMI
-  - Towny
-depend: [ Vault ]
+  - Vault
+
+libraries:
+  - net.kyori:adventure-api:4.17.0
+  - net.kyori:adventure-platform-bukkit:4.3.4
+  - net.kyori:adventure-text-minimessage:4.17.0
 
 commands:
   banco:
diff --git a/platform-common/pom.xml b/platform-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>0.6.7</version>
+        <version>0.6.8</version>
     </parent>
 
     <artifactId>banco-common</artifactId>
@@ -54,7 +54,7 @@
         <dependency> <!-- change once 0.3 is released -->
             <groupId>com.github.myth-MC.social</groupId>
             <artifactId>social-api</artifactId>
-            <version>c8c2ce2</version>
+            <version>d4d47ff</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/platform-common/src/main/java/ovh/mythmc/banco/common/hooks/BancoVaultHook.java b/platform-common/src/main/java/ovh/mythmc/banco/common/hooks/BancoVaultHook.java
@@ -39,14 +39,6 @@ public void error(final String message, final Object... args) {
     public void hook(Plugin plugin) {
         Bukkit.getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, this, plugin, ServicePriority.Highest);
         logger.info("Hooked with Vault " + Bukkit.getPluginManager().getPlugin("Vault").getDescription().getVersion());
-        /*
-        try {
-            Class.forName("net.milkbowl.vault.economy.Economy");
-            Bukkit.getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, this, plugin, ServicePriority.Highest);
-            logger.info("Hooked with Vault " + Bukkit.getPluginManager().getPlugin("Vault").getDescription().getVersion());
-        } catch (ClassNotFoundException ignored) {
-            logger.error("Vault not found");
-        } */
     }
 
     public void unhook() {
diff --git a/platform-paper/pom.xml b/platform-paper/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>0.6.7</version>
+        <version>0.6.8</version>
     </parent>
 
     <artifactId>banco-platform-paper</artifactId>
diff --git a/platform-paper/src/main/resources/paper-plugin.yml b/platform-paper/src/main/resources/paper-plugin.yml
@@ -11,7 +11,7 @@ folia-supported: true
 dependencies:
   server:
     Vault:
-      load: BEFORE
+      load: AFTER
       required: true
       join-classpath: true
     PlaceholderAPI:
@@ -26,15 +26,6 @@ dependencies:
       load: OMIT
       required: false
       join-classpath: true
-    Essentials:
-      load: AFTER
-      required: false
-    CMI:
-      load: AFTER
-      required: false
-    Towny:
-      load: AFTER
-      required: false
 
 permissions:
   banco.user:
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ovh.mythmc</groupId>
     <artifactId>banco</artifactId>
-    <version>0.6.7</version>
+    <version>0.6.8</version>
     <packaging>pom</packaging>
 
     <modules>
