Merge pull request #514 from Multiverse/MV5

MV5

Author: benwoo1110

.github/workflows/pr.test.yml

@@ -6,6 +6,6 @@ on:
 
 jobs:
   test:
-    uses: Multiverse/Multiverse-Core/.github/workflows/generic.test.yml@main
+    uses: Multiverse/Multiverse-Core/.github/workflows/generic.test.yml@MV5 # todo: Change back to main before release
     with:
       plugin_name: multiverse-inventories

README.md

@@ -1,9 +1,7 @@
 <p align="center">
-<img src="https://raw.githubusercontent.com/Multiverse/Multiverse-Core/main/config/multiverse2-long.png" alt="Multiverse Logo">
+<img src="config/multiverse-banner.png" alt="Multiverse Logo">
 </p>
 
-# Multiverse Inventories
-
 [![Modrinth](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/modrinth_vector.svg)](https://modrinth.com/plugin/multiverse-inventories)
 [![Hangar](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/available/hangar_vector.svg)](https://hangar.papermc.io/Multiverse/Multiverse-Inventories)
 [![Bukkit](https://raw.githubusercontent.com/intergrav/devins-badges/refs/heads/v3/assets/cozy/available/bukkit_vector.svg)](https://dev.bukkit.org/projects/multiverse-inventories)
@@ -17,11 +15,11 @@
 
 [Multiverse Inventories](https://dev.bukkit.org/projects/multiverse-inventories) is an add-on Plugin for [Multiverse core](https://dev.bukkit.org/projects/multiverse-core) that lets players have separate inventories **per world!** This makes it possible to create multi gamemode servers without Velocity or Bungee!
 
-Now it's time to create your very own server with Multiverse Inventories, do check out our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki/Home-(Inventories)) and [Usage Guide](https://github.com/Multiverse/Multiverse-Core/wiki/Basics-(Inventories)) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any questions or just want to have a chat with us!
+Now it's time to create your very own server with Multiverse Inventories, do check out our [Wiki](https://mvplugins.org) and [Usage Guide](https://mvplugins.org/inventories/fundamentals/basic-usage/) to get started. Feel free to hop onto our [Discord](https://discord.gg/NZtfKky) if you have any questions or just want to have a chat with us!
 
 ## Our other amazing sub-modules:
 
-With just [Multiverse Core](https://github.com/multiverse/multiverse) and any of the below plugins, you can access all of these other related features in the Multiverse ecosystem.
+With just [Multiverse Core](https://github.com/multiverse/multiverse-core) and any of the below plugins, you can access all of these other related features in the Multiverse ecosystem.
 
 * [Multiverse-NetherPortals](https://github.com/Multiverse/Multiverse-NetherPortals) -> Have separate nether and end worlds for each of your overworlds!
 * [Multiverse-Portals](https://github.com/Multiverse/Multiverse-Portals) -> Make custom portals to go to any destination!
@@ -38,7 +36,7 @@ Simply build the source with Gradle:
 **Want to help improve Multiverse Inventories?** There are several ways you can support and contribute to the project.
 * Take a look at our "Bug: Unconfirmed" issues, where you can find issues that need extra testing and investigation.
 * Want others to love Multiverse too? You can join the [Multiverse Discord community](https://discord.gg/NZtfKky) and help others with issues and setup!
-* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/Multiverse-Core/wiki) with your latest tips, tricks and guides! The wiki open for all to edit and improve.
+* A Multiverse guru? You can update our [Wiki](https://github.com/Multiverse/multiverse-web) with your latest tips, tricks and guides! The wiki open for all to edit and improve.
 * Love coding? You could look at ["State: Open to PR"](https://github.com/Multiverse/Multiverse-Inventories/labels/State%3A%20Open%20to%20PR) and ["Resolution: Accepted"](https://github.com/Multiverse/Multiverse-Inventories/labels/Resolution%3A%20Accepted) issues. We're always happy to receive bug fixes and feature additions as [pull requests](https://www.freecodecamp.org/news/how-to-make-your-first-pull-request-on-github-3/).
 * If you'd like to make a financial contribution to the project, do consider joining our [Patreon](https://www.patreon.com/dumptruckman) or make a one-time donation [here](https://paypal.me/dumptruckman)!
 

build.gradle

@@ -1,106 +1,98 @@
 plugins {
-    id 'java-library'
-    id 'maven-publish'
     id 'checkstyle'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'org.mvplugins.multiverse-plugin' version '1.1.0'
 }
 
-version = System.getenv('GITHUB_VERSION') ?: 'local'
-group = 'com.onarandombox.multiverseinventories'
+group = 'org.mvplugins.multiverse.inventories'
 description = 'Multiverse-Inventories'
 
-java.sourceCompatibility = JavaVersion.VERSION_11
-
 repositories {
-    mavenLocal()
-    mavenCentral()
-
     maven {
-        name = 'onarandombox'
-        url = uri('https://repo.onarandombox.com/content/groups/public')
+        name = 'codemc'
+        url = uri('https://repo.codemc.org/repository/maven-releases')
     }
 
     maven {
-        name ='papermc'
-        url = uri('https://papermc.io/repo/repository/maven-public/')
+        name = 'benwoo1110'
+        url = uri('https://repo.c0ding.party/multiverse-beta')
     }
+}
 
-    maven {
-        name = 'jitpack.io'
-        url = uri('https://jitpack.io/')
-    }
+configure(apiDependencies) {
+    serverApiVersion = '1.21.3-R0.1-SNAPSHOT'
+    mockBukkitServerApiVersion = '1.21'
+    mockBukkitVersion = '4.31.1'
 }
 
 dependencies {
-    // Spigot
-    implementation('org.bukkit:bukkit:1.14.4-R0.1-SNAPSHOT') {
-        exclude group: 'junit', module: 'junit'
-    }
+    // Server API
+    // TODO make our custom plugin target paper instead of spigot
+    externalPlugin 'io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT'
 
     // Core
-    implementation('com.onarandombox.multiversecore:Multiverse-Core:4.2.2') {
-        exclude group: 'me.main__.util', module: 'SerializationConfig'
-    }
+    // TODO update to correct version once we have it published
+    externalPlugin 'org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT'
 
     // Config
-    api 'com.dumptruckman.minecraft:JsonConfiguration:1.1'
-    api ('com.googlecode.json-simple:json-simple:1.1.1') {
-        exclude group: 'junit', module: 'junit'
-    }
+    shadowed 'com.dumptruckman.minecraft:JsonConfiguration:1.2-SNAPSHOT'
+    shadowed 'net.minidev:json-smart:2.5.1'
 
     // Utils
-    api 'io.papermc:paperlib:1.0.7'
-    api('com.dumptruckman.minecraft:Logging:1.1.1') {
+    shadowed('com.dumptruckman.minecraft:Logging:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
 
+    // Caching
+    shadowed("com.github.ben-manes.caffeine:caffeine:3.2.0")
+
+    // Luckperms for group context
+    compileOnly 'net.luckperms:api:5.4'
+
     // Other plugins for import
-    implementation('uk.co:MultiInv:3.0.6') {
+    compileOnly('uk.co:MultiInv:3.0.6') {
         exclude group: '*', module: '*'
     }
-    implementation('me.drayshak:WorldInventories:1.0.2') {
+    compileOnly('me.drayshak:WorldInventories:1.0.2') {
         exclude group: '*', module: '*'
     }
-
-    // Legacy Multiverse-Adventure
-    implementation('com.onarandombox.multiverseadventure:Multiverse-Adventure:2.5.0-SNAPSHOT') {
+    // perworldinventory is weird and has snakeyaml included in the jar, so we can only use compileOnly for build to work properly
+    compileOnly('me.ebonjaeger:perworldinventory-kt:2.3.2') {
         exclude group: '*', module: '*'
     }
 
-    // Tests
-    testImplementation 'com.github.MilkBowl:VaultAPI:1.7.1'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
-}
-
-
-java {
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
+    // hk2 for annotation processing only
+    compileOnly('org.glassfish.hk2:hk2-api:3.0.3') {
+        exclude group: '*', module: '*'
+    }
+    annotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
+    testAnnotationProcessor 'org.glassfish.hk2:hk2-metadata-generator:3.0.3'
 }
 
-tasks.withType(Javadoc).configureEach {
-    options.encoding = 'UTF-8'
+shadowJar {
+    relocate 'com.dumptruckman.minecraft.util.Logging', 'org.mvplugins.multiverse.inventories.utils.InvLogging'
+    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'org.mvplugins.multiverse.inventories.utils.DebugFileLogger'
+    relocate 'com.dumptruckman.bukkit.configuration', 'org.mvplugins.multiverse.inventories.utils.configuration'
+    relocate 'net.minidev', 'org.mvplugins.multiverse.inventories.utils.minidev'
+    relocate 'com.github.benmanes', 'org.mvplugins.multiverse.inventories.utils.benmanes'
+    relocate 'com.google.errorprone', 'org.mvplugins.multiverse.inventories.utils.errorprone'
+
+    dependencies {
+        exclude(dependency {
+            it.moduleGroup == 'org.ow2.asm'
+        })
+        exclude(dependency {
+            it.moduleGroup == 'org.jetbrains'
+        })
+    }
 }
 
-
-configurations {
-    [apiElements, runtimeElements].each {
-        it.outgoing.artifacts.removeIf { it.buildDependencies.getDependencies(null).contains(jar) }
-        it.outgoing.artifact(shadowJar)
-    }
+checkstyle {
+    toolVersion = '6.1.1'
+    configFile file('config/mv_checks.xml')
+    ignoreFailures = true
 }
 
 publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-        }
-    }
     repositories {
         maven {
             name = "GitHubPackages"
@@ -110,57 +102,12 @@ publishing {
                 password = System.getenv("GITHUB_TOKEN")
             }
         }
+
         maven {
-            name = "multiverse"
-            def releasesRepoUrl = "https://repo.onarandombox.com/multiverse-releases"
-            def snapshotsRepoUrl = "https://repo.onarandombox.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)
         }
     }
 }
-
-
-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 }
-}
-
-
-checkstyle {
-    toolVersion = '6.1.1'
-    configFile file('config/mv_checks.xml')
-    ignoreFailures = true
-}
-
-
-javadoc {
-    source = sourceSets.main.allJava
-    classpath = configurations.compileClasspath
-}
-
-
-project.configurations.api.canBeResolved = true
-
-shadowJar {
-    relocate 'com.dumptruckman.minecraft.util.Logging', 'com.onarandombox.multiverseinventories.utils.InvLogging'
-    relocate 'com.dumptruckman.minecraft.util.DebugLog', 'com.onarandombox.multiverseinventories.utils.DebugFileLogger'
-    relocate 'com.dumptruckman.bukkit.configuration', 'com.onarandombox.multiverseinventories.utils.configuration'
-    relocate 'io.papermc.lib', 'com.onarandombox.multiverseinventories.utils.paperlib'
-    relocate 'net.minidev.json', 'com.onarandombox.multiverseinventories.utils.json'
-
-    configurations = [project.configurations.api]
-
-    archiveFileName = "$baseName-$version.$extension"
-}
-
-build.dependsOn shadowJar
-jar.enabled = false

config/multiverse-banner.png

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,13 @@
  * This file was generated by the Gradle 'init' task.
  */
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            url = uri('https://repo.onarandombox.com/multiverse-releases')
+        }
+    }
+}
+
 rootProject.name = 'multiverse-inventories'