diff options
| author | Noah van der Aa <[email protected]> | 2024-08-09 01:59:51 +0200 |
|---|---|---|
| committer | Noah van der Aa <[email protected]> | 2024-08-09 01:59:51 +0200 |
| commit | ad1a5e1a1c59d2e94e70976eb93a57d45b9f7316 (patch) | |
| tree | 0ba2f7a540befad739922e1530919ab8ee98a69a | |
| parent | 2b5dc6db49f1c15f42255684274e92bac60b1f82 (diff) | |
| download | Paper-ad1a5e1a1c59d2e94e70976eb93a57d45b9f7316.tar.gz Paper-ad1a5e1a1c59d2e94e70976eb93a57d45b9f7316.zip | |
Fix registry crash
3 files changed, 5 insertions, 6 deletions
diff --git a/patches/server/0474-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0474-Add-RegistryAccess-for-managing-Registries.patch index 4652577439..3d0ad0a80c 100644 --- a/patches/server/0474-Add-RegistryAccess-for-managing-Registries.patch +++ b/patches/server/0474-Add-RegistryAccess-for-managing-Registries.patch @@ -12,10 +12,10 @@ public net.minecraft.server.RegistryLayer STATIC_ACCESS diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java new file mode 100644 -index 0000000000000000000000000000000000000000..183a649cadcf96f2ecca18fef9b93f0176febeab +index 0000000000000000000000000000000000000000..3cc03a8ce584b0e8db0054b75a67062d0cd6cc7e --- /dev/null +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java -@@ -0,0 +1,144 @@ +@@ -0,0 +1,143 @@ +package io.papermc.paper.registry; + +import io.papermc.paper.adventure.PaperAdventure; @@ -110,7 +110,6 @@ index 0000000000000000000000000000000000000000..183a649cadcf96f2ecca18fef9b93f01 + apiOnly(Registries.BIOME, RegistryKey.BIOME, () -> org.bukkit.Registry.BIOME), + apiOnly(Registries.PAINTING_VARIANT, RegistryKey.PAINTING_VARIANT, () -> org.bukkit.Registry.ART), + apiOnly(Registries.ATTRIBUTE, RegistryKey.ATTRIBUTE, () -> org.bukkit.Registry.ATTRIBUTE), -+ apiOnly(Registries.BANNER_PATTERN, RegistryKey.BANNER_PATTERN, () -> org.bukkit.Registry.BANNER_PATTERN), + apiOnly(Registries.ENTITY_TYPE, RegistryKey.ENTITY_TYPE, () -> org.bukkit.Registry.ENTITY_TYPE), + apiOnly(Registries.PARTICLE_TYPE, RegistryKey.PARTICLE_TYPE, () -> org.bukkit.Registry.PARTICLE_TYPE), + apiOnly(Registries.POTION, RegistryKey.POTION, () -> org.bukkit.Registry.POTION), diff --git a/patches/server/1021-Registry-Modification-API.patch b/patches/server/1021-Registry-Modification-API.patch index d17e5191bb..5f96cdff71 100644 --- a/patches/server/1021-Registry-Modification-API.patch +++ b/patches/server/1021-Registry-Modification-API.patch @@ -9,7 +9,7 @@ public net.minecraft.resources.RegistryOps lookupProvider public net.minecraft.resources.RegistryOps$HolderLookupAdapter diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java -index 183a649cadcf96f2ecca18fef9b93f0176febeab..22715ff8b21d76004e8995758fb4aa05b2ec3486 100644 +index 3cc03a8ce584b0e8db0054b75a67062d0cd6cc7e..ad0ba4b9f7e74b53e3dac1ae02476324da428d53 100644 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java @@ -2,6 +2,7 @@ package io.papermc.paper.registry; @@ -28,7 +28,7 @@ index 183a649cadcf96f2ecca18fef9b93f0176febeab..22715ff8b21d76004e8995758fb4aa05 @DefaultQualifier(NonNull.class) public final class PaperRegistries { -@@ -139,6 +141,15 @@ public final class PaperRegistries { +@@ -138,6 +140,15 @@ public final class PaperRegistries { return ResourceKey.create((ResourceKey<? extends Registry<M>>) PaperRegistries.registryToNms(typedKey.registryKey()), PaperAdventure.asVanilla(typedKey.key())); } diff --git a/patches/server/1022-Add-registry-entry-and-builders.patch b/patches/server/1022-Add-registry-entry-and-builders.patch index 2a64231d8e..5fd152f0d2 100644 --- a/patches/server/1022-Add-registry-entry-and-builders.patch +++ b/patches/server/1022-Add-registry-entry-and-builders.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add registry entry and builders diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java -index 22715ff8b21d76004e8995758fb4aa05b2ec3486..a853abaa9a714d97cf689d490b22f2a3cd5e8df2 100644 +index ad0ba4b9f7e74b53e3dac1ae02476324da428d53..8ee45ac0edc7e93994a6f880cb2a87b12a1dd875 100644 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java @@ -1,6 +1,8 @@ |