From 8e04a66b1ee9ae450be6954e9a6ea6e1d9753a62 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 1 Apr 2020 11:17:12 -0500 Subject: [PATCH] Stage (#1245) Co-authored-by: liach --- mappings/net/minecraft/block/AntBlock.mapping | 8 ++++++ .../net/minecraft/block/BookBoxBlock.mapping | 3 +++ .../block/NeitherPortalBlock.mapping | 2 ++ .../PortalBlock.mapping} | 25 ++++++++++++++++++- .../entity/NetherPortalBlockEntity.mapping | 5 ++++ .../gui/screen/ingame/BookContent.mapping} | 10 +++++++- .../server/command/DebugDimCommand.mapping | 7 ++++++ .../server/command/WarpCommand.mapping | 6 +++++ .../minecraft/util/registry/Registry.mapping | 2 +- .../source/DirectBiomeAccessType.mapping | 1 + .../dimension/DimensionHashHelper.mapping | 5 ++++ 11 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 mappings/net/minecraft/block/AntBlock.mapping create mode 100644 mappings/net/minecraft/block/BookBoxBlock.mapping create mode 100644 mappings/net/minecraft/block/NeitherPortalBlock.mapping rename mappings/net/minecraft/{class_5010.mapping => block/PortalBlock.mapping} (51%) create mode 100644 mappings/net/minecraft/block/entity/NetherPortalBlockEntity.mapping rename mappings/net/minecraft/{class_5001.mapping => client/gui/screen/ingame/BookContent.mapping} (58%) create mode 100644 mappings/net/minecraft/server/command/DebugDimCommand.mapping create mode 100644 mappings/net/minecraft/server/command/WarpCommand.mapping create mode 100644 mappings/net/minecraft/world/biome/source/DirectBiomeAccessType.mapping create mode 100644 mappings/net/minecraft/world/dimension/DimensionHashHelper.mapping diff --git a/mappings/net/minecraft/block/AntBlock.mapping b/mappings/net/minecraft/block/AntBlock.mapping new file mode 100644 index 0000000000..2a568cf810 --- /dev/null +++ b/mappings/net/minecraft/block/AntBlock.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5006 net/minecraft/block/AntBlock + FIELD field_23422 FACING Lnet/minecraft/class_2753; + METHOD method_26476 move (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5006$class_5007;)V + ARG 1 state + ARG 2 world + ARG 3 pos + ARG 4 clockwiseness + CLASS class_5007 Clockwiseness diff --git a/mappings/net/minecraft/block/BookBoxBlock.mapping b/mappings/net/minecraft/block/BookBoxBlock.mapping new file mode 100644 index 0000000000..2738559be8 --- /dev/null +++ b/mappings/net/minecraft/block/BookBoxBlock.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5008 net/minecraft/block/BookBoxBlock + FIELD field_23433 FACING Lnet/minecraft/class_2753; + FIELD field_23434 RANDOM_CHARACTERS [C diff --git a/mappings/net/minecraft/block/NeitherPortalBlock.mapping b/mappings/net/minecraft/block/NeitherPortalBlock.mapping new file mode 100644 index 0000000000..fdb72c803b --- /dev/null +++ b/mappings/net/minecraft/block/NeitherPortalBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5009 net/minecraft/block/NeitherPortalBlock + FIELD field_23436 RANDOM Ljava/util/Random; diff --git a/mappings/net/minecraft/class_5010.mapping b/mappings/net/minecraft/block/PortalBlock.mapping similarity index 51% rename from mappings/net/minecraft/class_5010.mapping rename to mappings/net/minecraft/block/PortalBlock.mapping index 6cd303ff70..dedba2c59b 100644 --- a/mappings/net/minecraft/class_5010.mapping +++ b/mappings/net/minecraft/block/PortalBlock.mapping @@ -1,4 +1,24 @@ -CLASS net/minecraft/class_5010 +CLASS net/minecraft/class_5010 net/minecraft/block/PortalBlock + FIELD field_23437 AXIS Lnet/minecraft/class_2754; + FIELD field_23438 X_SHAPE Lnet/minecraft/class_265; + FIELD field_23439 Z_SHAPE Lnet/minecraft/class_265; + METHOD method_26479 teleportTo (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)V + ARG 1 world + ARG 2 pos + ARG 3 state + ARG 4 dimension + METHOD method_26480 tryCreatePortal (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)Z + ARG 0 world + ARG 1 pos + ARG 2 frame + METHOD method_26481 createAreaHelper (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)Lnet/minecraft/class_5010$class_2424; + ARG 0 world + ARG 1 pos + ARG 2 frame + METHOD method_26483 createParticleEffect (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2394; + ARG 1 state + ARG 2 world + ARG 3 pos CLASS class_2424 AreaHelper FIELD field_11311 width I FIELD field_11312 height I @@ -8,9 +28,12 @@ CLASS net/minecraft/class_5010 FIELD field_11316 lowerCorner Lnet/minecraft/class_2338; FIELD field_11317 axis Lnet/minecraft/class_2350$class_2351; FIELD field_11318 world Lnet/minecraft/class_1936; + FIELD field_23440 frame Lnet/minecraft/class_2248; METHOD (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_2248;)V ARG 1 world ARG 2 pos + ARG 3 axis + ARG 4 frame METHOD method_10353 findHeight ()I METHOD method_10354 distanceToPortalEdge (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/NetherPortalBlockEntity.mapping b/mappings/net/minecraft/block/entity/NetherPortalBlockEntity.mapping new file mode 100644 index 0000000000..6b1acceda7 --- /dev/null +++ b/mappings/net/minecraft/block/entity/NetherPortalBlockEntity.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5012 net/minecraft/block/entity/NetherPortalBlockEntity + FIELD field_23443 dimension I + METHOD method_26487 setDimension (I)V + ARG 1 dimension + METHOD method_26488 getDimension ()I diff --git a/mappings/net/minecraft/class_5001.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookContent.mapping similarity index 58% rename from mappings/net/minecraft/class_5001.mapping rename to mappings/net/minecraft/client/gui/screen/ingame/BookContent.mapping index e207ebdf8f..563745fe42 100644 --- a/mappings/net/minecraft/class_5001.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookContent.mapping @@ -1,6 +1,14 @@ -CLASS net/minecraft/class_5001 +CLASS net/minecraft/class_5001 net/minecraft/client/gui/screen/ingame/BookContent + FIELD field_23405 EMPTY Lnet/minecraft/class_5001; METHOD method_17560 getPageCount ()I METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_2561; + ARG 1 index + METHOD method_26437 fromStack (Lnet/minecraft/class_1799;)Lnet/minecraft/class_5001; + ARG 0 stack + METHOD method_26438 fromTag (Lnet/minecraft/class_2487;)Ljava/util/List; + ARG 0 tag + METHOD method_26439 getPage (I)Lnet/minecraft/class_2561; + ARG 1 index CLASS class_3932 WritableBookContents FIELD field_17419 pages Ljava/util/List; METHOD (Lnet/minecraft/class_1799;)V diff --git a/mappings/net/minecraft/server/command/DebugDimCommand.mapping b/mappings/net/minecraft/server/command/DebugDimCommand.mapping new file mode 100644 index 0000000000..8ffe577b34 --- /dev/null +++ b/mappings/net/minecraft/server/command/DebugDimCommand.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_5115 net/minecraft/server/command/DebugDimCommand + FIELD field_23638 GSON Lcom/google/gson/Gson; + FIELD field_23639 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD method_26710 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_26712 execute (Lnet/minecraft/class_2168;)I + ARG 0 source diff --git a/mappings/net/minecraft/server/command/WarpCommand.mapping b/mappings/net/minecraft/server/command/WarpCommand.mapping new file mode 100644 index 0000000000..88972dd536 --- /dev/null +++ b/mappings/net/minecraft/server/command/WarpCommand.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_5116 net/minecraft/server/command/WarpCommand + METHOD method_26724 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_26726 execute (Lnet/minecraft/class_2168;Ljava/lang/String;)I + ARG 0 source + ARG 1 taret diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 516888ccbd..eae8dc76a4 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 registry ARG 1 id ARG 2 entry - METHOD method_10227 putDefaultEntry (Ljava/lang/String;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; + METHOD method_10227 create (Ljava/lang/String;Lnet/minecraft/class_2385;Ljava/util/function/Supplier;)Lnet/minecraft/class_2385; ARG 0 id METHOD method_10230 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_2960;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry diff --git a/mappings/net/minecraft/world/biome/source/DirectBiomeAccessType.mapping b/mappings/net/minecraft/world/biome/source/DirectBiomeAccessType.mapping new file mode 100644 index 0000000000..968666a263 --- /dev/null +++ b/mappings/net/minecraft/world/biome/source/DirectBiomeAccessType.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5005 net/minecraft/world/biome/source/DirectBiomeAccessType diff --git a/mappings/net/minecraft/world/dimension/DimensionHashHelper.mapping b/mappings/net/minecraft/world/dimension/DimensionHashHelper.mapping new file mode 100644 index 0000000000..3325e3094a --- /dev/null +++ b/mappings/net/minecraft/world/dimension/DimensionHashHelper.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5013 net/minecraft/world/dimension/DimensionHashHelper + FIELD field_23479 lastSearchedName Ljava/lang/String; + METHOD method_26491 getLastSearchedName ()Ljava/lang/String; + METHOD method_26492 getHash (Ljava/lang/String;)I + ARG 0 name