Merge pull request #554 from Multiverse/ben/mv5/mv5-core

Ben/mv5/mv5 core

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

build.gradle

@@ -2,14 +2,22 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'checkstyle'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.gradleup.shadow' version '8.3.5'
 }
 
 version = System.getenv('GITHUB_VERSION') ?: 'local'
-group = 'com.onarandombox.multiverseinventories'
+group = 'org.mvplugins.multiverse.inventories'
 description = 'Multiverse-Inventories'
 
-java.sourceCompatibility = JavaVersion.VERSION_11
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+// todo: Enable test when convert them to use mockbukkit like mv-core
+compileTestJava {
+    enabled = false
+}
 
 repositories {
     mavenLocal()
@@ -29,6 +37,11 @@ repositories {
         name = 'jitpack.io'
         url = uri('https://jitpack.io/')
     }
+
+    maven {
+        name = 'benwoo1110'
+        url = uri('https://repo.c0ding.party/multiverse-beta')
+    }
 }
 
 dependencies {
@@ -38,9 +51,8 @@ dependencies {
     }
 
     // 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
+    implementation 'org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT'
 
     // Config
     api 'com.dumptruckman.minecraft:JsonConfiguration:1.1'
@@ -62,11 +74,6 @@ dependencies {
         exclude group: '*', module: '*'
     }
 
-    // Legacy Multiverse-Adventure
-    implementation('com.onarandombox.multiverseadventure:Multiverse-Adventure:2.5.0-SNAPSHOT') {
-        exclude group: '*', module: '*'
-    }
-
     // Tests
     testImplementation 'com.github.MilkBowl:VaultAPI:1.7.1'
     testImplementation 'junit:junit:4.13.2'
@@ -144,16 +151,28 @@ javadoc {
 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'
+    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 'io.papermc.lib', 'org.mvplugins.multiverse.inventories.utils.paperlib'
+    relocate 'net.minidev.json', 'org.mvplugins.multiverse.inventories.utils.json'
 
     configurations = [project.configurations.api]
 
-    archiveFileName = "$baseName-$version.$extension"
+    archiveClassifier.set('')
 }
 
 build.dependsOn shadowJar
 jar.enabled = false
+
+
+tasks.register('runHabitatGenerator', JavaExec) {
+    classpath = configurations["compileClasspath"]
+    mainClass.set('org.mvplugins.multiverse.external.jvnet.hk2.generator.HabitatGenerator')
+
+    args = [
+            '--file', "build/libs/multiverse-inventories-$version" + ".jar",
+            '--locator', 'Multiverse-Inventories',
+    ]
+}
+tasks.named("build") { finalizedBy("runHabitatGenerator") }

gradle/wrapper/gradle-wrapper.properties

@@ -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

src/main/java/com/onarandombox/multiverseinventories/AdventureListener.java

@@ -1,14 +1,15 @@
-package com.onarandombox.multiverseinventories;
+package org.mvplugins.multiverse.inventories;
 
 import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.multiverseinventories.profile.WorldGroupManager;
-import com.onarandombox.multiverseinventories.profile.GroupingConflict;
-import com.onarandombox.multiverseinventories.share.Sharables;
-import com.onarandombox.multiverseinventories.share.Shares;
-import com.onarandombox.multiverseinventories.locale.Message;
+import org.mvplugins.multiverse.inventories.profile.WorldGroupManager;
+import org.mvplugins.multiverse.inventories.profile.GroupingConflict;
+import org.mvplugins.multiverse.inventories.share.Sharables;
+import org.mvplugins.multiverse.inventories.share.Shares;
+import org.mvplugins.multiverse.inventories.locale.Message;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
+import org.mvplugins.multiverse.core.world.WorldManager;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -25,9 +26,11 @@ abstract class AbstractWorldGroupManager implements WorldGroupManager {
     static final String DEFAULT_GROUP_NAME = "default";
     protected final Map<String, WorldGroup> groupNamesMap = new LinkedHashMap<>();
     protected final MultiverseInventories plugin;
+    protected final WorldManager worldManager;
 
     public AbstractWorldGroupManager(final MultiverseInventories plugin) {
         this.plugin = plugin;
+        this.worldManager = plugin.getServiceLocator().getService(WorldManager.class);
     }
 
     /**
@@ -60,7 +63,7 @@ public List<WorldGroup> getGroupsForWorld(String worldName) {
         }
         // Only use the default group for worlds managed by MV-Core
         if (worldGroups.isEmpty() && plugin.getMVIConfig().isDefaultingUngroupedWorlds() &&
-                plugin.getCore().getMVWorldManager().isMVWorld(worldName)) {
+                this.worldManager.isWorld(worldName)) {
             Logging.finer("Returning default group for world: " + worldName);
             worldGroups.add(getDefaultGroup());
         }

src/main/java/com/onarandombox/multiverseinventories/command/package-info.java

@@ -1,7 +1,7 @@
-package com.onarandombox.multiverseinventories;
+package org.mvplugins.multiverse.inventories;
 
 import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
+import org.mvplugins.multiverse.core.event.MVDebugModeEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 

src/main/java/com/onarandombox/multiverseinventories/share/package-info.java

@@ -1,4 +1,4 @@
-package com.onarandombox.multiverseinventories;
+package org.mvplugins.multiverse.inventories;
 
 import com.dumptruckman.minecraft.util.Logging;
 import net.minidev.json.JSONArray;