From c73080b5755949a5ad0ca8a033290b82e464d4bb Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 25 Jan 2024 14:18:13 +1100 Subject: [PATCH] some 24w04a stuff (#3772) plenty more to do, i'm going to bed :) --- .../minecraft/entity/SpawnLocation.mapping | 8 +++++++ .../entity/SpawnLocationTypes.mapping | 22 +++++++++++++++++++ .../minecraft/entity/mob/BreezeEntity.mapping | 6 +++++ .../entity/passive/ArmadilloEntity.mapping | 1 + .../network/message/MessageType.mapping | 2 ++ .../dedicated/command/TransferCommand.mapping | 17 ++++++++++++++ .../net/minecraft/test/TestContext.mapping | 4 ++++ .../minecraft/world/StructureLocator.mapping | 2 ++ .../placement/StructurePlacement.mapping | 8 +++++++ 9 files changed, 70 insertions(+) create mode 100644 mappings/net/minecraft/entity/SpawnLocation.mapping create mode 100644 mappings/net/minecraft/entity/SpawnLocationTypes.mapping create mode 100644 mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping diff --git a/mappings/net/minecraft/entity/SpawnLocation.mapping b/mappings/net/minecraft/entity/SpawnLocation.mapping new file mode 100644 index 0000000000..a8827ed8a4 --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnLocation.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9168 net/minecraft/entity/SpawnLocation + METHOD isSpawnPositionOk (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 1 world + ARG 2 pos + ARG 3 entityType + METHOD method_56553 adjustPosition (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/entity/SpawnLocationTypes.mapping b/mappings/net/minecraft/entity/SpawnLocationTypes.mapping new file mode 100644 index 0000000000..efbd23aa54 --- /dev/null +++ b/mappings/net/minecraft/entity/SpawnLocationTypes.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/class_9169 net/minecraft/entity/SpawnLocationTypes + FIELD field_48742 UNRESTRICTED Lnet/minecraft/class_9168; + FIELD field_48743 IN_WATER Lnet/minecraft/class_9168; + FIELD field_48744 IN_LAVA Lnet/minecraft/class_9168; + FIELD field_48745 ON_GROUND Lnet/minecraft/class_9168; + METHOD method_56554 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 0 world + ARG 1 pos + ARG 2 entityType + METHOD method_56555 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 0 world + ARG 1 pos + ARG 2 entityType + METHOD method_56556 (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 0 world + ARG 1 pos + ARG 2 entityType + CLASS 1 + METHOD method_56557 isClearForSpawn (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_1299;)Z + ARG 1 world + ARG 2 pos + ARG 3 entityType diff --git a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping index 7b57ed1a0d..4d63607626 100644 --- a/mappings/net/minecraft/entity/mob/BreezeEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BreezeEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity FIELD field_47279 longJumpingParticleAddCount I FIELD field_47280 inhalingAnimationState Lnet/minecraft/class_7094; FIELD field_47281 shootingAnimationState Lnet/minecraft/class_7094; + FIELD field_47815 ticksUntilWhirlSound I FIELD field_48344 PROJECTILE_DEFLECTOR Lnet/minecraft/class_9109; METHOD method_55007 addBlockParticles (I)V ARG 1 count @@ -20,3 +21,8 @@ CLASS net/minecraft/class_8949 net/minecraft/entity/mob/BreezeEntity ARG 2 random METHOD method_56088 (Lnet/minecraft/class_1299;)Ljava/lang/Boolean; ARG 0 projectileOwnerType + METHOD method_56560 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309; + ARG 0 livingAttacker + METHOD method_56561 (Lnet/minecraft/class_1297;)Z + ARG 0 attacker + METHOD method_56562 getHurtBy ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping index 97a776f562..934f9f8334 100644 --- a/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ArmadilloEntity.mapping @@ -15,6 +15,7 @@ CLASS net/minecraft/class_9069 net/minecraft/entity/passive/ArmadilloEntity METHOD method_55719 getNextScuteShedCooldown ()I METHOD method_55720 updateAnimationStates ()V METHOD method_55721 isEntityThreatening (Lnet/minecraft/class_1309;)Z + ARG 1 entity METHOD method_55722 createArmadilloAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_55723 isNotIdle ()Z METHOD method_55724 unroll ()V diff --git a/mappings/net/minecraft/network/message/MessageType.mapping b/mappings/net/minecraft/network/message/MessageType.mapping index e456d18910..7488e7cb21 100644 --- a/mappings/net/minecraft/network/message/MessageType.mapping +++ b/mappings/net/minecraft/network/message/MessageType.mapping @@ -82,7 +82,9 @@ CLASS net/minecraft/class_2556 net/minecraft/network/message/MessageType CLASS class_7602 Parameters COMMENT A record holding the message type and the decoration parameters. FIELD comp_919 type Lnet/minecraft/class_6880; + FIELD field_48776 CODEC Lnet/minecraft/class_9139; METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_2561;)V + ARG 1 type ARG 2 name METHOD comp_919 type ()Lnet/minecraft/class_6880; METHOD method_44837 applyChatDecoration (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping new file mode 100644 index 0000000000..ef4820419b --- /dev/null +++ b/mappings/net/minecraft/server/dedicated/command/TransferCommand.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_9159 net/minecraft/server/dedicated/command/TransferCommand + FIELD field_48710 NO_PLAYERS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + METHOD method_56522 register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD method_56523 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56524 (Lnet/minecraft/class_2168;)Z + ARG 0 source + METHOD method_56525 transfer (Lnet/minecraft/class_2168;Ljava/lang/String;ILjava/util/Collection;)I + ARG 0 source + ARG 1 host + ARG 2 port + ARG 3 players + METHOD method_56527 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_56529 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context diff --git a/mappings/net/minecraft/test/TestContext.mapping b/mappings/net/minecraft/test/TestContext.mapping index cb03e115eb..323a8a3ae3 100644 --- a/mappings/net/minecraft/test/TestContext.mapping +++ b/mappings/net/minecraft/test/TestContext.mapping @@ -415,3 +415,7 @@ CLASS net/minecraft/class_4516 net/minecraft/test/TestContext ARG 5 margin METHOD method_56208 getEntities (Lnet/minecraft/class_1299;)Ljava/util/List; ARG 1 type + METHOD method_56606 assertEquals (Ljava/lang/Number;Ljava/lang/Number;Ljava/lang/String;)V + ARG 1 value + ARG 2 expected + ARG 3 name diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index 75faffbdc9..f5932b420c 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -41,6 +41,8 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator METHOD method_39831 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;Lnet/minecraft/class_6874;Z)Lnet/minecraft/class_6833; ARG 1 pos ARG 2 type + ARG 3 placement + ARG 4 skipReferencedStructures METHOD method_39832 getStructurePresence (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;ZJ)Lnet/minecraft/class_6833; ARG 1 pos ARG 2 structure diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping index f36c41788e..e398c03441 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructurePlacement.mapping @@ -54,6 +54,14 @@ CLASS net/minecraft/class_6874 net/minecraft/world/gen/chunk/placement/Structure METHOD method_41644 getFrequency ()F METHOD method_41645 getSalt ()I METHOD method_41646 getExclusionZone ()Ljava/util/Optional; + METHOD method_56575 applyFrequencyReduction (IIJ)Z + ARG 1 chunkX + ARG 2 chunkZ + ARG 3 seed + METHOD method_56576 applyExclusionZone (Lnet/minecraft/class_7869;II)Z + ARG 1 calculator + ARG 2 centerChunkX + ARG 3 centerChunkZ CLASS class_7152 ExclusionZone FIELD field_37781 CODEC Lcom/mojang/serialization/Codec; METHOD method_41647 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;