Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-06-26 14:35:04 +02:00
Code Issues Projects Releases Wiki Activity

Change world-to-folder implementation for latest forge and fabric versions

Browse Source 
to get the correct save-folder even if the actual world-name is different
This commit is contained in:
Blue (Lukas Rieger) 2020-09-14 19:04:22 +02:00
parent 9075dc6a76
commit c677c28075
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
implementations/fabric-1.16.1/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -57,6 +57,7 @@
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.WorldSavePath;
import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType;
public class FabricMod implements ModInitializer, ServerInterface { public class FabricMod implements ModInitializer, ServerInterface {
@ -161,8 +162,7 @@ public UUID getUUIDForWorld(ServerWorld world) throws IOException {
private UUID loadUUIDForWorld(ServerWorld world) throws IOException { private UUID loadUUIDForWorld(ServerWorld world) throws IOException {
MinecraftServer server = world.getServer(); MinecraftServer server = world.getServer();
String worldName = server.getSaveProperties().getLevelName(); File worldFolder = world.getServer().getRunDirectory().toPath().resolve(server.getSavePath(WorldSavePath.ROOT)).toFile();
File worldFolder = new File(world.getServer().getRunDirectory(), worldName);
File dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder); File dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder);
File dimensionDir = dimensionFolder.getCanonicalFile(); File dimensionDir = dimensionFolder.getCanonicalFile();
return getUUIDForWorld(dimensionDir); return getUUIDForWorld(dimensionDir);

4
implementations/fabric-1.16.2/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -57,6 +57,7 @@
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.WorldSavePath;
import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType;
public class FabricMod implements ModInitializer, ServerInterface { public class FabricMod implements ModInitializer, ServerInterface {
@ -161,8 +162,7 @@ public UUID getUUIDForWorld(ServerWorld world) throws IOException {
private UUID loadUUIDForWorld(ServerWorld world) throws IOException { private UUID loadUUIDForWorld(ServerWorld world) throws IOException {
MinecraftServer server = world.getServer(); MinecraftServer server = world.getServer();
String worldName = server.getSaveProperties().getLevelName(); File worldFolder = world.getServer().getRunDirectory().toPath().resolve(server.getSavePath(WorldSavePath.ROOT)).toFile();
File worldFolder = new File(world.getServer().getRunDirectory(), worldName);
File dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder); File dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder);
File dimensionDir = dimensionFolder.getCanonicalFile(); File dimensionDir = dimensionFolder.getCanonicalFile();
return getUUIDForWorld(dimensionDir); return getUUIDForWorld(dimensionDir);

4
implementations/forge-1.16.2/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
View File

@ -53,6 +53,7 @@
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.DimensionType; import net.minecraft.world.DimensionType;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.FolderName;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.TickEvent.ServerTickEvent; import net.minecraftforge.event.TickEvent.ServerTickEvent;
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
@ -174,8 +175,7 @@ private UUID loadUUIDForWorld(ServerWorld world) throws IOException {
private File getFolderForWorld(ServerWorld world) throws IOException { private File getFolderForWorld(ServerWorld world) throws IOException {
MinecraftServer server = world.getServer(); MinecraftServer server = world.getServer();
String worldName = server.func_240793_aU_().getWorldName(); File worldFolder = world.getServer().getDataDirectory().toPath().resolve(server.func_240776_a_(FolderName.field_237253_i_)).toFile();
File worldFolder = new File(world.getServer().getDataDirectory(), worldName);
File dimensionFolder = DimensionType.func_236031_a_(world.func_234923_W_(), worldFolder); File dimensionFolder = DimensionType.func_236031_a_(world.func_234923_W_(), worldFolder);
return dimensionFolder.getCanonicalFile(); return dimensionFolder.getCanonicalFile();
} }