diff --git a/Common/Source/build.gradle b/Common/Source/build.gradle index a1ee46d..c93a366 100644 --- a/Common/Source/build.gradle +++ b/Common/Source/build.gradle @@ -28,11 +28,6 @@ dependencies { shadowJar { archiveClassifier.set('') - - dependencies { - exclude 'dev/brighten/antivpn/depends/Relocate*' - exclude 'dev/brighten/antivpn/depends/MavenLibraries*' - } } tasks.build.dependsOn shadowJar diff --git a/Velocity/VelocityLoader/build.gradle b/Velocity/VelocityLoader/build.gradle index 74bc7d1..f3d5e95 100644 --- a/Velocity/VelocityLoader/build.gradle +++ b/Velocity/VelocityLoader/build.gradle @@ -11,6 +11,12 @@ dependencies { implementation 'org.bstats:bstats-velocity:2.2.1' } +tasks.processResources { + filesMatching('velocity-plugin.json') { + expand(projectVersion: project.version) + } +} + shadowJar { archiveClassifier.set('') @@ -28,3 +34,7 @@ tasks.named('shadowJar') { } tasks.build.dependsOn shadowJar + +jar { + archiveClassifier.set('raw') +} diff --git a/Velocity/VelocityLoader/src/main/resources/velocity-plugin.json b/Velocity/VelocityLoader/src/main/resources/velocity-plugin.json index d23d87a..df1020e 100644 --- a/Velocity/VelocityLoader/src/main/resources/velocity-plugin.json +++ b/Velocity/VelocityLoader/src/main/resources/velocity-plugin.json @@ -1 +1 @@ -{"id":"kaurivpn","name":"KauriVPN","version":"${project.version}","authors":["funkemunky"],"dependencies":[],"main":"dev.brighten.antivpn.velocity.VelocityPluginLoader"} +{"id":"kaurivpn","name":"KauriVPN","version":"${projectVersion}","authors":["funkemunky"],"dependencies":[],"main":"dev.brighten.antivpn.velocity.VelocityPluginLoader"} diff --git a/build.gradle b/build.gradle index 9e7e0cf..ccedeff 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ def aggregateTestProjects = [ allprojects { group = 'dev.brighten.antivpn' - version = '1.10.1' + version = '1.10.1.1' repositories { maven { url 'https://repo.papermc.io/repository/maven-public/' } @@ -76,7 +76,6 @@ evaluationDependsOn(':Bungee:BungeeLoader') dependencies { implementation project(':Bukkit:Loader') - implementation project(':Velocity:VelocityLoader') implementation project(':Bungee:BungeeLoader') } @@ -87,6 +86,10 @@ shadowJar { from(project(':Common:Source').tasks.shadowJar) { rename { 'antivpn-source.jarinjar' } } + + from({ + zipTree(project(':Velocity:VelocityLoader').tasks.shadowJar.archiveFile.get().asFile) + }) } tasks.named('shadowJar') {