From d9a890e5dce0eb54d4aa37dc9419153b4d25110f Mon Sep 17 00:00:00 2001 From: Juuxel <6596629+Juuxel@users.noreply.github.com> Date: Tue, 19 Nov 2019 16:22:22 +0200 Subject: [PATCH] Fix various issues (#966) * Fix various issues Fixed TextRenderer.draw parameter names. Closes #965. RabbitEntity.method_20669 -> canSpawn. Closes #956. Block/Fluid.stateFactory + getters -> stateManager. Closes #957. MinecraftServer.advancementManager + getter -> advancementLoader. ServerPlayerEntity.advancementManager + getter -> advancementTracker. Closes #960. PlayerManager.getAdvancementManager -> getAdvancementTracker. PlayerManager.advancementManagerMap -> advancementTrackers. Fixed typo in StatePredicate.test param name (sate -> state). * PlayerManager.advancementManagerMap -> advancementTrackers * liach's suggestion --- mappings/net/minecraft/block/Block.mapping | 4 ++-- mappings/net/minecraft/client/font/TextRenderer.mapping | 4 ++-- mappings/net/minecraft/entity/passive/RabbitEntity.mapping | 1 + mappings/net/minecraft/fluid/Fluid.mapping | 4 ++-- mappings/net/minecraft/predicate/StatePredicate.mapping | 2 +- mappings/net/minecraft/server/MinecraftServer.mapping | 4 ++-- mappings/net/minecraft/server/PlayerManager.mapping | 4 ++-- .../net/minecraft/server/network/ServerPlayerEntity.mapping | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index b6c038db66..cdaeac6b14 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -67,7 +67,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block FIELD field_10644 FACINGS [Lnet/minecraft/class_2350; FIELD field_10645 dynamicBounds Z FIELD field_10646 defaultState Lnet/minecraft/class_2680; - FIELD field_10647 stateFactory Lnet/minecraft/class_2689; + FIELD field_10647 stateManager Lnet/minecraft/class_2689; FIELD field_10648 resistance F FIELD field_10649 FACE_CULL_MAP Ljava/lang/ThreadLocal; FIELD field_10650 hardness F @@ -404,7 +404,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 player ARG 3 world ARG 4 pos - METHOD method_9595 getStateFactory ()Lnet/minecraft/class_2689; + METHOD method_9595 getStateManager ()Lnet/minecraft/class_2689; METHOD method_9597 getMaterial (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3614; ARG 1 state METHOD method_9598 rotate (Lnet/minecraft/class_2680;Lnet/minecraft/class_2470;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index c40a03de79..e0903fd6d1 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -106,8 +106,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 string ARG 2 x ARG 3 y - ARG 4 z - ARG 5 color + ARG 4 color + ARG 5 shadow ARG 6 matrix ARG 7 vertexConsumerProvider ARG 8 seeThrough diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index fc6a97c001..f2c767e9e2 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity FIELD field_6850 lastOnGround Z FIELD field_6851 jumpTicks I FIELD field_6852 RABBIT_TYPE Lnet/minecraft/class_2940; + METHOD method_20669 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z METHOD method_6606 setSpeed (D)V ARG 1 speed METHOD method_6607 wantsCarrots ()Z diff --git a/mappings/net/minecraft/fluid/Fluid.mapping b/mappings/net/minecraft/fluid/Fluid.mapping index 07cbe15f5d..84908d1a6e 100644 --- a/mappings/net/minecraft/fluid/Fluid.mapping +++ b/mappings/net/minecraft/fluid/Fluid.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid FIELD field_15903 defaultState Lnet/minecraft/class_3610; FIELD field_15904 STATE_IDS Lnet/minecraft/class_2361; - FIELD field_15905 stateFactory Lnet/minecraft/class_2689; + FIELD field_15905 stateManager Lnet/minecraft/class_2689; METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792; METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid ARG 1 world ARG 2 pos ARG 3 state - METHOD method_15783 getStateFactory ()Lnet/minecraft/class_2689; + METHOD method_15783 getStateManager ()Lnet/minecraft/class_2689; METHOD method_15784 getBlastResistance ()F METHOD method_15785 getDefaultState ()Lnet/minecraft/class_3610; METHOD method_15787 getParticle ()Lnet/minecraft/class_2394; diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index e416f915ee..f09cc35f2e 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -56,7 +56,7 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate ARG 1 factory ARG 2 reporter METHOD method_22518 test (Lnet/minecraft/class_3610;)Z - ARG 1 sate + ARG 1 state METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559; ARG 0 json METHOD method_22521 createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559$class_4562; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 4fafa9e313..4221e1a77e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -34,7 +34,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4564 motd Ljava/lang/String; FIELD field_4565 levelName Ljava/lang/String; FIELD field_4566 recipeManager Lnet/minecraft/class_1863; - FIELD field_4567 advancementManager Lnet/minecraft/class_2989; + FIELD field_4567 advancementLoader Lnet/minecraft/class_2989; FIELD field_4568 serverGuiTickables Ljava/util/List; FIELD field_4569 bonusChest Z FIELD field_4570 whitelistEnabled Z @@ -259,7 +259,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 serverName METHOD method_3850 setWorldHeight (I)V ARG 1 worldHeight - METHOD method_3851 getAdvancementManager ()Lnet/minecraft/class_2989; + METHOD method_3851 getAdvancementLoader ()Lnet/minecraft/class_2989; METHOD method_3852 isPvpEnabled ()Z METHOD method_3853 setKeyPair (Ljava/security/KeyPair;)V METHOD method_3855 getDataFixer ()Lcom/mojang/datafixers/DataFixer; diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index 13018c32cd..009ab595c5 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager FIELD field_14343 WHITELIST_FILE Ljava/io/File; FIELD field_14344 bannedProfiles Lnet/minecraft/class_3335; FIELD field_14345 bannedIps Lnet/minecraft/class_3317; - FIELD field_14346 advancementManagerMap Ljava/util/Map; + FIELD field_14346 advancementTrackers Ljava/util/Map; FIELD field_14347 maxPlayers I FIELD field_14348 OPERATORS_FILE Ljava/io/File; FIELD field_14349 LOGGER Lorg/apache/logging/log4j/Logger; @@ -52,7 +52,7 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager ARG 1 player METHOD method_14577 savePlayerData (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_14578 getAdvancementManager (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; + METHOD method_14578 getAdvancementTracker (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; ARG 1 player METHOD method_14579 areCheatsAllowed ()Z METHOD method_14580 getPlayerNames ()[Ljava/lang/String; diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 4ba5954f4f..6a970ded02 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity FIELD field_13967 pingMilliseconds I FIELD field_13968 lastAirScore I FIELD field_13969 seenCredits Z - FIELD field_13970 advancementManager Lnet/minecraft/class_2985; + FIELD field_13970 advancementTracker Lnet/minecraft/class_2985; FIELD field_13972 syncedSaturationIsZero Z FIELD field_13973 levitationStartTick I FIELD field_13974 interactionManager Lnet/minecraft/class_3225; @@ -62,7 +62,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14230 isPvpEnabled ()Z METHOD method_14232 getCameraPosition ()Lnet/minecraft/class_4076; METHOD method_14234 updateLastActionTime ()V - METHOD method_14236 getAdvancementManager ()Lnet/minecraft/class_2985; + METHOD method_14236 getAdvancementTracker ()Lnet/minecraft/class_2985; METHOD method_14237 incrementContainerSyncId ()V METHOD method_14238 getClientChatVisibility ()Lnet/minecraft/class_1659; METHOD method_14240 onTeleportationDone ()V