SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.19

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-06-08 02:00:00 +10:00
parent 91d9aa9a89
commit 25f3b50f6b
332 changed files with 3628 additions and 2559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/nms-patches/net/minecraft/util/worldupdate/WorldUpgrader.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/net/minecraft/util/worldupdate/WorldUpgrader.java
@@ -38,6 +38,10 @@
@@ -40,6 +40,10 @@
import net.minecraft.world.level.storage.WorldPersistentData;
import org.slf4j.Logger;
@@ -11,16 +11,16 @@
public class WorldUpgrader {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -53,7 +57,7 @@
@@ -55,7 +59,7 @@
private volatile int totalChunks;
private volatile int converted;
private volatile int skipped;
- private final Object2FloatMap<ResourceKey<World>> progressMap = Object2FloatMaps.synchronize(new Object2FloatOpenCustomHashMap(SystemUtils.identityStrategy()));
+ private final Object2FloatMap<ResourceKey<WorldDimension>> progressMap = Object2FloatMaps.synchronize(new Object2FloatOpenCustomHashMap(SystemUtils.identityStrategy())); // CraftBukkit
private volatile IChatBaseComponent status = new ChatMessage("optimizeWorld.stage.counting");
private volatile IChatBaseComponent status = IChatBaseComponent.translatable("optimizeWorld.stage.counting");
private static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
private final WorldPersistentData overworldDataStorage;
@@ -86,13 +90,13 @@
@@ -88,13 +92,13 @@
private void work() {
this.totalChunks = 0;
@@ -37,7 +37,7 @@
list = this.getAllChunkPos(resourcekey);
builder.put(resourcekey, list.listIterator());
@@ -102,18 +106,18 @@
@@ -104,18 +108,18 @@
this.finished = true;
} else {
float f = (float) this.totalChunks;
@@ -60,8 +60,8 @@
+ ImmutableMap<ResourceKey<WorldDimension>, IChunkLoader> immutablemap1 = builder1.build(); // CraftBukkit
long i = SystemUtils.getMillis();
this.status = new ChatMessage("optimizeWorld.stage.upgrading");
@@ -125,7 +129,7 @@
this.status = IChatBaseComponent.translatable("optimizeWorld.stage.upgrading");
@@ -127,7 +131,7 @@
float f2;
for (UnmodifiableIterator unmodifiableiterator2 = immutableset.iterator(); unmodifiableiterator2.hasNext(); f1 += f2) {
@@ -70,7 +70,7 @@
ListIterator<ChunkCoordIntPair> listiterator = (ListIterator) immutablemap.get(resourcekey2);
IChunkLoader ichunkloader = (IChunkLoader) immutablemap1.get(resourcekey2);
@@ -138,10 +142,10 @@
@@ -140,10 +144,10 @@
if (nbttagcompound != null) {
int j = IChunkLoader.getVersion(nbttagcompound);
@@ -83,7 +83,7 @@
ChunkCoordIntPair chunkcoordintpair1 = new ChunkCoordIntPair(nbttagcompound1.getInt("xPos"), nbttagcompound1.getInt("zPos"));
if (!chunkcoordintpair1.equals(chunkcoordintpair)) {
@@ -213,8 +217,8 @@
@@ -223,8 +227,8 @@
}
}
@@ -94,7 +94,7 @@
File file1 = new File(file, "region");
File[] afile = file1.listFiles((file2, s) -> {
return s.endsWith(".mca");
@@ -274,7 +278,7 @@
@@ -284,7 +288,7 @@
}
public ImmutableSet<ResourceKey<World>> levels() {