From ee1d477e1844fd709923861a2f42cb863fba553b Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Sun, 16 Aug 2020 13:43:46 +0200 Subject: [PATCH] 1 outer class, 3 inner classes & some moves (#1679) * 1 outer class, 3 inner classes & some moves * moved AreaHelper to world.dimension --- .../{ => gui/screen}/DisconnectedRealmsScreen.mapping | 2 +- .../client/realms/gui/screen/RealmsPlayerScreen.mapping | 3 +++ .../net/minecraft/client/util/OrderableTooltip.mapping | 2 ++ .../minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping | 1 + .../net/minecraft/entity/passive/StriderEntity.mapping | 7 +++++++ mappings/net/minecraft/{ => text}/CharacterVisitor.mapping | 2 +- .../net/minecraft/world/biome/layer/BiomeLayers.mapping | 1 + .../net/minecraft/{ => world/dimension}/AreaHelper.mapping | 2 +- 8 files changed, 17 insertions(+), 3 deletions(-) rename mappings/net/minecraft/client/realms/{ => gui/screen}/DisconnectedRealmsScreen.mapping (79%) create mode 100644 mappings/net/minecraft/client/util/OrderableTooltip.mapping rename mappings/net/minecraft/{ => text}/CharacterVisitor.mapping (90%) rename mappings/net/minecraft/{ => world/dimension}/AreaHelper.mapping (89%) diff --git a/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping similarity index 79% rename from mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping rename to mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping index f28bdf1488..bc2b3be7cc 100644 --- a/mappings/net/minecraft/client/realms/DisconnectedRealmsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4899 net/minecraft/client/realms/DisconnectedRealmsScreen +CLASS net/minecraft/class_4899 net/minecraft/client/realms/gui/screen/DisconnectedRealmsScreen FIELD field_22807 title Lnet/minecraft/class_2561; FIELD field_22808 reason Lnet/minecraft/class_2561; FIELD field_22809 lines Lnet/minecraft/class_5489; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index 3ed08b521e..aecd57d0c9 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -18,7 +18,9 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay FIELD field_22705 USER_ICON Lnet/minecraft/class_2960; FIELD field_22706 CROSS_PLAYER_ICON Lnet/minecraft/class_2960; FIELD field_22707 OPTIONS_BACKGROUND Lnet/minecraft/class_2960; + FIELD field_26496 operation Lnet/minecraft/class_4406$class_5488; METHOD (Lnet/minecraft/class_4388;Lnet/minecraft/class_4877;)V + ARG 1 parent ARG 2 serverData METHOD method_21325 updateButtonStates ()V METHOD method_21326 shouldRemoveAndOpdeopButtonBeVisible (I)Z @@ -57,3 +59,4 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlay ARG 4 y ARG 5 mouseX ARG 6 mouseY + CLASS class_5488 PlayerOperation diff --git a/mappings/net/minecraft/client/util/OrderableTooltip.mapping b/mappings/net/minecraft/client/util/OrderableTooltip.mapping new file mode 100644 index 0000000000..29ce604d87 --- /dev/null +++ b/mappings/net/minecraft/client/util/OrderableTooltip.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5499 net/minecraft/client/util/OrderableTooltip + METHOD method_31047 getOrderedTooltip ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping index 40423cc8c8..34327c5433 100644 --- a/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping +++ b/mappings/net/minecraft/entity/ai/goal/MoveToTargetPosGoal.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_1367 net/minecraft/entity/ai/goal/MoveToTargetPosGoal ARG 2 speed ARG 4 range ARG 5 maxYDifference + METHOD method_30953 getTargetPos ()Lnet/minecraft/class_2338; METHOD method_6290 startMovingToTarget ()V METHOD method_6291 getDesiredSquaredDistanceToTarget ()D METHOD method_6292 findTargetPos ()Z diff --git a/mappings/net/minecraft/entity/passive/StriderEntity.mapping b/mappings/net/minecraft/entity/passive/StriderEntity.mapping index 422d16f679..3155c2829e 100644 --- a/mappings/net/minecraft/entity/passive/StriderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/StriderEntity.mapping @@ -9,7 +9,9 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity FIELD field_23247 SADDLED Lnet/minecraft/class_2940; METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 spawnReason + ARG 3 pos ARG 4 random METHOD method_26345 getSpeed ()F METHOD method_26347 updateFloating ()V @@ -21,3 +23,8 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity METHOD (Lnet/minecraft/class_4985;Lnet/minecraft/class_1937;)V ARG 1 entity ARG 2 world + CLASS class_5494 GoBackToLavaGoal + FIELD field_26632 strider Lnet/minecraft/class_4985; + METHOD (Lnet/minecraft/class_4985;D)V + ARG 1 strider + ARG 2 speed diff --git a/mappings/net/minecraft/CharacterVisitor.mapping b/mappings/net/minecraft/text/CharacterVisitor.mapping similarity index 90% rename from mappings/net/minecraft/CharacterVisitor.mapping rename to mappings/net/minecraft/text/CharacterVisitor.mapping index df92f46eb1..012f700e61 100644 --- a/mappings/net/minecraft/CharacterVisitor.mapping +++ b/mappings/net/minecraft/text/CharacterVisitor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5224 net/minecraft/CharacterVisitor +CLASS net/minecraft/class_5224 net/minecraft/text/CharacterVisitor COMMENT A visitor for single characters in a string. METHOD accept (ILnet/minecraft/class_2583;I)Z COMMENT Visits a single character. diff --git a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping index 5e6ad37271..7ac116f6c0 100644 --- a/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping +++ b/mappings/net/minecraft/world/biome/layer/BiomeLayers.mapping @@ -24,3 +24,4 @@ CLASS net/minecraft/class_3645 net/minecraft/world/biome/layer/BiomeLayers ARG 5 contextProvider METHOD method_15849 (JJ)Lnet/minecraft/class_3631; ARG 2 salt + CLASS class_5503 Category diff --git a/mappings/net/minecraft/AreaHelper.mapping b/mappings/net/minecraft/world/dimension/AreaHelper.mapping similarity index 89% rename from mappings/net/minecraft/AreaHelper.mapping rename to mappings/net/minecraft/world/dimension/AreaHelper.mapping index 82ec931969..c4ac7610b2 100644 --- a/mappings/net/minecraft/AreaHelper.mapping +++ b/mappings/net/minecraft/world/dimension/AreaHelper.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2424 net/minecraft/AreaHelper +CLASS net/minecraft/class_2424 net/minecraft/world/dimension/AreaHelper FIELD field_11311 width I FIELD field_11312 height I FIELD field_11313 foundPortalBlocks I