fix: dependencies of npc module

theSimpleCloud · Sep 29, 2024 · 50ada35 · 50ada35
1 parent b6cd5fe
commit 50ada35
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 15 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -57,7 +57,7 @@ jobs:
         rm temp/modules/SimpleCloud-Chat+Tab.jar
         rm temp/modules/SimpleCloud-ServiceSelection.jar
         rm temp/modules/SimpleCloud-CloudFlare.jar
-#        rm temp/modules/SimpleCloud-Placeholders.jar
+        rm temp/modules/SimpleCloud-Placeholders.jar
     
     - name: Upload zip
       uses: actions/upload-artifact@v3

diff --git a/build.gradle b/build.gradle
@@ -70,6 +70,14 @@ allprojects {
             name 'spigotmc-repo'
             url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
         }
+
+        // packetevents
+        maven {
+            url "https://repo.codemc.io/repository/maven-releases/"
+            mavenContent {
+                includeGroup("com.github.retrooper")
+            }
+        }
     }
 
     project.ext {

diff --git a/settings.gradle b/settings.gradle
@@ -52,8 +52,8 @@ findProject(':simplecloud-modules:simplecloud-module-chat-tab')?.name = 'simplec
 include 'simplecloud-modules:simplecloud-module-statistics'
 findProject(':simplecloud-modules:simplecloud-module-statistics')?.name = 'simplecloud-module-statistics'
 include 'simplecloud-dependency-loader'
-//include 'simplecloud-modules:simplecloud-module-npc'
-//findProject(':simplecloud-modules:simplecloud-module-npc')?.name = 'simplecloud-module-npc'
-//include 'simplecloud-modules:simplecloud-module-placeholders'
-//findProject(':simplecloud-modules:simplecloud-module-placeholders')?.name = 'simplecloud-module-placeholders'
+include 'simplecloud-modules:simplecloud-module-npc'
+findProject(':simplecloud-modules:simplecloud-module-npc')?.name = 'simplecloud-module-npc'
+include 'simplecloud-modules:simplecloud-module-placeholders'
+findProject(':simplecloud-modules:simplecloud-module-placeholders')?.name = 'simplecloud-module-placeholders'
 
diff --git a/simplecloud-api/build.gradle b/simplecloud-api/build.gradle
@@ -22,7 +22,7 @@
 
 dependencies {
     testApi group: 'io.netty', name: 'netty-all', version: dependencyNettyVersion
-    testApi group: 'org.mockito', name: 'mockito-core', version: '2.1.0'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.14.0'
     compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.6.1'
     compileOnly(project(":simplecloud-runner"))
 

diff --git a/simplecloud-modules/simplecloud-module-npc/build.gradle b/simplecloud-modules/simplecloud-module-npc/build.gradle
@@ -22,20 +22,35 @@
 
 shadowJar {
     archiveFileName.set("SimpleCloud-NPC.jar")
+
+    relocate("net.kyori", "eu.thesimplecloud.simplecloud.relocate.net.kyori")
+    relocate("io.papermc.lib", "eu.thesimplecloud.simplecloud.relocate.paperlib")
+    relocate("io.leangen.geantyref", "eu.thesimplecloud.simplecloud.relocate.geantyref")
+    relocate("io.github.retrooper", "eu.thesimplecloud.simplecloud.relocate.io.packetevents")
+    relocate("com.github.retrooper", "eu.thesimplecloud.simplecloud.relocate.com.packetevents")
+    relocate("com.github.juliarn.npclib", "eu.thesimplecloud.simplecloud.relocate.com.github.juliarn.npclib")
+
+    dependencies {
+        exclude("plugin.yml")
+        // excludes the META-INF directory, module infos & html files of all dependencies
+        // this includes for example maven lib files & multi-release module-json files
+        exclude("META-INF/**", "**/*.html", "module-info.*")
+    }
 }
 
+
 dependencies {
     compileOnly project(":simplecloud-base")
     compileOnly project(":simplecloud-api")
     compileOnly project(":simplecloud-plugin")
     compileOnly project(":simplecloud-launcher")
 
-    compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
-    compileOnly 'com.github.retrooper.packetevents:spigot:b48a91bcee'
+    compileOnly 'org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT'
 
-    api 'io.github.juliarn:npc-lib-api:3.0.0-beta7'
-    api 'io.github.juliarn:npc-lib-common:3.0.0-beta7'
-    api 'io.github.juliarn:npc-lib-bukkit:3.0.0-beta7'
+    api 'io.github.juliarn:npc-lib-api:3.0.0-beta9'
+    api 'io.github.juliarn:npc-lib-common:3.0.0-beta9'
+    api 'io.github.juliarn:npc-lib-bukkit:3.0.0-beta9'
 
     api 'com.github.cryptomorin:XSeries:9.2.0'
 }
+
diff --git a/simplecloud-modules/simplecloud-module-npc/src/main/resources/plugin.yml b/simplecloud-modules/simplecloud-module-npc/src/main/resources/plugin.yml
@@ -6,4 +6,4 @@ main: eu.thesimplecloud.module.npc.plugin.NPCPlugin
 
 depend: [ SimpleCloud-Plugin ]
 
-api-version: 1.13
+api-version: 1.21
diff --git a/simplecloud-modules/simplecloud-module-permission/src/main/resources/plugin.yml b/simplecloud-modules/simplecloud-module-permission/src/main/resources/plugin.yml
@@ -6,6 +6,6 @@ main: eu.thesimplecloud.module.permission.service.spigot.SpigotPluginMain
 
 depend: [ SimpleCloud-Plugin ]
 
-api-version: 1.13
+api-version: 1.21
 
 commands:
diff --git a/simplecloud-modules/simplecloud-module-sign/src/main/resources/plugin.yml b/simplecloud-modules/simplecloud-module-sign/src/main/resources/plugin.yml
@@ -6,7 +6,7 @@ main: eu.thesimplecloud.module.sign.service.BukkitPluginMain
 
 depend: [ SimpleCloud-Plugin ]
 
-api-version: 1.13
+api-version: 1.21
 
 commands:
   cloudsigns:

diff --git a/simplecloud-plugin/src/main/resources/plugin.yml b/simplecloud-plugin/src/main/resources/plugin.yml
@@ -4,6 +4,6 @@ author: Wetterbericht
 
 main: eu.thesimplecloud.plugin.server.CloudSpigotPlugin
 
-api-version: 1.13
+api-version: 1.21
 
 commands: