From 85fa278887aa375e4498b2cad332a75b3d33f373 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Fri, 22 Jan 2021 14:36:31 +0100 Subject: [PATCH] 21w03a stuff (#1964) * 21w03a stuff * Update mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> --- mappings/net/minecraft/block/GlowLichenBlock.mapping | 2 ++ .../client/particle/SquidInkParticle.mapping | 6 ++++++ .../render/entity/EntityRenderDispatcher.mapping | 4 ++++ .../render/entity/GlowSquidEntityRenderer.mapping | 2 ++ .../render/entity/ItemFrameEntityRenderer.mapping | 5 +++++ .../client/render/entity/SquidEntityRenderer.mapping | 3 +++ .../metadata/AnimationFrameResourceMetadata.mapping | 1 + mappings/net/minecraft/entity/EntityType.mapping | 3 +++ .../entity/decoration/ItemFrameEntity.mapping | 12 ++++++++++++ .../minecraft/entity/passive/GlowSquidEntity.mapping | 5 +++++ .../net/minecraft/entity/passive/SquidEntity.mapping | 2 ++ mappings/net/minecraft/item/Items.mapping | 1 + .../net/minecraft/server/MinecraftServer.mapping | 4 ++-- mappings/net/minecraft/sound/BlockSoundGroup.mapping | 1 + mappings/net/minecraft/village/TradeOffers.mapping | 2 ++ .../world/gen/feature/LargeDripstoneFeature.mapping | 2 ++ 16 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 mappings/net/minecraft/block/GlowLichenBlock.mapping create mode 100644 mappings/net/minecraft/client/render/entity/GlowSquidEntityRenderer.mapping create mode 100644 mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping diff --git a/mappings/net/minecraft/block/GlowLichenBlock.mapping b/mappings/net/minecraft/block/GlowLichenBlock.mapping new file mode 100644 index 0000000000..23476d680c --- /dev/null +++ b/mappings/net/minecraft/block/GlowLichenBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5777 net/minecraft/block/GlowLichenBlock + FIELD field_28412 WATERLOGGED Lnet/minecraft/class_2746; diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index 95edabeac8..45bb643e0d 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -7,7 +7,13 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + ARG 14 color + ARG 15 spriteProvider CLASS class_726 Factory FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_5788 GlowFactory + FIELD field_28460 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 00676bf8de..ea0c26e089 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -95,6 +95,10 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3955 setRenderHitboxes (Z)V ARG 1 value METHOD method_3956 renderHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;F)V + ARG 0 matrices + ARG 1 vertices + ARG 2 entity + ARG 3 tickDelta METHOD method_3958 shouldRenderHitboxes ()Z METHOD method_3959 getSquaredDistanceToCamera (DDD)D ARG 1 x diff --git a/mappings/net/minecraft/client/render/entity/GlowSquidEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GlowSquidEntityRenderer.mapping new file mode 100644 index 0000000000..ed1bc37ad6 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/GlowSquidEntityRenderer.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5789 net/minecraft/client/render/entity/GlowSquidEntityRenderer + FIELD field_28461 TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping index 5694b3d6fe..59ed14366e 100644 --- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping @@ -1,5 +1,10 @@ CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntityRenderer + FIELD field_28462 GLOW_FRAME Lnet/minecraft/class_1091; + FIELD field_28463 MAP_GLOW_FRAME Lnet/minecraft/class_1091; FIELD field_4720 itemRenderer Lnet/minecraft/class_918; FIELD field_4721 NORMAL_FRAME Lnet/minecraft/class_1091; FIELD field_4723 MAP_FRAME Lnet/minecraft/class_1091; FIELD field_4724 client Lnet/minecraft/class_310; + METHOD method_33434 getModelId (Lnet/minecraft/class_1533;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1091; + ARG 1 entity + ARG 2 stack diff --git a/mappings/net/minecraft/client/render/entity/SquidEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/SquidEntityRenderer.mapping index 01fff7a53e..e5100a73c2 100644 --- a/mappings/net/minecraft/client/render/entity/SquidEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/SquidEntityRenderer.mapping @@ -1,2 +1,5 @@ CLASS net/minecraft/class_951 net/minecraft/client/render/entity/SquidEntityRenderer FIELD field_4791 TEXTURE Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_610;)V + ARG 1 ctx + ARG 2 model diff --git a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping index bf16199705..4c8760699d 100644 --- a/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping +++ b/mappings/net/minecraft/client/resource/metadata/AnimationFrameResourceMetadata.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_1080 net/minecraft/client/resource/metadata/AnimationF ARG 2 time METHOD method_4690 getIndex ()I METHOD method_4691 getTime (I)I + ARG 1 defaultTime diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index 346799bd93..37445cbac1 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -72,6 +72,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 0 world ARG 1 type METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + ARG 1 world ARG 2 itemTag ARG 3 name ARG 4 player @@ -90,6 +91,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 world METHOD method_5893 isSaveable ()Z METHOD method_5894 spawnFromItemStack (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + ARG 1 world ARG 2 stack ARG 3 player ARG 4 pos @@ -104,6 +106,7 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType METHOD method_5898 get (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id METHOD method_5899 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297; + ARG 1 world ARG 2 itemTag ARG 3 name ARG 4 player diff --git a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping index b80743cd27..bfbb3e838f 100644 --- a/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ItemFrameEntity.mapping @@ -4,6 +4,17 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity FIELD field_7130 ITEM_STACK Lnet/minecraft/class_2940; FIELD field_7131 ITEM_FRAME_LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_7132 ROTATION Lnet/minecraft/class_2940; + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + ARG 1 type + ARG 2 world + ARG 3 pos + ARG 4 direction + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V + ARG 1 world + ARG 2 pos + ARG 3 direction + METHOD method_33339 isGlowItemFrame ()Z + METHOD method_33340 getStack ()Lnet/minecraft/class_1799; METHOD method_6933 setHeldItemStack (Lnet/minecraft/class_1799;Z)V ARG 1 value ARG 2 update @@ -11,6 +22,7 @@ CLASS net/minecraft/class_1533 net/minecraft/entity/decoration/ItemFrameEntity METHOD method_6935 setHeldItemStack (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_6936 dropHeldStack (Lnet/minecraft/class_1297;Z)V + ARG 1 entity ARG 2 alwaysDrop METHOD method_6937 removeFromFrame (Lnet/minecraft/class_1799;)V ARG 1 map diff --git a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping new file mode 100644 index 0000000000..38bf48f2a8 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5776 net/minecraft/entity/passive/GlowSquidEntity + FIELD field_28403 DARK_TICKS_REMAINING Lnet/minecraft/class_2940; + METHOD method_33333 setDarkTicksRemaining (I)V + ARG 1 ticks + METHOD method_33334 getDarkTicksRemaining ()I diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping index 8c2394722e..fa12c5d056 100644 --- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/class_1477 net/minecraft/entity/passive/SquidEntity ARG 3 pos ARG 4 random METHOD method_26895 createSquidAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_33336 getInkParticle ()Lnet/minecraft/class_2394; + METHOD method_33337 getSquirtSound ()Lnet/minecraft/class_3414; METHOD method_6669 squirt ()V METHOD method_6670 setSwimmingVector (FFF)V COMMENT Sets the direction and velocity the squid must go when fleeing an enemy. Only has an effect when in the water. diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 1b6a3fa4c6..32ee08ef32 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -240,6 +240,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_28042 POINTED_DRIPSTONE Lnet/minecraft/class_1792; FIELD field_28043 DRIPSTONE_BLOCK Lnet/minecraft/class_1792; FIELD field_28101 SCULK_SENSOR Lnet/minecraft/class_1792; + FIELD field_28409 GLOW_LICHEN Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index e5e0280b79..8e767b003d 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -138,11 +138,11 @@ CLASS net/minecraft/server/MinecraftServer COMMENT To store the player data in addition to server data, call {@link PlayerManager#saveAllPlayerData()}. COMMENT COMMENT @return whether saving was successful - COMMENT if it should immediately write all data to storage device - COMMENT when set to true, all the {@link ServerWorld}s will be saved even if {@link ServerWorld#savingDisabled} is set to true ARG 1 suppressLogs ARG 2 flush + COMMENT if it should immediately write all data to storage device ARG 3 force + COMMENT when set to true, all the {@link ServerWorld}s will be saved even if {@link ServerWorld#savingDisabled} is set to true METHOD method_3724 isSinglePlayer ()Z METHOD method_3725 getIconFile ()Ljava/io/File; METHOD method_3727 hasGui ()Z diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 3fd6ea1fca..092d859bf3 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -66,6 +66,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_28060 DRIPSTONE_BLOCK Lnet/minecraft/class_2498; FIELD field_28061 POINTED_DRIPSTONE Lnet/minecraft/class_2498; FIELD field_28116 SCULK_SENSOR Lnet/minecraft/class_2498; + FIELD field_28427 GLOW_LICHEN Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 09426ee580..66b87fb4fe 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -118,11 +118,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses diff --git a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping index 66778fb355..282a12886d 100644 --- a/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping @@ -37,6 +37,8 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea FIELD field_28212 wind Lnet/minecraft/class_243; METHOD (ILjava/util/Random;Lnet/minecraft/class_5700;)V ARG 1 y + ARG 2 random + ARG 3 wind METHOD method_33031 modify (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 1 pos METHOD method_33032 create ()Lnet/minecraft/class_5727$class_5729;