From 692f7fadd9150000ea1944de8ea28c6145e442a2 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Mon, 17 Feb 2020 14:46:39 +0100 Subject: [PATCH] Random fixes (#1109) * fiiiiiiiiiiixes * revert for c2s packet * "loot table" -> "table" * juuxeled --- mappings/net/minecraft/block/Block.mapping | 2 +- mappings/net/minecraft/entity/EntityType.mapping | 2 +- mappings/net/minecraft/entity/player/PlayerEntity.mapping | 3 ++- mappings/net/minecraft/fluid/Fluid.mapping | 2 +- mappings/net/minecraft/loot/LootManager.mapping | 8 ++++---- .../network/listener/ClientPlayPacketListener.mapping | 2 +- .../network/listener/ServerPlayPacketListener.mapping | 2 +- ...sageS2CPacket.mapping => GameMessageS2CPacket.mapping} | 2 +- mappings/net/minecraft/world/ModifiableWorld.mapping | 2 +- .../world/gen/feature/AbstractTreeFeature.mapping | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) rename mappings/net/minecraft/network/packet/s2c/play/{ChatMessageS2CPacket.mapping => GameMessageS2CPacket.mapping} (95%) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 6a38790a45..0ac8fbcb3b 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -144,7 +144,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 view ARG 3 pos ARG 4 facing - METHOD method_9525 matches (Lnet/minecraft/class_3494;)Z + METHOD method_9525 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag METHOD method_9526 hasSidedTransparency (Lnet/minecraft/class_2680;)Z ARG 1 state diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index a067d50264..209fc6467a 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_18388 getTrackTickInterval ()I METHOD method_18389 alwaysUpdateVelocity ()Z METHOD method_19946 isFireImmune ()Z - METHOD method_20210 isTaggedWith (Lnet/minecraft/class_3494;)Z + METHOD method_20210 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag METHOD method_20814 isSpawnableFarFromPlayer ()Z METHOD method_5881 loadFromEntityTag (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_2487;)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 2f8cc3b13b..98ba38423a 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -192,8 +192,9 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7350 resetLastAttackedTicks ()V METHOD method_7351 getBlockBreakingSpeed (Lnet/minecraft/class_2680;)F ARG 1 block - METHOD method_7353 addChatMessage (Lnet/minecraft/class_2561;Z)V + METHOD method_7353 addMessage (Lnet/minecraft/class_2561;Z)V ARG 1 message + ARG 2 actionBar METHOD method_7355 sendAbilitiesUpdate ()V METHOD method_7356 getShoulderEntityLeft ()Lnet/minecraft/class_2487; METHOD method_7357 getItemCooldownManager ()Lnet/minecraft/class_1796; diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 69de0bf42c..065d1617e0 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 world METHOD method_15790 toBlockState (Lnet/minecraft/class_3610;)Lnet/minecraft/class_2680; ARG 1 state - METHOD method_15791 matches (Lnet/minecraft/class_3494;)Z + METHOD method_15791 isIn (Lnet/minecraft/class_3494;)Z ARG 1 tag METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V ARG 1 world diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index afef77de46..589e7013df 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager FIELD field_20752 conditionManager Lnet/minecraft/class_4567; - FIELD field_970 suppliers Ljava/util/Map; + FIELD field_970 tables Ljava/util/Map; FIELD field_974 GSON Lcom/google/gson/Gson; FIELD field_975 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_4567;)V ARG 1 conditionManager - METHOD method_367 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; + METHOD method_367 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id METHOD method_368 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 key @@ -14,6 +14,6 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager ARG 0 reporter ARG 1 id ARG 2 table - METHOD method_370 getSupplierNames ()Ljava/util/Set; + METHOD method_370 getTableIds ()Ljava/util/Set; METHOD method_372 toJson (Lnet/minecraft/class_52;)Lcom/google/gson/JsonElement; - ARG 0 supplier + ARG 0 table diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index d36344cbe9..a867251e5e 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -87,7 +87,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_11120 onGameJoin (Lnet/minecraft/class_2678;)V ARG 1 packet - METHOD method_11121 onChatMessage (Lnet/minecraft/class_2635;)V + METHOD method_11121 onGameMessage (Lnet/minecraft/class_2635;)V ARG 1 packet METHOD method_11122 onHealthUpdate (Lnet/minecraft/class_2749;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 0e9eb27ce8..f60e98f064 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_12047 onRecipeBookData (Lnet/minecraft/class_2853;)V ARG 1 packet - METHOD method_12048 onChatMessage (Lnet/minecraft/class_2797;)V + METHOD method_12048 onGameMessage (Lnet/minecraft/class_2797;)V ARG 1 packet METHOD method_12049 onUpdateCommandBlockMinecart (Lnet/minecraft/class_2871;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping similarity index 95% rename from mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping rename to mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping index b4133d021f..4f1c7b3bdd 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameMessageS2CPacket.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/ChatMessageS2CPacket +CLASS net/minecraft/class_2635 net/minecraft/network/packet/s2c/play/GameMessageS2CPacket FIELD field_12112 message Lnet/minecraft/class_2561; FIELD field_12113 location Lnet/minecraft/class_2556; METHOD (Lnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/world/ModifiableWorld.mapping b/mappings/net/minecraft/world/ModifiableWorld.mapping index fed242e8e1..7ef76201a1 100644 --- a/mappings/net/minecraft/world/ModifiableWorld.mapping +++ b/mappings/net/minecraft/world/ModifiableWorld.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld COMMENT
  • 0b0001000 // 8 - REDRAW_ON_MAIN_THREAD - Forces a synchronous redraw on clients.
    • COMMENT
  • 0b0010000 // 16 - FORCE_STATE - Bypass virtual blockstate changes and forces the passed state to be stored as-is.
    • COMMENT
  • 0b0100000 // 32 - SKIP_DROPS - Prevents the previous block (container) from dropping items when destroyed.
    • - COMMENT
  • 0b1000000 // 64 - MECHANICAL_UPDATE - Signals that this is a mechanical update, usually caused by pistons moving blocks.
    • + COMMENT
  • 0b1000000 // 64 - MOVED - Signals that the current block is being moved to a different location, usually because of a piston.
    • COMMENT ARG 1 pos COMMENT the target position diff --git a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping index 7630495c98..2c26c95f0e 100644 --- a/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/AbstractTreeFeature.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/AbstractTreeFeatu ARG 4 logPositions ARG 5 leavesPositions ARG 7 config - METHOD method_16416 isLeaves (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z + METHOD method_16416 isVine (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos METHOD method_16419 isNaturalDirt (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z