From dc265f2888208b086a85f869665b4f3e6399747f Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Thu, 15 Nov 2018 18:25:00 +0100 Subject: [PATCH] method propagation fixes --- mappings/bhz.mapping | 15 +++++++++++++++ mappings/bie.mapping | 11 +++++++++++ mappings/bmr.mapping | 5 +++++ mappings/csp.mapping | 18 ++++++++++++++++++ mappings/net/minecraft/block/Block.mapping | 2 +- .../net/minecraft/block/BlockBeacon.mapping | 1 + .../net/minecraft/block/BlockGlass.mapping | 1 + .../minecraft/block/BlockGlassStained.mapping | 1 + .../net/minecraft/block/BlockLeaves.mapping | 2 +- .../net/minecraft/block/BlockObserver.mapping | 1 + .../minecraft/block/BlockScaffolding.mapping | 2 ++ .../client/gui/GuiEventListener.mapping | 1 - mappings/net/minecraft/container/Slot.mapping | 1 - mappings/net/minecraft/world/World.mapping | 4 +++- mappings/oh.mapping | 4 ++++ mappings/un.mapping | 2 ++ 16 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 mappings/bhz.mapping create mode 100644 mappings/bie.mapping create mode 100644 mappings/bmr.mapping create mode 100644 mappings/csp.mapping create mode 100644 mappings/oh.mapping diff --git a/mappings/bhz.mapping b/mappings/bhz.mapping new file mode 100644 index 0000000000..969f12a475 --- /dev/null +++ b/mappings/bhz.mapping @@ -0,0 +1,15 @@ +CLASS bhz + METHOD a getPlacementState (Latj;)Lbnz; + METHOD a createBlockEntity (Lazq;)Lbmc; + METHOD a activate (Lbnz;Lbae;Les;Laqa;Laev;Lex;FFF)Z + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 player + ARG 5 hand + ARG 6 facing + ARG 7 hitX + ARG 8 hitY + METHOD a applyRotation (Lbnz;Lbjp;)Lbnz; + ARG 1 state + METHOD a appendProperties (Lboa$a;)V diff --git a/mappings/bie.mapping b/mappings/bie.mapping new file mode 100644 index 0000000000..a5cf062808 --- /dev/null +++ b/mappings/bie.mapping @@ -0,0 +1,11 @@ +CLASS bie + METHOD a getPlacementState (Latj;)Lbnz; + METHOD a getBoundingShape (Lbnz;Lazq;Les;)Lckm; + ARG 1 state + ARG 2 view + METHOD a canPlaceAt (Lbnz;Lbai;Les;)Z + ARG 1 world + METHOD a getRenderingState (Lbnz;Lex;Lbnz;Lbaf;Les;Les;)Lbnz; + ARG 1 state + METHOD a appendProperties (Lboa$a;)V + METHOD c getRenderLayer ()Lazr; diff --git a/mappings/bmr.mapping b/mappings/bmr.mapping new file mode 100644 index 0000000000..028f52e029 --- /dev/null +++ b/mappings/bmr.mapping @@ -0,0 +1,5 @@ +CLASS bmr + METHOD a serialize (Lho;)Lho; + METHOD aa_ getUpdatePacket ()Lka; + METHOD ab_ serializeInitialChunkData ()Lho; + METHOD b deserialize (Lho;)V diff --git a/mappings/csp.mapping b/mappings/csp.mapping new file mode 100644 index 0000000000..838a91777b --- /dev/null +++ b/mappings/csp.mapping @@ -0,0 +1,18 @@ +CLASS csp + CLASS csp$1 + METHOD a onPressed (DD)V + CLASS csp$2 + METHOD a onPressed (DD)V + METHOD a draw (IIF)V + ARG 1 mouseX + ARG 2 mouseY + METHOD b onScaleChanged (Lcmx;II)V + ARG 1 game + ARG 2 width + METHOD c onInitialized ()V + METHOD f update ()V + METHOD g close ()V + METHOD keyPressed (III)Z + ARG 1 keyCode + ARG 2 scanCode + METHOD n onClosed ()V diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 68914997c9..147ab7230b 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -144,7 +144,7 @@ CLASS bfg net/minecraft/block/Block ARG 3 pos ARG 4 state METHOD a rayTrace (Lbnz;Lbae;Les;Lcjs;Lcjs;)Lcjp; - METHOD a (Lbnz;Lbae;Les;Ljava/util/Random;)V + METHOD a randomTick (Lbnz;Lbae;Les;Ljava/util/Random;)V ARG 1 world ARG 2 state ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockBeacon.mapping b/mappings/net/minecraft/block/BlockBeacon.mapping index 23cbcc2d1e..7f2b2c32d4 100644 --- a/mappings/net/minecraft/block/BlockBeacon.mapping +++ b/mappings/net/minecraft/block/BlockBeacon.mapping @@ -16,3 +16,4 @@ CLASS bfb net/minecraft/block/BlockBeacon ARG 8 hitY METHOD b getRenderType (Lbnz;)Lbjm; METHOD c getRenderLayer ()Lazr; + METHOD d isSimpleFullBlock (Lbnz;Lazq;Les;)Z diff --git a/mappings/net/minecraft/block/BlockGlass.mapping b/mappings/net/minecraft/block/BlockGlass.mapping index b3e6c804fd..74fd3bc862 100644 --- a/mappings/net/minecraft/block/BlockGlass.mapping +++ b/mappings/net/minecraft/block/BlockGlass.mapping @@ -1,2 +1,3 @@ CLASS bhl net/minecraft/block/BlockGlass METHOD c getRenderLayer ()Lazr; + METHOD d isSimpleFullBlock (Lbnz;Lazq;Les;)Z diff --git a/mappings/net/minecraft/block/BlockGlassStained.mapping b/mappings/net/minecraft/block/BlockGlassStained.mapping index d8d6cd3467..3c6ab8d06a 100644 --- a/mappings/net/minecraft/block/BlockGlassStained.mapping +++ b/mappings/net/minecraft/block/BlockGlassStained.mapping @@ -9,3 +9,4 @@ CLASS bkl net/minecraft/block/BlockGlassStained ARG 3 pos ARG 4 state METHOD c getRenderLayer ()Lazr; + METHOD d isSimpleFullBlock (Lbnz;Lazq;Les;)Z diff --git a/mappings/net/minecraft/block/BlockLeaves.mapping b/mappings/net/minecraft/block/BlockLeaves.mapping index dd3f2b4e73..d9bc78bed1 100644 --- a/mappings/net/minecraft/block/BlockLeaves.mapping +++ b/mappings/net/minecraft/block/BlockLeaves.mapping @@ -19,5 +19,5 @@ CLASS bif net/minecraft/block/BlockLeaves ARG 1 world ARG 2 state ARG 3 pos - METHOD e canSuffocate (Lbnz;)Z + METHOD e isFullBoundsCubeForCulling (Lbnz;)Z METHOD m hasRandomTicks (Lbnz;)Z diff --git a/mappings/net/minecraft/block/BlockObserver.mapping b/mappings/net/minecraft/block/BlockObserver.mapping index 941e1eb293..2fd2bf17c1 100644 --- a/mappings/net/minecraft/block/BlockObserver.mapping +++ b/mappings/net/minecraft/block/BlockObserver.mapping @@ -1,5 +1,6 @@ CLASS biv net/minecraft/block/BlockObserver METHOD a getPlacementState (Latj;)Lbnz; + METHOD a (Lbae;Les;Lbnz;)V METHOD a getWeakRedstonePower (Lbnz;Lazq;Les;Lex;)I ARG 1 state ARG 2 view diff --git a/mappings/net/minecraft/block/BlockScaffolding.mapping b/mappings/net/minecraft/block/BlockScaffolding.mapping index 56f1a88527..f575b2f928 100644 --- a/mappings/net/minecraft/block/BlockScaffolding.mapping +++ b/mappings/net/minecraft/block/BlockScaffolding.mapping @@ -12,6 +12,8 @@ CLASS bjs net/minecraft/block/BlockScaffolding ARG 1 world ARG 2 state ARG 3 pos + METHOD a canPlaceAt (Lbnz;Lbai;Les;)Z + ARG 1 world METHOD a getRenderingState (Lbnz;Lex;Lbnz;Lbaf;Les;Les;)Lbnz; ARG 1 state METHOD a appendProperties (Lboa$a;)V diff --git a/mappings/net/minecraft/client/gui/GuiEventListener.mapping b/mappings/net/minecraft/client/gui/GuiEventListener.mapping index 1ecb5a0a8e..4687cbf344 100644 --- a/mappings/net/minecraft/client/gui/GuiEventListener.mapping +++ b/mappings/net/minecraft/client/gui/GuiEventListener.mapping @@ -6,4 +6,3 @@ CLASS cos net/minecraft/client/gui/GuiEventListener ARG 1 keyCode ARG 2 scanCode METHOD mouseClicked (DDI)Z - ARG 1 mouseX diff --git a/mappings/net/minecraft/container/Slot.mapping b/mappings/net/minecraft/container/Slot.mapping index 097cececa4..fbe09f4144 100644 --- a/mappings/net/minecraft/container/Slot.mapping +++ b/mappings/net/minecraft/container/Slot.mapping @@ -7,7 +7,6 @@ CLASS asu net/minecraft/container/Slot METHOD a getMaxStackAmount ()I METHOD a takeStack (I)Lavf; METHOD a matches (Laep;I)Z - ARG 1 inventory METHOD a canTakeItems (Laqa;)Z METHOD a onTakeItem (Laqa;Lavf;)Lavf; METHOD a canInsert (Lavf;)Z diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 82eb27df86..4feeb0dc92 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -106,6 +106,8 @@ CLASS bae net/minecraft/world/World METHOD a getTop (Lbrm$a;II)I ARG 1 type ARG 2 x + METHOD a getTopPosition (Lbrm$a;Les;)Les; + ARG 1 type METHOD a isAreaNotEmpty (Lcjo;)Z METHOD a rayTrace (Lcjs;Lcjs;)Lcjp; ARG 1 begin @@ -194,7 +196,7 @@ CLASS bae net/minecraft/world/World METHOD d setTicksSinceLightningClient (I)V METHOD d addGlobalEntity (Lagc;)Z METHOD d isAir (Les;)Z - METHOD e isRemote ()Z + METHOD e ()Z METHOD e getFogColor (F)Lcjs; METHOD e getBiome (Les;)Lbbd; METHOD f getBlockEntity (Les;)Lbmc; diff --git a/mappings/oh.mapping b/mappings/oh.mapping new file mode 100644 index 0000000000..84b19c61da --- /dev/null +++ b/mappings/oh.mapping @@ -0,0 +1,4 @@ +CLASS oh + METHOD a read (Lip;)V + METHOD a apply (Lis;)V + METHOD b write (Lip;)V diff --git a/mappings/un.mapping b/mappings/un.mapping index e2efdd9d14..db6d495fcf 100644 --- a/mappings/un.mapping +++ b/mappings/un.mapping @@ -12,6 +12,8 @@ CLASS un METHOD a getTop (Lbrm$a;II)I ARG 1 type ARG 2 x + METHOD a getTopPosition (Lbrm$a;Les;)Les; + ARG 1 type METHOD a clearBlockState (Les;)Z METHOD a updateNeighbors (Les;Lbfg;)V METHOD a setBlockState (Les;Lbnz;I)Z