From cc751075a567eb0dbe2fe0d6781295ac01d4c393 Mon Sep 17 00:00:00 2001 From: marcin212 Date: Wed, 14 Nov 2018 23:19:48 +0100 Subject: [PATCH] Some command block gui and others mappings (#190) * some command block gui and others mappings * adjusted names * remove "is" from field name --- mappings/bqf.mapping | 2 ++ mappings/ccn.mapping | 2 ++ mappings/cik.mapping | 2 ++ mappings/coi.mapping | 3 +++ mappings/crr.mapping | 2 -- mappings/dip.mapping | 1 + .../net/minecraft/block/entity/BlockEntityChest.mapping | 1 + .../minecraft/block/entity/BlockEntityEnderChest.mapping | 3 +++ .../minecraft/client/block/ChestAnimationProgress.mapping | 2 ++ .../minecraft/client/gui/CommandBlockGui.mapping} | 8 +++++++- .../minecraft/client/gui/CommandBlockMinecartGui.mapping | 2 ++ .../minecraft/client/gui/SimpleCommandBlockGui.mapping} | 7 ++++++- .../net/minecraft/client/gui/ingame/GuiInventory.mapping | 1 + mappings/wf.mapping | 7 +++++++ 14 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 mappings/bqf.mapping create mode 100644 mappings/ccn.mapping create mode 100644 mappings/cik.mapping create mode 100644 mappings/coi.mapping delete mode 100644 mappings/crr.mapping create mode 100644 mappings/net/minecraft/client/block/ChestAnimationProgress.mapping rename mappings/{crc.mapping => net/minecraft/client/gui/CommandBlockGui.mapping} (54%) create mode 100644 mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping rename mappings/{cqw.mapping => net/minecraft/client/gui/SimpleCommandBlockGui.mapping} (67%) create mode 100644 mappings/wf.mapping diff --git a/mappings/bqf.mapping b/mappings/bqf.mapping new file mode 100644 index 0000000000..4e4886049b --- /dev/null +++ b/mappings/bqf.mapping @@ -0,0 +1,2 @@ +CLASS bqf + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/ccn.mapping b/mappings/ccn.mapping new file mode 100644 index 0000000000..051fa0001a --- /dev/null +++ b/mappings/ccn.mapping @@ -0,0 +1,2 @@ +CLASS ccn + FIELD b MUSHROOM_FILEDS_BIOME_ID I diff --git a/mappings/cik.mapping b/mappings/cik.mapping new file mode 100644 index 0000000000..e52a45a6f9 --- /dev/null +++ b/mappings/cik.mapping @@ -0,0 +1,2 @@ +CLASS cik + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/coi.mapping b/mappings/coi.mapping new file mode 100644 index 0000000000..720d5f7147 --- /dev/null +++ b/mappings/coi.mapping @@ -0,0 +1,3 @@ +CLASS coi + FIELD a game Lclx; + FIELD b fontRenderer Lcmk; diff --git a/mappings/crr.mapping b/mappings/crr.mapping deleted file mode 100644 index 2e176d8524..0000000000 --- a/mappings/crr.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS crr - METHOD c onInitialized ()V diff --git a/mappings/dip.mapping b/mappings/dip.mapping index 267ed2117f..071d714e14 100644 --- a/mappings/dip.mapping +++ b/mappings/dip.mapping @@ -8,6 +8,7 @@ CLASS dip ARG 4 headYaw ARG 5 headPitch ARG 6 scale + FIELD a TEXTURE Lpw; METHOD a shouldMergeTextures ()Z METHOD a render (Lagh;FFFFFFF)V METHOD a render (Lczj;FFFFFFF)V diff --git a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping index 04692e0ded..b0f3838d8d 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityChest.mapping @@ -4,6 +4,7 @@ CLASS blv net/minecraft/block/entity/BlockEntityChest METHOD Q_ isInvEmpty ()Z METHOD U_ getInvSize ()I METHOD Z_ tick ()V + METHOD a getAnimationProgress (F)F METHOD a createContainer (Lapu;Lapv;)Lark; ARG 1 playerInv METHOD a serialize (Lho;)Lho; diff --git a/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping b/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping index c7281650c6..8d4fcf5169 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityEnderChest.mapping @@ -1,7 +1,10 @@ CLASS bmd net/minecraft/block/entity/BlockEntityEnderChest + FIELD a animationProgress F + FIELD e lastAnimationProgress F FIELD f viewers I FIELD g ticks I METHOD Z_ tick ()V + METHOD a getAnimationProgress (F)F METHOD a canPlayerUse (Lapv;)Z METHOD c onOpen ()V METHOD d onClose ()V diff --git a/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping b/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping new file mode 100644 index 0000000000..cd2afb4fcb --- /dev/null +++ b/mappings/net/minecraft/client/block/ChestAnimationProgress.mapping @@ -0,0 +1,2 @@ +CLASS bmj net/minecraft/client/block/ChestAnimationProgress + METHOD a getAnimationProgress (F)F diff --git a/mappings/crc.mapping b/mappings/net/minecraft/client/gui/CommandBlockGui.mapping similarity index 54% rename from mappings/crc.mapping rename to mappings/net/minecraft/client/gui/CommandBlockGui.mapping index 6de2a72c09..18a9cb3a36 100644 --- a/mappings/crc.mapping +++ b/mappings/net/minecraft/client/gui/CommandBlockGui.mapping @@ -1,4 +1,4 @@ -CLASS crc +CLASS crc net/minecraft/client/gui/CommandBlockGui CLASS crc$1 METHOD a onPressed (DD)V ARG 0 mouseX @@ -8,6 +8,12 @@ CLASS crc CLASS crc$3 METHOD a onPressed (DD)V ARG 0 mouseX + FIELD A typeButton Lcmu; + FIELD B conditionalModeButton Lcmu; + FIELD C redstoneTriggerButton Lcmu; + FIELD D type Lblw$a; + FIELD E conditional Z + FIELD F alwaysActive Z METHOD b onScaleChanged (Lclx;II)V ARG 1 game ARG 2 width diff --git a/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping b/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping new file mode 100644 index 0000000000..8e20d5566f --- /dev/null +++ b/mappings/net/minecraft/client/gui/CommandBlockMinecartGui.mapping @@ -0,0 +1,2 @@ +CLASS crr net/minecraft/client/gui/CommandBlockMinecartGui + METHOD c onInitialized ()V diff --git a/mappings/cqw.mapping b/mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping similarity index 67% rename from mappings/cqw.mapping rename to mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping index 3f174a8311..afa7e73798 100644 --- a/mappings/cqw.mapping +++ b/mappings/net/minecraft/client/gui/SimpleCommandBlockGui.mapping @@ -1,4 +1,4 @@ -CLASS cqw +CLASS cqw net/minecraft/client/gui/SimpleCommandBlockGui CLASS cqw$1 METHOD a onPressed (DD)V ARG 0 mouseX @@ -8,6 +8,11 @@ CLASS cqw CLASS cqw$3 METHOD a onPressed (DD)V ARG 0 mouseX + FIELD a consoleCommandTextField Lcmy; + FIELD f previousOutputTextField Lcmy; + FIELD g doneButton Lcmu; + FIELD h cancelButton Lcmu; + FIELD i toggleTrackingOutputButton Lcmu; METHOD a draw (IIF)V ARG 1 mouseX ARG 2 mouseY diff --git a/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping b/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping index 6ea0595c32..6610a990dc 100644 --- a/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping +++ b/mappings/net/minecraft/client/gui/ingame/GuiInventory.mapping @@ -2,6 +2,7 @@ CLASS cro net/minecraft/client/gui/ingame/GuiInventory CLASS cro$1 METHOD a onPressed (DD)V ARG 0 mouseX + FIELD x TEXTURE Lpw; METHOD a isClickInContainerBounds (DDIII)Z ARG 1 mouseX ARG 3 mouseY diff --git a/mappings/wf.mapping b/mappings/wf.mapping new file mode 100644 index 0000000000..7185a92961 --- /dev/null +++ b/mappings/wf.mapping @@ -0,0 +1,7 @@ +CLASS wf + CLASS wf$a + FIELD a BANNED_IPS_FILE Ljava/io/File; + FIELD b BANNED_PLAYERS_FILE Ljava/io/File; + FIELD c OPS_FILE Ljava/io/File; + FIELD d WHITE_LIST_FILE Ljava/io/File; + FIELD e LOGGER Lorg/apache/logging/log4j/Logger;