MV5

.github/workflows/generic.checkstyle.yml

@@ -8,11 +8,15 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
+      pull-requests: write
+    continue-on-error: true
     steps:
       - uses: actions/checkout@v3
 
       - uses: dbelyaev/[email protected]
+        continue-on-error: true
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           checkstyle_version: 10.12.2
           checkstyle_config: ./config/mv_checks.xml
+          level: warning

.github/workflows/generic.github_release.yml

@@ -49,7 +49,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 

.github/workflows/generic.test.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 

build.gradle

@@ -1,122 +1,108 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'org.mvplugins.multiverse-plugin' version '1.0.2'
+    id 'org.mvplugins.kotlin-test-only' version '1.0.2'
 }
 
-version = System.getenv('GITHUB_VERSION') ?: 'local'
-group = 'com.onarandombox.multiversecore'
+group = 'org.mvplugins.multiverse.core'
 description = 'Multiverse-Core'
 
-java.sourceCompatibility = JavaVersion.VERSION_11
-
 repositories {
-    mavenLocal()
-    mavenCentral()
-
     maven {
-        url = uri('https://hub.spigotmc.org/nexus/content/repositories/snapshots/')
+        name = 'aikar repo'
+        url = uri('https://repo.aikar.co/content/groups/aikar/')
     }
 
     maven {
-        url = uri('https://repo.onarandombox.com/content/groups/public')
+        name = 'glaremasters repo'
+        url = 'https://repo.glaremasters.me/repository/towny/'
     }
 
     maven {
-        url = uri('https://hub.spigotmc.org/nexus/content/groups/public/')
+        name = "helpchatRepoReleases"
+        url = uri("https://repo.helpch.at/releases/")
     }
+}
 
-    maven {
-        url = uri('https://jitpack.io')
-    }
+configure(apiDependencies) {
+    serverApiVersion = '1.18.2-R0.1-SNAPSHOT'
+    mockBukkitServerApiVersion = '1.21'
+}
 
-    maven {
-        url = uri('https://repo.minebench.de/')
+dependencies {
+    // Economy
+    externalPlugin('com.github.MilkBowl:VaultAPI:1.7.1') {
+        exclude group: 'org.bukkit', module: 'bukkit'
     }
 
-    maven {
-        url = uri('https://repo.maven.apache.org/maven2/')
-    }
-}
+    // PlaceholderAPI
+    externalPlugin 'me.clip:placeholderapi:2.11.6'
 
-dependencies {
-    implementation 'org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT'
+    // Command Framework
+    shadowed 'co.aikar:acf-paper:0.5.1-SNAPSHOT'
 
-    implementation('com.github.MilkBowl:VaultAPI:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
+    // Config
+    shadowed('io.github.townyadvanced.commentedconfiguration:CommentedConfiguration:1.0.1') {
+        exclude group: 'org.spigotmc', module: 'spigot-api'
     }
 
-    compileOnly('me.main__.util:SerializationConfig:1.7') {
-        exclude group: 'org.bukkit', module: 'bukkit'
+    // Utils
+    shadowed 'io.vavr:vavr:0.10.4'
+    shadowed 'org.glassfish.hk2:hk2-locator:3.0.3'
+    shadowed('org.glassfish.hk2:hk2-inhabitant-generator:3.0.3') {
+        exclude group: 'org.apache.maven', module: 'maven-core'
     }
-    compileOnly('com.pneumaticraft.commandhandler:CommandHandler:11') {
-        exclude group: 'org.bukkit', module: 'bukkit'
+    shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
-    compileOnly 'com.dumptruckman.minecraft:buscript:2.0-SNAPSHOT'
-    compileOnly 'org.bstats:bstats-bukkit:2.2.1'
-    compileOnly('com.dumptruckman.minecraft:Logging:1.1.1') {
-        exclude group: 'junit', module: 'junit'
+    shadowed 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
+    shadowed('org.bstats:bstats-bukkit:3.1.0') {
+        exclude group: 'org.bukkit', module: 'bukkit'
     }
-    compileOnly 'de.themoep.idconverter:mappings:1.2-SNAPSHOT'
-    compileOnly 'org.jetbrains:annotations:16.0.2'
+    shadowed 'net.minidev:json-smart:2.4.9'
+    shadowed 'org.jetbrains:annotations:22.0.0'
+    shadowed 'io.papermc:paperlib:1.0.8'
 
-    testImplementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT'
+    // Tests
     testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'commons-io:commons-io:2.4'
 }
 
+ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
 
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-}
-
-tasks.withType(Javadoc) {
-    options.encoding = 'UTF-8'
+task prepareSource(type: Sync) {
+    inputs.property 'bitlyAccessToken', bitlyAccessToken
+    from sourceSets.main.java
+    into "$buildDir/src"
+    filter(ReplaceTokens, tokens: [
+            'bitly-access-token': bitlyAccessToken,
+    ])
 }
 
-
-configurations {
-    [apiElements, runtimeElements].each {
-        it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
-        it.outgoing.artifact(shadowJar)
-    }
-
-    testCompileOnly.extendsFrom compileOnly
-    testRuntimeOnly.extendsFrom testCompileOnly
-
-    shadowed.extendsFrom compileOnly {
-        canBeResolved = true
-    }
+shadowJar {
+    relocate 'co.aikar', 'org.mvplugins.multiverse.external.acf'
+    relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.core.utils.CoreLogging'
+    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.core.utils.DebugFileLogger'
+    relocate 'de.themoep.idconverter', 'org.mvplugins.multiverse.external.idconverter'
+    relocate 'io.github.townyadvanced.commentedconfiguration', 'org.mvplugins.multiverse.external.commentedconfiguration'
+    relocate 'org.bstats', 'org.mvplugins.multiverse.external.bstats'
+    relocate 'com.sun', 'org.mvplugins.multiverse.external.sun'
+    relocate 'net.minidev', 'org.mvplugins.multiverse.external.minidev'
+    relocate 'org.objectweb', 'org.mvplugins.multiverse.external.objectweb'
+    relocate 'io.vavr', 'org.mvplugins.multiverse.external.vavr'
+    relocate 'jakarta', 'org.mvplugins.multiverse.external.jakarta'
+    relocate 'javassist', 'org.mvplugins.multiverse.external.javassist'
+    relocate 'org.aopalliance', 'org.mvplugins.multiverse.external.aopalliance'
+    relocate 'org.glassfish', 'org.mvplugins.multiverse.external.glassfish'
+    relocate 'org.jvnet', 'org.mvplugins.multiverse.external.jvnet'
+    relocate 'org.intellij', 'org.mvplugins.multiverse.external.intellij'
+    relocate 'org.jetbrains', 'org.mvplugins.multiverse.external.jetbrains'
+    relocate 'io.papermc.lib', 'org.mvplugins.multiverse.external.paperlib'
 }
 
 publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            pom.withXml {
-                asNode().dependencies.'*'.findAll() {
-                    it.scope.text() == 'runtime'  && project.configurations.implementation.allDependencies.find { dep ->
-                        dep.name == it.artifactId.text()
-                    }
-                }.each() {
-                    it.scope*.value = 'provided'
-                }
-            }
-        }
-    }
     repositories {
         maven {
             name = "GitHubPackages"
@@ -126,69 +112,12 @@ publishing {
                 password = System.getenv("GITHUB_TOKEN")
             }
         }
+
         maven {
-            name = "multiverse"
-            def releasesRepoUrl = "https://repo.dumptruckman.com/multiverse-releases"
-            def snapshotsRepoUrl = "https://repo.dumptruckman.com/multiverse-snapshots"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            // todo: remove before mv5 release
+            name = "multiverseBeta"
+            url = "https://repo.c0ding.party/multiverse-beta"
             credentials(PasswordCredentials)
         }
     }
 }
-
-
-ext.bitlyAccessToken = System.getenv('BITLY_ACCESS_TOKEN') ?: 'bitly-access-token'
-
-task prepareSource(type: Sync) {
-    inputs.property 'bitlyAccessToken', bitlyAccessToken
-    from sourceSets.main.java
-    into "$buildDir/src"
-    filter(ReplaceTokens, tokens: [
-            'bitly-access-token': bitlyAccessToken,
-    ])
-}
-
-compileJava {
-    source = prepareSource.outputs
-}
-
-processResources {
-    def props = [version: "${project.version}"]
-    inputs.properties props
-    filteringCharset 'UTF-8'
-    filesMatching('plugin.yml') {
-        expand props
-    }
-
-    // This task should never be skipped. The tests depend on this having been run but we want the new version number
-    // that is created after tests are run and before we run again to publish.
-    outputs.upToDateWhen { false }
-}
-
-
-javadoc {
-    source = sourceSets.main.allJava
-    classpath = configurations.compileClasspath
-}
-
-
-project.configurations.api.canBeResolved = true
-
-shadowJar {
-    relocate 'me.main__.util', 'com.onarandombox.serializationconfig'
-    relocate 'com.pneumaticraft.commandhandler', 'com.onarandombox.commandhandler'
-    relocate 'buscript', 'com.onarandombox.buscript'
-    relocate 'org.bstats', 'com.onarandombox.bstats'
-    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.MultiverseCore.utils.CoreLogging'
-    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.MultiverseCore.utils.DebugFileLogger'
-    relocate 'org.codehaus.jettison', 'com.onarandombox.jettison'
-    relocate 'de.themoep.idconverter', 'com.onarandombox.idconverter'
-
-    configurations = [project.configurations.shadowed]
-
-    archiveFileName = "$baseName-$version.$extension"
-    classifier = ''
-}
-
-build.dependsOn shadowJar
-jar.enabled = false