Update to Minecraft 1.17

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-06-11 15:00:00 +10:00
parent 75faba7fde
commit b3a8254758
619 changed files with 10708 additions and 8451 deletions

View File

@@ -32,7 +32,7 @@
public static Properties loadPropertiesFile(Path path) {
Properties properties = new Properties();
@@ -61,6 +76,11 @@
@@ -58,6 +73,11 @@
public void savePropertiesFile(Path path) {
try {
@@ -42,9 +42,9 @@
+ }
+ // CraftBukkit end
OutputStream outputstream = Files.newOutputStream(path);
Throwable throwable = null;
@@ -92,7 +112,7 @@
try {
@@ -86,7 +106,7 @@
private static <V extends Number> Function<String, V> a(Function<String, V> function) {
return (s) -> {
try {
@@ -53,7 +53,7 @@
} catch (NumberFormatException numberformatexception) {
return null;
}
@@ -111,7 +131,7 @@
@@ -105,7 +125,7 @@
@Nullable
private String c(String s) {
@@ -62,7 +62,7 @@
}
@Nullable
@@ -139,7 +159,7 @@
@@ -133,7 +153,7 @@
V v1 = MoreObjects.firstNonNull(s1 != null ? function.apply(s1) : null, v0);
this.properties.put(s, function1.apply(v1));
@@ -71,7 +71,7 @@
}
protected <V> V a(String s, Function<String, V> function, UnaryOperator<V> unaryoperator, Function<V, String> function1, V v0) {
@@ -168,7 +188,7 @@
@@ -162,7 +182,7 @@
}
protected int getInt(String s, int i) {
@@ -80,7 +80,7 @@
}
protected PropertyManager<T>.EditableProperty<Integer> b(String s, int i) {
@@ -180,7 +200,7 @@
@@ -174,7 +194,7 @@
}
protected long getLong(String s, long i) {
@@ -89,7 +89,7 @@
}
protected boolean getBoolean(String s, boolean flag) {
@@ -203,7 +223,7 @@
@@ -197,7 +217,7 @@
return properties;
}
@@ -98,19 +98,19 @@
public class EditableProperty<V> implements Supplier<V> {
@@ -211,7 +231,7 @@
private final V c;
private final Function<V, String> d;
@@ -205,7 +225,7 @@
private final V value;
private final Function<V, String> serializer;
- private EditableProperty(String s, Object object, Function function) {
+ private EditableProperty(String s, V object, Function function) { // CraftBukkit - decompile error
this.b = s;
this.c = object;
this.d = function;
@@ -225,7 +245,7 @@
- EditableProperty(String s, Object object, Function function) {
+ EditableProperty(String s, V object, Function function) { // CraftBukkit - decompile error
this.key = s;
this.value = object;
this.serializer = function;
@@ -219,7 +239,7 @@
Properties properties = PropertyManager.this.a();
properties.put(this.b, this.d.apply(v0));
properties.put(this.key, this.serializer.apply(v0));
- return PropertyManager.this.reload(iregistrycustom, properties);
+ return PropertyManager.this.reload(iregistrycustom, properties, PropertyManager.this.options); // CraftBukkit
}