From 41850f5bf3d6768745cda539e008f81c6a68546b Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 23 Aug 2016 17:11:06 +0200 Subject: [PATCH] work on TileEntityStructureBlock and misc --- .../net/minecraft/block/BlockSlabBase.mapping | 11 ++++- .../block/impl/BlockSlabPurpurBase.mapping | 2 + .../block/impl/BlockSlabStone2Double.mapping | 1 + .../block/impl/BlockSlabStone2Single.mapping | 1 + .../block/impl/BlockSlabStoneDouble.mapping | 1 + .../block/impl/BlockSlabStoneSingle.mapping | 1 + .../block/impl/BlockSlabWoodDouble.mapping | 1 + .../block/impl/BlockSlabWoodSingle.mapping | 1 + .../block/impl/BlockStructure.mapping | 1 + .../impl/TileEntityStructureBlock.mapping | 46 +++++++++++++++++++ .../network/ClientConnection.mapping | 4 ++ .../net/minecraft/sortme/Difficulty.mapping | 2 + .../net/minecraft/sortme/IFileIOTask.mapping | 2 + .../minecraft/sortme/OptionMainHand.mapping | 2 + .../net/minecraft/sortme/ThreadFileIO.mapping | 12 +++++ .../sortme/WorldSaveLoadSomething.mapping | 5 ++ .../minecraft/sound/BlockSoundGroup.mapping | 6 +++ .../{sortme => util}/Snooper.mapping | 2 +- .../{sortme => world}/GameRules.mapping | 2 +- mappings/none/aua.mapping | 4 -- 20 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 mappings/net/minecraft/sortme/IFileIOTask.mapping create mode 100644 mappings/net/minecraft/sortme/ThreadFileIO.mapping create mode 100644 mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping rename mappings/net/minecraft/{sortme => util}/Snooper.mapping (75%) rename mappings/net/minecraft/{sortme => world}/GameRules.mapping (95%) delete mode 100644 mappings/none/aua.mapping diff --git a/mappings/net/minecraft/block/BlockSlabBase.mapping b/mappings/net/minecraft/block/BlockSlabBase.mapping index d3f34984f4..60a033427e 100644 --- a/mappings/net/minecraft/block/BlockSlabBase.mapping +++ b/mappings/net/minecraft/block/BlockSlabBase.mapping @@ -1,6 +1,15 @@ CLASS none/and net/minecraft/block/BlockSlabBase - CLASS none/and$a + CLASS none/and$a Half + FIELD a TOP Lnone/and$a; + FIELD b BOTTOM Lnone/and$a; + FIELD c name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name METHOD m asString ()Ljava/lang/String; + FIELD a HALF Lnone/asx; + FIELD b BOX_BOTTOM Lnone/bcp; + FIELD c BOX_TOP Lnone/bcp; METHOD a getDropAmount (Ljava/util/Random;)I METHOD a getStateForPlacement (Lnone/aiu;Lnone/cn;Lnone/cu;FFFILnone/sn;)Lnone/asj; METHOD b getBoundingBox (Lnone/asj;Lnone/aiy;Lnone/cn;)Lnone/bcp; + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping b/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping index 758ec872a9..b61f38a53d 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabPurpurBase.mapping @@ -1,6 +1,8 @@ CLASS none/aow net/minecraft/block/impl/BlockSlabPurpurBase CLASS none/aow$a Double + METHOD e isDoubleSlab ()Z CLASS none/aow$b Single + METHOD e isDoubleSlab ()Z CLASS none/aow$c METHOD m asString ()Ljava/lang/String; METHOD a deserializeState (I)Lnone/asj; diff --git a/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping index e7c9f3d076..d402fcafbc 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Double.mapping @@ -1 +1,2 @@ CLASS none/amt net/minecraft/block/impl/BlockSlabStone2Double + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping b/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping index 046fe7854a..e433f6d16b 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabStone2Single.mapping @@ -1 +1,2 @@ CLASS none/anc net/minecraft/block/impl/BlockSlabStone2Single + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping b/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping index 241c1a870d..5b0b88afce 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabStoneDouble.mapping @@ -1 +1,2 @@ CLASS none/amu net/minecraft/block/impl/BlockSlabStoneDouble + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping b/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping index b4993e5a61..b4517a46dd 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabStoneSingle.mapping @@ -1 +1,2 @@ CLASS none/ane net/minecraft/block/impl/BlockSlabStoneSingle + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping b/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping index ecfb2613a8..51c04e43d9 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabWoodDouble.mapping @@ -1 +1,2 @@ CLASS none/amv net/minecraft/block/impl/BlockSlabWoodDouble + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping b/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping index f3d94635f4..4519b40bd2 100644 --- a/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping +++ b/mappings/net/minecraft/block/impl/BlockSlabWoodSingle.mapping @@ -1 +1,2 @@ CLASS none/ang net/minecraft/block/impl/BlockSlabWoodSingle + METHOD e isDoubleSlab ()Z diff --git a/mappings/net/minecraft/block/impl/BlockStructure.mapping b/mappings/net/minecraft/block/impl/BlockStructure.mapping index d084dc3203..81be46496e 100644 --- a/mappings/net/minecraft/block/impl/BlockStructure.mapping +++ b/mappings/net/minecraft/block/impl/BlockStructure.mapping @@ -1,4 +1,5 @@ CLASS none/aqg net/minecraft/block/impl/BlockStructure + FIELD a MODE Lnone/asx; METHOD a deserializeState (I)Lnone/asj; METHOD a getDropAmount (Ljava/util/Random;)I METHOD a createTileEntity (Lnone/aiu;I)Lnone/arb; diff --git a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping index 412666bdc2..32f41a36c3 100644 --- a/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping +++ b/mappings/net/minecraft/block/tile/impl/TileEntityStructureBlock.mapping @@ -6,7 +6,13 @@ CLASS none/arv net/minecraft/block/tile/impl/TileEntityStructureBlock FIELD d DATA Lnone/arv$a; FIELD e VALUES [Lnone/arv$a; FIELD f translationKey Ljava/lang/String; + FIELD g id I METHOD (Ljava/lang/String;ILjava/lang/String;I)V + METHOD a getId ()I + METHOD a byId (I)Lnone/arv$a; + ARG 0 id + METHOD a getTranslationKey (Lnone/arv$a;)Ljava/lang/String; + ARG 0 mode METHOD m asString ()Ljava/lang/String; METHOD values values ()[Lnone/arv$a; FIELD a name Ljava/lang/String; @@ -24,7 +30,47 @@ CLASS none/arv net/minecraft/block/tile/impl/TileEntityStructureBlock FIELD q integrity F FIELD r seed J METHOD C_ getUpdatePacket ()Lnone/fy; + METHOD G isPowered ()Z + METHOD H shouldShowAir ()Z + METHOD I shouldShowBoundingBox ()Z + METHOD a setIntegrity (F)V + ARG 0 value + METHOD a setSeed (J)V + ARG 0 value + METHOD a setName (Ljava/lang/String;)V + ARG 0 value + METHOD a setMode (Lnone/arv$a;)V + ARG 0 value METHOD a deserializeTag (Lnone/dt;)V + METHOD a setAuthor (Lnone/sn;)V + ARG 0 entity + METHOD a setIgnoreEntities (Z)V + ARG 0 value + METHOD b setMetadata (Ljava/lang/String;)V + ARG 0 vallue + METHOD b setMirror (Lnone/anw;)V + ARG 0 mirror + METHOD b setRotation (Lnone/apj;)V + ARG 0 value + METHOD b setPos (Lnone/cn;)V METHOD b serializeTag (Lnone/dt;)Lnone/dt; METHOD c writeToTag ()Lnone/dt; + METHOD c setSize (Lnone/cn;)V + ARG 0 value + METHOD d getName ()Ljava/lang/String; + METHOD d setPowered (Z)V + ARG 0 value + METHOD e egetPos ()Lnone/cn; + METHOD e setShowAir (Z)V + ARG 0 value + METHOD f setShowBoundingBox (Z)V + ARG 0 value + METHOD g getSize ()Lnone/cn; + METHOD h getMirror ()Lnone/anw; + METHOD i getRotation ()Lnone/apj; METHOD i_ getNameComponent ()Lnone/fa; + METHOD j getMetadata ()Ljava/lang/String; + METHOD k getMode ()Lnone/arv$a; + METHOD m shouldIgnoreEntities ()Z + METHOD n getIntegrity ()F + METHOD o getSeed ()J diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index 91b1ad5332..48dc1668f7 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -3,7 +3,11 @@ CLASS none/eq net/minecraft/network/ClientConnection METHOD initChannel initChannel (Lio/netty/channel/Channel;)V CLASS none/eq$6 METHOD initChannel initChannel (Lio/netty/channel/Channel;)V + FIELD g LOGGER Lorg/apache/logging/log4j/Logger; METHOD a connect (Ljava/net/InetAddress;IZ)Lnone/eq; ARG 0 address ARG 1 port METHOD a connect (Ljava/net/SocketAddress;)Lnone/eq; + METHOD channelActive channelActive (Lio/netty/channel/ChannelHandlerContext;)V + METHOD channelInactive channelInactive (Lio/netty/channel/ChannelHandlerContext;)V + METHOD exceptionCaught exceptionCaught (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Throwable;)V diff --git a/mappings/net/minecraft/sortme/Difficulty.mapping b/mappings/net/minecraft/sortme/Difficulty.mapping index a09175e05a..f46604ff94 100644 --- a/mappings/net/minecraft/sortme/Difficulty.mapping +++ b/mappings/net/minecraft/sortme/Difficulty.mapping @@ -7,6 +7,8 @@ CLASS none/qx net/minecraft/sortme/Difficulty FIELD f id I FIELD g translationKey Ljava/lang/String; METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 0 id + ARG 1 translationKey METHOD a getId ()I METHOD a byId (I)Lnone/qx; ARG 0 id diff --git a/mappings/net/minecraft/sortme/IFileIOTask.mapping b/mappings/net/minecraft/sortme/IFileIOTask.mapping new file mode 100644 index 0000000000..867d08ff7b --- /dev/null +++ b/mappings/net/minecraft/sortme/IFileIOTask.mapping @@ -0,0 +1,2 @@ +CLASS none/bcm net/minecraft/sortme/IFileIOTask + METHOD c run ()Z diff --git a/mappings/net/minecraft/sortme/OptionMainHand.mapping b/mappings/net/minecraft/sortme/OptionMainHand.mapping index e72296bbf7..b8103b026d 100644 --- a/mappings/net/minecraft/sortme/OptionMainHand.mapping +++ b/mappings/net/minecraft/sortme/OptionMainHand.mapping @@ -1,3 +1,5 @@ CLASS none/sm net/minecraft/sortme/OptionMainHand FIELD a LEFT Lnone/sm; FIELD b RIGHT Lnone/sm; + FIELD c optionName Lnone/fa; + METHOD a getOpposite ()Lnone/sm; diff --git a/mappings/net/minecraft/sortme/ThreadFileIO.mapping b/mappings/net/minecraft/sortme/ThreadFileIO.mapping new file mode 100644 index 0000000000..7c6797856c --- /dev/null +++ b/mappings/net/minecraft/sortme/ThreadFileIO.mapping @@ -0,0 +1,12 @@ +CLASS none/bcl net/minecraft/sortme/ThreadFileIO + FIELD a INSTANCE Lnone/bcl; + FIELD b tasks Ljava/util/List; + FIELD c tasksAdded J + FIELD d tasksCompleted J + FIELD e accelerated Z + METHOD a getInstance ()Lnone/bcl; + METHOD a addTask (Lnone/bcm;)V + ARG 0 task + METHOD b completeTasks ()V + METHOD c runTasks ()V + METHOD run run ()V diff --git a/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping b/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping new file mode 100644 index 0000000000..fe230c1abc --- /dev/null +++ b/mappings/net/minecraft/sortme/WorldSaveLoadSomething.mapping @@ -0,0 +1,5 @@ +CLASS none/aua net/minecraft/sortme/WorldSaveLoadSomething + METHOD a (Lnone/aiu;Lnone/dt;)Lnone/atm; + ARG 0 world + ARG 1 nbt + METHOD c run ()Z diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 94f8561468..aa27ebc2f1 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -11,17 +11,23 @@ CLASS none/apu net/minecraft/sound/BlockSoundGroup FIELD j LADDER Lnone/apu; FIELD k ANVIL Lnone/apu; FIELD l SLIME Lnone/apu; + FIELD m volume F + FIELD n pitch F FIELD o breakSound Lnone/nk; FIELD p stepSound Lnone/nk; FIELD q placeSound Lnone/nk; FIELD r hitSound Lnone/nk; FIELD s fallSound Lnone/nk; METHOD (FFLnone/nk;Lnone/nk;Lnone/nk;Lnone/nk;Lnone/nk;)V + ARG 0 volume + ARG 1 pitch ARG 2 breakSound ARG 3 stepSound ARG 4 placeSound ARG 5 hitSound ARG 6 fallSound + METHOD a getVolume ()F + METHOD b getPitch ()F METHOD c getBreakSound ()Lnone/nk; METHOD d getStepSound ()Lnone/nk; METHOD e getPlaceSound ()Lnone/nk; diff --git a/mappings/net/minecraft/sortme/Snooper.mapping b/mappings/net/minecraft/util/Snooper.mapping similarity index 75% rename from mappings/net/minecraft/sortme/Snooper.mapping rename to mappings/net/minecraft/util/Snooper.mapping index 26bfa706bb..b73ca7717b 100644 --- a/mappings/net/minecraft/sortme/Snooper.mapping +++ b/mappings/net/minecraft/util/Snooper.mapping @@ -1,4 +1,4 @@ -CLASS none/rj net/minecraft/sortme/Snooper +CLASS none/rj net/minecraft/util/Snooper FIELD c token Ljava/lang/String; FIELD d url Ljava/net/URL; FIELD f timer Ljava/util/Timer; diff --git a/mappings/net/minecraft/sortme/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping similarity index 95% rename from mappings/net/minecraft/sortme/GameRules.mapping rename to mappings/net/minecraft/world/GameRules.mapping index 0f47bf5156..36239a947d 100644 --- a/mappings/net/minecraft/sortme/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -1,4 +1,4 @@ -CLASS none/air net/minecraft/sortme/GameRules +CLASS none/air net/minecraft/world/GameRules CLASS none/air$a Value FIELD a asString Ljava/lang/String; FIELD b asBoolean Z diff --git a/mappings/none/aua.mapping b/mappings/none/aua.mapping deleted file mode 100644 index 63168817f9..0000000000 --- a/mappings/none/aua.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS none/aua - METHOD a (Lnone/aiu;Lnone/dt;)Lnone/atm; - ARG 0 world - ARG 1 nbt