From e8a1536e6c6319fe15015bb66ea4376bde80a905 Mon Sep 17 00:00:00 2001 From: enbrain <69905075+enbrain@users.noreply.github.com> Date: Thu, 10 Feb 2022 01:42:35 +0900 Subject: [PATCH] Fix some setters not matching fields and params (#2978) * Fix some setters not matching fields and params * Revert params with current prefix * Rename targetPool to target to match the setter in JigsawBlockEntity * Revert more renames * Revert setInvStackList -> setInventory Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../block/entity/EnchantingTableBlockEntity.mapping | 2 +- .../minecraft/block/entity/HopperBlockEntity.mapping | 4 ++-- .../minecraft/block/entity/JigsawBlockEntity.mapping | 6 +++--- .../block/entity/StructureBlockBlockEntity.mapping | 2 +- .../net/minecraft/client/font/FontManager.mapping | 2 +- mappings/net/minecraft/client/gl/GlUniform.mapping | 4 ++-- .../gui/screen/multiplayer/MultiplayerScreen.mapping | 4 ++-- .../gui/screen/world/EditGameRulesScreen.mapping | 4 ++-- .../gui/screen/world/SelectWorldScreen.mapping | 4 ++-- .../client/gui/widget/ClickableWidget.mapping | 4 ++-- .../client/gui/widget/TextFieldWidget.mapping | 4 ++-- .../client/network/ClientPlayerEntity.mapping | 2 +- .../net/minecraft/client/network/ServerInfo.mapping | 2 +- .../net/minecraft/client/option/GameOptions.mapping | 2 +- .../minecraft/client/realms/dto/RealmsServer.mapping | 2 +- .../realms/gui/screen/RealmsPlayerScreen.mapping | 2 +- .../client/realms/task/LongRunningTask.mapping | 4 ++-- .../render/debug/RaidCenterDebugRenderer.mapping | 2 +- .../render/entity/EntityRenderDispatcher.mapping | 4 ++-- .../net/minecraft/client/world/ClientWorld.mapping | 2 +- .../minecraft/command/EntitySelectorReader.mapping | 6 +++--- .../minecraft/entity/AreaEffectCloudEntity.mapping | 6 +++--- mappings/net/minecraft/entity/Entity.mapping | 6 +++--- mappings/net/minecraft/entity/ItemEntity.mapping | 8 ++++---- .../net/minecraft/entity/ai/pathing/Path.mapping | 2 +- mappings/net/minecraft/entity/boss/BossBar.mapping | 2 +- mappings/net/minecraft/entity/mob/Angerable.mapping | 4 ++-- .../net/minecraft/entity/mob/EndermanEntity.mapping | 2 +- .../net/minecraft/entity/mob/EvokerEntity.mapping | 2 +- mappings/net/minecraft/entity/mob/MobEntity.mapping | 6 +++--- mappings/net/minecraft/entity/mob/VexEntity.mapping | 2 +- .../entity/mob/ZombifiedPiglinEntity.mapping | 2 +- .../net/minecraft/entity/passive/BeeEntity.mapping | 6 +++--- .../minecraft/entity/passive/ChickenEntity.mapping | 2 +- .../minecraft/entity/passive/PolarBearEntity.mapping | 2 +- .../minecraft/entity/passive/VillagerEntity.mapping | 2 +- .../entity/passive/WanderingTraderEntity.mapping | 4 ++-- .../net/minecraft/entity/passive/WolfEntity.mapping | 2 +- .../minecraft/entity/player/HungerManager.mapping | 2 +- .../net/minecraft/entity/raid/RaiderEntity.mapping | 2 +- .../entity/vehicle/HopperMinecartEntity.mapping | 2 +- .../packet/c2s/play/UpdateJigsawC2SPacket.mapping | 12 ++++++------ .../minecraft/screen/MerchantScreenHandler.mapping | 10 +++++----- .../net/minecraft/server/MinecraftServer.mapping | 2 +- mappings/net/minecraft/structure/Structure.mapping | 2 +- mappings/net/minecraft/village/Merchant.mapping | 4 ++-- mappings/net/minecraft/village/raid/Raid.mapping | 2 +- .../net/minecraft/world/CommandBlockExecutor.mapping | 2 +- .../minecraft/world/MutableWorldProperties.mapping | 2 +- mappings/net/minecraft/world/SaveProperties.mapping | 6 +++--- mappings/net/minecraft/world/chunk/Chunk.mapping | 8 ++++---- .../net/minecraft/world/chunk/WorldChunk.mapping | 2 +- .../net/minecraft/world/entity/EntityLike.mapping | 4 ++-- .../world/level/ServerWorldProperties.mapping | 4 ++-- 54 files changed, 97 insertions(+), 97 deletions(-) diff --git a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping index 76cda80b84..52c6f44baf 100644 --- a/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2605 net/minecraft/block/entity/EnchantingTableBlockEn ARG 1 pos ARG 2 state METHOD method_11179 setCustomName (Lnet/minecraft/class_2561;)V - ARG 1 value + ARG 1 customName METHOD method_31688 tick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2605;)V ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index e53ddd5b99..f064987dfe 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -14,8 +14,8 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity METHOD method_11237 getInputItemEntities (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Ljava/util/List; ARG 0 world ARG 1 hopper - METHOD method_11238 setCooldown (I)V - ARG 1 cooldown + METHOD method_11238 setTransferCooldown (I)V + ARG 1 transferCooldown METHOD method_11239 needsCooldown ()Z METHOD method_11241 extract (Lnet/minecraft/class_1937;Lnet/minecraft/class_2615;)Z ARG 0 world diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping index d46c64dea0..91598f4cb7 100644 --- a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping @@ -14,10 +14,10 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity ARG 2 state METHOD method_16377 setFinalState (Ljava/lang/String;)V ARG 1 finalState - METHOD method_16378 setTargetPool (Lnet/minecraft/class_2960;)V + METHOD method_16378 setTarget (Lnet/minecraft/class_2960;)V ARG 1 target - METHOD method_16379 setAttachmentType (Lnet/minecraft/class_2960;)V - ARG 1 value + METHOD method_16379 setName (Lnet/minecraft/class_2960;)V + ARG 1 name METHOD method_16380 getFinalState ()Ljava/lang/String; METHOD method_16381 getName ()Lnet/minecraft/class_2960; METHOD method_16382 getPool ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index e60db355bc..67aacf6ce2 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -62,7 +62,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt METHOD method_11377 setSize (Lnet/minecraft/class_2382;)V ARG 1 size METHOD method_11378 setOffset (Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 offset METHOD method_11379 setPowered (Z)V ARG 1 powered METHOD method_11381 setMode (Lnet/minecraft/class_2776;)V diff --git a/mappings/net/minecraft/client/font/FontManager.mapping b/mappings/net/minecraft/client/font/FontManager.mapping index 7d74319231..c017f615ea 100644 --- a/mappings/net/minecraft/client/font/FontManager.mapping +++ b/mappings/net/minecraft/client/font/FontManager.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_378 net/minecraft/client/font/FontManager METHOD method_27540 (Lnet/minecraft/class_377;)V ARG 0 fontStorage METHOD method_27541 setIdOverrides (Ljava/util/Map;)V - ARG 1 overrides + ARG 1 idOverrides METHOD method_27542 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id CLASS 1 diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping index 4bde9c7069..69dee6f64c 100644 --- a/mappings/net/minecraft/client/gl/GlUniform.mapping +++ b/mappings/net/minecraft/client/gl/GlUniform.mapping @@ -14,8 +14,8 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform ARG 3 count ARG 4 program METHOD method_1296 uploadMatrix ()V - METHOD method_1297 setLoc (I)V - ARG 1 loc + METHOD method_1297 setLocation (I)V + ARG 1 location METHOD method_1298 getName ()Ljava/lang/String; METHOD method_1299 getTypeIndex (Ljava/lang/String;)I ARG 0 typeName diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping index 8ecae50388..5d1302d3d9 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerScreen.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip FIELD field_3037 serverListPinger Lnet/minecraft/class_644; FIELD field_3040 serverList Lnet/minecraft/class_641; FIELD field_3041 buttonEdit Lnet/minecraft/class_4185; - FIELD field_3042 tooltipText Ljava/util/List; + FIELD field_3042 tooltip Ljava/util/List; FIELD field_3043 serverListWidget Lnet/minecraft/class_4267; FIELD field_3044 LOGGER Lorg/slf4j/Logger; FIELD field_3045 lanServerDetector Lnet/minecraft/class_1134$class_1135; @@ -38,7 +38,7 @@ CLASS net/minecraft/class_500 net/minecraft/client/gui/screen/multiplayer/Multip METHOD method_20380 directConnect (Z)V ARG 1 confirmedAction METHOD method_2528 setTooltip (Ljava/util/List;)V - ARG 1 tooltipText + ARG 1 tooltip METHOD method_2529 getServerList ()Lnet/minecraft/class_641; METHOD method_2531 select (Lnet/minecraft/class_4267$class_504;)V ARG 1 entry diff --git a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping index 5f788c34c9..f28d66593b 100644 --- a/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/EditGameRulesScreen.mapping @@ -12,8 +12,8 @@ CLASS net/minecraft/class_5235 net/minecraft/client/gui/screen/world/EditGameRul ARG 1 button METHOD method_27620 markInvalid (Lnet/minecraft/class_5235$class_5240;)V ARG 1 ruleWidget - METHOD method_27624 setTooltipDescription (Ljava/util/List;)V - ARG 1 description + METHOD method_27624 setTooltip (Ljava/util/List;)V + ARG 1 tooltip METHOD method_27625 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_27626 markValid (Lnet/minecraft/class_5235$class_5240;)V diff --git a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping index ed05972401..f3b687d5d3 100644 --- a/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/SelectWorldScreen.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS FIELD field_3219 deleteButton Lnet/minecraft/class_4185; FIELD field_3220 searchBox Lnet/minecraft/class_342; FIELD field_3221 parent Lnet/minecraft/class_437; - FIELD field_3222 tooltipText Ljava/util/List; + FIELD field_3222 tooltip Ljava/util/List; FIELD field_3224 selectButton Lnet/minecraft/class_4185; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent @@ -25,7 +25,7 @@ CLASS net/minecraft/class_526 net/minecraft/client/gui/screen/world/SelectWorldS METHOD method_19945 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_2739 setTooltip (Ljava/util/List;)V - ARG 1 tooltipText + ARG 1 tooltip METHOD method_2744 (Ljava/lang/String;)V ARG 1 search METHOD method_35739 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping index ee5be52ed1..c3cc3cdd0f 100644 --- a/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ClickableWidget.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 5 deltaX ARG 7 deltaY METHOD method_25350 setAlpha (F)V - ARG 1 value + ARG 1 alpha METHOD method_25351 isValidClickButton (I)Z ARG 1 button METHOD method_25352 renderTooltip (Lnet/minecraft/class_4587;II)V @@ -50,7 +50,7 @@ CLASS net/minecraft/class_339 net/minecraft/client/gui/widget/ClickableWidget ARG 1 mouseX ARG 3 mouseY METHOD method_25358 setWidth (I)V - ARG 1 value + ARG 1 width METHOD method_25359 renderButton (Lnet/minecraft/class_4587;IIF)V ARG 1 matrices ARG 2 mouseX diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 38106f1428..e92b9cef7d 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -56,7 +56,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 drawsBackground METHOD method_1859 getInnerWidth ()I METHOD method_1860 setUneditableColor (I)V - ARG 1 color + ARG 1 uneditableColor METHOD method_1861 getMaxLength ()I METHOD method_1862 setVisible (Z)V ARG 1 visible @@ -71,7 +71,7 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget METHOD method_1867 write (Ljava/lang/String;)V ARG 1 text METHOD method_1868 setEditableColor (I)V - ARG 1 color + ARG 1 editableColor METHOD method_1869 getWordSkipPosition (II)I ARG 1 wordOffset ARG 2 cursorPosition diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 7e6637907d..e85604e609 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -53,7 +53,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity COMMENT {@return whether the player has movement input} METHOD method_22419 showsDeathScreen ()Z METHOD method_22420 setShowsDeathScreen (Z)V - ARG 1 shouldShow + ARG 1 showsDeathScreen METHOD method_26269 getMoodPercentage ()F COMMENT {@return the percentage for the biome mood sound for the debug HUD to COMMENT display} diff --git a/mappings/net/minecraft/client/network/ServerInfo.mapping b/mappings/net/minecraft/client/network/ServerInfo.mapping index 902f8d5879..24f4d613a5 100644 --- a/mappings/net/minecraft/client/network/ServerInfo.mapping +++ b/mappings/net/minecraft/client/network/ServerInfo.mapping @@ -32,7 +32,7 @@ CLASS net/minecraft/class_642 net/minecraft/client/network/ServerInfo COMMENT COMMENT

This is called when a user has responded to the prompt on whether to COMMENT accept server resource packs from this server in the future. - ARG 1 policy + ARG 1 resourcePackPolicy METHOD method_2996 copyFrom (Lnet/minecraft/class_642;)V ARG 1 serverInfo CLASS class_643 ResourcePackPolicy diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 65769a4ecb..e5c7b84c8a 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -256,7 +256,7 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions METHOD method_37294 getOptionsFile ()Ljava/io/File; METHOD method_37295 collectProfiledOptions ()Ljava/lang/String; METHOD method_38520 setServerViewDistance (I)V - ARG 1 viewDistance + ARG 1 serverViewDistance METHOD method_38521 getViewDistance ()I CLASS 2 METHOD method_33676 find (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping index 114b33e6ee..4d1ab97a9e 100644 --- a/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping +++ b/mappings/net/minecraft/client/realms/dto/RealmsServer.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4877 net/minecraft/client/realms/dto/RealmsServer FIELD field_22599 id J FIELD field_22600 remoteSubscriptionId Ljava/lang/String; FIELD field_22601 name Ljava/lang/String; - FIELD field_22602 motd Ljava/lang/String; + FIELD field_22602 description Ljava/lang/String; FIELD field_22603 state Lnet/minecraft/class_4877$class_4320; FIELD field_22604 owner Ljava/lang/String; FIELD field_22605 ownerUUID Ljava/lang/String; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping index fb5d8251b3..ab556f2498 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPlayerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4406 net/minecraft/client/realms/gui/screen/RealmsPlayerScreen FIELD field_19958 LOGGER Lorg/slf4j/Logger; - FIELD field_19959 tooltipText Lnet/minecraft/class_2561; + FIELD field_19959 tooltip Lnet/minecraft/class_2561; FIELD field_19960 parent Lnet/minecraft/class_4388; FIELD field_19961 serverData Lnet/minecraft/class_4877; FIELD field_19962 invitedObjectSelectionList Lnet/minecraft/class_4406$class_4407; diff --git a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping index 5db993d6d6..2b1f9e8b78 100644 --- a/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping +++ b/mappings/net/minecraft/client/realms/task/LongRunningTask.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_4358 net/minecraft/client/realms/task/LongRunningTask - FIELD field_19638 longRunningMcoTaskScreen Lnet/minecraft/class_4398; + FIELD field_19638 screen Lnet/minecraft/class_4398; FIELD field_22731 LOGGER Lorg/slf4j/Logger; FIELD field_32132 MAX_RETRIES I METHOD method_21065 aborted ()Z METHOD method_21066 setScreen (Lnet/minecraft/class_4398;)V - ARG 1 longRunningMcoTaskScreen + ARG 1 screen METHOD method_21068 tick ()V METHOD method_21069 setTitle (Lnet/minecraft/class_2561;)V ARG 1 title diff --git a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping index 14150d4a51..5003e83b92 100644 --- a/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/RaidCenterDebugRenderer.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_4304 net/minecraft/client/render/debug/RaidCenterDebug METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20561 setRaidCenters (Ljava/util/Collection;)V - ARG 1 centers + ARG 1 raidCenters METHOD method_23122 drawRaidCenter (Lnet/minecraft/class_2338;)V ARG 0 pos METHOD method_23123 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index ea0c26e089..de68105d88 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V ARG 1 world METHOD method_3948 setRenderShadows (Z)V - ARG 1 value + ARG 1 renderShadows METHOD method_3950 shouldRender (Lnet/minecraft/class_1297;Lnet/minecraft/class_4604;DDD)Z ARG 1 entity ARG 2 frustum @@ -93,7 +93,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 11 vertexConsumers ARG 12 light METHOD method_3955 setRenderHitboxes (Z)V - ARG 1 value + ARG 1 renderHitboxes METHOD method_3956 renderHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;F)V ARG 0 matrices ARG 1 vertices diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 2448255471..a6771979f5 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -175,7 +175,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 hardcore ARG 3 flatWorld METHOD method_165 setTimeOfDay (J)V - ARG 1 time + ARG 1 timeOfDay METHOD method_177 setTime (J)V ARG 1 time METHOD method_27875 setDifficulty (Lnet/minecraft/class_1267;)V diff --git a/mappings/net/minecraft/command/EntitySelectorReader.mapping b/mappings/net/minecraft/command/EntitySelectorReader.mapping index 4312f78075..e74010cb5d 100644 --- a/mappings/net/minecraft/command/EntitySelectorReader.mapping +++ b/mappings/net/minecraft/command/EntitySelectorReader.mapping @@ -90,7 +90,7 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader METHOD method_9845 setSorter (Ljava/util/function/BiConsumer;)V ARG 1 sorter METHOD method_9846 setLevelRange (Lnet/minecraft/class_2096$class_2100;)V - ARG 1 experienceRange + ARG 1 levelRange METHOD method_9847 suggestEndNext (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder ARG 2 consumer @@ -109,8 +109,8 @@ CLASS net/minecraft/class_2303 net/minecraft/command/EntitySelectorReader ARG 1 yawRange METHOD method_9856 (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_9857 setHasNegatedGameMode (Z)V - ARG 1 hasNegatedGameMode + METHOD method_9857 setExcludesGameMode (Z)V + ARG 1 excludesGameMode METHOD method_9858 suggestNormal (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder ARG 2 consumer diff --git a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping index f80c9d98e9..1fe92167e7 100644 --- a/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping +++ b/mappings/net/minecraft/entity/AreaEffectCloudEntity.mapping @@ -32,9 +32,9 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_35047 getWaitTime ()I METHOD method_35048 getPotion ()Lnet/minecraft/class_1842; METHOD method_5595 setWaitTime (I)V - ARG 1 ticks + ARG 1 waitTime METHOD method_5596 setRadiusGrowth (F)V - ARG 1 growth + ARG 1 radiusGrowth METHOD method_5597 updateColor ()V METHOD method_5598 setWaiting (Z)V ARG 1 waiting @@ -54,7 +54,7 @@ CLASS net/minecraft/class_1295 net/minecraft/entity/AreaEffectCloudEntity METHOD method_5608 setParticleType (Lnet/minecraft/class_2394;)V ARG 1 particle METHOD method_5609 setRadiusOnUse (F)V - ARG 1 radius + ARG 1 radiusOnUse METHOD method_5610 addEffect (Lnet/minecraft/class_1293;)V ARG 1 effect METHOD method_5611 isWaiting ()Z diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 813ed938e5..c2cb2cb540 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_25750 trackedPosition Lnet/minecraft/class_243; FIELD field_26994 lastChimeAge I FIELD field_26995 removalReason Lnet/minecraft/class_1297$class_5529; - FIELD field_26996 entityChangeListener Lnet/minecraft/class_5569; + FIELD field_26996 changeListener Lnet/minecraft/class_5569; FIELD field_26997 lastChimeIntensity F FIELD field_27857 inPowderSnow Z FIELD field_27858 FROZEN_TICKS Lnet/minecraft/class_2940; @@ -112,7 +112,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6002 world Lnet/minecraft/class_1937; FIELD field_6003 nextStepSoundDistance F FIELD field_6004 prevPitch F - FIELD field_6005 entityBounds Lnet/minecraft/class_238; + FIELD field_6005 boundingBox Lnet/minecraft/class_238; FIELD field_6007 velocityDirty Z FIELD field_6008 timeUntilRegen I FIELD field_6009 invulnerable Z @@ -218,7 +218,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 collisions METHOD method_20802 getFireTicks ()I METHOD method_20803 setFireTicks (I)V - ARG 1 ticks + ARG 1 fireTicks METHOD method_21749 bypassesSteppingEffects ()Z METHOD method_21750 bypassesLandingEffects ()Z METHOD method_21751 isSneaky ()Z diff --git a/mappings/net/minecraft/entity/ItemEntity.mapping b/mappings/net/minecraft/entity/ItemEntity.mapping index 0127ee2acb..9c635a2db6 100644 --- a/mappings/net/minecraft/entity/ItemEntity.mapping +++ b/mappings/net/minecraft/entity/ItemEntity.mapping @@ -70,8 +70,8 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity COMMENT Sets the item stack contained in this item entity to {@code stack}. ARG 1 stack METHOD method_6981 setThrower (Ljava/util/UUID;)V - COMMENT Sets the thrower of this item entity to {@code uuid}. - ARG 1 uuid + COMMENT Sets the thrower of this item entity to {@code thrower}. + ARG 1 thrower METHOD method_6982 setPickupDelay (I)V COMMENT Sets the number of ticks before this item entity can be picked up COMMENT to {@code pickupDelay}. @@ -79,11 +79,11 @@ CLASS net/minecraft/class_1542 net/minecraft/entity/ItemEntity METHOD method_6983 getStack ()Lnet/minecraft/class_1799; COMMENT Returns the item stack contained in this item entity. METHOD method_6984 setOwner (Ljava/util/UUID;)V - COMMENT Sets the owner of this item entity to {@code uuid}. + COMMENT Sets the owner of this item entity to {@code owner}. COMMENT COMMENT

Used when an item is given to an entity, but this entity COMMENT does not have enough space in its inventory. - ARG 1 uuid + ARG 1 owner METHOD method_6985 getItemAge ()I COMMENT Returns the number of ticks since this item entity has been created. COMMENT diff --git a/mappings/net/minecraft/entity/ai/pathing/Path.mapping b/mappings/net/minecraft/entity/ai/pathing/Path.mapping index bb8ebc3fbb..414088b85f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/Path.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/Path.mapping @@ -41,7 +41,7 @@ CLASS net/minecraft/class_11 net/minecraft/entity/ai/pathing/Path METHOD method_41 equalsPath (Lnet/minecraft/class_11;)Z ARG 1 o METHOD method_42 setCurrentNodeIndex (I)V - ARG 1 index + ARG 1 nodeIndex METHOD method_44 next ()V METHOD method_45 getEnd ()Lnet/minecraft/class_9; METHOD method_46 isFinished ()Z diff --git a/mappings/net/minecraft/entity/boss/BossBar.mapping b/mappings/net/minecraft/entity/boss/BossBar.mapping index 507b275a16..cb8f974dd4 100644 --- a/mappings/net/minecraft/entity/boss/BossBar.mapping +++ b/mappings/net/minecraft/entity/boss/BossBar.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1259 net/minecraft/entity/boss/BossBar ARG 1 darkenSky METHOD method_5407 getUuid ()Ljava/util/UUID; METHOD method_5408 setPercent (F)V - ARG 1 percentage + ARG 1 percent METHOD method_5409 setStyle (Lnet/minecraft/class_1259$class_1261;)V ARG 1 style METHOD method_5410 setDragonMusic (Z)Lnet/minecraft/class_1259; diff --git a/mappings/net/minecraft/entity/mob/Angerable.mapping b/mappings/net/minecraft/entity/mob/Angerable.mapping index ea3c596b3f..04a5d99f42 100644 --- a/mappings/net/minecraft/entity/mob/Angerable.mapping +++ b/mappings/net/minecraft/entity/mob/Angerable.mapping @@ -17,9 +17,9 @@ CLASS net/minecraft/class_5354 net/minecraft/entity/mob/Angerable ARG 1 world ARG 2 nbt METHOD method_29513 setAngryAt (Ljava/util/UUID;)V - ARG 1 uuid + ARG 1 angryAt METHOD method_29514 setAngerTime (I)V - ARG 1 ticks + ARG 1 angerTime METHOD method_29515 shouldAngerAt (Lnet/minecraft/class_1309;)Z ARG 1 entity METHOD method_29516 forgive (Lnet/minecraft/class_1657;)V diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping index dd88eb4aec..8776e88006 100644 --- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1560 net/minecraft/entity/mob/EndermanEntity FIELD field_20618 PROVOKED Lnet/minecraft/class_2940; FIELD field_25376 angerTime I - FIELD field_25377 targetUuid Ljava/util/UUID; + FIELD field_25377 angryAt Ljava/util/UUID; FIELD field_25378 ANGER_TIME_RANGE Lnet/minecraft/class_6019; FIELD field_7252 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322; FIELD field_7253 lastAngrySoundAge I diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping index 5d96649472..6c17e79ffd 100644 --- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_1564 net/minecraft/entity/mob/EvokerEntity FIELD field_7264 wololoTarget Lnet/minecraft/class_1472; METHOD method_26912 createEvokerAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_7036 setWololoTarget (Lnet/minecraft/class_1472;)V - ARG 1 sheep + ARG 1 wololoTarget METHOD method_7039 getWololoTarget ()Lnet/minecraft/class_1472; CLASS class_1565 ConjureFangsGoal METHOD method_7044 conjureFangs (DDDDFI)V diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index f0aa13a7e3..d3770fe890 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -50,7 +50,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity COMMENT Contains actions the entity can perform. These may consume, for example, the target COMMENT entity as determined during the {@link MobEntity#targetSelector}'s execution. FIELD field_6202 holdingEntity Lnet/minecraft/class_1297; - FIELD field_6203 pickUpLoot Z + FIELD field_6203 canPickUpLoot Z FIELD field_6204 jumpControl Lnet/minecraft/class_1334; FIELD field_6205 armorItems Lnet/minecraft/class_2371; FIELD field_6206 lookControl Lnet/minecraft/class_1333; @@ -152,7 +152,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_5937 setLeftHanded (Z)V ARG 1 leftHanded METHOD method_5938 setSidewaysSpeed (F)V - ARG 1 sidewaysMovement + ARG 1 sidewaysSpeed METHOD method_5939 canPickupItem (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_5940 readLeashNbt ()V @@ -183,7 +183,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity ARG 2 maxYawChange ARG 3 maxPitchChange METHOD method_5952 setCanPickUpLoot (Z)V - ARG 1 pickUpLoot + ARG 1 canPickUpLoot METHOD method_5954 attachLeash (Lnet/minecraft/class_1297;Z)V ARG 1 entity ARG 2 sendPacket diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping index 98cee095f2..d1a908fda0 100644 --- a/mappings/net/minecraft/entity/mob/VexEntity.mapping +++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_1634 net/minecraft/entity/mob/VexEntity ARG 1 mask METHOD method_7186 getBounds ()Lnet/minecraft/class_2338; METHOD method_7188 setBounds (Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 bounds METHOD method_7189 setVexFlag (IZ)V ARG 1 mask ARG 2 value diff --git a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping index 7a9b8e4b76..11da3981d1 100644 --- a/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity FIELD field_25379 ANGER_TIME_RANGE Lnet/minecraft/class_6019; FIELD field_25380 angerTime I - FIELD field_25381 targetUuid Ljava/util/UUID; + FIELD field_25381 angryAt Ljava/util/UUID; FIELD field_25382 ANGRY_SOUND_DELAY_RANGE Lnet/minecraft/class_6019; FIELD field_25608 angerPassingCooldown I FIELD field_25609 ANGER_PASSING_COOLDOWN_RANGE Lnet/minecraft/class_6019; diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 9a424d949d..9876faa28a 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_21645 moveToHiveGoal Lnet/minecraft/class_4466$class_4472; FIELD field_21646 moveToFlowerGoal Lnet/minecraft/class_4466$class_4473; FIELD field_25363 ANGER_TIME_RANGE Lnet/minecraft/class_6019; - FIELD field_25364 targetUuid Ljava/util/UUID; + FIELD field_25364 angryAt Ljava/util/UUID; FIELD field_30272 CROPS_GROWN_SINCE_POLLINATION_KEY Ljava/lang/String; FIELD field_30273 CANNOT_ENTER_HIVE_TICKS_KEY Ljava/lang/String; FIELD field_30276 TICKS_SINCE_POLLINATION_KEY Ljava/lang/String; @@ -65,13 +65,13 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_21793 addCropCounter ()V METHOD method_21794 isHiveValid ()Z METHOD method_21797 setFlowerPos (Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 flowerPos METHOD method_21805 setHasNectar (Z)V ARG 1 hasNectar METHOD method_21806 setHasStung (Z)V ARG 1 hasStung METHOD method_21807 setCannotEnterHiveTicks (I)V - ARG 1 ticks + ARG 1 cannotEnterHiveTicks METHOD method_21808 setNearTarget (Z)V ARG 1 nearTarget METHOD method_21811 getBodyPitch (F)F diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping index 2d41d9edd8..ed8d555451 100644 --- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1428 net/minecraft/entity/passive/ChickenEntity FIELD field_6737 flapSpeed F FIELD field_6738 prevMaxWingDeviation F FIELD field_6739 eggLayTime I - FIELD field_6740 jockey Z + FIELD field_6740 hasJockey Z FIELD field_6741 flapProgress F FIELD field_6742 BREEDING_INGREDIENT Lnet/minecraft/class_1856; FIELD field_6743 maxWingDeviation F diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping index 9bcacf0fad..b02601e1ee 100644 --- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity - FIELD field_25368 targetUuid Ljava/util/UUID; + FIELD field_25368 angryAt Ljava/util/UUID; FIELD field_25369 ANGER_TIME_RANGE Lnet/minecraft/class_6019; FIELD field_25370 angerTime I FIELD field_6837 warningAnimationProgress F diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 021b36490b..64adc216a0 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -61,7 +61,7 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity ARG 1 poiType METHOD method_19623 hasSeedToPlant ()Z METHOD method_19625 setExperience (I)V - ARG 1 amount + ARG 1 experience METHOD method_20264 sayNo ()V METHOD method_20593 (Lnet/minecraft/class_4139;)Z ARG 0 gossipType diff --git a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping index 9cdd820324..e773bd6a55 100644 --- a/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WanderingTraderEntity.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit FIELD field_17725 despawnDelay I FIELD field_17758 wanderTarget Lnet/minecraft/class_2338; METHOD method_18013 setDespawnDelay (I)V - ARG 1 delay + ARG 1 despawnDelay METHOD method_18014 getDespawnDelay ()I METHOD method_18065 getWanderTarget ()Lnet/minecraft/class_2338; METHOD method_18067 (Lnet/minecraft/class_3989;)Z @@ -10,7 +10,7 @@ CLASS net/minecraft/class_3989 net/minecraft/entity/passive/WanderingTraderEntit METHOD method_18068 (Lnet/minecraft/class_3989;)Z ARG 1 wanderingTrader METHOD method_18069 setWanderTarget (Lnet/minecraft/class_2338;)V - ARG 1 pos + ARG 1 wanderTarget METHOD method_20508 tickDespawnDelay ()V CLASS class_3994 WanderToTargetGoal FIELD field_17759 trader Lnet/minecraft/class_3989; diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 1206f9999c..618ebda42a 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -1,7 +1,7 @@ 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_6019; - FIELD field_25372 targetUuid Ljava/util/UUID; + FIELD field_25372 angryAt Ljava/util/UUID; FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_30386 WILD_MAX_HEALTH F FIELD field_30387 TAMED_MAX_HEALTH F diff --git a/mappings/net/minecraft/entity/player/HungerManager.mapping b/mappings/net/minecraft/entity/player/HungerManager.mapping index 3350077699..fca0aaa440 100644 --- a/mappings/net/minecraft/entity/player/HungerManager.mapping +++ b/mappings/net/minecraft/entity/player/HungerManager.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_1702 net/minecraft/entity/player/HungerManager FIELD field_7752 exhaustion F - FIELD field_7753 foodSaturationLevel F + FIELD field_7753 saturationLevel F FIELD field_7754 prevFoodLevel I FIELD field_7755 foodTickTimer I FIELD field_7756 foodLevel I diff --git a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping index cc9966664a..50b1921ed6 100644 --- a/mappings/net/minecraft/entity/raid/RaiderEntity.mapping +++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_3763 net/minecraft/entity/raid/RaiderEntity ARG 2 unused METHOD method_16486 getWave ()I METHOD method_16835 setOutOfRaidCounter (I)V - ARG 1 counter + ARG 1 outOfRaidCounter METHOD method_16836 getOutOfRaidCounter ()I METHOD method_20033 getCelebratingSound ()Lnet/minecraft/class_3414; METHOD method_20034 isCelebrating ()Z diff --git a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping index dc508c29e9..91fa4bc1dd 100644 --- a/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping +++ b/mappings/net/minecraft/entity/vehicle/HopperMinecartEntity.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_1700 net/minecraft/entity/vehicle/HopperMinecartEntity METHOD method_7570 setEnabled (Z)V ARG 1 enabled METHOD method_7571 setTransferCooldown (I)V - ARG 1 cooldown + ARG 1 transferCooldown METHOD method_7572 isEnabled ()Z METHOD method_7573 isCoolingDown ()Z METHOD method_7574 canOperate ()Z diff --git a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping index f712f110ae..719d1fb4a5 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/class_3753 net/minecraft/network/packet/c2s/play/UpdateJigsawC2SPacket - FIELD field_16563 attachmentType Lnet/minecraft/class_2960; + FIELD field_16563 name Lnet/minecraft/class_2960; FIELD field_16564 finalState Ljava/lang/String; FIELD field_16565 pos Lnet/minecraft/class_2338; - FIELD field_16566 targetPool Lnet/minecraft/class_2960; + FIELD field_16566 target Lnet/minecraft/class_2960; FIELD field_23401 pool Lnet/minecraft/class_2960; FIELD field_23402 jointType Lnet/minecraft/class_3751$class_4991; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_3751$class_4991;)V ARG 1 pos - ARG 2 attachmentType - ARG 3 targetPool + ARG 2 name + ARG 3 target ARG 4 pool ARG 5 finalState ARG 6 jointType METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD method_16393 getFinalState ()Ljava/lang/String; - METHOD method_16394 getTargetPool ()Lnet/minecraft/class_2960; - METHOD method_16395 getAttachmentType ()Lnet/minecraft/class_2960; + METHOD method_16394 getTarget ()Lnet/minecraft/class_2960; + METHOD method_16395 getName ()Lnet/minecraft/class_2960; METHOD method_16396 getPos ()Lnet/minecraft/class_2338; METHOD method_26435 getPool ()Lnet/minecraft/class_2960; METHOD method_26436 getJointType ()Lnet/minecraft/class_3751$class_4991; diff --git a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping index 968a0b478d..ca3c9fce52 100644 --- a/mappings/net/minecraft/screen/MerchantScreenHandler.mapping +++ b/mappings/net/minecraft/screen/MerchantScreenHandler.mapping @@ -14,14 +14,14 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler METHOD method_17437 setOffers (Lnet/minecraft/class_1916;)V ARG 1 offers METHOD method_17438 getRecipes ()Lnet/minecraft/class_1916; - METHOD method_19253 setCanLevel (Z)V - ARG 1 canLevel + METHOD method_19253 setLeveled (Z)V + ARG 1 leveled METHOD method_19254 getExperience ()I METHOD method_19255 setExperienceFromServer (I)V ARG 1 experience METHOD method_19256 getMerchantRewardedExperience ()I METHOD method_19257 setLevelProgress (I)V - ARG 1 progress + ARG 1 levelProgress METHOD method_19258 getLevelProgress ()I METHOD method_19259 isLeveled ()Z METHOD method_20214 autofill (ILnet/minecraft/class_1799;)V @@ -30,8 +30,8 @@ CLASS net/minecraft/class_1728 net/minecraft/screen/MerchantScreenHandler METHOD method_20215 switchTo (I)V ARG 1 recipeIndex METHOD method_20595 playYesSound ()V - METHOD method_20700 setRefreshTrades (Z)V - ARG 1 refreshable + METHOD method_20700 setCanRefreshTrades (Z)V + ARG 1 canRefreshTrades METHOD method_20701 canRefreshTrades ()Z METHOD method_7650 setRecipeIndex (I)V ARG 1 index diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 026f610b20..ee817198dc 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -222,7 +222,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3730 setDemo (Z)V ARG 1 demo METHOD method_3731 setEnforceWhitelist (Z)V - ARG 1 whitelistEnabled + ARG 1 enforceWhitelist METHOD method_37319 (Ljava/util/function/Consumer;Lnet/minecraft/class_3696;)V ARG 2 result METHOD method_3732 shouldBroadcastRconToOps ()Z diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 314f46edfe..d6a4e13ea3 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure FIELD field_31697 SIZE_KEY Ljava/lang/String; METHOD method_15160 getSize ()Lnet/minecraft/class_2382; METHOD method_15161 setAuthor (Ljava/lang/String;)V - ARG 1 name + ARG 1 author METHOD method_15162 applyTransformedOffset (Lnet/minecraft/class_2338;Lnet/minecraft/class_2415;Lnet/minecraft/class_2470;II)Lnet/minecraft/class_2338; ARG 0 pos ARG 1 mirror diff --git a/mappings/net/minecraft/village/Merchant.mapping b/mappings/net/minecraft/village/Merchant.mapping index 008cb5d6e3..850a2ee188 100644 --- a/mappings/net/minecraft/village/Merchant.mapping +++ b/mappings/net/minecraft/village/Merchant.mapping @@ -14,10 +14,10 @@ CLASS net/minecraft/class_1915 net/minecraft/village/Merchant ARG 1 experience METHOD method_20708 canRefreshTrades ()Z METHOD method_38069 isClient ()Z - METHOD method_8257 getCurrentCustomer ()Lnet/minecraft/class_1657; + METHOD method_8257 getCustomer ()Lnet/minecraft/class_1657; METHOD method_8258 onSellingItem (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_8259 setCurrentCustomer (Lnet/minecraft/class_1657;)V + METHOD method_8259 setCustomer (Lnet/minecraft/class_1657;)V ARG 1 customer METHOD method_8261 setOffersFromServer (Lnet/minecraft/class_1916;)V ARG 1 offers diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 6b8abe4b13..6ee108d962 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -126,7 +126,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 1 pos METHOD method_20511 moveRaidCenter ()V METHOD method_35211 setBadOmenLevel (I)V - ARG 1 level + ARG 1 badOmenLevel METHOD method_35212 getTotalHealth ()F METHOD method_35213 getAllRaiders ()Ljava/util/Set; CLASS class_3766 Member diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index ae52d3bcb0..12243536ba 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor FIELD field_9169 DATE_FORMAT Ljava/text/SimpleDateFormat; METHOD method_8286 setCommand (Ljava/lang/String;)V ARG 1 command - METHOD method_8287 setTrackingOutput (Z)V + METHOD method_8287 setTrackOutput (Z)V ARG 1 trackOutput METHOD method_8288 interact (Lnet/minecraft/class_1657;)Lnet/minecraft/class_1269; ARG 1 player diff --git a/mappings/net/minecraft/world/MutableWorldProperties.mapping b/mappings/net/minecraft/world/MutableWorldProperties.mapping index 708eb7afb8..64f546e52a 100644 --- a/mappings/net/minecraft/world/MutableWorldProperties.mapping +++ b/mappings/net/minecraft/world/MutableWorldProperties.mapping @@ -9,4 +9,4 @@ CLASS net/minecraft/class_5269 net/minecraft/world/MutableWorldProperties METHOD method_27419 setSpawnZ (I)V ARG 1 spawnZ METHOD method_30657 setSpawnAngle (F)V - ARG 1 angle + ARG 1 spawnAngle diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index 356691dcc4..a7d73d2dfe 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 2 playerNbt METHOD method_168 getVersion ()I METHOD method_186 setDifficultyLocked (Z)V - ARG 1 locked + ARG 1 difficultyLocked METHOD method_193 setGameMode (Lnet/minecraft/class_1934;)V ARG 1 gameMode METHOD method_194 areCommandsAllowed ()Z @@ -21,7 +21,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 1 difficulty METHOD method_210 getGameMode ()Lnet/minecraft/class_1934; METHOD method_221 setCustomBossEvents (Lnet/minecraft/class_2487;)V - ARG 1 nbt + ARG 1 customBossEvents METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487; METHOD method_228 getCustomBossEvents ()Lnet/minecraft/class_2487; METHOD method_24285 addServerBrand (Ljava/lang/String;Z)V @@ -36,7 +36,7 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties METHOD method_28057 getGeneratorOptions ()Lnet/minecraft/class_5285; METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2487; METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V - ARG 1 nbt + ARG 1 dragonFight METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_29589 getDataPackSettings ()Lnet/minecraft/class_5359; METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_5359;)V diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 7c90cdbdab..fcbd87b865 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -35,8 +35,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_12006 getSectionArray ()[Lnet/minecraft/class_2826; METHOD method_12007 setBlockEntity (Lnet/minecraft/class_2586;)V ARG 1 blockEntity - METHOD method_12008 setShouldSave (Z)V - ARG 1 shouldSave + METHOD method_12008 setNeedsSaving (Z)V + ARG 1 needsSaving METHOD method_12009 getStatus ()Lnet/minecraft/class_2806; METHOD method_12010 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_2680; ARG 1 pos @@ -106,8 +106,8 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk METHOD method_38870 increaseInhabitedTime (J)V ARG 1 delta METHOD method_38871 hasStructureReferences ()Z - METHOD method_39294 setBlender (Lnet/minecraft/class_6749;)V - ARG 1 blender + METHOD method_39294 setBlendingData (Lnet/minecraft/class_6749;)V + ARG 1 blendingData METHOD method_39295 hasHeightmap (Lnet/minecraft/class_2902$class_2903;)Z ARG 1 type METHOD method_39296 getTickSchedulers ()Lnet/minecraft/class_2791$class_6745; diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 30b9f5f0ab..86d7375701 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 2 nbt METHOD method_12225 getLevelType ()Lnet/minecraft/class_3193$class_3194; METHOD method_12226 setLoadedToWorld (Z)V - ARG 1 loaded + ARG 1 loadedToWorld METHOD method_12234 getFluidState (III)Lnet/minecraft/class_3610; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/world/entity/EntityLike.mapping b/mappings/net/minecraft/world/entity/EntityLike.mapping index dbeef4f648..24c6588a13 100644 --- a/mappings/net/minecraft/world/entity/EntityLike.mapping +++ b/mappings/net/minecraft/world/entity/EntityLike.mapping @@ -12,8 +12,8 @@ CLASS net/minecraft/class_5568 net/minecraft/world/entity/EntityLike COMMENT COMMENT @see #streamPassengersAndSelf() METHOD method_24515 getBlockPos ()Lnet/minecraft/class_2338; - METHOD method_31744 setListener (Lnet/minecraft/class_5569;)V - ARG 1 listener + METHOD method_31744 setChangeListener (Lnet/minecraft/class_5569;)V + ARG 1 changeListener METHOD method_31745 setRemoved (Lnet/minecraft/class_1297$class_5529;)V ARG 1 reason METHOD method_31746 shouldSave ()Z diff --git a/mappings/net/minecraft/world/level/ServerWorldProperties.mapping b/mappings/net/minecraft/world/level/ServerWorldProperties.mapping index 4777502030..728eab68d7 100644 --- a/mappings/net/minecraft/world/level/ServerWorldProperties.mapping +++ b/mappings/net/minecraft/world/level/ServerWorldProperties.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_5268 net/minecraft/world/level/ServerWorldProperties METHOD method_18038 getWanderingTraderSpawnDelay ()I METHOD method_18039 getWanderingTraderSpawnChance ()I METHOD method_18040 setWanderingTraderId (Ljava/util/UUID;)V - ARG 1 uuid + ARG 1 wanderingTraderId METHOD method_18041 setWanderingTraderSpawnDelay (I)V ARG 1 wanderingTraderSpawnDelay METHOD method_18042 setWanderingTraderSpawnChance (I)V @@ -28,7 +28,7 @@ CLASS net/minecraft/class_5268 net/minecraft/world/level/ServerWorldProperties METHOD method_223 setInitialized (Z)V ARG 1 initialized METHOD method_27415 setWorldBorder (Lnet/minecraft/class_2784$class_5200;)V - ARG 1 properties + ARG 1 worldBorder METHOD method_27422 getWorldBorder ()Lnet/minecraft/class_2784$class_5200; METHOD method_29034 setTime (J)V ARG 1 time