From f87d5ab52b3020adad4c909df1211b1d8a862c08 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 17 Jun 2021 01:51:18 -0500 Subject: [PATCH] Bump paperweight to 1.1.0 This paperweight update uses Hypo to cleanup and fix reobf mappings based on the completed jar, which removes a lot of issues we were previously having around weird CraftBukkit edge cases and synthetic issues (as always). It's not yet perfect (PaperMC/paperweight#18) but it's much better than it was. --- .../additional-spigot-member-mappings.csrg | 20 ------------------- build.gradle.kts | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/build-data/additional-spigot-member-mappings.csrg b/build-data/additional-spigot-member-mappings.csrg index 9452f6f5ca..0df7ebc7e2 100644 --- a/build-data/additional-spigot-member-mappings.csrg +++ b/build-data/additional-spigot-member-mappings.csrg @@ -4,23 +4,3 @@ # to getWorld(), which confuses our ability to map this method properly. This patch disambiguates it net/minecraft/world/item/trading/IMerchant fD ()Lnet/minecraft/world/level/World; getLevel net/minecraft/world/entity/npc/EntityVillagerAbstract fD ()Lnet/minecraft/world/level/World; getLevel - -# CraftBukkit mappings sometimes have mappings for child classes and not parent classes -# We handle this fine for deobf but this breaks reobf. These Patches fix those cases - -# BossBattle -> BossBattleServer -# net/minecraft/world/BossBattle a (F)V setProgress -# net/minecraft/world/BossBattle c (Z)Lnet/minecraft/world/BossBattle; setCreateFog -# net/minecraft/world/BossBattle a (Z)Lnet/minecraft/world/BossBattle; setDarkenSky -# net/minecraft/world/BossBattle b (Z)Lnet/minecraft/world/BossBattle; setPlayMusic - -# IChunkProvider -> ChunkProviderServer -# net/minecraft/world/level/chunk/IChunkProvider b (II)Z isLoaded - -# BehaviorWorkComposter -> BehaviorWork -net/minecraft/world/entity/ai/behavior/BehaviorWorkComposter a (Lnet/minecraft/server/level/WorldServer;Lnet/minecraft/world/entity/npc/EntityVillager;)V doWork - -# We add getLevel to the Hopper interface (implemented by Hoppers and Hopper Minecarts), but this also exists on BlockEntity, -# which Hoppers also extend. We need to map the method we add to the Hopper interface to the same name used for the method on BlockEntity -# to avoid remap causing issues -net/minecraft/world/level/block/entity/IHopper getWorld ()Lnet/minecraft/world/level/World; getLevel diff --git a/build.gradle.kts b/build.gradle.kts index 62d550f641..8490125534 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.0.5" + id("io.papermc.paperweight.core") version "1.1.0" } subprojects {