From c0c4b3a8b19661234c9c00daeb17ab0fa64f7405 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 7 Apr 2021 03:00:23 +1000 Subject: [PATCH] Misc 21w13a stuff (#2271) * misc stuff * Update mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping Co-authored-by: LambdAurora * Update OrderedText.mapping * Apply suggestions from code review Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> * Update Entity.mapping Co-authored-by: LambdAurora Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com> Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com> --- .../client/particle/ItemBillboardParticle.mapping | 9 +++++++++ mappings/net/minecraft/entity/Entity.mapping | 8 ++++++++ mappings/net/minecraft/entity/LivingEntity.mapping | 12 ++++++++++++ mappings/net/minecraft/item/map/MapState.mapping | 2 ++ mappings/net/minecraft/nbt/NbtList.mapping | 4 ++++ .../particle/AbstractDustParticleEffect.mapping | 3 +++ .../DustColorTransitionParticleEffect.mapping | 2 ++ mappings/net/minecraft/predicate/NumberRange.mapping | 12 ++++++++++++ mappings/net/minecraft/recipe/ShapedRecipe.mapping | 2 ++ mappings/net/minecraft/text/OrderedText.mapping | 5 +++++ mappings/net/minecraft/text/TextColor.mapping | 1 + .../net/minecraft/village/VillagerProfession.mapping | 1 + .../net/minecraft/village/raid/RaidManager.mapping | 1 + 13 files changed, 62 insertions(+) create mode 100644 mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping diff --git a/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping b/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping new file mode 100644 index 0000000000..08fd8fcf01 --- /dev/null +++ b/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_6237 net/minecraft/client/particle/ItemBillboardParticle + METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_1935;)V + ARG 1 world + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 item + CLASS class_6238 BarrierFactory + CLASS class_6239 LightFactory diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index a95f3a6bd6..302bf211ba 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -15,6 +15,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_27857 inPowderSnow Z FIELD field_27858 FROZEN_TICKS Lnet/minecraft/class_2940; FIELD field_28628 wasInPowderSnow Z + FIELD field_28629 wasOnFire Z + FIELD field_29985 ID_KEY Ljava/lang/String; + FIELD field_29986 PASSENGERS_KEY Ljava/lang/String; + FIELD field_29994 UUID_KEY Ljava/lang/String; FIELD field_5951 ridingCooldown I FIELD field_5952 onGround Z FIELD field_5953 firstUpdate Z @@ -318,6 +322,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @implNote The vanilla implementation always returns {@code null}. METHOD method_33189 occludeVibrationSignals ()Z + METHOD method_33332 calculateBoundingBox ()Lnet/minecraft/class_238; METHOD method_33567 requestTeleportAndDismount (DDD)V ARG 1 destX ARG 3 destY @@ -345,6 +350,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT

This is only called when the entity {@linkplain #getMoveEffect() has COMMENT any move effect}, from {@link #move(MovementType, Vec3d)} + METHOD method_33574 setPosition (Lnet/minecraft/class_243;)V + ARG 1 pos METHOD method_33575 getCameraBlockPos ()Lnet/minecraft/class_2338; METHOD method_33724 isRegionUnloaded ()Z COMMENT Returns whether any part of this entity's bounding box is in an unloaded @@ -353,6 +360,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT @implSpec This implementation expands this entity's bounding box by 1 in COMMENT each axis and checks whether the expanded box's smallest enclosing COMMENT axis-aligned integer box is fully loaded in the world. + METHOD method_35049 getRemovalReason ()Lnet/minecraft/class_1297$class_5529; METHOD method_5621 getMountedHeightOffset ()D METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 893003f082..433f58a681 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -212,9 +212,16 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V ARG 1 attacking METHOD method_29920 shouldSwimInFluids ()Z + METHOD method_30120 (Ljava/util/List;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + ARG 2 slot + ARG 3 stack + METHOD method_30121 swapHandStacks (Ljava/util/Map;)V + ARG 1 equipment METHOD method_30122 setArmorInSlot (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 armor + METHOD method_30123 setEquipment (Ljava/util/Map;)V + ARG 1 equipment METHOD method_30124 setStackInHandSlot (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V ARG 1 slot ARG 2 stack @@ -223,6 +230,11 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_30126 getStackInHandSlot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; ARG 1 slot METHOD method_30127 swapHandStacks ()V + METHOD method_31079 positionInPortal (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; + ARG 0 pos + METHOD method_32321 getCommandItemSlot (Lnet/minecraft/class_1309;Lnet/minecraft/class_1304;)Lnet/minecraft/class_5630; + ARG 0 entity + ARG 1 slot METHOD method_32322 getEquipmentSlot (I)Lnet/minecraft/class_1304; ARG 0 slotId METHOD method_32324 removePowderSnowSlow ()V diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping index 165178ed93..8b73603eb1 100644 --- a/mappings/net/minecraft/item/map/MapState.mapping +++ b/mappings/net/minecraft/item/map/MapState.mapping @@ -99,6 +99,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_32368 removeIcon (Ljava/lang/String;)V ARG 1 id METHOD method_32369 replaceIcons (Ljava/util/List;)V + ARG 1 icons METHOD method_32370 setColor (IIB)V ARG 1 x ARG 2 z @@ -108,6 +109,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState METHOD method_32372 hasMonumentIcon ()Z METHOD method_32373 getIcons ()Ljava/lang/Iterable; METHOD method_32374 markIconsDirty ()V + METHOD method_35503 getBanners ()Ljava/util/Collection; CLASS class_23 PlayerUpdateTracker FIELD field_124 emptyPacketsRequested I FIELD field_125 player Lnet/minecraft/class_1657; diff --git a/mappings/net/minecraft/nbt/NbtList.mapping b/mappings/net/minecraft/nbt/NbtList.mapping index 52a612bbb5..3b8281e8d8 100644 --- a/mappings/net/minecraft/nbt/NbtList.mapping +++ b/mappings/net/minecraft/nbt/NbtList.mapping @@ -31,3 +31,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList METHOD method_10611 getDouble (I)D ARG 1 index METHOD method_17809 forgetTypeIfEmpty ()V + METHOD method_36111 getIntArray (I)[I + ARG 1 index + METHOD method_36112 getLongArray (I)[J + ARG 1 index diff --git a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping index e09078550e..73759ce425 100644 --- a/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/AbstractDustParticleEffect.mapping @@ -2,7 +2,10 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect FIELD field_28273 color Lnet/minecraft/class_1160; FIELD field_28274 scale F METHOD (Lnet/minecraft/class_1160;F)V + ARG 1 color ARG 2 scale METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_1160; METHOD method_33119 getColor ()Lnet/minecraft/class_1160; METHOD method_33120 getScale ()F + METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1160; + ARG 0 buf diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index a04ae5d4de..88e49df1f3 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl FIELD field_28270 FACTORY Lnet/minecraft/class_2394$class_2395; FIELD field_28271 toColor Lnet/minecraft/class_1160; METHOD (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;F)V + ARG 1 fromColor + ARG 2 toColor ARG 3 scale METHOD method_33110 getFromColor ()Lnet/minecraft/class_1160; METHOD method_33112 getToColor ()Lnet/minecraft/class_1160; diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 0d6929c6e8..d4b54e77f1 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -45,6 +45,13 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange METHOD (Ljava/lang/Float;Ljava/lang/Float;)V ARG 1 min ARG 2 max + METHOD method_35284 exactly (F)Lnet/minecraft/class_2096$class_2099; + ARG 0 value + METHOD method_35285 between (FF)Lnet/minecraft/class_2096$class_2099; + ARG 0 min + ARG 1 max + METHOD method_35286 atMost (F)Lnet/minecraft/class_2096$class_2099; + ARG 0 value METHOD method_9044 square (Ljava/lang/Float;)Ljava/lang/Double; ARG 0 value METHOD method_9045 testSqrt (D)Z @@ -71,6 +78,11 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V ARG 1 min ARG 2 max + METHOD method_35287 between (II)Lnet/minecraft/class_2096$class_2100; + ARG 0 min + ARG 1 max + METHOD method_35289 atMost (I)Lnet/minecraft/class_2096$class_2100; + ARG 0 value METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value METHOD method_9054 test (I)Z diff --git a/mappings/net/minecraft/recipe/ShapedRecipe.mapping b/mappings/net/minecraft/recipe/ShapedRecipe.mapping index 8cc5d79581..8fc8dd31ce 100644 --- a/mappings/net/minecraft/recipe/ShapedRecipe.mapping +++ b/mappings/net/minecraft/recipe/ShapedRecipe.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe ARG 0 ingredient METHOD method_31586 (Lnet/minecraft/class_1856;)Z ARG 0 ingredient + METHOD method_35228 outputFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1799; + ARG 0 json METHOD method_8145 getPattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; ARG 0 json METHOD method_8146 combinePattern ([Ljava/lang/String;)[Ljava/lang/String; diff --git a/mappings/net/minecraft/text/OrderedText.mapping b/mappings/net/minecraft/text/OrderedText.mapping index 09d9a3d385..7ebed8dd3a 100644 --- a/mappings/net/minecraft/text/OrderedText.mapping +++ b/mappings/net/minecraft/text/OrderedText.mapping @@ -42,3 +42,8 @@ CLASS net/minecraft/class_5481 net/minecraft/text/OrderedText ARG 2 codePointMapper METHOD method_30755 innerConcat (Ljava/util/List;)Lnet/minecraft/class_5481; ARG 0 texts + METHOD method_34905 empty ()Lnet/minecraft/class_5481; + METHOD method_34906 of (Lnet/minecraft/class_5481;)Lnet/minecraft/class_5481; + ARG 0 text + METHOD method_34909 concat ([Lnet/minecraft/class_5481;)Lnet/minecraft/class_5481; + ARG 0 texts diff --git a/mappings/net/minecraft/text/TextColor.mapping b/mappings/net/minecraft/text/TextColor.mapping index 145406bffa..470e95680d 100644 --- a/mappings/net/minecraft/text/TextColor.mapping +++ b/mappings/net/minecraft/text/TextColor.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor FIELD field_24363 BY_NAME Ljava/util/Map; FIELD field_24364 rgb I FIELD field_24365 name Ljava/lang/String; + FIELD field_33291 RGB_PREFIX Ljava/lang/String; METHOD (I)V ARG 1 rgb METHOD (ILjava/lang/String;)V diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index 5b0a5373b0..10699d2428 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -24,3 +24,4 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession METHOD method_19199 getGatherableItems ()Lcom/google/common/collect/ImmutableSet; METHOD method_19630 getSecondaryJobSites ()Lcom/google/common/collect/ImmutableSet; METHOD method_22384 getWorkSound ()Lnet/minecraft/class_3414; + METHOD method_35202 getId ()Ljava/lang/String; diff --git a/mappings/net/minecraft/village/raid/RaidManager.mapping b/mappings/net/minecraft/village/raid/RaidManager.mapping index 526f814a6d..d7d9444241 100644 --- a/mappings/net/minecraft/village/raid/RaidManager.mapping +++ b/mappings/net/minecraft/village/raid/RaidManager.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager FIELD field_16638 nextAvailableId I FIELD field_16639 raids Ljava/util/Map; FIELD field_16641 world Lnet/minecraft/class_3218; + FIELD field_30690 RAIDS Ljava/lang/String; METHOD (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_16532 getOrCreateRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3765;