|
|
|
@@ -1030,7 +1030,7 @@ index 16f07007a0f73ec0c6f421c9b082518e87e8cc7b..fc69834e18e0860750d878e1361722fc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Paper end - rewrite chunk system
|
|
|
|
// Paper end - rewrite chunk system
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe28b6027c2 100644
|
|
|
|
index e40665cead218502b44dd49051a53326ed94f061..a25e1bfd74b7ec9d6fcc3fe7c4369bc20b33a0da 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
|
|
|
|
@@ -23,7 +23,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -23,7 +23,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -1042,7 +1042,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
private final RegionStorageInfo info;
|
|
|
|
private final RegionStorageInfo info;
|
|
|
|
private final Path folder;
|
|
|
|
private final Path folder;
|
|
|
|
private final boolean sync;
|
|
|
|
private final boolean sync;
|
|
|
|
@@ -33,8 +33,33 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -33,8 +33,27 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
private static final int MAX_NON_EXISTING_CACHE = 1024 * 4;
|
|
|
|
private static final int MAX_NON_EXISTING_CACHE = 1024 * 4;
|
|
|
|
private final it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet nonExistingRegionFiles = new it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet();
|
|
|
|
private final it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet nonExistingRegionFiles = new it.unimi.dsi.fastutil.longs.LongLinkedOpenHashSet();
|
|
|
|
private static String getRegionFileName(final int chunkX, final int chunkZ) {
|
|
|
|
private static String getRegionFileName(final int chunkX, final int chunkZ) {
|
|
|
|
@@ -1053,31 +1053,25 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
+ public static abomination.IRegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
|
|
|
|
+ public static abomination.IRegionFile createNew(RegionStorageInfo info, Path filePath, Path folder, boolean sync) throws IOException{
|
|
|
|
+ final me.earthme.luminol.utils.EnumRegionFormat regionFormat = me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat;
|
|
|
|
+ final me.earthme.luminol.utils.EnumRegionFormat regionFormat = me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat;
|
|
|
|
+ final String fullFileName = filePath.getFileName().toString();
|
|
|
|
+ final String fullFileName = filePath.getFileName().toString();
|
|
|
|
+ final String argument;
|
|
|
|
+ final String[] fullNameSplit = fullFileName.split("\\.");
|
|
|
|
|
|
|
|
+ final String extensionName = fullNameSplit[fullNameSplit.length - 1];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ int lastDotIndex = fullFileName.lastIndexOf(".");
|
|
|
|
+ if (!regionFormat.getArgument().equalsIgnoreCase(extensionName)) {
|
|
|
|
+ if (lastDotIndex != -1 && lastDotIndex < fullFileName.length() - 1) {
|
|
|
|
+ net.minecraft.server.MinecraftServer.setFatalException(new RuntimeException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument()));
|
|
|
|
+ argument = fullFileName.substring(lastDotIndex + 1);
|
|
|
|
+ throw new IOException("Invalid region file format: " + extensionName + " expected " + regionFormat.getArgument());
|
|
|
|
+ }else {
|
|
|
|
|
|
|
|
+ throw new IOException("Invalid region file name: " + fullFileName);
|
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
+ if (!regionFormat.getArgument().equalsIgnoreCase(argument)) {
|
|
|
|
|
|
|
|
+ net.minecraft.server.MinecraftServer.setFatalException(new RuntimeException("Invalid region file format: " + argument + " expected " + regionFormat.getArgument()));
|
|
|
|
|
|
|
|
+ throw new IOException("Invalid region file format: ." + argument + " expected " + regionFormat.getArgument());
|
|
|
|
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ return regionFormat.getCreator().create(new me.earthme.luminol.utils.RegionCreatorInfo(info, filePath, folder, sync));
|
|
|
|
+ return regionFormat.getCreator().create(new me.earthme.luminol.utils.RegionCreatorInfo(info, filePath, folder, sync));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public static String getExtensionName() {
|
|
|
|
+ public static String getExtensionName() {
|
|
|
|
+ return me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat.getArgument();
|
|
|
|
+ return "." + me.earthme.luminol.config.modules.misc.RegionFormatConfig.regionFormat.getArgument();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Luminol end
|
|
|
|
+ // Luminol end
|
|
|
|
|
|
|
|
|
|
|
|
private boolean doesRegionFilePossiblyExist(final long position) {
|
|
|
|
private boolean doesRegionFilePossiblyExist(final long position) {
|
|
|
|
synchronized (this.nonExistingRegionFiles) {
|
|
|
|
synchronized (this.nonExistingRegionFiles) {
|
|
|
|
@@ -68,15 +93,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -68,15 +87,15 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@@ -1096,7 +1090,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
if (ret != null) {
|
|
|
|
if (ret != null) {
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -100,7 +125,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -100,7 +119,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
|
|
|
|
|
|
|
|
FileUtil.createDirectoriesSafe(this.folder);
|
|
|
|
FileUtil.createDirectoriesSafe(this.folder);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1105,7 +1099,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
|
|
|
|
|
|
|
|
this.regionCache.putAndMoveToFirst(key, ret);
|
|
|
|
this.regionCache.putAndMoveToFirst(key, ret);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -119,7 +144,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -119,7 +138,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
|
|
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
|
|
|
@@ -1114,7 +1108,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
|
|
|
|
|
|
|
|
// note: not required to keep regionfile loaded after this call, as the write param takes a regionfile as input
|
|
|
|
// note: not required to keep regionfile loaded after this call, as the write param takes a regionfile as input
|
|
|
|
// (and, the regionfile parameter is unused for writing until the write call)
|
|
|
|
// (and, the regionfile parameter is unused for writing until the write call)
|
|
|
|
@@ -153,7 +178,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -153,7 +172,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
) throws IOException {
|
|
|
|
) throws IOException {
|
|
|
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
|
|
|
final ChunkPos pos = new ChunkPos(chunkX, chunkZ);
|
|
|
|
if (writeData.result() == ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE) {
|
|
|
|
if (writeData.result() == ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE) {
|
|
|
|
@@ -1123,7 +1117,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
if (regionFile != null) {
|
|
|
|
if (regionFile != null) {
|
|
|
|
regionFile.clear(pos);
|
|
|
|
regionFile.clear(pos);
|
|
|
|
} // else: didn't exist
|
|
|
|
} // else: didn't exist
|
|
|
|
@@ -168,7 +193,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -168,7 +187,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
public final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.ReadData moonrise$readData(
|
|
|
|
public final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.ReadData moonrise$readData(
|
|
|
|
final int chunkX, final int chunkZ
|
|
|
|
final int chunkX, final int chunkZ
|
|
|
|
) throws IOException {
|
|
|
|
) throws IOException {
|
|
|
|
@@ -1132,7 +1126,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
|
|
|
|
|
|
|
|
final DataInputStream input = regionFile == null ? null : regionFile.getChunkDataInputStream(new ChunkPos(chunkX, chunkZ));
|
|
|
|
final DataInputStream input = regionFile == null ? null : regionFile.getChunkDataInputStream(new ChunkPos(chunkX, chunkZ));
|
|
|
|
|
|
|
|
|
|
|
|
@@ -221,7 +246,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -221,7 +240,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@Nullable
|
|
|
|
@Nullable
|
|
|
|
public static ChunkPos getRegionFileCoordinates(Path file) {
|
|
|
|
public static ChunkPos getRegionFileCoordinates(Path file) {
|
|
|
|
String fileName = file.getFileName().toString();
|
|
|
|
String fileName = file.getFileName().toString();
|
|
|
|
@@ -1141,7 +1135,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -250,12 +275,12 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -250,12 +269,12 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
@@ -1156,7 +1150,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
if (existingOnly) {
|
|
|
|
if (existingOnly) {
|
|
|
|
return this.moonrise$getRegionFileIfExists(chunkcoordintpair.x, chunkcoordintpair.z);
|
|
|
|
return this.moonrise$getRegionFileIfExists(chunkcoordintpair.x, chunkcoordintpair.z);
|
|
|
|
@@ -263,7 +288,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -263,7 +282,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
synchronized (this) {
|
|
|
|
synchronized (this) {
|
|
|
|
final long key = ChunkPos.asLong(chunkcoordintpair.x >> REGION_SHIFT, chunkcoordintpair.z >> REGION_SHIFT);
|
|
|
|
final long key = ChunkPos.asLong(chunkcoordintpair.x >> REGION_SHIFT, chunkcoordintpair.z >> REGION_SHIFT);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1165,7 +1159,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
if (ret != null) {
|
|
|
|
if (ret != null) {
|
|
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -278,7 +303,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -278,7 +297,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
|
|
|
|
|
|
|
|
FileUtil.createDirectoriesSafe(this.folder);
|
|
|
|
FileUtil.createDirectoriesSafe(this.folder);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1174,7 +1168,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
|
|
|
|
|
|
|
|
this.regionCache.putAndMoveToFirst(key, ret);
|
|
|
|
this.regionCache.putAndMoveToFirst(key, ret);
|
|
|
|
|
|
|
|
|
|
|
|
@@ -292,7 +317,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -292,7 +311,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
|
|
|
|
org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1183,7 +1177,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
synchronized (regionfile) {
|
|
|
|
synchronized (regionfile) {
|
|
|
|
try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
|
|
|
|
try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
|
|
|
|
CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
|
|
|
|
CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
|
|
|
|
@@ -327,7 +352,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -327,7 +346,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@Nullable
|
|
|
|
@Nullable
|
|
|
|
public CompoundTag read(ChunkPos pos) throws IOException {
|
|
|
|
public CompoundTag read(ChunkPos pos) throws IOException {
|
|
|
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
|
|
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
|
|
|
@@ -1192,7 +1186,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
if (regionfile == null) {
|
|
|
|
if (regionfile == null) {
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -391,7 +416,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -391,7 +410,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
|
|
|
|
|
|
|
|
public void scanChunk(ChunkPos chunkPos, StreamTagVisitor scanner) throws IOException {
|
|
|
|
public void scanChunk(ChunkPos chunkPos, StreamTagVisitor scanner) throws IOException {
|
|
|
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
|
|
|
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
|
|
|
|
@@ -1201,7 +1195,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
if (regionfile == null) {
|
|
|
|
if (regionfile == null) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -421,7 +446,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -421,7 +440,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper - rewrite chunk system - public
|
|
|
|
public void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper - rewrite chunk system - public
|
|
|
|
@@ -1210,7 +1204,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
if (regionfile == null) {
|
|
|
|
if (regionfile == null) {
|
|
|
|
// if the RegionFile doesn't exist, no point in deleting from it
|
|
|
|
// if the RegionFile doesn't exist, no point in deleting from it
|
|
|
|
@@ -465,7 +490,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -465,7 +484,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
synchronized (this) {
|
|
|
|
synchronized (this) {
|
|
|
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
|
|
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
|
|
|
@@ -1219,7 +1213,7 @@ index e40665cead218502b44dd49051a53326ed94f061..d16d0c0ec4cd32688b436bc73d152fe2
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
regionFile.close();
|
|
|
|
regionFile.close();
|
|
|
|
} catch (final IOException ex) {
|
|
|
|
} catch (final IOException ex) {
|
|
|
|
@@ -482,7 +507,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
@@ -482,7 +501,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
// Paper start - rewrite chunk system
|
|
|
|
synchronized (this) {
|
|
|
|
synchronized (this) {
|
|
|
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
|
|
|
final ExceptionCollector<IOException> exceptionCollector = new ExceptionCollector<>();
|
|
|
|
|
