Skip to content

Commit f38ef50

Browse files
committed
Fix fabric-1.18 for pre-5
1 parent e373b5b commit f38ef50

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

implementations/fabric-1.18/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ configurations {
99
}
1010

1111
dependencies {
12-
minecraft "com.mojang:minecraft:1.18-pre1"
13-
mappings "net.fabricmc:yarn:1.18-pre1+build.8:v2"
12+
minecraft "com.mojang:minecraft:1.18-pre5"
13+
mappings "net.fabricmc:yarn:1.18-pre5+build.4:v2"
1414
modImplementation "net.fabricmc:fabric-loader:0.11.3"
1515
modImplementation "net.fabricmc.fabric-api:fabric-api:0.42.2+1.18"
1616

implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import com.github.benmanes.caffeine.cache.Caffeine;
2828
import com.github.benmanes.caffeine.cache.LoadingCache;
29-
import com.google.gson.Gson;
3029
import de.bluecolored.bluemap.common.plugin.Plugin;
3130
import de.bluecolored.bluemap.common.plugin.commands.Commands;
3231
import de.bluecolored.bluemap.common.plugin.serverinterface.Player;
@@ -42,27 +41,16 @@
4241
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
4342
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
4443
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
45-
import net.fabricmc.loom.configuration.FabricApiExtension;
4644
import net.minecraft.server.MinecraftServer;
4745
import net.minecraft.server.network.ServerPlayerEntity;
4846
import net.minecraft.server.world.ServerWorld;
49-
import net.minecraft.util.Identifier;
5047
import net.minecraft.util.WorldSavePath;
51-
import net.minecraft.util.registry.BuiltinRegistries;
52-
import net.minecraft.util.registry.Registry;
53-
import net.minecraft.world.biome.Biome;
54-
import net.minecraft.world.biome.BiomeEffects;
55-
import net.minecraft.world.biome.BiomeKeys;
56-
import net.minecraft.world.biome.BuiltinBiomes;
5748
import net.minecraft.world.dimension.DimensionType;
5849
import org.apache.logging.log4j.LogManager;
59-
import org.spongepowered.configurate.ConfigurateException;
60-
import org.spongepowered.configurate.ConfigurationNode;
61-
import org.spongepowered.configurate.gson.GsonConfigurationLoader;
6250

6351
import java.io.File;
6452
import java.io.IOException;
65-
import java.nio.file.Paths;
53+
import java.nio.file.Path;
6654
import java.util.*;
6755
import java.util.concurrent.CompletableFuture;
6856
import java.util.concurrent.ConcurrentHashMap;
@@ -173,9 +161,9 @@ public UUID getUUIDForWorld(ServerWorld world) throws IOException {
173161

174162
private UUID loadUUIDForWorld(ServerWorld world) throws IOException {
175163
MinecraftServer server = world.getServer();
176-
File worldFolder = world.getServer().getRunDirectory().toPath().resolve(server.getSavePath(WorldSavePath.ROOT)).toFile();
177-
File dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder);
178-
File dimensionDir = dimensionFolder.getCanonicalFile();
164+
Path worldFolder = world.getServer().getRunDirectory().toPath().resolve(server.getSavePath(WorldSavePath.ROOT));
165+
Path dimensionFolder = DimensionType.getSaveDirectory(world.getRegistryKey(), worldFolder);
166+
File dimensionDir = dimensionFolder.toFile().getCanonicalFile();
179167
return getUUIDForWorld(dimensionDir);
180168
}
181169

0 commit comments

Comments
 (0)