From f4f29cfa8e2cdd1860607990375661f1057c6708 Mon Sep 17 00:00:00 2001 From: asie Date: Fri, 26 Oct 2018 08:23:20 +0200 Subject: [PATCH] fix mapping issue, start mapping fluids, map a bit more block stuff --- mappings/adn.mapping | 4 ---- mappings/bgc.mapping | 21 ------------------- mappings/bii.mapping | 11 ---------- .../block/BlockGrass.mapping => bjd.mapping} | 2 +- mappings/bln.mapping | 1 + mappings/bog.mapping | 2 +- mappings/boh.mapping | 2 +- mappings/bop.mapping | 2 +- mappings/cac.mapping | 1 - mappings/cad.mapping | 2 ++ mappings/dag.mapping | 2 +- .../minecraft/block/BlockFluid.mapping} | 2 +- .../minecraft/block/BlockPodzol.mapping} | 2 +- .../net/minecraft/block/BlockSkull.mapping | 19 +++++++++++++++++ .../minecraft/block/BlockSkullBase.mapping} | 4 +++- .../minecraft/block/BlockSkullPlayer.mapping} | 2 +- .../block/BlockSkullPlayerWall.mapping} | 2 +- mappings/net/minecraft/block/Material.mapping | 1 + .../minecraft/block/state/BlockState.mapping | 2 +- mappings/net/minecraft/fluid/Fluid.mapping | 3 +++ .../net/minecraft/fluid/FluidBase.mapping | 2 ++ .../net/minecraft/fluid/FluidEmpty.mapping | 2 ++ .../net/minecraft/fluid/FluidLava.mapping | 6 ++++++ .../net/minecraft/fluid/FluidState.mapping | 3 +++ .../net/minecraft/fluid/FluidWater.mapping | 6 ++++++ .../reference/BlockProperties.mapping | 1 + .../net/minecraft/reference/Fluids.mapping | 6 ++++++ .../minecraft/server/MinecraftServer.mapping | 1 + .../minecraft/sortme/BlockProperties.mapping | 1 - .../minecraft/util/ThreadTaskQueue.mapping | 8 +++++++ .../net/minecraft/world/IBlockView.mapping | 2 +- mappings/net/minecraft/world/World.mapping | 2 +- .../minecraft/world/chunk/ChunkCache.mapping | 2 +- mappings/uh.mapping | 2 +- 34 files changed, 78 insertions(+), 53 deletions(-) delete mode 100644 mappings/adn.mapping delete mode 100644 mappings/bgc.mapping delete mode 100644 mappings/bii.mapping rename mappings/{net/minecraft/block/BlockGrass.mapping => bjd.mapping} (93%) create mode 100644 mappings/bln.mapping delete mode 100644 mappings/cac.mapping create mode 100644 mappings/cad.mapping rename mappings/{bgu.mapping => net/minecraft/block/BlockFluid.mapping} (94%) rename mappings/{bim.mapping => net/minecraft/block/BlockPodzol.mapping} (75%) create mode 100644 mappings/net/minecraft/block/BlockSkull.mapping rename mappings/{bdf.mapping => net/minecraft/block/BlockSkullBase.mapping} (62%) rename mappings/{bhj.mapping => net/minecraft/block/BlockSkullPlayer.mapping} (77%) rename mappings/{bhk.mapping => net/minecraft/block/BlockSkullPlayerWall.mapping} (75%) create mode 100644 mappings/net/minecraft/fluid/Fluid.mapping create mode 100644 mappings/net/minecraft/fluid/FluidBase.mapping create mode 100644 mappings/net/minecraft/fluid/FluidEmpty.mapping create mode 100644 mappings/net/minecraft/fluid/FluidLava.mapping create mode 100644 mappings/net/minecraft/fluid/FluidState.mapping create mode 100644 mappings/net/minecraft/fluid/FluidWater.mapping create mode 100644 mappings/net/minecraft/reference/BlockProperties.mapping create mode 100644 mappings/net/minecraft/reference/Fluids.mapping delete mode 100644 mappings/net/minecraft/sortme/BlockProperties.mapping create mode 100644 mappings/net/minecraft/util/ThreadTaskQueue.mapping diff --git a/mappings/adn.mapping b/mappings/adn.mapping deleted file mode 100644 index c7f62b6441..0000000000 --- a/mappings/adn.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS adn - METHOD a execute (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; - METHOD a execute (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; - METHOD aw isMainThread ()Z diff --git a/mappings/bgc.mapping b/mappings/bgc.mapping deleted file mode 100644 index af9933cde4..0000000000 --- a/mappings/bgc.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS bgc - METHOD (Lbdx$c;)V - ARG 0 builder - METHOD a isFertilizable (Layn;Leq;Lblz;Z)Z - ARG 0 world - ARG 1 pos - ARG 2 state - ARG 3 remote - METHOD a canGrow (Laza;Ljava/util/Random;Leq;Lblz;)Z - ARG 0 world - ARG 1 rand - ARG 2 pos - ARG 3 state - METHOD b grow (Laza;Ljava/util/Random;Leq;Lblz;)V - ARG 0 world - ARG 1 rand - ARG 2 pos - ARG 3 state - METHOD c getRenderLayer ()Layo; - METHOD f isFullBoundsCubeForCulling (Lblz;)Z - ARG 0 state diff --git a/mappings/bii.mapping b/mappings/bii.mapping deleted file mode 100644 index 1beb93d062..0000000000 --- a/mappings/bii.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS bii - METHOD a getBoundingBox (Lblz;Layn;Leq;)Lchu; - ARG 0 state - ARG 1 view - ARG 2 pos - METHOD a applyMirror (Lblz;Lbha;)Lblz; - ARG 0 state - ARG 1 mirror - METHOD a applyRotation (Lblz;Lbia;)Lblz; - ARG 0 state - ARG 1 rotation diff --git a/mappings/net/minecraft/block/BlockGrass.mapping b/mappings/bjd.mapping similarity index 93% rename from mappings/net/minecraft/block/BlockGrass.mapping rename to mappings/bjd.mapping index ac19612031..d959ca8a4e 100644 --- a/mappings/net/minecraft/block/BlockGrass.mapping +++ b/mappings/bjd.mapping @@ -1,4 +1,4 @@ -CLASS bjd net/minecraft/block/BlockGrass +CLASS bjd METHOD (Lbdx$c;)V ARG 0 builder METHOD Y_ getOffsetType ()Lbdx$b; diff --git a/mappings/bln.mapping b/mappings/bln.mapping new file mode 100644 index 0000000000..f528294fce --- /dev/null +++ b/mappings/bln.mapping @@ -0,0 +1 @@ +CLASS bln diff --git a/mappings/bog.mapping b/mappings/bog.mapping index d0ce7e093e..f7221314bf 100644 --- a/mappings/bog.mapping +++ b/mappings/bog.mapping @@ -1,6 +1,6 @@ CLASS bog METHOD H getMaxLightLevel ()I - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos diff --git a/mappings/boh.mapping b/mappings/boh.mapping index 455706fee6..d292e91e95 100644 --- a/mappings/boh.mapping +++ b/mappings/boh.mapping @@ -3,7 +3,7 @@ CLASS boh ARG 0 x ARG 1 y ARG 2 z - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD c (III)I ARG 0 x diff --git a/mappings/bop.mapping b/mappings/bop.mapping index 69404caec9..8b4b883bf5 100644 --- a/mappings/bop.mapping +++ b/mappings/bop.mapping @@ -3,7 +3,7 @@ CLASS bop ARG 0 x ARG 1 y ARG 2 z - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD c (III)I ARG 0 x diff --git a/mappings/cac.mapping b/mappings/cac.mapping deleted file mode 100644 index 4628f5be9a..0000000000 --- a/mappings/cac.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cac diff --git a/mappings/cad.mapping b/mappings/cad.mapping new file mode 100644 index 0000000000..272778aa6a --- /dev/null +++ b/mappings/cad.mapping @@ -0,0 +1,2 @@ +CLASS cad + METHOD c getFluid ()Lcab; diff --git a/mappings/dag.mapping b/mappings/dag.mapping index 3ac377ca7f..463cf2bafa 100644 --- a/mappings/dag.mapping +++ b/mappings/dag.mapping @@ -6,7 +6,7 @@ CLASS dag METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD c getBiome (Leq;)Lazx; ARG 0 pos diff --git a/mappings/bgu.mapping b/mappings/net/minecraft/block/BlockFluid.mapping similarity index 94% rename from mappings/bgu.mapping rename to mappings/net/minecraft/block/BlockFluid.mapping index 530b594173..a9f3897626 100644 --- a/mappings/bgu.mapping +++ b/mappings/net/minecraft/block/BlockFluid.mapping @@ -1,4 +1,4 @@ -CLASS bgu +CLASS bgu net/minecraft/block/BlockFluid METHOD a getTickRate (Laze;)I ARG 0 world METHOD a isFullBoundsCubeForConnection (Lblz;)Z diff --git a/mappings/bim.mapping b/mappings/net/minecraft/block/BlockPodzol.mapping similarity index 75% rename from mappings/bim.mapping rename to mappings/net/minecraft/block/BlockPodzol.mapping index fbbe7b677d..79000547a8 100644 --- a/mappings/bim.mapping +++ b/mappings/net/minecraft/block/BlockPodzol.mapping @@ -1,4 +1,4 @@ -CLASS bim +CLASS bim net/minecraft/block/BlockPodzol METHOD (Lbdx$c;)V ARG 0 builder METHOD a getRenderingState (Lblz;Lev;Lblz;Lazb;Leq;Leq;)Lblz; diff --git a/mappings/net/minecraft/block/BlockSkull.mapping b/mappings/net/minecraft/block/BlockSkull.mapping new file mode 100644 index 0000000000..525a33ce05 --- /dev/null +++ b/mappings/net/minecraft/block/BlockSkull.mapping @@ -0,0 +1,19 @@ +CLASS bii net/minecraft/block/BlockSkull + CLASS bii$a ISkullType + CLASS bii$b Type + FIELD a SKELETON Lbii$b; + FIELD b WITHER_SKELETON Lbii$b; + FIELD c PLAYER Lbii$b; + FIELD d ZOMBIE Lbii$b; + FIELD e CREEPER Lbii$b; + FIELD f DRAGON Lbii$b; + METHOD a getBoundingBox (Lblz;Layn;Leq;)Lchu; + ARG 0 state + ARG 1 view + ARG 2 pos + METHOD a applyMirror (Lblz;Lbha;)Lblz; + ARG 0 state + ARG 1 mirror + METHOD a applyRotation (Lblz;Lbia;)Lblz; + ARG 0 state + ARG 1 rotation diff --git a/mappings/bdf.mapping b/mappings/net/minecraft/block/BlockSkullBase.mapping similarity index 62% rename from mappings/bdf.mapping rename to mappings/net/minecraft/block/BlockSkullBase.mapping index dda0380bcd..a6f75a116b 100644 --- a/mappings/bdf.mapping +++ b/mappings/net/minecraft/block/BlockSkullBase.mapping @@ -1,6 +1,8 @@ -CLASS bdf +CLASS bdf net/minecraft/block/BlockSkullBase + FIELD a type Lbii$a; METHOD a createBlockEntity (Layn;)Lbkf; METHOD a isFullBoundsCubeForConnection (Lblz;)Z ARG 0 state + METHOD b getSkullType ()Lbii$a; METHOD b hasBlockEntityBreakingRender (Lblz;)Z ARG 0 state diff --git a/mappings/bhj.mapping b/mappings/net/minecraft/block/BlockSkullPlayer.mapping similarity index 77% rename from mappings/bhj.mapping rename to mappings/net/minecraft/block/BlockSkullPlayer.mapping index f3f5087de4..98fa70ec82 100644 --- a/mappings/bhj.mapping +++ b/mappings/net/minecraft/block/BlockSkullPlayer.mapping @@ -1,4 +1,4 @@ -CLASS bhj +CLASS bhj net/minecraft/block/BlockSkullPlayer METHOD (Lbdx$c;)V ARG 0 builder METHOD a onPlaced (Laza;Leq;Lblz;Lafq;Lauc;)V diff --git a/mappings/bhk.mapping b/mappings/net/minecraft/block/BlockSkullPlayerWall.mapping similarity index 75% rename from mappings/bhk.mapping rename to mappings/net/minecraft/block/BlockSkullPlayerWall.mapping index fe0f828a58..62f80d923c 100644 --- a/mappings/bhk.mapping +++ b/mappings/net/minecraft/block/BlockSkullPlayerWall.mapping @@ -1,4 +1,4 @@ -CLASS bhk +CLASS bhk net/minecraft/block/BlockSkullPlayerWall METHOD (Lbdx$c;)V ARG 0 builder METHOD a onPlaced (Laza;Leq;Lblz;Lafq;Lauc;)V diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index 8e047bd94f..089106c5d2 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,3 +1,4 @@ CLASS cag net/minecraft/block/Material + FIELD a AIR Lcag; METHOD h getPistonBehavior ()Lcai; METHOD i getMapColor ()Lcah; diff --git a/mappings/net/minecraft/block/state/BlockState.mapping b/mappings/net/minecraft/block/state/BlockState.mapping index 4b4a6dc90f..9c1ba067e3 100644 --- a/mappings/net/minecraft/block/state/BlockState.mapping +++ b/mappings/net/minecraft/block/state/BlockState.mapping @@ -4,7 +4,7 @@ CLASS blz net/minecraft/block/state/BlockState ARG 0 x ARG 1 y ARG 2 z - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD d getBlockEntity (Leq;)Lbkf; ARG 0 pos diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping new file mode 100644 index 0000000000..3d1d3584b5 --- /dev/null +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -0,0 +1,3 @@ +CLASS caa net/minecraft/fluid/Fluid + METHOD e getFlowing ()Lcab; + METHOD f getStill ()Lcab; diff --git a/mappings/net/minecraft/fluid/FluidBase.mapping b/mappings/net/minecraft/fluid/FluidBase.mapping new file mode 100644 index 0000000000..791539c963 --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidBase.mapping @@ -0,0 +1,2 @@ +CLASS cab net/minecraft/fluid/FluidBase + METHOD a getRenderLayer ()Layo; diff --git a/mappings/net/minecraft/fluid/FluidEmpty.mapping b/mappings/net/minecraft/fluid/FluidEmpty.mapping new file mode 100644 index 0000000000..55bfa4f15a --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidEmpty.mapping @@ -0,0 +1,2 @@ +CLASS bzz net/minecraft/fluid/FluidEmpty + METHOD a getRenderLayer ()Layo; diff --git a/mappings/net/minecraft/fluid/FluidLava.mapping b/mappings/net/minecraft/fluid/FluidLava.mapping new file mode 100644 index 0000000000..dd91d31657 --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidLava.mapping @@ -0,0 +1,6 @@ +CLASS caf net/minecraft/fluid/FluidLava + CLASS caf$a Flowing + CLASS caf$b Still + METHOD a getRenderLayer ()Layo; + METHOD e getFlowing ()Lcab; + METHOD f getStill ()Lcab; diff --git a/mappings/net/minecraft/fluid/FluidState.mapping b/mappings/net/minecraft/fluid/FluidState.mapping new file mode 100644 index 0000000000..4645340194 --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidState.mapping @@ -0,0 +1,3 @@ +CLASS cac net/minecraft/fluid/FluidState + METHOD c getFluid ()Lcab; + METHOD k getRenderLayer ()Layo; diff --git a/mappings/net/minecraft/fluid/FluidWater.mapping b/mappings/net/minecraft/fluid/FluidWater.mapping new file mode 100644 index 0000000000..8b975702ab --- /dev/null +++ b/mappings/net/minecraft/fluid/FluidWater.mapping @@ -0,0 +1,6 @@ +CLASS caj net/minecraft/fluid/FluidWater + CLASS caj$a Flowing + CLASS caj$b Still + METHOD a getRenderLayer ()Layo; + METHOD e getFlowing ()Lcab; + METHOD f getStill ()Lcab; diff --git a/mappings/net/minecraft/reference/BlockProperties.mapping b/mappings/net/minecraft/reference/BlockProperties.mapping new file mode 100644 index 0000000000..bfbee7e4a8 --- /dev/null +++ b/mappings/net/minecraft/reference/BlockProperties.mapping @@ -0,0 +1 @@ +CLASS bmx net/minecraft/reference/BlockProperties diff --git a/mappings/net/minecraft/reference/Fluids.mapping b/mappings/net/minecraft/reference/Fluids.mapping new file mode 100644 index 0000000000..4d0b808539 --- /dev/null +++ b/mappings/net/minecraft/reference/Fluids.mapping @@ -0,0 +1,6 @@ +CLASS cae net/minecraft/reference/Fluids + FIELD a EMPTY Lcab; + FIELD b WATER_FLOWING Lcaa; + FIELD c WATER Lcaa; + FIELD d LAVA_FLOWING Lcaa; + FIELD e LAVA Lcaa; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 1240b3aa64..80f45d21e2 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -113,6 +113,7 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer METHOD ar getUserCache ()Lvy; METHOD as getServerMetadata ()Lpd; METHOD au getMaxWorldBorderRadius ()I + METHOD av isOffThread ()Z METHOD aw isMainThread ()Z METHOD ax getNetworkCompressionThreshold ()I METHOD ay getServerStartTime ()J diff --git a/mappings/net/minecraft/sortme/BlockProperties.mapping b/mappings/net/minecraft/sortme/BlockProperties.mapping deleted file mode 100644 index 16ba6cdb5c..0000000000 --- a/mappings/net/minecraft/sortme/BlockProperties.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bmx net/minecraft/sortme/BlockProperties diff --git a/mappings/net/minecraft/util/ThreadTaskQueue.mapping b/mappings/net/minecraft/util/ThreadTaskQueue.mapping new file mode 100644 index 0000000000..d955cffa33 --- /dev/null +++ b/mappings/net/minecraft/util/ThreadTaskQueue.mapping @@ -0,0 +1,8 @@ +CLASS adn net/minecraft/util/ThreadTaskQueue + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD g taskQueue Ljava/util/Queue; + METHOD a executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; + METHOD a executeFuture (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + METHOD av isOffThread ()Z + METHOD aw isMainThread ()Z + METHOD ba executeQueuedTasks ()V diff --git a/mappings/net/minecraft/world/IBlockView.mapping b/mappings/net/minecraft/world/IBlockView.mapping index fb156c7197..42df80c824 100644 --- a/mappings/net/minecraft/world/IBlockView.mapping +++ b/mappings/net/minecraft/world/IBlockView.mapping @@ -5,7 +5,7 @@ CLASS ayn net/minecraft/world/IBlockView ARG 0 x ARG 1 y ARG 2 z - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD b (III)I ARG 0 x diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 1ca6a790e7..053610bd53 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -115,7 +115,7 @@ CLASS aza net/minecraft/world/World METHOD a rayTrace (Lchc;Lchc;Lcha;ZZ)Lcgz; ARG 0 begin ARG 1 end - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD a addBlockAction (Leq;Lbdx;II)V ARG 0 pos diff --git a/mappings/net/minecraft/world/chunk/ChunkCache.mapping b/mappings/net/minecraft/world/chunk/ChunkCache.mapping index 318c4c3118..b44ade6b7a 100644 --- a/mappings/net/minecraft/world/chunk/ChunkCache.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkCache.mapping @@ -15,7 +15,7 @@ CLASS azm net/minecraft/world/chunk/ChunkCache METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD c getBiome (Leq;)Lazx; ARG 0 pos diff --git a/mappings/uh.mapping b/mappings/uh.mapping index 66016892e2..937838512f 100644 --- a/mappings/uh.mapping +++ b/mappings/uh.mapping @@ -9,7 +9,7 @@ CLASS uh METHOD a getLightLevel (Lazj;Leq;)I ARG 0 type ARG 1 pos - METHOD a (Leq;)Lcac; + METHOD a getFluidState (Leq;)Lcac; ARG 0 pos METHOD a getEmittedStrongRedstonePower (Leq;Lev;)I ARG 0 pos