Skip to content

Update to multiverse-core and multiverse-inventories 5.1.1 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcbal wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to multiverse-core and multiverse-inventories 5.1.1 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions uSkyBlock-Core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,13 @@
</profile>
</profiles>

<repositories>
<repository>
<id>onarandombodx</id>
<url>https://repo.onarandombox.com/content/groups/public/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>ovh.uskyblock</groupId>
Expand Down Expand Up @@ -388,9 +395,9 @@
</dependency>
<!-- Multiverse -->
<dependency>
<groupId>com.onarandombox.multiversecore</groupId>
<artifactId>Multiverse-Core</artifactId>
<version>4.3.1</version>
<groupId>org.mvplugins.multiverse.core</groupId>
<artifactId>multiverse-core</artifactId>
<version>5.1.1</version>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
Expand All @@ -401,9 +408,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.onarandombox.multiverseinventories</groupId>
<artifactId>Multiverse-Inventories</artifactId>
<version>4.2.3</version>
<groupId>org.mvplugins.multiverse.inventories</groupId>
<artifactId>multiverse-inventories</artifactId>
<version>5.1.1</version>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
Expand Down
58 changes: 34 additions & 24 deletions uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/hook/world/MultiverseHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package us.talabrek.ultimateskyblock.hook.world;

import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.multiverseinventories.MultiverseInventories;
import com.onarandombox.multiverseinventories.WorldGroup;
import com.onarandombox.multiverseinventories.profile.WorldGroupManager;
import com.onarandombox.multiverseinventories.share.Sharables;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.WorldType;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.mvplugins.multiverse.core.MultiverseCore;
import org.mvplugins.multiverse.core.MultiverseCoreApi;
import org.mvplugins.multiverse.core.world.MultiverseWorld;
import org.mvplugins.multiverse.core.world.WorldManager;
import org.mvplugins.multiverse.inventories.MultiverseInventories;
import org.mvplugins.multiverse.inventories.MultiverseInventoriesApi;
import org.mvplugins.multiverse.inventories.profile.group.WorldGroup;
import org.mvplugins.multiverse.inventories.profile.group.WorldGroupManager;
import org.mvplugins.multiverse.inventories.share.Sharables;
import us.talabrek.ultimateskyblock.Settings;
import us.talabrek.ultimateskyblock.hook.PluginHook;
import us.talabrek.ultimateskyblock.uSkyBlock;
Expand Down Expand Up @@ -64,15 +66,19 @@ public void registerOverworld(@NotNull World world) {
return;
}

if (!mvCore.getMVWorldManager().isMVWorld(world)) {
mvCore.getMVWorldManager().addWorld(world.getName(), World.Environment.NORMAL,
"0", WorldType.NORMAL, false, GENERATOR_NAME, false);
WorldManager mvWorldManager = MultiverseCoreApi.get().getWorldManager();

if (!mvWorldManager.isWorld(world.getName())) {
//mvWorldManager.addWorld(world.getName(), World.Environment.NORMAL,
// "0", WorldType.NORMAL, false, GENERATOR_NAME, false);
// The new MV API doesn't seem to provide methods to import a World when it is already loaded by the server.
plugin.getLogger().severe("the Skyblock overworld is loaded by the server but not found throught the Multiverse-core API");
}

MultiverseWorld mvWorld = mvCore.getMVWorldManager().getMVWorld(world);
mvWorld.setEnvironment(World.Environment.NORMAL);
mvWorld.setScaling(1.0);
mvWorld.setGenerator(GENERATOR_NAME);
MultiverseWorld mvWorld = mvWorldManager.getWorld(world).get();
//mvWorld.setEnvironment(World.Environment.NORMAL);
mvWorld.setScale(1.0);
//mvWorld.setGenerator(GENERATOR_NAME);

if (Settings.general_spawnSize > 0 && LocationUtil.isEmptyLocation(mvWorld.getSpawnLocation())) {
Location spawn = LocationUtil.centerOnBlock(
Expand All @@ -83,7 +89,7 @@ public void registerOverworld(@NotNull World world) {
}

if (!Settings.extras_sendToSpawn) {
mvWorld.setRespawnToWorld(mvWorld.getName());
mvWorld.setRespawnWorld(mvWorld);
}
}

Expand All @@ -96,15 +102,19 @@ public void registerNetherworld(@NotNull World world) {
return;
}

if (!mvCore.getMVWorldManager().isMVWorld(world)) {
mvCore.getMVWorldManager().addWorld(world.getName(), World.Environment.NETHER,
"0", WorldType.NORMAL, false, GENERATOR_NAME, false);
WorldManager mvWorldManager = MultiverseCoreApi.get().getWorldManager();

if (!mvWorldManager.isWorld(world.getName())) {
//mvWorldManager.addWorld(world.getName(), World.Environment.NETHER,
// "0", WorldType.NORMAL, false, GENERATOR_NAME, false);
// The new MV API doesn't seem to provide methods to import a World when it is already loaded by the server.
plugin.getLogger().severe("the Skyblock nether is loaded by the server but not found throught the Multiverse-core API");
}

MultiverseWorld mvWorld = mvCore.getMVWorldManager().getMVWorld(world);
mvWorld.setEnvironment(World.Environment.NETHER);
mvWorld.setScaling(1.0);
mvWorld.setGenerator(GENERATOR_NAME);
MultiverseWorld mvWorld = mvWorldManager.getWorld(world).get();
//mvWorld.setEnvironment(World.Environment.NETHER);
mvWorld.setScale(1.0);
//mvWorld.setGenerator(GENERATOR_NAME);
if (Settings.general_spawnSize > 0 && LocationUtil.isEmptyLocation(mvWorld.getSpawnLocation())) {
Location spawn = LocationUtil.centerOnBlock(
new Location(world, 0.5, Settings.island_height/2.0 + 0.1, 0.5));
Expand All @@ -114,7 +124,7 @@ public void registerNetherworld(@NotNull World world) {
}

if (!Settings.extras_sendToSpawn) {
mvWorld.setRespawnToWorld(plugin.getWorldManager().getWorld().getName());
mvWorld.setRespawnWorld(plugin.getWorldManager().getWorld().getName());
}

linkNetherInventory(plugin.getWorldManager().getWorld(), world);
Expand All @@ -125,7 +135,7 @@ private void linkNetherInventory(@NotNull World... worlds) {
return;
}

WorldGroupManager groupManager = mvInventories.getGroupManager();
WorldGroupManager groupManager = MultiverseInventoriesApi.get().getWorldGroupManager();
WorldGroup worldGroup = groupManager.getGroup("skyblock");
if (worldGroup == null) {
worldGroup = groupManager.newEmptyGroup("skyblock");
Expand Down