Skip to content

Commit b0c541e

Browse files
committed
use relevant util that I forgot existed
Signed-off-by: BT (calcastor/mame) <43831917+calcastor@users.noreply.github.com>
1 parent a61d1ef commit b0c541e

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

platform/platform-modern/src/main/java/tc/oc/pgm/platform/modern/impl/ModernNMSHacks.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package tc.oc.pgm.platform.modern.impl;
22

3+
import static tc.oc.pgm.util.bukkit.MiscUtils.MISC_UTILS;
34
import static tc.oc.pgm.util.nms.Packets.ENTITIES;
45
import static tc.oc.pgm.util.platform.Supports.Variant.PAPER;
56

@@ -8,8 +9,6 @@
89
import io.papermc.paper.world.PaperWorldLoader;
910
import io.papermc.paper.world.migration.WorldFolderMigration;
1011
import java.io.IOException;
11-
import java.nio.file.Files;
12-
import java.nio.file.Path;
1312
import java.util.ArrayList;
1413
import java.util.List;
1514
import java.util.OptionalLong;
@@ -19,10 +18,7 @@
1918
import net.minecraft.core.Registry;
2019
import net.minecraft.core.RegistryAccess;
2120
import net.minecraft.core.registries.Registries;
22-
import net.minecraft.nbt.NbtAccounter;
23-
import net.minecraft.nbt.NbtIo;
2421
import net.minecraft.resources.ResourceKey;
25-
import net.minecraft.server.MinecraftServer;
2622
import net.minecraft.server.TickTask;
2723
import net.minecraft.server.WorldLoader;
2824
import net.minecraft.server.dedicated.DedicatedServer;
@@ -228,7 +224,8 @@ public World createWorld(@NonNull WorldCreator creator) {
228224
}
229225

230226
// PGM: We need to read data version from level.dat pre-migration
231-
int dataVersion = readDataVersion(server.getWorldContainer().toPath().resolve(name));
227+
int dataVersion = MISC_UTILS.getWorldDataVersion(
228+
server.getWorldContainer().toPath().resolve(name).resolve("level.dat"));
232229

233230
try {
234231
WorldFolderMigration.migrateApiWorld(
@@ -333,21 +330,6 @@ public World createWorld(@NonNull WorldCreator creator) {
333330
return serverLevel.getWorld();
334331
}
335332

336-
/**
337-
* Read the {@code DataVersion} tag from a world folder's {@code level.dat}. Returns 0 on failure.
338-
*/
339-
private static int readDataVersion(Path worldFolder) {
340-
Path levelDat = worldFolder.resolve("level.dat");
341-
if (!Files.exists(levelDat)) return 0;
342-
try {
343-
return NbtIo.readCompressed(levelDat, NbtAccounter.unlimitedHeap())
344-
.getIntOr("DataVersion", 0);
345-
} catch (IOException e) {
346-
MinecraftServer.LOGGER.warn("Failed to read DataVersion from {}", levelDat, e);
347-
return 0;
348-
}
349-
}
350-
351333
@Override
352334
public boolean canMineBlock(BlockMaterialData blockMaterial, Player player) {
353335
return ((ModernBlockMaterialData) blockMaterial)

0 commit comments

Comments
 (0)