twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 19:55:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Begin 1.21.6-pre1

Browse Source 
Initial move of patches to rejected and non rejected source patches to
publish to patch-roulette.
This commit is contained in:
Bjarne Koll
2025-05-28 13:23:32 +02:00
parent a033e3b9ef
commit b745ab65e6
233 changed files with 2443 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
paper-server/patches/sources/net/minecraft/resources/RegistryDataLoader.java.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/resources/RegistryDataLoader.java
+++ b/net/minecraft/resources/RegistryDataLoader.java
@@ -271,13 +_,14 @@
@@ -274,13 +_,14 @@
RegistryOps<JsonElement> ops,
ResourceKey<E> resourceKey,
Resource resource,
@@ -9,7 +9,7 @@
+ io.papermc.paper.registry.data.util.Conversions conversions // Paper - pass conversions
) throws IOException {
try (Reader reader = resource.openAsReader()) {
JsonElement jsonElement = JsonParser.parseReader(reader);
JsonElement jsonElement = StrictJsonParser.parse(reader);
DataResult<E> dataResult = codec.parse(ops, jsonElement);
E orThrow = dataResult.getOrThrow();
- registry.register(resourceKey, orThrow, registrationInfo);
@@ -17,7 +17,7 @@
}
}
@@ -291,6 +_,7 @@
@@ -294,6 +_,7 @@
FileToIdConverter fileToIdConverter = FileToIdConverter.registry(registry.key());
RegistryOps<JsonElement> registryOps = RegistryOps.create(JsonOps.INSTANCE, registryInfoLookup);
@@ -25,7 +25,7 @@
for (Entry<ResourceLocation, Resource> entry : fileToIdConverter.listMatchingResources(resourceManager).entrySet()) {
ResourceLocation resourceLocation = entry.getKey();
ResourceKey<E> resourceKey = ResourceKey.create(registry.key(), fileToIdConverter.fileToId(resourceLocation));
@@ -298,7 +_,7 @@
@@ -301,7 +_,7 @@
RegistrationInfo registrationInfo = REGISTRATION_INFO_CACHE.apply(resource.knownPackInfo());
try {
@@ -34,7 +34,7 @@
} catch (Exception var14) {
loadingErrors.put(
resourceKey,
@@ -307,7 +_,9 @@
@@ -310,7 +_,9 @@
}
}
@@ -45,7 +45,7 @@
}
static <E> void loadContentsFromNetwork(
@@ -324,6 +_,7 @@
@@ -327,6 +_,7 @@
RegistryOps<JsonElement> registryOps1 = RegistryOps.create(JsonOps.INSTANCE, registryInfoLookup);
FileToIdConverter fileToIdConverter = FileToIdConverter.registry(registry.key());
@@ -53,7 +53,7 @@
for (RegistrySynchronization.PackedRegistryEntry packedRegistryEntry : networkedRegistryData.elements) {
ResourceKey<E> resourceKey = ResourceKey.create(registry.key(), packedRegistryEntry.id());
Optional<Tag> optional = packedRegistryEntry.data();
@@ -342,7 +_,7 @@
@@ -345,7 +_,7 @@
try {
Resource resourceOrThrow = resourceProvider.getResourceOrThrow(resourceLocation);
@@ -62,7 +62,7 @@
} catch (Exception var17) {
loadingErrors.put(resourceKey, new IllegalStateException("Failed to parse local data", var17));
}
@@ -384,6 +_,7 @@
@@ -387,6 +_,7 @@
RegistryDataLoader.Loader<T> create(Lifecycle registryLifecycle, Map<ResourceKey<?>, Exception> loadingErrors) {
WritableRegistry<T> writableRegistry = new MappedRegistry<>(this.key, registryLifecycle);