From 31b97b576fe534a1fd1e57955b25f4e06ce473fc Mon Sep 17 00:00:00 2001 From: asiekierka Date: Sun, 14 Aug 2016 20:22:30 +0200 Subject: [PATCH] work on GlHandler, decorators, potions, misc. classes --- mappings/net/minecraft/block/Material.mapping | 1 + .../minecraft/block/impl/BlockLeaves.mapping | 1 + .../minecraft/block/impl/BlockLeaves2.mapping | 1 + .../block/impl/BlockLeavesBase.mapping | 2 + .../minecraft/block/impl/BlockLog2.mapping | 1 + .../net/minecraft/block/tile/IHopper.mapping | 1 + .../block/tile/impl/TileEntityBeacon.mapping | 1 + .../tile/impl/TileEntityBrewingStand.mapping | 1 + .../block/tile/impl/TileEntityChest.mapping | 1 + .../impl/TileEntityDaylightDetector.mapping | 1 + .../impl/TileEntityEnchantingTable.mapping | 1 + .../tile/impl/TileEntityEndGateway.mapping | 1 + .../tile/impl/TileEntityEnderChest.mapping | 1 + .../block/tile/impl/TileEntityFurnace.mapping | 1 + .../block/tile/impl/TileEntityHopper.mapping | 1 + .../tile/impl/TileEntityMobSpawner.mapping | 1 + .../block/tile/impl/TileEntityPiston.mapping | 1 + .../block/tile/impl/TileEntitySkull.mapping | 1 + .../net/minecraft/client/GlHandler.mapping | 84 ++++++++++++++++++- .../net/minecraft/client/Minecraft.mapping | 3 + mappings/net/minecraft/potion/Potion.mapping | 10 +++ .../net/minecraft/reference/Bootstrap.mapping | 2 + .../minecraft/server/IntegratedServer.mapping | 1 + .../minecraft/server/MinecraftServer.mapping | 2 + .../net/minecraft/util/ITileTickable.mapping | 2 + .../minecraft/util/math/BoundingBox.mapping | 2 + .../impl/DecoratorDoublePlant.mapping | 5 ++ .../impl/DecoratorEndGateway.mapping | 2 + .../decorator/impl/DecoratorFossil.mapping | 20 +++++ .../decorator/impl/DecoratorGlowstone.mapping | 2 + .../impl/DecoratorGlowstone2.mapping | 2 + .../decorator/impl/DecoratorMelon.mapping | 2 + .../decorator/impl/DecoratorMushroom.mapping | 3 + .../impl/DecoratorNetherrackFire.mapping | 2 + .../decorator/impl/DecoratorPackedIce.mapping | 2 + .../impl/DecoratorTreeAcacia.mapping | 4 + .../decorator/impl/DecoratorTreeBirch.mapping | 5 ++ .../impl/DecoratorTreeDarkOak.mapping | 4 + .../decorator/impl/DecoratorVine.mapping | 2 + .../decorator/impl/DecoratorWaterlily.mapping | 2 + mappings/none/auz.mapping | 2 - mappings/none/avh.mapping | 2 - mappings/none/avi.mapping | 2 - mappings/none/avn.mapping | 2 - mappings/none/avp.mapping | 2 - mappings/none/avq.mapping | 2 - mappings/none/avs.mapping | 2 - mappings/none/avu.mapping | 2 - mappings/none/avw.mapping | 2 - mappings/none/awa.mapping | 2 - mappings/none/awd.mapping | 2 + mappings/none/awg.mapping | 2 - mappings/none/awi.mapping | 2 - mappings/none/awl.mapping | 2 + mappings/none/awp.mapping | 2 - mappings/none/awq.mapping | 2 - mappings/none/car.mapping | 2 + mappings/none/cau.mapping | 2 + mappings/none/lu.mapping | 3 + mappings/none/mg.mapping | 2 + mappings/none/mi.mapping | 2 + mappings/none/qp.mapping | 4 + 62 files changed, 200 insertions(+), 29 deletions(-) create mode 100644 mappings/net/minecraft/block/tile/IHopper.mapping create mode 100644 mappings/net/minecraft/potion/Potion.mapping create mode 100644 mappings/net/minecraft/util/ITileTickable.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorDoublePlant.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorEndGateway.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorFossil.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone2.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorMelon.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorMushroom.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorNetherrackFire.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorPackedIce.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorTreeAcacia.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorTreeBirch.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorTreeDarkOak.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorVine.mapping create mode 100644 mappings/net/minecraft/world/decorator/impl/DecoratorWaterlily.mapping delete mode 100644 mappings/none/auz.mapping delete mode 100644 mappings/none/avh.mapping delete mode 100644 mappings/none/avi.mapping delete mode 100644 mappings/none/avn.mapping delete mode 100644 mappings/none/avp.mapping delete mode 100644 mappings/none/avq.mapping delete mode 100644 mappings/none/avs.mapping delete mode 100644 mappings/none/avu.mapping delete mode 100644 mappings/none/avw.mapping delete mode 100644 mappings/none/awa.mapping delete mode 100644 mappings/none/awg.mapping delete mode 100644 mappings/none/awi.mapping delete mode 100644 mappings/none/awp.mapping delete mode 100644 mappings/none/awq.mapping create mode 100644 mappings/none/car.mapping create mode 100644 mappings/none/cau.mapping create mode 100644 mappings/none/lu.mapping create mode 100644 mappings/none/mg.mapping create mode 100644 mappings/none/mi.mapping create mode 100644 mappings/none/qp.mapping diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index a7a44c7534..40827ef667 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -6,6 +6,7 @@ CLASS none/ayo net/minecraft/block/Material FIELD h WATER Lnone/ayo; FIELD i LAVA Lnone/ayo; FIELD n CLOTH Lnone/ayo; + FIELD p SAND Lnone/ayo; FIELD s GLASS Lnone/ayo; FIELD w ICE Lnone/ayo; METHOD r getMapColor ()Lnone/ayp; diff --git a/mappings/net/minecraft/block/impl/BlockLeaves.mapping b/mappings/net/minecraft/block/impl/BlockLeaves.mapping index 189f3f1636..7a5cb17897 100644 --- a/mappings/net/minecraft/block/impl/BlockLeaves.mapping +++ b/mappings/net/minecraft/block/impl/BlockLeaves.mapping @@ -1,4 +1,5 @@ CLASS none/aok net/minecraft/block/impl/BlockLeaves + FIELD e TYPE Lnone/asx; METHOD a deserializeState (I)Lnone/asj; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD b createStateFactory ()Lnone/ask; diff --git a/mappings/net/minecraft/block/impl/BlockLeaves2.mapping b/mappings/net/minecraft/block/impl/BlockLeaves2.mapping index cb07d99c95..8624607d4b 100644 --- a/mappings/net/minecraft/block/impl/BlockLeaves2.mapping +++ b/mappings/net/minecraft/block/impl/BlockLeaves2.mapping @@ -1,4 +1,5 @@ CLASS none/aoe net/minecraft/block/impl/BlockLeaves2 + FIELD e TYPE Lnone/asx; METHOD a deserializeState (I)Lnone/asj; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD a getDropStack (Lnone/aiu;Lnone/cn;Lnone/asj;)Lnone/aeq; diff --git a/mappings/net/minecraft/block/impl/BlockLeavesBase.mapping b/mappings/net/minecraft/block/impl/BlockLeavesBase.mapping index 246789d481..9b03dd79a8 100644 --- a/mappings/net/minecraft/block/impl/BlockLeavesBase.mapping +++ b/mappings/net/minecraft/block/impl/BlockLeavesBase.mapping @@ -1,3 +1,5 @@ CLASS none/anp net/minecraft/block/impl/BlockLeavesBase + FIELD a DECAYABLE Lnone/asv; + FIELD b CHECK_DECAY Lnone/asv; METHOD a getDropItem (Lnone/asj;Ljava/util/Random;I)Lnone/aeo; METHOD f getRenderLayer ()Lnone/aim; diff --git a/mappings/net/minecraft/block/impl/BlockLog2.mapping b/mappings/net/minecraft/block/impl/BlockLog2.mapping index 13d9c95cdb..ae1cf1b9c1 100644 --- a/mappings/net/minecraft/block/impl/BlockLog2.mapping +++ b/mappings/net/minecraft/block/impl/BlockLog2.mapping @@ -1,4 +1,5 @@ CLASS none/aof net/minecraft/block/impl/BlockLog2 + FIELD b TYPE Lnone/asx; METHOD a deserializeState (I)Lnone/asj; METHOD a addStacksForDisplay (Lnone/aeo;Lnone/adq;Lnone/dc;)V METHOD b createStateFactory ()Lnone/ask; diff --git a/mappings/net/minecraft/block/tile/IHopper.mapping b/mappings/net/minecraft/block/tile/IHopper.mapping new file mode 100644 index 0000000000..ae7272ac3f --- /dev/null +++ b/mappings/net/minecraft/block/tile/IHopper.mapping @@ -0,0 +1 @@ +CLASS none/arn net/minecraft/block/tile/IHopper diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping index 67b6c1f2ea..c24e9bafb7 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBeacon.mapping @@ -1,2 +1,3 @@ CLASS none/ara net/minecraft/block/tile/impl/TileEntityBeacon + METHOD D_ update ()V METHOD a getAvailableSlots (Lnone/cu;)[I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping index e923422e97..b96e6cd1ea 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityBrewingStand.mapping @@ -2,4 +2,5 @@ CLASS none/arc net/minecraft/block/tile/impl/TileEntityBrewingStand FIELD a SLOTS_UP [I FIELD f SLOTS_DOWN [I FIELD g SLOTS_SIDE [I + METHOD D_ update ()V METHOD a getAvailableSlots (Lnone/cu;)[I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping index 9a2af6df8f..c140fe5f94 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityChest.mapping @@ -3,6 +3,7 @@ CLASS none/ard net/minecraft/block/tile/impl/TileEntityChest FIELD g neighborEast Lnone/ard; FIELD h neighborWest Lnone/ard; FIELD i neighborSouth Lnone/ard; + METHOD D_ update ()V METHOD a getNeighbor (Lnone/cu;)Lnone/ard; ARG 0 facing METHOD t_ getSlotCount ()I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityDaylightDetector.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityDaylightDetector.mapping index 9c567d3573..dddff2e8a9 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityDaylightDetector.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityDaylightDetector.mapping @@ -1 +1,2 @@ CLASS none/arg net/minecraft/block/tile/impl/TileEntityDaylightDetector + METHOD D_ update ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping index 18e64aada2..8941575fb5 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEnchantingTable.mapping @@ -1,3 +1,4 @@ CLASS none/arj net/minecraft/block/tile/impl/TileEntityEnchantingTable FIELD o rand Ljava/util/Random; + METHOD D_ update ()V METHOD k getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping index bcadd3276e..91aaceff37 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEndGateway.mapping @@ -1,2 +1,3 @@ CLASS none/arw net/minecraft/block/tile/impl/TileEntityEndGateway FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + METHOD D_ update ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityEnderChest.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityEnderChest.mapping index 596deffbaa..2aaba948d9 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityEnderChest.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityEnderChest.mapping @@ -1 +1,2 @@ CLASS none/ark net/minecraft/block/tile/impl/TileEntityEnderChest + METHOD D_ update ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping index 5b8c915045..271544f1ca 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityFurnace.mapping @@ -2,4 +2,5 @@ CLASS none/arm net/minecraft/block/tile/impl/TileEntityFurnace FIELD a SLOTS_UP [I FIELD f SLOTS_DOWN [I FIELD g SLOTS_SIDE [I + METHOD D_ update ()V METHOD a getAvailableSlots (Lnone/cu;)[I diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping index 958a972cb3..c5f198bf8d 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityHopper.mapping @@ -1 +1,2 @@ CLASS none/aro net/minecraft/block/tile/impl/TileEntityHopper + METHOD D_ update ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping index 6df8b67de6..22acadee93 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityMobSpawner.mapping @@ -1 +1,2 @@ CLASS none/arq net/minecraft/block/tile/impl/TileEntityMobSpawner + METHOD D_ update ()V diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityPiston.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityPiston.mapping index a7a793b986..e47f5db316 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityPiston.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityPiston.mapping @@ -8,6 +8,7 @@ CLASS none/asd net/minecraft/block/tile/impl/TileEntityPiston ARG 0 pushedBlock ARG 1 facing ARG 2 extending + METHOD D_ update ()V METHOD a getProgress (F)F ARG 0 partialTick METHOD d getPushedBlock ()Lnone/asj; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping b/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping index 54c3b2ac41..35c2a354a1 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntitySkull.mapping @@ -1 +1,2 @@ CLASS none/aru net/minecraft/block/tile/impl/TileEntitySkull + METHOD D_ update ()V diff --git a/mappings/net/minecraft/client/GlHandler.mapping b/mappings/net/minecraft/client/GlHandler.mapping index ec6fc47394..95a7724038 100644 --- a/mappings/net/minecraft/client/GlHandler.mapping +++ b/mappings/net/minecraft/client/GlHandler.mapping @@ -1,4 +1,34 @@ CLASS none/bos net/minecraft/client/GlHandler + CLASS none/bos$b + FIELD b sfactor I + FIELD c dfactor I + CLASS none/bos$d + FIELD a clearDepth D + FIELD b clearColor Lnone/bos$e; + CLASS none/bos$e + CLASS none/bos$f + FIELD b logicOp I + CLASS none/bos$h + FIELD b face I + FIELD c mode I + CLASS none/bos$j + FIELD b cullFace I + CLASS none/bos$k + FIELD b mask Z + FIELD c func I + CLASS none/bos$p + FIELD c factor F + FIELD d units F + CLASS none/bos$x + FIELD b boundTexture I + FIELD f colorMaterial Lnone/bos$h; + FIELD g blendFunc Lnone/bos$b; + FIELD h depth Lnone/bos$k; + FIELD k polygonOffset Lnone/bos$p; + FIELD s shadeModel I + FIELD u colorMask Lnone/bos$g; + FIELD v color Lnone/bos$e; + METHOD A genTextures ()I METHOD F loadIdentity ()V METHOD G pushMatrix ()V METHOD H popMatrix ()V @@ -6,18 +36,67 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD K endList ()V METHOD L getError ()I METHOD a pushAttrib ()V + METHOD a clearDepth (D)V METHOD a scale (DDD)V + METHOD a ortho (DDDDDD)V + METHOD a polygonOffset (FF)V + ARG 0 factor + ARG 1 units + METHOD a normal (FFF)V + METHOD a clearColor (FFFF)V METHOD a alphaFunc (IF)V + METHOD a colorMaterial (II)V + ARG 0 face + ARG 1 mode + METHOD a texEnv (IIF)V + METHOD a texEnv (III)V + METHOD a copyTexSubImage2D (IIIIIIII)V + METHOD a texImage2D (IIIIIIIILjava/nio/IntBuffer;)V + METHOD a readPixels (IIIIIILjava/nio/IntBuffer;)V + METHOD a getTexImage (IIIILjava/nio/IntBuffer;)V + METHOD a texCoordPointer (IIILjava/nio/ByteBuffer;)V + METHOD a normalPointer (IILjava/nio/ByteBuffer;)V + METHOD a light (IILjava/nio/FloatBuffer;)V + METHOD a lightModel (ILjava/nio/FloatBuffer;)V + METHOD a getInteger (ILjava/nio/IntBuffer;)V + METHOD a multMatrix (Ljava/nio/FloatBuffer;)V + METHOD a (Lnone/bos$u;ILjava/nio/FloatBuffer;)V + METHOD a multMatrix (Lorg/lwjgl/util/vector/Quaternion;)V + METHOD a depthMask (Z)V + METHOD a colorMask (ZZZZ)V METHOD b translate (DDD)V + METHOD b texCoord (FF)V METHOD b scale (FFF)V METHOD b rotate (FFFF)V + METHOD b blendFunc (II)V + METHOD b texParameter (IIF)V + METHOD b texParameter (III)V METHOD b viewport (IIII)V + METHOD b texSubImage2D (IIIIIIIILjava/nio/IntBuffer;)V + METHOD b vertexPointer (IIILjava/nio/ByteBuffer;)V + METHOD b texEnv (IILjava/nio/FloatBuffer;)V METHOD c popAttrib ()V + METHOD c (F)V METHOD c translate (FFF)V + METHOD c color (FFFF)V + METHOD c depthFunc (I)V + METHOD c getTexLevelParameter (III)I + METHOD c texCoordPointer (IIII)V + METHOD c colorPointer (IIILjava/nio/ByteBuffer;)V + METHOD c getFloat (ILjava/nio/FloatBuffer;)V METHOD d lineWidth (F)V + METHOD d blendEquation (I)V + METHOD d polygonMode (II)V + METHOD d vertexPointer (IIII)V + METHOD e vertex (FFF)V METHOD e deleteLists (II)V + METHOD e colorPointer (IIII)V + METHOD f logicOp (I)V METHOD f newList (II)V METHOD f drawArrays (III)V + METHOD g pixelStore (II)V + METHOD h deleteTextures (I)V + METHOD i bindTexture (I)V METHOD j shadeModel (I)V METHOD m clear (I)V METHOD n matrixMode (I)V @@ -25,4 +104,7 @@ CLASS none/bos net/minecraft/client/GlHandler METHOD q enableClientState (I)V METHOD r begin (I)V METHOD s callList (I)V - METHOD t (I)I + METHOD t genLists (I)I + METHOD u getString (I)Ljava/lang/String; + METHOD v getInteger (I)I + METHOD x cullFace (I)V diff --git a/mappings/net/minecraft/client/Minecraft.mapping b/mappings/net/minecraft/client/Minecraft.mapping index cd7accecef..f5643394de 100644 --- a/mappings/net/minecraft/client/Minecraft.mapping +++ b/mappings/net/minecraft/client/Minecraft.mapping @@ -4,6 +4,9 @@ CLASS none/bdo net/minecraft/client/Minecraft FIELD L DISPLAY_MODES Ljava/util/List; FIELD R instance Lnone/bdo; FIELD aP thread Ljava/lang/Thread; + FIELD w runDirectory Ljava/io/File; METHOD I getCurrentTimeMillis ()J + METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a (Ljava/lang/String;)V + METHOD aE isMainThread ()Z METHOD z getInstance ()Lnone/bdo; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping new file mode 100644 index 0000000000..c9179c3589 --- /dev/null +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -0,0 +1,10 @@ +CLASS none/age net/minecraft/potion/Potion + FIELD a REGISTRY Lnone/cs; + FIELD b id Lnone/kp; + FIELD c maxRawId I + FIELD d name Ljava/lang/String; + METHOD a getPotionByRawId (I)Lnone/age; + METHOD a getPotionById (Ljava/lang/String;)Lnone/age; + METHOD a register (Ljava/lang/String;Lnone/age;)V + METHOD a getRawIdFromPotion (Lnone/age;)I + METHOD b getName (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/reference/Bootstrap.mapping b/mappings/net/minecraft/reference/Bootstrap.mapping index 841a7e139d..8b1feab910 100644 --- a/mappings/net/minecraft/reference/Bootstrap.mapping +++ b/mappings/net/minecraft/reference/Bootstrap.mapping @@ -3,3 +3,5 @@ CLASS none/ks net/minecraft/reference/Bootstrap FIELD b initialized Z FIELD c LOGGER Lorg/apache/logging/log4j/Logger; METHOD a isInitialized ()Z + METHOD a printStdout (Ljava/lang/String;)V + METHOD d redirectOutputStreams ()V diff --git a/mappings/net/minecraft/server/IntegratedServer.mapping b/mappings/net/minecraft/server/IntegratedServer.mapping index 51696a5852..881a3be9cd 100644 --- a/mappings/net/minecraft/server/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/IntegratedServer.mapping @@ -1,5 +1,6 @@ CLASS none/caj net/minecraft/server/IntegratedServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; + FIELD l mc Lnone/bdo; METHOD A getRunDirectory ()Ljava/io/File; METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; METHOD u stop ()V diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 768b759dd6..79fb0d2ab6 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -3,7 +3,9 @@ CLASS net/minecraft/server/MinecraftServer net/minecraft/server/MinecraftServer FIELD k LOGGER Lorg/apache/logging/log4j/Logger; METHOD A getRunDirectory ()Ljava/io/File; METHOD G getVersion ()Ljava/lang/String; + METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; METHOD a loadServerIcon (Lnone/ke;)V + METHOD aE isMainThread ()Z METHOD b addServerInfoToCrashReport (Lnone/b;)Lnone/b; ARG 0 report METHOD d getFile (Ljava/lang/String;)Ljava/io/File; diff --git a/mappings/net/minecraft/util/ITileTickable.mapping b/mappings/net/minecraft/util/ITileTickable.mapping new file mode 100644 index 0000000000..f40844affb --- /dev/null +++ b/mappings/net/minecraft/util/ITileTickable.mapping @@ -0,0 +1,2 @@ +CLASS none/ld net/minecraft/util/ITileTickable + METHOD D_ update ()V diff --git a/mappings/net/minecraft/util/math/BoundingBox.mapping b/mappings/net/minecraft/util/math/BoundingBox.mapping index a8f25ffba0..1571f7e333 100644 --- a/mappings/net/minecraft/util/math/BoundingBox.mapping +++ b/mappings/net/minecraft/util/math/BoundingBox.mapping @@ -12,3 +12,5 @@ CLASS none/bcp net/minecraft/util/math/BoundingBox ARG 3 x2 ARG 4 y2 ARG 5 z2 + METHOD b isValid ()Z + METHOD c getCenter ()Lnone/bcs; diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorDoublePlant.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorDoublePlant.mapping new file mode 100644 index 0000000000..4bb0e0c227 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorDoublePlant.mapping @@ -0,0 +1,5 @@ +CLASS none/avh net/minecraft/world/decorator/impl/DecoratorDoublePlant + FIELD a type Lnone/ama$b; + METHOD a setType (Lnone/ama$b;)V + ARG 0 type + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorEndGateway.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorEndGateway.mapping new file mode 100644 index 0000000000..1ee70676c8 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorEndGateway.mapping @@ -0,0 +1,2 @@ +CLASS none/avi net/minecraft/world/decorator/impl/DecoratorEndGateway + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorFossil.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorFossil.mapping new file mode 100644 index 0000000000..80da3d3966 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorFossil.mapping @@ -0,0 +1,20 @@ +CLASS none/avn net/minecraft/world/decorator/impl/DecoratorFossil + FIELD a FOSSIL_SPINE_1 Lnone/kp; + FIELD b FOSSIL_SPINE_2 Lnone/kp; + FIELD c FOSSIL_SPINE_3 Lnone/kp; + FIELD d FOSSIL_SPINE_4 Lnone/kp; + FIELD e FOSSIL_SPINE_1_COAL Lnone/kp; + FIELD f FOSSIL_SPINE_2_COAL Lnone/kp; + FIELD g FOSSIL_SPINE_3_COAL Lnone/kp; + FIELD h FOSSIL_SPINE_4_COAL Lnone/kp; + FIELD i FOSSIL_SKULL_1 Lnone/kp; + FIELD j FOSSIL_SKULL_2 Lnone/kp; + FIELD k FOSSIL_SKULL_3 Lnone/kp; + FIELD l FOSSIL_SKULL_4 Lnone/kp; + FIELD m FOSSIL_SKULL_1_COAL Lnone/kp; + FIELD n FOSSIL_SKULL_2_COAL Lnone/kp; + FIELD o FOSSIL_SKULL_3_COAL Lnone/kp; + FIELD p FOSSIL_SKULL_4_COAL Lnone/kp; + FIELD q FOSSILS [Lnone/kp; + FIELD r FOSSILS_COAL [Lnone/kp; + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone.mapping new file mode 100644 index 0000000000..db8db0fc4e --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone.mapping @@ -0,0 +1,2 @@ +CLASS none/avq net/minecraft/world/decorator/impl/DecoratorGlowstone + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone2.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone2.mapping new file mode 100644 index 0000000000..1e8b0f3635 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorGlowstone2.mapping @@ -0,0 +1,2 @@ +CLASS none/avw net/minecraft/world/decorator/impl/DecoratorGlowstone2 + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorMelon.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorMelon.mapping new file mode 100644 index 0000000000..95218d7f54 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorMelon.mapping @@ -0,0 +1,2 @@ +CLASS none/awa net/minecraft/world/decorator/impl/DecoratorMelon + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorMushroom.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorMushroom.mapping new file mode 100644 index 0000000000..b74c031e78 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorMushroom.mapping @@ -0,0 +1,3 @@ +CLASS none/avs net/minecraft/world/decorator/impl/DecoratorMushroom + FIELD a block Lnone/akw; + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorNetherrackFire.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorNetherrackFire.mapping new file mode 100644 index 0000000000..2d3821cff5 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorNetherrackFire.mapping @@ -0,0 +1,2 @@ +CLASS none/avp net/minecraft/world/decorator/impl/DecoratorNetherrackFire + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorPackedIce.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorPackedIce.mapping new file mode 100644 index 0000000000..8371c2ed31 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorPackedIce.mapping @@ -0,0 +1,2 @@ +CLASS none/avu net/minecraft/world/decorator/impl/DecoratorPackedIce + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorTreeAcacia.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeAcacia.mapping new file mode 100644 index 0000000000..d2ac823151 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeAcacia.mapping @@ -0,0 +1,4 @@ +CLASS none/awi net/minecraft/world/decorator/impl/DecoratorTreeAcacia + FIELD a LOG Lnone/asj; + FIELD b LEAVES Lnone/asj; + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorTreeBirch.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeBirch.mapping new file mode 100644 index 0000000000..c6e2130173 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeBirch.mapping @@ -0,0 +1,5 @@ +CLASS none/auz net/minecraft/world/decorator/impl/DecoratorTreeBirch + FIELD a LOG Lnone/asj; + FIELD b LEAVES Lnone/asj; + FIELD c increasedHeight Z + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorTreeDarkOak.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeDarkOak.mapping new file mode 100644 index 0000000000..1d7d3eb808 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorTreeDarkOak.mapping @@ -0,0 +1,4 @@ +CLASS none/awg net/minecraft/world/decorator/impl/DecoratorTreeDarkOak + FIELD a LOG Lnone/asj; + FIELD b LEAVES Lnone/asj; + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorVine.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorVine.mapping new file mode 100644 index 0000000000..34206c9eb2 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorVine.mapping @@ -0,0 +1,2 @@ +CLASS none/awp net/minecraft/world/decorator/impl/DecoratorVine + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/net/minecraft/world/decorator/impl/DecoratorWaterlily.mapping b/mappings/net/minecraft/world/decorator/impl/DecoratorWaterlily.mapping new file mode 100644 index 0000000000..f66c54f7d8 --- /dev/null +++ b/mappings/net/minecraft/world/decorator/impl/DecoratorWaterlily.mapping @@ -0,0 +1,2 @@ +CLASS none/awq net/minecraft/world/decorator/impl/DecoratorWaterlily + METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/auz.mapping b/mappings/none/auz.mapping deleted file mode 100644 index b4c489df92..0000000000 --- a/mappings/none/auz.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/auz - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avh.mapping b/mappings/none/avh.mapping deleted file mode 100644 index 51ed75d939..0000000000 --- a/mappings/none/avh.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avh - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avi.mapping b/mappings/none/avi.mapping deleted file mode 100644 index 8c86aaef1d..0000000000 --- a/mappings/none/avi.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avi - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avn.mapping b/mappings/none/avn.mapping deleted file mode 100644 index 425b76a712..0000000000 --- a/mappings/none/avn.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avn - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avp.mapping b/mappings/none/avp.mapping deleted file mode 100644 index 4a19fe085e..0000000000 --- a/mappings/none/avp.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avp - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avq.mapping b/mappings/none/avq.mapping deleted file mode 100644 index c9a59691a6..0000000000 --- a/mappings/none/avq.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avq - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avs.mapping b/mappings/none/avs.mapping deleted file mode 100644 index a4af84b93b..0000000000 --- a/mappings/none/avs.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avs - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avu.mapping b/mappings/none/avu.mapping deleted file mode 100644 index 1ebc081a6b..0000000000 --- a/mappings/none/avu.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avu - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/avw.mapping b/mappings/none/avw.mapping deleted file mode 100644 index 3e0e1d87e4..0000000000 --- a/mappings/none/avw.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/avw - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awa.mapping b/mappings/none/awa.mapping deleted file mode 100644 index e68e71b036..0000000000 --- a/mappings/none/awa.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/awa - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awd.mapping b/mappings/none/awd.mapping index 017cd25609..5d0fe5789e 100644 --- a/mappings/none/awd.mapping +++ b/mappings/none/awd.mapping @@ -1,2 +1,4 @@ CLASS none/awd + FIELD a LOG Lnone/asj; + FIELD b LEAVES Lnone/asj; METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awg.mapping b/mappings/none/awg.mapping deleted file mode 100644 index be6d8cea20..0000000000 --- a/mappings/none/awg.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/awg - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awi.mapping b/mappings/none/awi.mapping deleted file mode 100644 index b8eeff0527..0000000000 --- a/mappings/none/awi.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/awi - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awl.mapping b/mappings/none/awl.mapping index 09b2e58f0e..07d0af7b48 100644 --- a/mappings/none/awl.mapping +++ b/mappings/none/awl.mapping @@ -1,2 +1,4 @@ CLASS none/awl + FIELD a LOG Lnone/asj; + FIELD b LEAVES Lnone/asj; METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awp.mapping b/mappings/none/awp.mapping deleted file mode 100644 index e78eeb5911..0000000000 --- a/mappings/none/awp.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/awp - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/awq.mapping b/mappings/none/awq.mapping deleted file mode 100644 index cc8a9be425..0000000000 --- a/mappings/none/awq.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS none/awq - METHOD b generate (Lnone/aiu;Ljava/util/Random;Lnone/cn;)Z diff --git a/mappings/none/car.mapping b/mappings/none/car.mapping new file mode 100644 index 0000000000..4433918a23 --- /dev/null +++ b/mappings/none/car.mapping @@ -0,0 +1,2 @@ +CLASS none/car + METHOD D_ update ()V diff --git a/mappings/none/cau.mapping b/mappings/none/cau.mapping new file mode 100644 index 0000000000..8b6f7f231c --- /dev/null +++ b/mappings/none/cau.mapping @@ -0,0 +1,2 @@ +CLASS none/cau + METHOD D_ update ()V diff --git a/mappings/none/lu.mapping b/mappings/none/lu.mapping new file mode 100644 index 0000000000..2d9d19a0eb --- /dev/null +++ b/mappings/none/lu.mapping @@ -0,0 +1,3 @@ +CLASS none/lu + METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + METHOD aE isMainThread ()Z diff --git a/mappings/none/mg.mapping b/mappings/none/mg.mapping new file mode 100644 index 0000000000..219b053e59 --- /dev/null +++ b/mappings/none/mg.mapping @@ -0,0 +1,2 @@ +CLASS none/mg + METHOD D_ update ()V diff --git a/mappings/none/mi.mapping b/mappings/none/mi.mapping new file mode 100644 index 0000000000..7613e66dd5 --- /dev/null +++ b/mappings/none/mi.mapping @@ -0,0 +1,2 @@ +CLASS none/mi + METHOD D_ update ()V diff --git a/mappings/none/qp.mapping b/mappings/none/qp.mapping new file mode 100644 index 0000000000..1233e6ce1b --- /dev/null +++ b/mappings/none/qp.mapping @@ -0,0 +1,4 @@ +CLASS none/qp + METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; + ARG 0 task + METHOD aE isMainThread ()Z