Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -0,0 +1,61 @@
--- a/net/minecraft/resources/RegistryResourceAccess.java
+++ b/net/minecraft/resources/RegistryResourceAccess.java
@@ -160,8 +160,10 @@
}));
}
- private static final class Entry extends Record {
+ // CraftBukkit start
+ private static final record Entry(JsonElement data, int id, Lifecycle lifecycle) {
+ /*
final JsonElement data;
final int id;
final Lifecycle lifecycle;
@@ -183,6 +185,8 @@
public final boolean equals(Object object) {
return this.equals<invokedynamic>(this, object);
}
+ */
+ // CraftBukkit end
public JsonElement data() {
return this.data;
@@ -198,8 +202,10 @@
}
}
- public static final class ParsedEntry extends Record {
+ // CraftBukkit start
+ public static final record ParsedEntry<E>(E value, OptionalInt fixedId) {
+ /*
private final E value;
private final OptionalInt fixedId;
@@ -207,6 +213,8 @@
this.value = e0;
this.fixedId = optionalint;
}
+ */
+ // CraftBukkit end
public static <E> RegistryResourceAccess.ParsedEntry<E> createWithoutId(E e0) {
return new RegistryResourceAccess.ParsedEntry(e0, OptionalInt.empty());
@@ -216,6 +224,8 @@
return new RegistryResourceAccess.ParsedEntry(e0, OptionalInt.of(i));
}
+ // CraftBukkit start
+ /*
public final String toString() {
return this.toString < invokedynamic > (this);
}
@@ -235,5 +245,7 @@
public OptionalInt fixedId() {
return this.fixedId;
}
+ */
+ // CraftBukkit end
}
}