From 2107b78f009871280560f25055b1c48b59842624 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Sun, 20 Jun 2021 16:22:20 -0500 Subject: [PATCH] Update paperweight to 1.1.6 --- build-data/reobf-mappings-patch.tiny | 10 ++++++---- build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-data/reobf-mappings-patch.tiny b/build-data/reobf-mappings-patch.tiny index 33fea4d20e..7513c20c25 100644 --- a/build-data/reobf-mappings-patch.tiny +++ b/build-data/reobf-mappings-patch.tiny @@ -12,12 +12,14 @@ tiny 2 0 mojang+yarn spigot -# CraftBukkit changes this field's type, which causes the original mapping to miss +# CraftBukkit changes type c net/minecraft/server/level/ServerLevel net/minecraft/server/level/WorldServer f Lnet/minecraft/world/level/storage/PrimaryLevelData; serverLevelData E -# generic hell TODO no clue why the return type here needs to be spigot mapped? + +# unknown issue c net/minecraft/core/RegistryAccess net/minecraft/core/IRegistryCustom - m (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/IRegistry; registryOrThrow d -# paper changes type + m (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Registry; registryOrThrow d + +# Paper changes type c net/minecraft/core/MappedRegistry net/minecraft/core/RegistryMaterials f Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap; toId bw diff --git a/build.gradle.kts b/build.gradle.kts index 49acd816ed..0a9c12efdb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java id("com.github.johnrengelman.shadow") version "7.0.0" apply false - id("io.papermc.paperweight.core") version "1.1.5" + id("io.papermc.paperweight.core") version "1.1.6" } subprojects {