Update to Minecraft 1.17.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-07-07 00:00:00 +10:00
parent 0392f45e9c
commit e8c9836ec9
59 changed files with 428 additions and 492 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/storage/Convertable.java
+++ b/net/minecraft/world/level/storage/Convertable.java
@@ -60,6 +60,10 @@
@@ -61,6 +61,10 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -11,7 +11,7 @@
public class Convertable {
static final Logger LOGGER = LogManager.getLogger();
@@ -105,26 +109,26 @@
@@ -106,26 +110,26 @@
Logger logger = Convertable.LOGGER;
Objects.requireNonNull(logger);
@@ -42,7 +42,7 @@
return new IllegalStateException("Failed to get noise settings registry");
});
@@ -294,9 +298,23 @@
@@ -302,9 +306,23 @@
return this.backupDir;
}
@@ -68,7 +68,7 @@
public class ConversionSession implements AutoCloseable {
@@ -304,8 +322,12 @@
@@ -312,8 +330,12 @@
public final Path levelPath;
private final String levelId;
private final Map<SavedFile, Path> resources = Maps.newHashMap();
@@ -82,7 +82,7 @@
this.levelId = s;
this.levelPath = Convertable.this.baseDir.resolve(s);
this.lock = SessionLock.a(this.levelPath);
@@ -322,7 +344,7 @@
@@ -330,7 +352,7 @@
}
public File a(ResourceKey<World> resourcekey) {