Update to Minecraft 1.20

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-06-08 01:30:00 +10:00
parent bac55e67d6
commit 9d740b84b0
269 changed files with 2605 additions and 2568 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/DispenserRegistry.java
+++ b/net/minecraft/server/DispenserRegistry.java
@@ -26,6 +26,12 @@
@@ -30,6 +30,12 @@
import net.minecraft.world.level.block.BlockFire;
import org.slf4j.Logger;
@@ -13,7 +13,7 @@
public class DispenserRegistry {
public static final PrintStream STDOUT = System.out;
@@ -36,6 +42,23 @@
@@ -41,6 +47,23 @@
public static void bootStrap() {
if (!DispenserRegistry.isBootstrapped) {
@@ -35,11 +35,11 @@
+ }
+ // CraftBukkit end
DispenserRegistry.isBootstrapped = true;
if (BuiltInRegistries.REGISTRY.keySet().isEmpty()) {
throw new IllegalStateException("Unable to load registries");
@@ -52,6 +75,69 @@
BuiltInRegistries.bootStrap();
Instant instant = Instant.now();
@@ -61,6 +84,69 @@
wrapStreams();
DispenserRegistry.bootstrapDuration.set(Duration.between(instant, Instant.now()).toMillis());
}
+ // CraftBukkit start - easier than fixing the decompile
+ DataConverterFlattenData.register(1008, "{Name:'minecraft:oak_sign',Properties:{rotation:'0'}}", "{Name:'minecraft:standing_sign',Properties:{rotation:'0'}}");