Skip to content

Commit f760913

Browse files
ZoriotZoriot
authored
Update dependencies for mc 1.21.8 (#189)
Signed-off-by: Zoriot <[email protected]>
1 parent 7e68767 commit f760913

File tree

8 files changed

+71
-49
lines changed

8 files changed

+71
-49
lines changed

‎pom.xml‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<groupId>com.alpsbte</groupId>
3232
<artifactId>PlotSystem</artifactId>
33-
<version>4.1.4</version>
33+
<version>4.2.0</version>
3434

3535
<repositories>
3636
<!-- JitPack -->
@@ -99,9 +99,9 @@
9999
</dependency>
100100
<!-- Multiverse Core -->
101101
<dependency>
102-
<groupId>com.onarandombox.multiversecore</groupId>
103-
<artifactId>Multiverse-Core</artifactId>
104-
<version>4.3.1</version>
102+
<groupId>org.mvplugins.multiverse.core</groupId>
103+
<artifactId>multiverse-core</artifactId>
104+
<version>5.3.0</version>
105105
<scope>provided</scope>
106106
</dependency>
107107
<!-- ParticleNativeAPI -->
@@ -115,7 +115,7 @@
115115
<dependency>
116116
<groupId>com.alpsbte</groupId>
117117
<artifactId>canvas</artifactId>
118-
<version>1.1</version>
118+
<version>1.3</version>
119119
<scope>compile</scope>
120120
</dependency>
121121
<!-- HeadDB -->
@@ -136,7 +136,7 @@
136136
<dependency>
137137
<groupId>com.alpsbte.alpslib</groupId>
138138
<artifactId>alpslib-io</artifactId>
139-
<version>1.0.38</version>
139+
<version>1.2.0</version>
140140
</dependency>
141141
<dependency>
142142
<groupId>com.alpsbte.alpslib</groupId>
@@ -147,7 +147,7 @@
147147
<dependency>
148148
<groupId>com.alpsbte.alpslib</groupId>
149149
<artifactId>alpslib-utils</artifactId>
150-
<version>1.3.4</version>
150+
<version>1.3.5</version>
151151
<scope>compile</scope>
152152
</dependency>
153153
<!-- MariaDB Connector -->
@@ -187,24 +187,30 @@
187187
</dependency>
188188
<!-- Protocol Lib -->
189189
<dependency>
190-
<groupId>com.comphenix.protocol</groupId>
190+
<groupId>net.dmulloy2</groupId>
191191
<artifactId>ProtocolLib</artifactId>
192-
<version>5.1.0</version>
192+
<version>5.4.0</version>
193193
<scope>provided</scope>
194194
</dependency>
195195
<!-- Fancy NPCs -->
196196
<dependency>
197197
<groupId>de.oliver</groupId>
198198
<artifactId>FancyNpcs</artifactId>
199-
<version>2.4.0</version>
199+
<version>2.7.0</version>
200200
<scope>provided</scope>
201201
</dependency>
202202
<dependency>
203203
<groupId>li.cinnazeyy</groupId>
204-
<artifactId>LangLibs</artifactId>
205-
<version>1.5</version>
204+
<artifactId>LangLibs-API</artifactId>
205+
<version>1.5.1</version>
206206
<scope>provided</scope>
207207
</dependency>
208+
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
209+
<dependency>
210+
<groupId>commons-io</groupId>
211+
<artifactId>commons-io</artifactId>
212+
<version>2.20.0</version>
213+
</dependency>
208214
</dependencies>
209215
<!-- Fast Async World Edit -->
210216
<dependencyManagement>
@@ -246,7 +252,7 @@
246252
<!-- IMPORTANT: Plugin Building Path -->
247253
<sourceDirectory>src/main/java/</sourceDirectory>
248254
<!-- IMPORTANT: Output File Name -->
249-
<finalName>${project.artifactId}-${project.version}-${build.number}</finalName>
255+
<finalName>${project.artifactId}-${project.version}${build.number}</finalName>
250256
<plugins>
251257
<plugin>
252258
<groupId>org.apache.maven.plugins</groupId>

‎src/main/java/com/alpsbte/plotsystem/PlotSystem.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import com.alpsbte.plotsystem.utils.io.LangUtil;
5050
import com.comphenix.protocol.ProtocolLibrary;
5151
import com.comphenix.protocol.ProtocolManager;
52-
import com.onarandombox.MultiverseCore.MultiverseCore;
5352
import com.sk89q.worldedit.WorldEdit;
5453
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
5554
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
@@ -61,6 +60,7 @@
6160
import org.bukkit.plugin.java.JavaPlugin;
6261
import org.ipvp.canvas.MenuFunctionListener;
6362
import org.jetbrains.annotations.NotNull;
63+
import org.mvplugins.multiverse.core.MultiverseCoreApi;
6464

6565
import java.io.IOException;
6666
import java.io.InputStream;
@@ -346,8 +346,8 @@ public static String getMultiverseInventoriesConfigPath(String worldName) {
346346
/**
347347
* @return Multiverse-Core instance
348348
*/
349-
public static MultiverseCore getMultiverseCore() {
350-
return (MultiverseCore) plugin.getServer().getPluginManager().getPlugin("Multiverse-Core");
349+
public static MultiverseCoreApi getMultiverseCore() {
350+
return MultiverseCoreApi.get();
351351
}
352352

353353
/**

‎src/main/java/com/alpsbte/plotsystem/core/system/plot/generator/PlotWorldGenerator.java‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
package com.alpsbte.plotsystem.core.system.plot.generator;
2626

2727
import com.alpsbte.plotsystem.PlotSystem;
28-
import com.onarandombox.MultiverseCore.api.MVWorldManager;
29-
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
3028
import com.sk89q.worldedit.bukkit.BukkitAdapter;
3129
import com.sk89q.worldguard.WorldGuard;
3230
import com.sk89q.worldguard.protection.flags.Flags;
@@ -37,7 +35,12 @@
3735
import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
3836
import com.sk89q.worldguard.protection.regions.RegionContainer;
3937
import org.bukkit.*;
38+
import org.bukkit.entity.SpawnCategory;
4039
import org.bukkit.generator.ChunkGenerator;
40+
import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
41+
import org.mvplugins.multiverse.core.world.WorldManager;
42+
import org.mvplugins.multiverse.core.world.options.ImportWorldOptions;
43+
import org.mvplugins.multiverse.external.vavr.control.Option;
4144

4245
import javax.annotation.Nonnull;
4346
import java.util.Objects;
@@ -46,7 +49,7 @@
4649
import static net.kyori.adventure.text.Component.text;
4750

4851
public class PlotWorldGenerator {
49-
private final MVWorldManager worldManager = PlotSystem.DependencyManager.getMultiverseCore().getMVWorldManager();
52+
private final WorldManager worldManager = PlotSystem.DependencyManager.getMultiverseCore().getWorldManager();
5053
private WorldCreator worldCreator;
5154

5255
private final String worldName;
@@ -74,17 +77,26 @@ protected void generateWorld() {
7477
protected void createMultiverseWorld() throws Exception {
7578
// Check if world creator is configured and add new world to multiverse world manager
7679
if (worldCreator != null) {
77-
if (!worldManager.isMVWorld(worldName))
78-
worldManager.addWorld(worldName, environment, null, worldType, false,
79-
"VoidGen:{\"caves\":false,\"decoration\":false,\"mobs\":false,\"structures\":false}", false);
80+
if (!worldManager.isLoadedWorld(worldName)) {
81+
worldManager.importWorld(ImportWorldOptions.worldName(worldName)
82+
.environment(environment)
83+
.generator("VoidGen:{\"caves\":false,\"decoration\":false,\"mobs\":false,\"structures\":false}")
84+
.useSpawnAdjust(false)
85+
);
86+
}
8087
} else {
8188
throw new Exception("World Creator is not configured");
8289
}
8390
}
8491

8592
protected void configureWorld() {
8693
World bukkitWorld = Bukkit.getWorld(worldName);
87-
MultiverseWorld mvWorld = worldManager.getMVWorld(bukkitWorld);
94+
Option<LoadedMultiverseWorld> mvWorld = worldManager.getLoadedWorld(worldName);
95+
96+
if (mvWorld.isEmpty()) {
97+
PlotSystem.getPlugin().getComponentLogger().warn(text("Multiverse world" + worldName + " is not loaded! Skipping world configuration..."));
98+
return;
99+
}
88100

89101
// Set world time to midday
90102
assert bukkitWorld != null;
@@ -100,14 +112,14 @@ protected void configureWorld() {
100112
bukkitWorld.setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false);
101113

102114
// Configure multiverse world
103-
mvWorld.setAllowFlight(true);
104-
mvWorld.setGameMode(GameMode.CREATIVE);
105-
mvWorld.setEnableWeather(false);
106-
mvWorld.setDifficulty(Difficulty.PEACEFUL);
107-
mvWorld.setAllowAnimalSpawn(false);
108-
mvWorld.setAllowMonsterSpawn(false);
109-
mvWorld.setAutoLoad(false);
110-
mvWorld.setKeepSpawnInMemory(false);
115+
mvWorld.get().setAllowFlight(true);
116+
mvWorld.get().setGameMode(GameMode.CREATIVE);
117+
mvWorld.get().setAllowWeather(false);
118+
mvWorld.get().setDifficulty(Difficulty.PEACEFUL);
119+
mvWorld.get().getEntitySpawnConfig().getSpawnCategoryConfig(SpawnCategory.ANIMAL).setSpawn(false);
120+
mvWorld.get().getEntitySpawnConfig().getSpawnCategoryConfig(SpawnCategory.MONSTER).setSpawn(false);
121+
mvWorld.get().setAutoLoad(false);
122+
mvWorld.get().setKeepSpawnInMemory(false);
111123
worldManager.saveWorldsConfig();
112124
}
113125

‎src/main/java/com/alpsbte/plotsystem/core/system/plot/utils/PlotUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ public static boolean isPlayerOnPlot(@NotNull AbstractPlot plot, Player player)
190190
return null;
191191
}
192192

193-
public static boolean isPlotWorld(World world) {
194-
return PlotSystem.DependencyManager.getMultiverseCore().getMVWorldManager().isMVWorld(world) && (PlotWorld.isOnePlotWorld(world.getName()) || PlotWorld.isCityPlotWorld(world.getName()));
193+
public static boolean isPlotWorld(@NotNull World world) {
194+
return PlotSystem.DependencyManager.getMultiverseCore().getWorldManager().isLoadedWorld(world) && (PlotWorld.isOnePlotWorld(world.getName()) || PlotWorld.isCityPlotWorld(world.getName()));
195195
}
196196

197197

‎src/main/java/com/alpsbte/plotsystem/core/system/plot/world/PlotWorld.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import com.alpsbte.plotsystem.core.system.plot.generator.AbstractPlotGenerator;
3232
import com.alpsbte.plotsystem.utils.Utils;
3333
import com.fastasyncworldedit.core.FaweAPI;
34-
import com.onarandombox.MultiverseCore.MultiverseCore;
3534
import com.sk89q.worldedit.bukkit.BukkitAdapter;
3635
import com.sk89q.worldedit.extent.clipboard.Clipboard;
3736
import com.sk89q.worldedit.math.BlockVector3;
@@ -46,6 +45,8 @@
4645
import org.bukkit.entity.Player;
4746
import org.jetbrains.annotations.NotNull;
4847
import org.jetbrains.annotations.Nullable;
48+
import org.mvplugins.multiverse.core.MultiverseCoreApi;
49+
import org.mvplugins.multiverse.core.world.options.DeleteWorldOptions;
4950

5051
import java.io.File;
5152
import java.io.IOException;
@@ -59,7 +60,7 @@ public class PlotWorld implements IWorld {
5960
public static final int MAX_WORLD_HEIGHT = 256;
6061
public static final int MIN_WORLD_HEIGHT = 5;
6162

62-
private final MultiverseCore mvCore = PlotSystem.DependencyManager.getMultiverseCore();
63+
private final MultiverseCoreApi mvCore = PlotSystem.DependencyManager.getMultiverseCore();
6364
private final String worldName;
6465
private final AbstractPlot plot;
6566

@@ -81,7 +82,9 @@ public <T extends AbstractPlotGenerator> boolean regenWorld(@NotNull Class<T> ge
8182
@Override
8283
public boolean deleteWorld() {
8384
if (isWorldGenerated() && loadWorld()) {
84-
if (mvCore.getMVWorldManager().deleteWorld(getWorldName(), true, true) && mvCore.saveWorldConfig()) {
85+
if (Boolean.TRUE.equals(mvCore.getWorldManager().getWorld(getWorldName())
86+
.map(world -> mvCore.getWorldManager().deleteWorld(DeleteWorldOptions.world(world)).isSuccess())
87+
.getOrElse(false)) && mvCore.getWorldManager().saveWorldsConfig().isSuccess()) {
8588
try {
8689
File multiverseInventoriesConfig = new File(PlotSystem.DependencyManager.getMultiverseInventoriesConfigPath(getWorldName()));
8790
File worldGuardConfig = new File(PlotSystem.DependencyManager.getWorldGuardConfigPath(getWorldName()));
@@ -102,7 +105,7 @@ public boolean loadWorld() {
102105
if (isWorldGenerated()) {
103106
if (isWorldLoaded()) {
104107
return true;
105-
} else return mvCore.getMVWorldManager().loadWorld(getWorldName()) || isWorldLoaded();
108+
} else return mvCore.getWorldManager().loadWorld(getWorldName()).isSuccess() || isWorldLoaded();
106109
} else PlotSystem.getPlugin().getComponentLogger().warn(text("Could not load world " + worldName + " because it is not generated!"));
107110
return false;
108111
}
@@ -145,7 +148,7 @@ public Location getSpawnPoint(BlockVector3 plotVector) {
145148
}
146149

147150
// Set spawn point 1 block above the highest block at the spawn location
148-
spawnLocation.setY(getBukkitWorld().getHighestBlockYAt((int) spawnLocation.getX(), (int) spawnLocation.getZ()) + 1);
151+
spawnLocation.setY(getBukkitWorld().getHighestBlockYAt((int) spawnLocation.getX(), (int) spawnLocation.getZ()) + 1d);
149152
return spawnLocation;
150153
}
151154
return null;
@@ -199,7 +202,7 @@ public boolean isWorldLoaded() {
199202

200203
@Override
201204
public boolean isWorldGenerated() {
202-
return mvCore.getMVWorldManager().getMVWorld(worldName) != null || mvCore.getMVWorldManager().getUnloadedWorlds().contains(worldName);
205+
return mvCore.getWorldManager().getWorld(worldName).isDefined();
203206
}
204207

205208
private ProtectedRegion getRegion(String regionName) {

‎src/main/java/com/alpsbte/plotsystem/core/system/tutorial/utils/TutorialNPC.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import de.oliver.fancynpcs.api.FancyNpcsPlugin;
2828
import de.oliver.fancynpcs.api.Npc;
2929
import de.oliver.fancynpcs.api.NpcData;
30-
import de.oliver.fancynpcs.api.utils.SkinFetcher;
30+
import de.oliver.fancynpcs.api.skins.SkinData;
3131
import org.bukkit.Bukkit;
3232
import org.bukkit.Location;
3333
import org.bukkit.entity.Player;
@@ -44,7 +44,7 @@ public class TutorialNPC {
4444
private final String id;
4545
private final String displayName;
4646
private final String interactionPrompt;
47-
private final SkinFetcher.SkinData skin;
47+
private final SkinData skin;
4848

4949
private Npc npc;
5050
private TutorialNPCHologram hologram;
@@ -61,7 +61,7 @@ public TutorialNPC(String npcId, String npcDisplayName, String npcInteractionPro
6161
this.id = npcId;
6262
this.displayName = npcDisplayName;
6363
this.interactionPrompt = npcInteractionPrompt;
64-
this.skin = new SkinFetcher.SkinData(npcId, npcSknTexture, npcSkinSignature);
64+
this.skin = new SkinData(npcId, SkinData.SkinVariant.AUTO, npcSknTexture, npcSkinSignature);
6565
}
6666

6767
/**
@@ -74,7 +74,7 @@ public void create(Location spawnPos) {
7474

7575
NpcData npcData = new NpcData(id, UUID.randomUUID(), spawnPos);
7676
npc = FancyNpcsPlugin.get().getNpcAdapter().apply(npcData);
77-
npc.getData().setSkin(skin);
77+
npc.getData().setSkinData(skin);
7878
npc.getData().setDisplayName(EMPTY_TAG);
7979
npc.getData().setTurnToPlayer(true);
8080
npc.setSaveToFile(false);
@@ -158,7 +158,7 @@ public String getInteractionPrompt() {
158158
return interactionPrompt;
159159
}
160160

161-
public SkinFetcher.SkinData getSkin() {
161+
public SkinData getSkin() {
162162
return skin;
163163
}
164164
}

‎src/main/java/com/alpsbte/plotsystem/utils/Utils.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.alpsbte.plotsystem.utils.io.LangPaths;
3737
import com.alpsbte.plotsystem.utils.io.LangUtil;
3838
import com.alpsbte.plotsystem.utils.items.CustomHeads;
39-
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
4039
import com.sk89q.worldedit.math.BlockVector2;
4140
import net.kyori.adventure.text.Component;
4241
import net.kyori.adventure.text.TextComponent;
@@ -53,6 +52,8 @@
5352
import org.jetbrains.annotations.Contract;
5453
import org.jetbrains.annotations.NotNull;
5554
import org.jetbrains.annotations.Nullable;
55+
import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
56+
import org.mvplugins.multiverse.external.vavr.control.Option;
5657

5758
import java.sql.SQLException;
5859
import java.time.LocalDateTime;
@@ -79,14 +80,14 @@ public static Location getSpawnLocation() {
7980

8081
if (!Objects.requireNonNull(config.getString(ConfigPaths.SPAWN_WORLD)).equalsIgnoreCase("default")) {
8182
try {
82-
MultiverseWorld spawnWorld = PlotSystem.DependencyManager.getMultiverseCore().getMVWorldManager().getMVWorld(config.getString(ConfigPaths.SPAWN_WORLD));
83-
return spawnWorld.getSpawnLocation();
83+
Option<LoadedMultiverseWorld> spawnWorld = PlotSystem.DependencyManager.getMultiverseCore().getWorldManager().getLoadedWorld(config.getString(ConfigPaths.SPAWN_WORLD));
84+
return spawnWorld.get().getSpawnLocation();
8485
} catch (Exception ignore) {
8586
PlotSystem.getPlugin().getComponentLogger().warn(text("Could not find %s in multiverse config!"), ConfigPaths.SPAWN_WORLD);
8687
}
8788
}
8889

89-
return PlotSystem.DependencyManager.getMultiverseCore().getMVWorldManager().getSpawnWorld().getSpawnLocation();
90+
return PlotSystem.DependencyManager.getMultiverseCore().getWorldManager().getDefaultWorld().get().getSpawnLocation();
9091
}
9192

9293
public static void updatePlayerInventorySlots(Player player) {

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
main: com.alpsbte.plotsystem.PlotSystem
2-
version: 4.1.3
2+
version: 4.2.0
33
api-version: "1.21"
44
name: Plot-System
55
author: R3tuxn & Cinnazeyy

0 commit comments

Comments
 (0)