From b948925b87516ad034191f8f5034b6126d2b712e Mon Sep 17 00:00:00 2001 From: NeunEinser Date: Thu, 18 Apr 2019 22:51:33 +0200 Subject: [PATCH] A few new pre-4 mappings (#633) * A few new pre-4 mappings * typo * Update and rename ItemOminousBannerTranslataionKeyRenameFix.mapping to ItemOminousBannerTranslationKeyRenameFix.mapping * Improvements + some parameter names for CartographyTableContainer --- mappings/net/minecraft/client/gui/hud/DebugHud.mapping | 1 + .../container/CartographyTableContainer.mapping | 5 +++++ mappings/net/minecraft/container/Container.mapping | 5 +++++ .../datafixers/fixes/ItemOminousBannerRenameFix.mapping | 1 + .../entity/ai/brain/task/LoseJobOnSiteLossTask.mapping | 1 + mappings/net/minecraft/world/Heightmap.mapping | 9 +++------ 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/datafixers/fixes/ItemOminousBannerRenameFix.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index bed97fa376..71abb8273c 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -1,4 +1,5 @@ CLASS cwr net/minecraft/client/gui/hud/DebugHud + FIELD a HEIGHT_MAP_TYPES Ljava/util/Map; FIELD b client Lcvg; FIELD c fontRenderer Lcvy; FIELD d blockHit Lcrr; diff --git a/mappings/net/minecraft/container/CartographyTableContainer.mapping b/mappings/net/minecraft/container/CartographyTableContainer.mapping index 0ded27c7b7..96d4e6ccbf 100644 --- a/mappings/net/minecraft/container/CartographyTableContainer.mapping +++ b/mappings/net/minecraft/container/CartographyTableContainer.mapping @@ -1,10 +1,15 @@ CLASS ayg net/minecraft/container/CartographyTableContainer FIELD c inventory Lags; FIELD d context Layk; + FIELD e currentlyTakingItem Z + FIELD f resultSlot Lazi; METHOD (ILavv;)V ARG 1 syncId + ARG 2 inventory METHOD (ILavv;Layk;)V ARG 1 syncId + ARG 2 inventory + ARG 3 context METHOD a updateResult (Lbbz;Lbbz;Lbbz;)V ARG 1 map ARG 2 item diff --git a/mappings/net/minecraft/container/Container.mapping b/mappings/net/minecraft/container/Container.mapping index 2dc19d5832..5dc625b2a9 100644 --- a/mappings/net/minecraft/container/Container.mapping +++ b/mappings/net/minecraft/container/Container.mapping @@ -26,10 +26,12 @@ CLASS aya net/minecraft/container/Container METHOD a setStackInSlot (ILbbz;)V ARG 1 slot METHOD a onContentChanged (Lags;)V + ARG 1 inventory METHOD a checkContainerSize (Lags;I)V ARG 1 expectedSize METHOD a getNextActionId (Lavv;)S METHOD a canUse (Lavw;)Z + ARG 1 player METHOD a onButtonClick (Lavw;I)Z ARG 1 player ARG 2 id @@ -55,6 +57,8 @@ CLASS aya net/minecraft/container/Container ARG 3 endIndex ARG 4 fromLast METHOD a canInsertIntoSlot (Lbbz;Lazn;)Z + ARG 1 stack + ARG 2 slot METHOD a canStacksCombine (Lbbz;Lbbz;)Z METHOD a calculateComparatorOutput (Lbtk;)I ARG 0 entity @@ -74,6 +78,7 @@ CLASS aya net/minecraft/container/Container METHOD b calculateComparatorOutput (Lags;)I ARG 0 inventory METHOD b close (Lavw;)V + ARG 1 player METHOD b transferSlot (Lavw;I)Lbbz; ARG 1 player ARG 2 invSlot diff --git a/mappings/net/minecraft/datafixers/fixes/ItemOminousBannerRenameFix.mapping b/mappings/net/minecraft/datafixers/fixes/ItemOminousBannerRenameFix.mapping new file mode 100644 index 0000000000..726734dc71 --- /dev/null +++ b/mappings/net/minecraft/datafixers/fixes/ItemOminousBannerRenameFix.mapping @@ -0,0 +1 @@ +CLASS aae net/minecraft/datafixers/fixes/ItemOminousBannerRenameFix diff --git a/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping new file mode 100644 index 0000000000..7ee72934d5 --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask.mapping @@ -0,0 +1 @@ +CLASS ako net/minecraft/entity/ai/brain/task/LoseJobOnSiteLossTask diff --git a/mappings/net/minecraft/world/Heightmap.mapping b/mappings/net/minecraft/world/Heightmap.mapping index 331cb14101..2ffeb2b586 100644 --- a/mappings/net/minecraft/world/Heightmap.mapping +++ b/mappings/net/minecraft/world/Heightmap.mapping @@ -1,21 +1,18 @@ CLASS byo net/minecraft/world/Heightmap CLASS byo$a Type - FIELD a WORLD_SURFACE_WG Lbyo$a; - FIELD b WORLD_SURFACE Lbyo$a; - FIELD c OCEAN_FLOOR_WG Lbyo$a; - FIELD d OCEAN_FLOOR Lbyo$a; - FIELD e MOTION_BLOCKING Lbyo$a; - FIELD f MOTION_BLOCKING_NO_LEAVES Lbyo$a; FIELD g name Ljava/lang/String; FIELD h purpose Lbyo$b; FIELD i blockPredicate Ljava/util/function/Predicate; FIELD j BY_NAME Ljava/util/Map; METHOD (Ljava/lang/String;ILjava/lang/String;Lbyo$b;Ljava/util/function/Predicate;)V ARG 3 name + ARG 4 purpose + ARG 5 blockPredicate METHOD a getName ()Ljava/lang/String; METHOD a byName (Ljava/lang/String;)Lbyo$a; ARG 0 name METHOD b shouldSendToClient ()Z + METHOD c isStoredServerSide ()Z METHOD d getBlockPredicate ()Ljava/util/function/Predicate; CLASS byo$b Purpose FIELD a ALWAYS_TRUE Ljava/util/function/Predicate;