Misc 21w13a stuff (#2271)

* misc stuff

* Update mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping

Co-authored-by: LambdAurora <aurora42lambda@gmail.com>

* 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 <aurora42lambda@gmail.com>
Co-authored-by: Juuxel <6596629+Juuxel@users.noreply.github.com>
Co-authored-by: enbrain <69905075+enbrain@users.noreply.github.com>
This commit is contained in:
Shnupbups 2021-04-07 03:00:23 +10:00 committed by GitHub
parent 3943407bbe
commit c0c4b3a8b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 62 additions and 0 deletions

View File

@ -0,0 +1,9 @@
CLASS net/minecraft/class_6237 net/minecraft/client/particle/ItemBillboardParticle
METHOD <init> (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

View File

@ -15,6 +15,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_27857 inPowderSnow Z FIELD field_27857 inPowderSnow Z
FIELD field_27858 FROZEN_TICKS Lnet/minecraft/class_2940; FIELD field_27858 FROZEN_TICKS Lnet/minecraft/class_2940;
FIELD field_28628 wasInPowderSnow Z 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_5951 ridingCooldown I
FIELD field_5952 onGround Z FIELD field_5952 onGround Z
FIELD field_5953 firstUpdate Z FIELD field_5953 firstUpdate Z
@ -318,6 +322,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT COMMENT
COMMENT @implNote The vanilla implementation always returns {@code null}. COMMENT @implNote The vanilla implementation always returns {@code null}.
METHOD method_33189 occludeVibrationSignals ()Z METHOD method_33189 occludeVibrationSignals ()Z
METHOD method_33332 calculateBoundingBox ()Lnet/minecraft/class_238;
METHOD method_33567 requestTeleportAndDismount (DDD)V METHOD method_33567 requestTeleportAndDismount (DDD)V
ARG 1 destX ARG 1 destX
ARG 3 destY ARG 3 destY
@ -345,6 +350,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
COMMENT COMMENT
COMMENT <p>This is only called when the entity {@linkplain #getMoveEffect() has COMMENT <p>This is only called when the entity {@linkplain #getMoveEffect() has
COMMENT any move effect}, from {@link #move(MovementType, Vec3d)} 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_33575 getCameraBlockPos ()Lnet/minecraft/class_2338;
METHOD method_33724 isRegionUnloaded ()Z METHOD method_33724 isRegionUnloaded ()Z
COMMENT Returns whether any part of this entity's bounding box is in an unloaded 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 @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 each axis and checks whether the expanded box's smallest enclosing
COMMENT axis-aligned integer box is fully loaded in the world. 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_5621 getMountedHeightOffset ()D
METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V METHOD method_5622 onBlockCollision (Lnet/minecraft/class_2680;)V
ARG 1 state ARG 1 state

View File

@ -212,9 +212,16 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V
ARG 1 attacking ARG 1 attacking
METHOD method_29920 shouldSwimInFluids ()Z 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 METHOD method_30122 setArmorInSlot (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
ARG 1 slot ARG 1 slot
ARG 2 armor 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 METHOD method_30124 setStackInHandSlot (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
ARG 1 slot ARG 1 slot
ARG 2 stack 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; METHOD method_30126 getStackInHandSlot (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799;
ARG 1 slot ARG 1 slot
METHOD method_30127 swapHandStacks ()V 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; METHOD method_32322 getEquipmentSlot (I)Lnet/minecraft/class_1304;
ARG 0 slotId ARG 0 slotId
METHOD method_32324 removePowderSnowSlow ()V METHOD method_32324 removePowderSnowSlow ()V

View File

@ -99,6 +99,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
METHOD method_32368 removeIcon (Ljava/lang/String;)V METHOD method_32368 removeIcon (Ljava/lang/String;)V
ARG 1 id ARG 1 id
METHOD method_32369 replaceIcons (Ljava/util/List;)V METHOD method_32369 replaceIcons (Ljava/util/List;)V
ARG 1 icons
METHOD method_32370 setColor (IIB)V METHOD method_32370 setColor (IIB)V
ARG 1 x ARG 1 x
ARG 2 z ARG 2 z
@ -108,6 +109,7 @@ CLASS net/minecraft/class_22 net/minecraft/item/map/MapState
METHOD method_32372 hasMonumentIcon ()Z METHOD method_32372 hasMonumentIcon ()Z
METHOD method_32373 getIcons ()Ljava/lang/Iterable; METHOD method_32373 getIcons ()Ljava/lang/Iterable;
METHOD method_32374 markIconsDirty ()V METHOD method_32374 markIconsDirty ()V
METHOD method_35503 getBanners ()Ljava/util/Collection;
CLASS class_23 PlayerUpdateTracker CLASS class_23 PlayerUpdateTracker
FIELD field_124 emptyPacketsRequested I FIELD field_124 emptyPacketsRequested I
FIELD field_125 player Lnet/minecraft/class_1657; FIELD field_125 player Lnet/minecraft/class_1657;

View File

@ -31,3 +31,7 @@ CLASS net/minecraft/class_2499 net/minecraft/nbt/NbtList
METHOD method_10611 getDouble (I)D METHOD method_10611 getDouble (I)D
ARG 1 index ARG 1 index
METHOD method_17809 forgetTypeIfEmpty ()V METHOD method_17809 forgetTypeIfEmpty ()V
METHOD method_36111 getIntArray (I)[I
ARG 1 index
METHOD method_36112 getLongArray (I)[J
ARG 1 index

View File

@ -2,7 +2,10 @@ CLASS net/minecraft/class_5744 net/minecraft/particle/AbstractDustParticleEffect
FIELD field_28273 color Lnet/minecraft/class_1160; FIELD field_28273 color Lnet/minecraft/class_1160;
FIELD field_28274 scale F FIELD field_28274 scale F
METHOD <init> (Lnet/minecraft/class_1160;F)V METHOD <init> (Lnet/minecraft/class_1160;F)V
ARG 1 color
ARG 2 scale ARG 2 scale
METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_1160; METHOD method_33118 readColor (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_1160;
METHOD method_33119 getColor ()Lnet/minecraft/class_1160; METHOD method_33119 getColor ()Lnet/minecraft/class_1160;
METHOD method_33120 getScale ()F METHOD method_33120 getScale ()F
METHOD method_33466 readColor (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1160;
ARG 0 buf

View File

@ -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_28270 FACTORY Lnet/minecraft/class_2394$class_2395;
FIELD field_28271 toColor Lnet/minecraft/class_1160; FIELD field_28271 toColor Lnet/minecraft/class_1160;
METHOD <init> (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;F)V METHOD <init> (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;F)V
ARG 1 fromColor
ARG 2 toColor
ARG 3 scale ARG 3 scale
METHOD method_33110 getFromColor ()Lnet/minecraft/class_1160; METHOD method_33110 getFromColor ()Lnet/minecraft/class_1160;
METHOD method_33112 getToColor ()Lnet/minecraft/class_1160; METHOD method_33112 getToColor ()Lnet/minecraft/class_1160;

View File

@ -45,6 +45,13 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange
METHOD <init> (Ljava/lang/Float;Ljava/lang/Float;)V METHOD <init> (Ljava/lang/Float;Ljava/lang/Float;)V
ARG 1 min ARG 1 min
ARG 2 max 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; METHOD method_9044 square (Ljava/lang/Float;)Ljava/lang/Double;
ARG 0 value ARG 0 value
METHOD method_9045 testSqrt (D)Z METHOD method_9045 testSqrt (D)Z
@ -71,6 +78,11 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange
METHOD <init> (Ljava/lang/Integer;Ljava/lang/Integer;)V METHOD <init> (Ljava/lang/Integer;Ljava/lang/Integer;)V
ARG 1 min ARG 1 min
ARG 2 max 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; METHOD method_9053 atLeast (I)Lnet/minecraft/class_2096$class_2100;
ARG 0 value ARG 0 value
METHOD method_9054 test (I)Z METHOD method_9054 test (I)Z

View File

@ -16,6 +16,8 @@ CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe
ARG 0 ingredient ARG 0 ingredient
METHOD method_31586 (Lnet/minecraft/class_1856;)Z METHOD method_31586 (Lnet/minecraft/class_1856;)Z
ARG 0 ingredient 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; METHOD method_8145 getPattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String;
ARG 0 json ARG 0 json
METHOD method_8146 combinePattern ([Ljava/lang/String;)[Ljava/lang/String; METHOD method_8146 combinePattern ([Ljava/lang/String;)[Ljava/lang/String;

View File

@ -42,3 +42,8 @@ CLASS net/minecraft/class_5481 net/minecraft/text/OrderedText
ARG 2 codePointMapper ARG 2 codePointMapper
METHOD method_30755 innerConcat (Ljava/util/List;)Lnet/minecraft/class_5481; METHOD method_30755 innerConcat (Ljava/util/List;)Lnet/minecraft/class_5481;
ARG 0 texts 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

View File

@ -8,6 +8,7 @@ CLASS net/minecraft/class_5251 net/minecraft/text/TextColor
FIELD field_24363 BY_NAME Ljava/util/Map; FIELD field_24363 BY_NAME Ljava/util/Map;
FIELD field_24364 rgb I FIELD field_24364 rgb I
FIELD field_24365 name Ljava/lang/String; FIELD field_24365 name Ljava/lang/String;
FIELD field_33291 RGB_PREFIX Ljava/lang/String;
METHOD <init> (I)V METHOD <init> (I)V
ARG 1 rgb ARG 1 rgb
METHOD <init> (ILjava/lang/String;)V METHOD <init> (ILjava/lang/String;)V

View File

@ -24,3 +24,4 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession
METHOD method_19199 getGatherableItems ()Lcom/google/common/collect/ImmutableSet; METHOD method_19199 getGatherableItems ()Lcom/google/common/collect/ImmutableSet;
METHOD method_19630 getSecondaryJobSites ()Lcom/google/common/collect/ImmutableSet; METHOD method_19630 getSecondaryJobSites ()Lcom/google/common/collect/ImmutableSet;
METHOD method_22384 getWorkSound ()Lnet/minecraft/class_3414; METHOD method_22384 getWorkSound ()Lnet/minecraft/class_3414;
METHOD method_35202 getId ()Ljava/lang/String;

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_3767 net/minecraft/village/raid/RaidManager
FIELD field_16638 nextAvailableId I FIELD field_16638 nextAvailableId I
FIELD field_16639 raids Ljava/util/Map; FIELD field_16639 raids Ljava/util/Map;
FIELD field_16641 world Lnet/minecraft/class_3218; FIELD field_16641 world Lnet/minecraft/class_3218;
FIELD field_30690 RAIDS Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_3218;)V METHOD <init> (Lnet/minecraft/class_3218;)V
ARG 1 world ARG 1 world
METHOD method_16532 getOrCreateRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3765; METHOD method_16532 getOrCreateRaid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3765;