From 987aa1a483a6e2a5cf3389a74696204691db702e Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 19 Jun 2020 05:17:05 +1000 Subject: [PATCH] 1.16 pre3 things (#1459) * stuff mapped every class except 5395 because i dont understand codecs lol * dont mind me * there we go * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/ai/goal/UniversalAngerGoal.mapping Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/entity/passive/WolfEntity.mapping Co-authored-by: jadon * Update EditGameRulesScreen.mapping * Apply suggestions from code review Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: jadon --- .../screen/world/EditGameRulesScreen.mapping | 10 ++++++++++ .../client/render/DiffuseLighting.mapping | 2 ++ .../client/render/SkyProperties.mapping | 8 ++++++++ .../datafixer/fix/MissingDimensionFix.mapping | 4 ++++ .../brain/task/FindPointOfInterestTask.mapping | 13 +++++++++++++ .../entity/ai/goal/UniversalAngerGoal.mapping | 11 +++++++++++ .../net/minecraft/entity/mob/Angerable.mapping | 7 +++++++ .../entity/passive/WolfEntity.mapping | 3 +++ .../entity/projectile/ProjectileEntity.mapping | 2 ++ .../s2c/play/GameStateChangeS2CPacket.mapping | 18 ++++++++++++++++++ .../minecraft/server/MinecraftServer.mapping | 1 + ...kstoneReplacementStructureProcessor.mapping | 1 + .../BlockAgeStructureProcessor.mapping | 3 +++ .../BlockIgnoreStructureProcessor.mapping | 1 + .../BlockRotStructureProcessor.mapping | 3 +++ .../GravityStructureProcessor.mapping | 3 +++ ...JigsawReplacementStructureProcessor.mapping | 1 + ...avaSubmergedBlockStructureProcessor.mapping | 3 +++ .../processor/NopStructureProcessor.mapping | 1 + .../processor/RuleStructureProcessor.mapping | 1 + .../processor/StructureProcessorType.mapping | 1 + mappings/net/minecraft/tag/SetTag.mapping | 8 ++++++++ 22 files changed, 105 insertions(+) create mode 100644 mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping create mode 100644 mappings/net/minecraft/entity/ai/goal/UniversalAngerGoal.mapping create mode 100644 mappings/net/minecraft/structure/processor/LavaSubmergedBlockStructureProcessor.mapping create mode 100644 mappings/net/minecraft/tag/SetTag.mapping diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index 5bcc3a6bdd..b3ca7facc1 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -50,3 +50,13 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul METHOD method_27640 createRuleWidget (Lnet/minecraft/class_1928$class_4313;Lnet/minecraft/class_5235$class_5238;)V ARG 1 key ARG 2 widgetFactory + CLASS class_5400 NamedRuleWidget + FIELD field_25629 name Ljava/util/List; + FIELD field_25630 children Ljava/util/List; + METHOD (Lnet/minecraft/class_5235;Ljava/util/List;Lnet/minecraft/class_2561;)V + ARG 2 description + ARG 3 name + METHOD method_29989 drawName (Lnet/minecraft/class_4587;II)V + ARG 1 matrices + ARG 2 x + ARG 3 y diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index 7e95995139..0d5c336823 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting METHOD method_22890 enable ()V METHOD method_24210 disableGuiDepthLighting ()V METHOD method_24211 enableGuiDepthLighting ()V + METHOD method_27869 (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix diff --git a/mappings/net/minecraft/client/render/SkyProperties.mapping b/mappings/net/minecraft/client/render/SkyProperties.mapping index fc08a7e2e8..3e4f08d912 100644 --- a/mappings/net/minecraft/client/render/SkyProperties.mapping +++ b/mappings/net/minecraft/client/render/SkyProperties.mapping @@ -4,9 +4,14 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties FIELD field_24611 cloudsHeight F FIELD field_24612 alternateSkyColor Z FIELD field_24613 shouldRenderSky Z + FIELD field_25637 skyType Lnet/minecraft/class_5294$class_5401; + FIELD field_25638 darkened Z METHOD (FZLnet/minecraft/class_5294$class_5401;ZZ)V ARG 1 cloudsHeight ARG 2 alternateSkyColor + ARG 3 skyType + ARG 4 shouldRenderSky + ARG 5 darkened METHOD method_28108 getCloudsHeight ()F METHOD method_28109 getSkyColor (FF)[F ARG 1 skyAngle @@ -20,6 +25,9 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties ARG 2 sunHeight METHOD method_28113 isAlternateSkyColor ()Z METHOD method_28114 shouldRenderSky ()Z + METHOD method_29992 getSkyType ()Lnet/minecraft/class_5294$class_5401; + METHOD method_29993 isDarkened ()Z CLASS class_5295 End CLASS class_5296 Nether CLASS class_5297 Overworld + CLASS class_5401 SkyType diff --git a/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping b/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping new file mode 100644 index 0000000000..f159619bdb --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/MissingDimensionFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5396 net/minecraft/datafixer/fix/MissingDimensionFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + ARG 1 outputSchema + ARG 2 changesType diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index 588125dc84..1e93940167 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -6,3 +6,16 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Z)V ARG 1 poiType + CLASS class_5397 RetryMarker + FIELD field_25600 random Ljava/util/Random; + FIELD field_25601 previousAttemptAt J + FIELD field_25602 nextScheduledAttemptAt J + FIELD field_25603 currentDelay I + METHOD (Ljava/util/Random;J)V + ARG 2 time + METHOD method_29926 (J)V + ARG 1 time + METHOD method_29927 (J)Z + ARG 1 time + METHOD method_29928 (J)Z + ARG 1 time diff --git a/mappings/net/minecraft/entity/ai/goal/UniversalAngerGoal.mapping b/mappings/net/minecraft/entity/ai/goal/UniversalAngerGoal.mapping new file mode 100644 index 0000000000..35a1e17eff --- /dev/null +++ b/mappings/net/minecraft/entity/ai/goal/UniversalAngerGoal.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_5398 net/minecraft/entity/ai/goal/UniversalAngerGoal + FIELD field_25604 mob Lnet/minecraft/class_1308; + FIELD field_25605 triggerOthers Z + METHOD (Lnet/minecraft/class_1308;Z)V + ARG 1 mob + ARG 2 triggerOthers + METHOD method_29930 (Lnet/minecraft/class_1308;)Lnet/minecraft/class_5354; + ARG 0 entity + METHOD method_29931 (Lnet/minecraft/class_1308;)Z + ARG 1 entity + METHOD method_29933 getOthersInRange ()Ljava/util/List; diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index 6897bf8788..6acb0cfc0b 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable METHOD method_29505 setAttacking (Lnet/minecraft/class_1657;)V + ARG 1 attacking METHOD method_29507 getAngerTime ()I METHOD method_29508 getAngryAt ()Ljava/util/UUID; METHOD method_29509 chooseRandomAngerTime ()V METHOD method_29510 tickAngerLogic (Lnet/minecraft/class_3218;Z)V + ARG 1 world METHOD method_29511 hasAngerTime ()Z METHOD method_29512 angerFromTag (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V + ARG 1 world ARG 2 tag METHOD method_29513 setAngryAt (Ljava/util/UUID;)V ARG 1 uuid @@ -17,6 +20,10 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable ARG 1 player METHOD method_29517 angerToTag (Lnet/minecraft/class_2487;)V ARG 1 tag + METHOD method_29921 universallyAnger ()V + METHOD method_29922 stopAnger ()V + METHOD method_29923 isUniversallyAngry (Lnet/minecraft/class_1937;)Z + ARG 1 world METHOD method_5968 getTarget ()Lnet/minecraft/class_1309; METHOD method_5980 setTarget (Lnet/minecraft/class_1309;)V ARG 1 target diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index bc902f723f..077aa68a51 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_18004 FOLLOW_TAMED_PREDICATE Ljava/util/function/Predicate; + FIELD field_25371 ANGER_TIME_RANGE Lnet/minecraft/class_4801; + FIELD field_25372 angryAt Ljava/util/UUID; + FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; diff --git a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping index 432d9c3e02..9826759e0b 100644 --- a/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/ProjectileEntity.mapping @@ -10,7 +10,9 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity METHOD method_24920 onBlockHit (Lnet/minecraft/class_3965;)V ARG 1 blockHitResult METHOD method_24921 getOwner ()Lnet/minecraft/class_1297; + METHOD method_26960 updateRotation (FF)F METHOD method_7432 setOwner (Lnet/minecraft/class_1297;)V + ARG 1 entity METHOD method_7454 onEntityHit (Lnet/minecraft/class_3966;)V ARG 1 entityHitResult METHOD method_7485 setVelocity (DDDFF)V diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping index 2a64caead2..27edeb9a59 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket.mapping @@ -1,7 +1,25 @@ CLASS net/minecraft/class_2668 net/minecraft/network/packet/s2c/play/GameStateChangeS2CPacket FIELD field_12198 value F FIELD field_12199 reason Lnet/minecraft/class_2668$class_5402; + FIELD field_25645 NO_RESPAWN_BLOCK Lnet/minecraft/class_2668$class_5402; + FIELD field_25646 RAIN_STARTED Lnet/minecraft/class_2668$class_5402; + FIELD field_25647 RAIN_STOPPED Lnet/minecraft/class_2668$class_5402; + FIELD field_25648 GAME_MODE_CHANGED Lnet/minecraft/class_2668$class_5402; + FIELD field_25649 GAME_WON Lnet/minecraft/class_2668$class_5402; + FIELD field_25650 DEMO_MESSAGE_SHOWN Lnet/minecraft/class_2668$class_5402; + FIELD field_25651 PROJECTILE_HIT_PLAYER Lnet/minecraft/class_2668$class_5402; + FIELD field_25652 RAIN_GRADIENT_CHANGED Lnet/minecraft/class_2668$class_5402; + FIELD field_25653 THUNDER_GRADIENT_CHANGED Lnet/minecraft/class_2668$class_5402; + FIELD field_25654 PUFFERFISH_STING Lnet/minecraft/class_2668$class_5402; + FIELD field_25655 ELDER_GUARDIAN_EFFECT Lnet/minecraft/class_2668$class_5402; + FIELD field_25656 IMMEDIATE_RESPAWN Lnet/minecraft/class_2668$class_5402; METHOD (Lnet/minecraft/class_2668$class_5402;F)V + ARG 1 reason ARG 2 value METHOD method_11491 getReason ()Lnet/minecraft/class_2668$class_5402; METHOD method_11492 getValue ()F + CLASS class_5402 Reason + FIELD field_25657 REASONS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; + FIELD field_25658 id I + METHOD (I)V + ARG 1 id diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 7cad153690..e141b50ad8 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -108,6 +108,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 2 safemode METHOD method_29740 startServer (Ljava/util/function/Function;)Lnet/minecraft/server/MinecraftServer; ARG 0 serverFactory + METHOD method_30002 getOverworld ()Lnet/minecraft/class_3218; METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3718 isFlightEnabled ()Z METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository; diff --git a/mappings/net/minecraft/structure/processor/BlackstoneReplacementStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlackstoneReplacementStructureProcessor.mapping index 86fa494df4..e676838317 100644 --- a/mappings/net/minecraft/structure/processor/BlackstoneReplacementStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlackstoneReplacementStructureProcessor.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_5192 net/minecraft/structure/processor/BlackstoneReplacementStructureProcessor FIELD field_24040 INSTANCE Lnet/minecraft/class_5192; FIELD field_24041 replacementMap Ljava/util/Map; + FIELD field_24996 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping index 19e1bc3a04..213332b74a 100644 --- a/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructureProcessor FIELD field_24042 mossiness F + FIELD field_24997 CODEC Lcom/mojang/serialization/Codec; + METHOD (F)V + ARG 1 mossiness METHOD method_27256 processBlocks (Ljava/util/Random;)Lnet/minecraft/class_2680; METHOD method_27257 randomStairProperties (Ljava/util/Random;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; ARG 1 stairs diff --git a/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping index 2c89e8434d..0c42486a97 100644 --- a/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockIgnoreStructureProcessor.mapping @@ -3,3 +3,4 @@ CLASS net/minecraft/class_3793 net/minecraft/structure/processor/BlockIgnoreStru FIELD field_16719 IGNORE_AIR Lnet/minecraft/class_3793; FIELD field_16720 blocks Lcom/google/common/collect/ImmutableList; FIELD field_16721 IGNORE_AIR_AND_STRUCTURE_BLOCKS Lnet/minecraft/class_3793; + FIELD field_24998 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping index 9799b3650a..70be45bf22 100644 --- a/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/BlockRotStructureProcessor.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_3488 net/minecraft/structure/processor/BlockRotStructureProcessor FIELD field_15523 integrity F + FIELD field_25000 CODEC Lcom/mojang/serialization/Codec; + METHOD (F)V + ARG 1 integrity diff --git a/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping index 18444eb618..a6dd221083 100644 --- a/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/GravityStructureProcessor.mapping @@ -2,3 +2,6 @@ CLASS net/minecraft/class_3795 net/minecraft/structure/processor/GravityStructur FIELD field_16723 heightmap Lnet/minecraft/class_2902$class_2903; FIELD field_16725 offset I FIELD field_25002 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_2902$class_2903;I)V + ARG 1 heightmap + ARG 2 offset diff --git a/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping index 6b68966998..84d669f1f4 100644 --- a/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/JigsawReplacementStructureProcessor.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3794 net/minecraft/structure/processor/JigsawReplacementStructureProcessor FIELD field_16871 INSTANCE Lnet/minecraft/class_3794; + FIELD field_25003 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/processor/LavaSubmergedBlockStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/LavaSubmergedBlockStructureProcessor.mapping new file mode 100644 index 0000000000..2a6c804823 --- /dev/null +++ b/mappings/net/minecraft/structure/processor/LavaSubmergedBlockStructureProcessor.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5399 net/minecraft/structure/processor/LavaSubmergedBlockStructureProcessor + FIELD field_25618 CODEC Lcom/mojang/serialization/Codec; + FIELD field_25619 INSTANCE Lnet/minecraft/class_5399; diff --git a/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping index dc21396b1b..a71981df94 100644 --- a/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/NopStructureProcessor.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3822 net/minecraft/structure/processor/NopStructureProcessor FIELD field_16876 INSTANCE Lnet/minecraft/class_3822; + FIELD field_25005 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping b/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping index a26e7b8a65..6d55101212 100644 --- a/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping +++ b/mappings/net/minecraft/structure/processor/RuleStructureProcessor.mapping @@ -1,2 +1,3 @@ CLASS net/minecraft/class_3826 net/minecraft/structure/processor/RuleStructureProcessor FIELD field_16881 rules Lcom/google/common/collect/ImmutableList; + FIELD field_25011 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping index 0af8f901af..d553f863c5 100644 --- a/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping +++ b/mappings/net/minecraft/structure/processor/StructureProcessorType.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/class_3828 net/minecraft/structure/processor/StructureProcessorType + FIELD field_25013 CODEC Lcom/mojang/serialization/Codec; METHOD method_16822 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_3828; ARG 0 id diff --git a/mappings/net/minecraft/tag/SetTag.mapping b/mappings/net/minecraft/tag/SetTag.mapping new file mode 100644 index 0000000000..2868655f8c --- /dev/null +++ b/mappings/net/minecraft/tag/SetTag.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_5394 net/minecraft/tag/SetTag + FIELD field_25592 EMPTY Lnet/minecraft/class_5394; + FIELD field_25593 values Lcom/google/common/collect/ImmutableList; + METHOD (Ljava/util/Set;Ljava/lang/Class;)V + ARG 1 set + METHOD method_29898 empty ()Lnet/minecraft/class_5394; + METHOD method_29900 (Ljava/util/Set;)Lnet/minecraft/class_5394; + ARG 0 set