From e9c5c02d50cc6cbc8a2205cc3d1dc6d5250374a9 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 29 May 2020 14:31:34 +0100 Subject: [PATCH] 20w22a --- build.gradle | 2 +- .../blaze3d/platform/GlStateManager.mapping | 16 ---- .../screens/RealmsBackupInfoScreen.mapping | 1 - .../PlayerAdvancementTracker.mapping | 13 +--- mappings/net/minecraft/block/Material.mapping | 8 +- .../block/entity/BeehiveBlockEntity.mapping | 3 +- .../block/entity/JigsawBlockEntity.mapping | 2 +- .../block/entity/SignBlockEntity.mapping | 6 +- mappings/net/minecraft/class_5335.mapping | 3 + mappings/net/minecraft/class_5341.mapping | 5 ++ mappings/net/minecraft/class_5348.mapping | 27 +++++++ .../minecraft/client/MinecraftClient.mapping | 1 - .../minecraft/client/font/TextHandler.mapping | 23 ++---- .../client/font/TextRenderer.mapping | 33 +++----- .../client/font/TextVisitFactory.mapping | 3 +- .../client/gui/DrawableHelper.mapping | 6 +- .../minecraft/client/gui/hud/ChatHud.mapping | 5 +- .../client/gui/hud/ChatHudLine.mapping | 7 +- .../client/gui/screen/DeathScreen.mapping | 2 +- .../client/gui/screen/Screen.mapping | 9 +-- .../advancement/AdvancementWidget.mapping | 2 +- .../gui/screen/ingame/BookScreen.mapping | 6 +- .../screen/ingame/EnchantingPhrases.mapping | 2 +- .../screen/ingame/JigsawBlockScreen.mapping | 2 - .../client/gui/widget/EntryListWidget.mapping | 6 -- .../client/gui/widget/ListWidget.mapping | 77 ------------------- .../client/network/ClientPlayerEntity.mapping | 4 +- .../ClientPlayerInteractionManager.mapping | 2 +- .../particle/ItemPickupParticle.mapping | 1 - .../client/render/RenderLayers.mapping | 4 +- .../client/render/SkyProperties.mapping | 2 +- .../client/render/WorldRenderer.mapping | 1 - .../render/debug/VillageDebugRenderer.mapping | 1 - .../client/resource/language/I18n.mapping | 3 - .../resource/language/LanguageManager.mapping | 3 - .../language/TranslationStorage.mapping | 12 +-- .../client/util/ChatMessages.mapping | 3 +- .../client/util/TextCollector.mapping | 9 +-- .../client/world/ClientWorld.mapping | 4 +- .../arguments/BlockArgumentParser.mapping | 32 ++++---- .../arguments/ItemStringReader.mapping | 12 +-- .../server/BlockLootTableGenerator.mapping | 14 ++-- .../server/FishingLootTableGenerator.mapping | 14 ++-- mappings/net/minecraft/entity/Entity.mapping | 7 -- .../net/minecraft/entity/LivingEntity.mapping | 6 +- .../net/minecraft/entity/SpawnGroup.mapping | 7 +- .../ai/brain/task/DefeatTargetTask.mapping | 2 +- .../ai/brain/task/FarmerVillagerTask.mapping | 1 - .../task/FindPointOfInterestTask.mapping | 4 +- .../ai/brain/task/StayAboveWaterTask.mapping | 4 +- .../ai/pathing/LandPathNodeMaker.mapping | 5 -- .../entity/boss/BossBarManager.mapping | 3 - .../boss/dragon/EnderDragonFight.mapping | 2 +- .../entity/damage/DamageSource.mapping | 3 +- .../minecraft/entity/mob/PiglinBrain.mapping | 2 - .../minecraft/entity/mob/PiglinEntity.mapping | 1 - .../entity/player/PlayerInventory.mapping | 5 -- mappings/net/minecraft/item/Item.mapping | 2 +- mappings/net/minecraft/loot/LootPool.mapping | 4 +- .../minecraft/loot/LootTableReporter.mapping | 2 +- .../AlternativeLootCondition.mapping | 8 +- ...amageSourcePropertiesLootCondition.mapping | 2 +- .../EntityPropertiesLootCondition.mapping | 6 +- .../condition/InvertedLootCondition.mapping | 6 +- .../KilledByPlayerLootCondition.mapping | 2 +- .../LocationCheckLootCondition.mapping | 2 +- .../loot/condition/LootCondition.mapping | 20 ----- .../LootConditionConsumingBuilder.mapping | 2 +- .../condition/LootConditionManager.mapping | 2 +- .../loot/condition/LootConditions.mapping | 17 ---- .../condition/MatchToolLootCondition.mapping | 2 +- .../RandomChanceLootCondition.mapping | 2 +- ...ndomChanceWithLootingLootCondition.mapping | 2 +- .../SurvivesExplosionLootCondition.mapping | 2 +- .../condition/TableBonusLootCondition.mapping | 2 +- .../loot/context/LootContext.mapping | 6 +- .../loot/entry/CombinedEntry.mapping | 15 +--- .../minecraft/loot/entry/DynamicEntry.mapping | 5 +- .../minecraft/loot/entry/EmptyEntry.mapping | 2 +- .../minecraft/loot/entry/GroupEntry.mapping | 3 - .../minecraft/loot/entry/ItemEntry.mapping | 4 +- .../minecraft/loot/entry/LeafEntry.mapping | 6 +- .../minecraft/loot/entry/LootEntries.mapping | 15 ---- .../minecraft/loot/entry/LootEntry.mapping | 24 ++---- .../loot/entry/LootTableEntry.mapping | 4 +- .../net/minecraft/loot/entry/TagEntry.mapping | 4 +- .../function/ApplyBonusLootFunction.mapping | 10 +-- .../function/ConditionalLootFunction.mapping | 8 +- .../function/CopyNameLootFunction.mapping | 4 +- .../loot/function/CopyNbtLootFunction.mapping | 2 +- .../loot/function/CopyStateFunction.mapping | 2 +- .../EnchantRandomlyLootFunction.mapping | 4 +- .../EnchantWithLevelsLootFunction.mapping | 2 +- .../ExplorationMapLootFunction.mapping | 2 +- .../ExplosionDecayLootFunction.mapping | 2 +- .../FillPlayerHeadLootFunction.mapping | 2 +- .../function/FurnaceSmeltLootFunction.mapping | 3 +- .../function/LimitCountLootFunction.mapping | 4 +- .../loot/function/LootFunction.mapping | 15 ---- .../loot/function/LootFunctions.mapping | 17 ---- .../LootingEnchantLootFunction.mapping | 2 +- .../SetAttributesLootFunction.mapping | 2 +- .../function/SetContentsLootFunction.mapping | 2 +- .../function/SetCountLootFunction.mapping | 4 +- .../function/SetDamageLootFunction.mapping | 4 +- .../function/SetLootTableLootFunction.mapping | 2 +- .../loot/function/SetLoreLootFunction.mapping | 2 +- .../loot/function/SetNameLootFunction.mapping | 2 +- .../loot/function/SetNbtLootFunction.mapping | 4 +- .../SetStewEffectLootFunction.mapping | 2 +- .../play/JigsawGeneratingC2SPacket.mapping | 2 +- .../packet/s2c/play/GameJoinS2CPacket.mapping | 14 +--- .../s2c/play/PlayerRespawnS2CPacket.mapping | 9 +-- ...ncementEntityPredicateDeserializer.mapping | 2 +- ...vancementEntityPredicateSerializer.mapping | 2 +- .../predicate/entity/EntityPredicate.mapping | 6 +- .../ReloadableResourceManagerImpl.mapping | 5 +- .../resource/ResourcePackManager.mapping | 6 -- .../minecraft/server/MinecraftServer.mapping | 14 ---- .../minecraft/server/PlayerManager.mapping | 1 - .../server/command/ExecuteCommand.mapping | 2 +- .../server/command/TestCommand.mapping | 8 +- .../server/function/CommandFunction.mapping | 4 +- .../function/CommandFunctionManager.mapping | 18 ----- .../integrated/IntegratedServer.mapping | 2 +- .../server/network/ServerRecipeBook.mapping | 7 +- .../server/world/ChunkHolder.mapping | 6 +- .../server/world/ServerWorld.mapping | 2 - .../net/minecraft/structure/Structure.mapping | 6 +- .../structure/StructureManager.mapping | 4 +- .../pool/StructurePoolBasedGenerator.mapping | 8 +- mappings/net/minecraft/test/GameTest.mapping | 11 +-- .../minecraft/test/StructureTestUtil.mapping | 19 +---- .../net/minecraft/test/TestRunner.mapping | 5 +- mappings/net/minecraft/test/TestSet.mapping | 1 - mappings/net/minecraft/test/TestUtil.mapping | 10 +-- mappings/net/minecraft/text/Text.mapping | 58 +------------- .../minecraft/text/TranslatableText.mapping | 11 +-- mappings/net/minecraft/util/Language.mapping | 12 +-- .../minecraft/util/registry/Registry.mapping | 3 +- .../minecraft/world/FeatureUpdater.mapping | 2 +- .../minecraft/world/StructureHolder.mapping | 12 +-- .../net/minecraft/world/chunk/Palette.mapping | 3 +- .../world/dimension/DimensionType.mapping | 4 - .../minecraft/world/gen/carver/Carver.mapping | 3 +- .../chunk/FlatChunkGeneratorConfig.mapping | 1 - .../world/gen/foliage/FoliagePlacer.mapping | 7 +- .../world/poi/PointOfInterestType.mapping | 1 - .../storage/VersionedChunkStorage.mapping | 3 +- .../world/updater/WorldUpdater.mapping | 2 +- 150 files changed, 274 insertions(+), 741 deletions(-) create mode 100644 mappings/net/minecraft/class_5335.mapping create mode 100644 mappings/net/minecraft/class_5341.mapping create mode 100644 mappings/net/minecraft/class_5348.mapping delete mode 100644 mappings/net/minecraft/client/gui/widget/ListWidget.mapping delete mode 100644 mappings/net/minecraft/loot/condition/LootCondition.mapping diff --git a/build.gradle b/build.gradle index 140cdec0d0..be88b28b25 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w21a" +def minecraft_version = "20w22a" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index debc2fd89a..ef0c6902a9 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -213,11 +213,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 0 target ARG 1 pname ARG 2 param - METHOD method_21987 renderbufferStorage (IIII)V - ARG 0 target - ARG 1 internalFormat - ARG 2 width - ARG 3 height METHOD method_21989 getFloat (ILjava/nio/FloatBuffer;)V ARG 0 pname ARG 1 params @@ -257,11 +252,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 0 target ARG 1 level ARG 2 pname - METHOD method_22004 framebufferRenderbuffer (IIII)V - ARG 0 target - ARG 1 attachment - ARG 2 renderbufferTarget - ARG 3 renderbuffer METHOD method_22006 getAttribLocation (ILjava/lang/CharSequence;)I ARG 0 program ARG 1 name @@ -363,9 +353,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22044 disableColorMaterial ()V METHOD method_22045 useProgram (I)V ARG 0 program - METHOD method_22046 bindRenderbuffer (II)V - ARG 0 target - ARG 1 renderbuffer METHOD method_22047 disableDepthTest ()V METHOD method_22048 deleteProgram (I)V ARG 0 program @@ -385,8 +372,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 0 pname ARG 1 param METHOD method_22056 enableBlend ()V - METHOD method_22057 deleteRenderbuffers (I)V - ARG 0 renderbuffers METHOD method_22058 polygonMode (II)V ARG 0 face ARG 1 mode @@ -404,7 +389,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22068 genFramebuffers ()I METHOD method_22069 clientActiveTexture (I)V ARG 0 texture - METHOD method_22070 genRenderbuffers ()I METHOD method_22071 fogMode (I)V ARG 0 mode METHOD method_22072 enableFog ()V diff --git a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping index cb087a0ff6..f578b6c6e5 100644 --- a/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping +++ b/mappings/com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_4379 com/mojang/realmsclient/gui/screens/RealmsBackupInfoScreen FIELD field_19734 lastScreen Lnet/minecraft/class_437; FIELD field_19736 backup Lnet/minecraft/class_4867; - FIELD field_19737 keys Ljava/util/List; FIELD field_19738 backupInfoList Lnet/minecraft/class_4379$class_4380; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_4867;)V ARG 2 backup diff --git a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping index c1c07333c2..79a307a63c 100644 --- a/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping +++ b/mappings/net/minecraft/advancement/PlayerAdvancementTracker.mapping @@ -10,13 +10,8 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke FIELD field_13394 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13395 GSON Lcom/google/gson/Gson; FIELD field_13396 dirty Z - FIELD field_13397 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/io/File;Lnet/minecraft/class_3222;)V - ARG 1 server - ARG 2 advancementFile - ARG 3 owner - METHOD method_12872 rewardEmptyAdvancements ()V - METHOD method_12873 load ()V + METHOD method_12872 rewardEmptyAdvancements (Lnet/minecraft/class_2989;)V + METHOD method_12873 load (Lnet/minecraft/class_2989;)V METHOD method_12874 beginTracking (Lnet/minecraft/class_161;)V ARG 1 advancement METHOD method_12875 setOwner (Lnet/minecraft/class_3222;)V @@ -43,9 +38,9 @@ CLASS net/minecraft/class_2985 net/minecraft/advancement/PlayerAdvancementTracke ARG 2 progress METHOD method_12885 updateDisplay (Lnet/minecraft/class_161;)V ARG 1 advancement - METHOD method_12886 reload ()V + METHOD method_12886 reload (Lnet/minecraft/class_2989;)V METHOD method_12887 updateCompleted ()V METHOD method_12888 setDisplayTab (Lnet/minecraft/class_161;)V ARG 1 advancement - METHOD method_12889 beginTrackingAllAdvancements ()V + METHOD method_12889 beginTrackingAllAdvancements (Lnet/minecraft/class_2989;)V METHOD method_12890 save ()V diff --git a/mappings/net/minecraft/block/Material.mapping b/mappings/net/minecraft/block/Material.mapping index f0819382dc..b8e5a85ef4 100644 --- a/mappings/net/minecraft/block/Material.mapping +++ b/mappings/net/minecraft/block/Material.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_15911 solid Z - FIELD field_15912 breakByHand Z FIELD field_15913 COBWEB Lnet/minecraft/class_3614; FIELD field_15914 STONE Lnet/minecraft/class_3614; COMMENT Material for blocks that are stone or made from it, and generally prefer to be broken by a pickaxe. @@ -73,7 +72,7 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material FIELD field_17008 SHULKER_BOX Lnet/minecraft/class_3614; FIELD field_22223 NETHER_WOOD Lnet/minecraft/class_3614; COMMENT Material for blocks crafted from Nether stems and hyphae. - METHOD (Lnet/minecraft/class_3620;ZZZZZZZLnet/minecraft/class_3619;)V + METHOD (Lnet/minecraft/class_3620;ZZZZZZLnet/minecraft/class_3619;)V ARG 1 color ARG 2 liquid ARG 3 solid @@ -81,8 +80,6 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material ARG 5 blocksLight ARG 6 breakByHand ARG 7 burnable - ARG 8 replaceable - ARG 9 pistonBehavior METHOD method_15797 isLiquid ()Z METHOD method_15798 getPistonBehavior ()Lnet/minecraft/class_3619; METHOD method_15799 isSolid ()Z @@ -91,14 +88,12 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material METHOD method_15802 isBurnable ()Z METHOD method_15803 getColor ()Lnet/minecraft/class_3620; METHOD method_15804 blocksLight ()Z - METHOD method_15805 canBreakByHand ()Z CLASS class_3615 Builder FIELD field_15961 color Lnet/minecraft/class_3620; FIELD field_15962 blocksLight Z FIELD field_15963 solid Z FIELD field_15964 replaceable Z FIELD field_15965 liquid Z - FIELD field_15966 breakByHand Z FIELD field_15967 burnable Z FIELD field_15968 pistonBehavior Lnet/minecraft/class_3619; FIELD field_15969 blocksMovement Z @@ -111,6 +106,5 @@ CLASS net/minecraft/class_3614 net/minecraft/block/Material METHOD method_15811 allowsMovement ()Lnet/minecraft/class_3614$class_3615; METHOD method_15812 lightPassesThrough ()Lnet/minecraft/class_3614$class_3615; METHOD method_15813 build ()Lnet/minecraft/class_3614; - METHOD method_15814 requiresTool ()Lnet/minecraft/class_3614$class_3615; METHOD method_15815 replaceable ()Lnet/minecraft/class_3614$class_3615; METHOD method_15816 blocksPistons ()Lnet/minecraft/class_3614$class_3615; diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 4b9ec814f7..67034247dd 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -15,9 +15,8 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity ARG 1 state METHOD method_21854 (Lnet/minecraft/class_2680;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;Lnet/minecraft/class_4482$class_4483;)Z ARG 4 bee - METHOD method_21855 releaseBee (Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;)Z + METHOD method_21855 releaseBee (Lnet/minecraft/class_2680;Lnet/minecraft/class_4482$class_4483;Ljava/util/List;Lnet/minecraft/class_4482$class_4484;)Z ARG 1 state - ARG 2 compoundTag METHOD method_21856 isFullOfBees ()Z METHOD method_21857 hasFlowerPos ()Z METHOD method_21858 tickBees ()V diff --git a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping index 4be0f3cbce..bf8b339c9c 100644 --- a/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/JigsawBlockEntity.mapping @@ -19,7 +19,7 @@ CLASS net/minecraft/class_3751 net/minecraft/block/entity/JigsawBlockEntity ARG 1 pool METHOD method_26399 getTarget ()Lnet/minecraft/class_2960; METHOD method_26400 getJoint ()Lnet/minecraft/class_3751$class_4991; - METHOD method_27191 generate (Lnet/minecraft/class_3218;I)V + METHOD method_27191 generate (Lnet/minecraft/class_3218;IZ)V ARG 1 world ARG 2 maxDepth CLASS class_4991 Joint diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping index f909ab82a8..761be53ba3 100644 --- a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping @@ -1,18 +1,16 @@ CLASS net/minecraft/class_2625 net/minecraft/block/entity/SignBlockEntity FIELD field_12046 editor Lnet/minecraft/class_1657; FIELD field_12048 editable Z - FIELD field_12049 textBeingEdited [Lnet/minecraft/class_2561; + FIELD field_12049 textBeingEdited [Lnet/minecraft/class_5348; FIELD field_12050 text [Lnet/minecraft/class_2561; FIELD field_16419 textColor Lnet/minecraft/class_1767; METHOD method_11299 setTextOnRow (ILnet/minecraft/class_2561;)V ARG 1 row ARG 2 text - METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/UnaryOperator;)Lnet/minecraft/class_2561; + METHOD method_11300 getTextBeingEditedOnRow (ILjava/util/function/UnaryOperator;)Lnet/minecraft/class_5348; ARG 1 row METHOD method_11301 onActivate (Lnet/minecraft/class_1657;)Z ARG 1 player - METHOD method_11302 getTextOnRow (I)Lnet/minecraft/class_2561; - ARG 1 row METHOD method_11303 setEditable (Z)V METHOD method_11304 getCommandSource (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2168; ARG 1 player diff --git a/mappings/net/minecraft/class_5335.mapping b/mappings/net/minecraft/class_5335.mapping new file mode 100644 index 0000000000..24bd8b93c5 --- /dev/null +++ b/mappings/net/minecraft/class_5335.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5335 + METHOD method_516 toJson (Lcom/google/gson/JsonObject;Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)V + METHOD method_517 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/class_5341.mapping b/mappings/net/minecraft/class_5341.mapping new file mode 100644 index 0000000000..34f700cbf5 --- /dev/null +++ b/mappings/net/minecraft/class_5341.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_5341 + CLASS class_210 Builder + METHOD method_16780 invert ()Lnet/minecraft/class_5341$class_210; + METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; + ARG 1 condition diff --git a/mappings/net/minecraft/class_5348.mapping b/mappings/net/minecraft/class_5348.mapping new file mode 100644 index 0000000000..c3e472e384 --- /dev/null +++ b/mappings/net/minecraft/class_5348.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_5348 + METHOD method_27657 visit (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; + METHOD method_27658 visit (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; + CLASS class_5245 Visitor + COMMENT A visitor for text content. + METHOD accept (Ljava/lang/String;)Ljava/util/Optional; + COMMENT Visits a text's {@link Text#asString() asString result}. + COMMENT + COMMENT

When a {@link Optional#isPresent() present optional} is returned, + COMMENT the visit is terminated before visiting all text. Can return {@link + COMMENT Text#TERMINATE_VISIT} for convenience.

+ ARG 1 asString + CLASS class_5246 StyledVisitor + COMMENT A visitor for text content and a contextual {@link Style}. + METHOD accept (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; + COMMENT Visits a text's contextual style and {@link Text#asString() asString + COMMENT result}. + COMMENT + COMMENT

A contextual style is obtained by calling {@link Style#withParent(Style)} + COMMENT on the current's text style, passing the previous contextual style or + COMMENT the starting style if it is the beginning of a visit.

+ COMMENT + COMMENT

When a {@link Optional#isPresent() present optional} is returned, + COMMENT the visit is terminated before visiting all text. Can return {@link + COMMENT Text#TERMINATE_VISIT} for convenience.

+ ARG 1 style + ARG 2 asString diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index beffc3e73f..47d35be31e 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -146,7 +146,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1524 handleProfilerKeyPress (I)V ARG 1 digit METHOD method_1526 getLanguageManager ()Lnet/minecraft/class_1076; - METHOD method_1527 startTimerHackThread ()V METHOD method_1530 isDemo ()Z METHOD method_1531 getTextureManager ()Lnet/minecraft/class_1060; METHOD method_1534 getLastFrameDuration ()F diff --git a/mappings/net/minecraft/client/font/TextHandler.mapping b/mappings/net/minecraft/client/font/TextHandler.mapping index 731d1c2b19..90552ae6c5 100644 --- a/mappings/net/minecraft/client/font/TextHandler.mapping +++ b/mappings/net/minecraft/client/font/TextHandler.mapping @@ -25,19 +25,15 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 3 style ARG 4 retainTrailingWordSplit ARG 5 consumer - METHOD method_27488 getWidth (Lnet/minecraft/class_2561;)F + METHOD method_27488 getWidth (Lnet/minecraft/class_5348;)F COMMENT Returns the width of a text. - ARG 1 text - METHOD method_27489 trimToWidth (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_2561; + METHOD method_27489 trimToWidth (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_2583; COMMENT Trim a text to be at most {@code maxWidth} wide. COMMENT COMMENT @return the trimmed text - ARG 1 text - COMMENT the text ARG 2 maxWidth COMMENT the max width of the trimmed text - METHOD method_27490 trimToWidth (Lnet/minecraft/class_2561;ILnet/minecraft/class_2583;)Lnet/minecraft/class_5250; - ARG 1 text + METHOD method_27490 trimToWidth (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;)Lnet/minecraft/class_5348; ARG 2 width ARG 3 style METHOD method_27494 trimToWidth (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String; @@ -50,7 +46,7 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler COMMENT the max width of the trimmed string ARG 3 style COMMENT the style of the trimmed string - METHOD method_27495 wrapLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_2583;)Ljava/util/List; + METHOD method_27495 wrapLines (Lnet/minecraft/class_5348;ILnet/minecraft/class_2583;)Ljava/util/List; ARG 2 maxWidth METHOD method_27497 trimToWidthBackwards (Ljava/lang/String;ILnet/minecraft/class_2583;)Ljava/lang/String; COMMENT Trim a string from right to left to be at most {@code maxWidth} wide. @@ -73,10 +69,10 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler FIELD field_24221 joined Ljava/lang/String; METHOD (Ljava/util/List;)V ARG 1 parts - METHOD method_27499 collectRemainers ()Lnet/minecraft/class_2561; + METHOD method_27499 collectRemainers ()Lnet/minecraft/class_5348; METHOD method_27500 charAt (I)C ARG 1 index - METHOD method_27501 collectLine (IILnet/minecraft/class_2583;)Lnet/minecraft/class_2561; + METHOD method_27501 collectLine (IILnet/minecraft/class_2583;)Lnet/minecraft/class_5348; ARG 1 lineLength ARG 2 skippedLength ARG 3 style @@ -100,13 +96,6 @@ CLASS net/minecraft/class_5225 net/minecraft/client/font/TextHandler ARG 2 finishStyle METHOD method_27508 getEndingStyle ()Lnet/minecraft/class_2583; METHOD method_27509 hasLineBreak ()Z - CLASS class_5228 FormattedString - FIELD field_24232 text Ljava/lang/String; - FIELD field_24233 style Lnet/minecraft/class_2583; - METHOD (Ljava/lang/String;Lnet/minecraft/class_2583;)V - ARG 1 text - ARG 2 style - METHOD method_27510 getText ()Lnet/minecraft/class_5250; CLASS class_5229 LineWrappingConsumer COMMENT A consumer of the line-breaking information. METHOD accept (Lnet/minecraft/class_2583;II)V diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index fea305921e..e4cbae389d 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_1997 fontStorageAccessor Ljava/util/function/Function; - FIELD field_1999 rightToLeft Z FIELD field_2000 fontHeight I FIELD field_2001 random Ljava/util/Random; FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160; @@ -21,8 +20,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 11 blue ARG 12 alpha ARG 13 light - METHOD method_1712 drawTrimmed (Lnet/minecraft/class_2561;IIII)V - ARG 1 text + METHOD method_1712 drawTrimmed (Lnet/minecraft/class_5348;IIII)V ARG 2 x ARG 3 y ARG 4 maxWidth @@ -30,11 +28,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_1713 getStringBoundedHeight (Ljava/lang/String;I)I ARG 1 text ARG 2 maxWidth - METHOD method_1714 trimToWidth (Lnet/minecraft/class_2561;I)Lnet/minecraft/class_5250; - ARG 1 text + METHOD method_1714 trimToWidth (Lnet/minecraft/class_5348;I)Lnet/minecraft/class_5348; ARG 2 width - METHOD method_1719 setRightToLeft (Z)V - ARG 1 rightToLeft METHOD method_1720 drawWithShadow (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I ARG 1 matrices ARG 2 text @@ -43,8 +38,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 5 color METHOD method_1721 mirror (Ljava/lang/String;)Ljava/lang/String; ARG 1 text - METHOD method_1723 drawInternal (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I - ARG 1 text + METHOD method_1723 drawInternal (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 2 x ARG 3 y ARG 4 color @@ -68,8 +62,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_1726 isRightToLeft ()Z METHOD method_1727 getWidth (Ljava/lang/String;)I ARG 1 text - METHOD method_1728 wrapLines (Lnet/minecraft/class_2561;I)Ljava/util/List; - ARG 1 text + METHOD method_1728 wrapLines (Lnet/minecraft/class_5348;I)Ljava/util/List; ARG 2 width METHOD method_1729 draw (Lnet/minecraft/class_4587;Ljava/lang/String;FFI)I ARG 1 matrices @@ -77,15 +70,13 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 3 x ARG 4 y ARG 5 color - METHOD method_22941 draw (Lnet/minecraft/class_2561;FFILnet/minecraft/class_1159;Z)I - ARG 1 text + METHOD method_22941 draw (Lnet/minecraft/class_5348;FFILnet/minecraft/class_1159;Z)I ARG 2 x ARG 3 y ARG 4 color ARG 5 matrix ARG 6 shadow - METHOD method_22942 draw (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I - ARG 1 text + METHOD method_22942 draw (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 2 x ARG 3 y ARG 4 color @@ -97,9 +88,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 10 light METHOD method_27515 tweakTransparency (I)I ARG 0 argb - METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I + METHOD method_27517 drawWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;FFI)I ARG 1 matrices - ARG 2 text ARG 3 x ARG 4 y ARG 5 color @@ -141,14 +131,12 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 text ARG 2 maxWidth ARG 3 backwards - METHOD method_27525 getWidth (Lnet/minecraft/class_2561;)I - ARG 1 text + METHOD method_27525 getWidth (Lnet/minecraft/class_5348;)I METHOD method_27526 getFontStorage (Lnet/minecraft/class_2960;)Lnet/minecraft/class_377; ARG 1 id METHOD method_27527 getTextHandler ()Lnet/minecraft/class_5225; - METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;FFI)I + METHOD method_27528 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;FFI)I ARG 1 matrices - ARG 2 text ARG 3 x ARG 4 y ARG 5 color @@ -164,8 +152,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 9 backgroundColor ARG 10 light ARG 11 mirror - METHOD method_27530 drawLayer (Lnet/minecraft/class_2561;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F - ARG 1 text + METHOD method_27530 drawLayer (Lnet/minecraft/class_5348;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F ARG 2 x ARG 3 y ARG 4 color diff --git a/mappings/net/minecraft/client/font/TextVisitFactory.mapping b/mappings/net/minecraft/client/font/TextVisitFactory.mapping index 8d0b3fefd3..8e4bab420c 100644 --- a/mappings/net/minecraft/client/font/TextVisitFactory.mapping +++ b/mappings/net/minecraft/client/font/TextVisitFactory.mapping @@ -49,7 +49,7 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT the style of the string ARG 2 visitor COMMENT the visitor of characters - METHOD method_27476 visitFormatted (Lnet/minecraft/class_2561;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z + METHOD method_27476 visitFormatted (Lnet/minecraft/class_5348;Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;)Z COMMENT Visits the code points for every {@link Text#asString() partial string} COMMENT of the texts in {@code text} and its siblings, applying the formatting COMMENT codes within. @@ -59,7 +59,6 @@ CLASS net/minecraft/class_5223 net/minecraft/client/font/TextVisitFactory COMMENT @return {@code true} if the full string was visited, or {@code false} indicating COMMENT the {@code visitor} terminated half-way COMMENT @see Text#visit(Text.StyledVisitor, Style) - ARG 0 text ARG 1 style ARG 2 visitor METHOD method_27477 visitRegularCharacter (Lnet/minecraft/class_2583;Lnet/minecraft/class_5223$class_5224;IC)Z diff --git a/mappings/net/minecraft/client/gui/DrawableHelper.mapping b/mappings/net/minecraft/client/gui/DrawableHelper.mapping index 7c3d7f0918..2df28470f8 100644 --- a/mappings/net/minecraft/client/gui/DrawableHelper.mapping +++ b/mappings/net/minecraft/client/gui/DrawableHelper.mapping @@ -188,17 +188,15 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawableHelper ARG 3 yStart ARG 4 xEnd ARG 5 yEnd - METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V + METHOD method_27534 drawCenteredText (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5348;III)V ARG 1 matrices ARG 2 textRenderer - ARG 3 text ARG 4 x ARG 5 y ARG 6 color - METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_2561;III)V + METHOD method_27535 drawTextWithShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_327;Lnet/minecraft/class_5348;III)V ARG 1 matrices ARG 2 textRenderer - ARG 3 text ARG 4 x ARG 5 y ARG 6 color diff --git a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping index 0183ebea50..1a75bec31a 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHud.mapping @@ -27,11 +27,10 @@ CLASS net/minecraft/class_338 net/minecraft/client/gui/hud/ChatHud ARG 1 message METHOD method_1813 getVisibleLineCount ()I METHOD method_1814 getChatScale ()D - METHOD method_1815 addMessage (Lnet/minecraft/class_2561;IIZ)V - ARG 1 message + METHOD method_1815 addMessage (Lnet/minecraft/class_5348;IIZ)V ARG 2 messageId ARG 3 timestamp - METHOD method_1816 getText (DD)Lnet/minecraft/class_2561; + METHOD method_1816 getText (DD)Lnet/minecraft/class_2583; ARG 1 x ARG 3 y METHOD method_1817 reset ()V diff --git a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping index bcc142d877..db683a2ae2 100644 --- a/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping +++ b/mappings/net/minecraft/client/gui/hud/ChatHudLine.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_303 net/minecraft/client/gui/hud/ChatHudLine FIELD field_1649 id I FIELD field_1650 creationTick I - FIELD field_1651 text Lnet/minecraft/class_2561; - METHOD (ILnet/minecraft/class_2561;I)V + FIELD field_1651 text Lnet/minecraft/class_5348; + METHOD (ILnet/minecraft/class_5348;I)V ARG 1 creationTick - ARG 2 text ARG 3 id - METHOD method_1412 getText ()Lnet/minecraft/class_2561; + METHOD method_1412 getText ()Lnet/minecraft/class_5348; METHOD method_1413 getId ()I METHOD method_1414 getCreationTick ()I diff --git a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping index 2d3399bd25..29c3b2822c 100644 --- a/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/DeathScreen.mapping @@ -7,6 +7,6 @@ CLASS net/minecraft/class_418 net/minecraft/client/gui/screen/DeathScreen ARG 2 isHardcore METHOD method_20373 onConfirmQuit (Z)V ARG 1 quit - METHOD method_2164 getTextComponentUnderMouse (I)Lnet/minecraft/class_2561; + METHOD method_2164 getTextComponentUnderMouse (I)Lnet/minecraft/class_2583; ARG 1 mouseX METHOD method_22364 quitLevel ()V diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index eb4957bbb3..bac655a31d 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -44,9 +44,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 2 lines ARG 3 x ARG 4 y - METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + METHOD method_25418 renderTextHoverEffect (Lnet/minecraft/class_4587;Lnet/minecraft/class_2583;II)V ARG 1 matrices - ARG 2 text METHOD method_25419 onClose ()V METHOD method_25420 renderBackground (Lnet/minecraft/class_4587;)V COMMENT Renders the background of this screen. @@ -60,9 +59,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 client ARG 2 width ARG 3 height - METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_2561;II)V + METHOD method_25424 renderTooltip (Lnet/minecraft/class_4587;Lnet/minecraft/class_5348;II)V ARG 1 matrices - ARG 2 line ARG 3 x ARG 4 y METHOD method_25425 sendMessage (Ljava/lang/String;Z)V @@ -75,8 +73,7 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 open METHOD method_25429 addChild (Lnet/minecraft/class_364;)Lnet/minecraft/class_364; ARG 1 child - METHOD method_25430 handleTextClick (Lnet/minecraft/class_2561;)Z - ARG 1 text + METHOD method_25430 handleTextClick (Lnet/minecraft/class_2583;)Z METHOD method_25432 removed ()V METHOD method_25433 renderBackground (Lnet/minecraft/class_4587;I)V COMMENT Renders the background of this screen. diff --git a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping index 188e52ed8f..4f11242854 100644 --- a/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/advancement/AdvancementWidget.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_456 net/minecraft/client/gui/screen/advancement/Advanc FIELD field_2710 yPos I FIELD field_2711 xPos I FIELD field_2712 display Lnet/minecraft/class_185; - FIELD field_2713 title Lnet/minecraft/class_2561; + FIELD field_2713 title Lnet/minecraft/class_5348; FIELD field_2714 progress Lnet/minecraft/class_167; FIELD field_2715 width I METHOD (Lnet/minecraft/class_454;Lnet/minecraft/class_310;Lnet/minecraft/class_161;Lnet/minecraft/class_185;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping index f7be77a724..fb45abb88b 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BookScreen.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen METHOD (Lnet/minecraft/class_3872$class_3931;Z)V ARG 1 contents ARG 2 playPageTurnSound - METHOD method_17048 getTextAt (DD)Lnet/minecraft/class_2561; + METHOD method_17048 getTextAt (DD)Lnet/minecraft/class_2583; ARG 1 x ARG 3 y METHOD method_17053 getStringWidth (Ljava/lang/String;)I @@ -34,11 +34,11 @@ CLASS net/minecraft/class_3872 net/minecraft/client/gui/screen/ingame/BookScreen ARG 1 page CLASS class_3931 Contents METHOD method_17560 getPageCount ()I - METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_2561; + METHOD method_17561 getPageUnchecked (I)Lnet/minecraft/class_5348; ARG 1 index METHOD method_17562 create (Lnet/minecraft/class_1799;)Lnet/minecraft/class_3872$class_3931; ARG 0 stack - METHOD method_17563 getPage (I)Lnet/minecraft/class_2561; + METHOD method_17563 getPage (I)Lnet/minecraft/class_5348; ARG 1 index CLASS class_3932 WritableBookContents FIELD field_17419 pages Ljava/util/List; diff --git a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping index 8787ad51e2..c9da9540b5 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_487 net/minecraft/client/gui/screen/ingame/EnchantingP FIELD field_2916 phrases [Ljava/lang/String; FIELD field_2917 INSTANCE Lnet/minecraft/class_487; FIELD field_2918 random Ljava/util/Random; - METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Lnet/minecraft/class_5250; + METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Lnet/minecraft/class_5348; ARG 1 fontRenderer ARG 2 width METHOD method_2480 setSeed (J)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping index 5f61524497..e2ca140648 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/JigsawBlockScreen.mapping @@ -8,8 +8,6 @@ CLASS net/minecraft/class_3742 net/minecraft/client/gui/screen/ingame/JigsawBloc FIELD field_23351 jointRotationButton Lnet/minecraft/class_4185; FIELD field_23352 joint Lnet/minecraft/class_3751$class_4991; FIELD field_24052 generationDepth I - METHOD (Lnet/minecraft/class_3751;)V - ARG 1 jigsaw METHOD method_16346 onDone ()V METHOD method_16348 updateServer ()V METHOD method_16349 onCancel ()V diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 3437ee7a0a..56ed340e6f 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_22742 width I FIELD field_22743 height I FIELD field_22744 centerListVertically Z - FIELD field_22745 yDrag I FIELD field_22746 renderSelection Z FIELD field_22747 renderHeader Z FIELD field_22748 headerHeight I @@ -65,11 +64,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25325 renderBackground (Lnet/minecraft/class_4587;)V METHOD method_25326 getEntry (I)Lnet/minecraft/class_350$class_351; ARG 1 index - METHOD method_25327 renderHoleBackground (IIII)V - ARG 1 top - ARG 2 bottom - ARG 3 alphaTop - ARG 4 alphaBottom METHOD method_25328 ensureVisible (Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_25329 getScrollbarPositionX ()I diff --git a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping b/mappings/net/minecraft/client/gui/widget/ListWidget.mapping deleted file mode 100644 index c03115a1cd..0000000000 --- a/mappings/net/minecraft/client/gui/widget/ListWidget.mapping +++ /dev/null @@ -1,77 +0,0 @@ -CLASS net/minecraft/class_358 net/minecraft/client/gui/widget/ListWidget - FIELD field_2165 bottom I - FIELD field_2166 top I - FIELD field_2175 scrollAmount D - FIELD field_2180 left I - FIELD field_2181 right I - FIELD field_22769 scrolling Z - FIELD field_22770 client Lnet/minecraft/class_310; - FIELD field_22771 width I - FIELD field_22772 height I - FIELD field_22773 itemHeight I - FIELD field_22774 centerListVertically Z - FIELD field_22775 yDrag I - FIELD field_22776 visible Z - FIELD field_22777 renderSelection Z - FIELD field_22778 renderHeader Z - FIELD field_22779 headerHeight I - METHOD (Lnet/minecraft/class_310;IIIII)V - ARG 1 client - ARG 2 width - ARG 3 height - ARG 4 top - ARG 5 bottom - ARG 6 itemHeight - METHOD method_25371 getItemCount ()I - METHOD method_25372 getItemAtPosition (DD)I - ARG 1 mouseX - ARG 3 mouseY - METHOD method_25373 isSelectedItem (I)Z - ARG 1 index - METHOD method_25374 clickedHeader (II)V - METHOD method_25375 selectItem (IIDD)Z - ARG 1 index - ARG 2 button - ARG 3 mouseX - ARG 5 mouseY - METHOD method_25376 updateItemPosition (IIIF)V - ARG 1 index - ARG 2 x - ARG 3 y - ARG 4 delta - METHOD method_25377 renderList (Lnet/minecraft/class_4587;IIIIF)V - METHOD method_25378 renderItem (Lnet/minecraft/class_4587;IIIIIIF)V - ARG 2 x - ARG 3 y - ARG 4 itemHeight - ARG 5 mouseX - ARG 6 mouseY - METHOD method_25379 renderHeader (IILnet/minecraft/class_289;)V - ARG 1 x - ARG 2 y - ARG 3 tessellator - METHOD method_25380 renderBackground ()V - METHOD method_25381 updateScrollingState (DDI)V - ARG 1 mouseX - ARG 3 mouseY - ARG 5 button - METHOD method_25382 renderDecorations (II)V - ARG 1 mouseX - ARG 2 mouseY - METHOD method_25383 isVisible ()Z - METHOD method_25384 isMouseInList (DD)Z - ARG 1 mouseX - ARG 3 mouseY - METHOD method_25385 getMaxPosition ()I - METHOD method_25386 moveSelection (I)V - ARG 1 by - METHOD method_25387 renderHoleBackground (IIII)V - ARG 1 top - ARG 2 bottom - ARG 3 topAlpha - ARG 4 bottomAlpha - METHOD method_25388 capYPosition ()V - METHOD method_25389 getMaxScroll ()I - METHOD method_25390 getRowWidth ()I - METHOD method_25391 isFocused ()Z - METHOD method_25392 getScrollbarPosition ()I diff --git a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping index 7f6fb13784..038d684795 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerEntity.mapping @@ -33,9 +33,7 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity FIELD field_3943 serverBrand Ljava/lang/String; FIELD field_3944 networkHandler Lnet/minecraft/class_634; FIELD field_3945 activeHand Lnet/minecraft/class_1268; - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)V - ARG 1 client - ARG 3 networkHandler + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_638;Lnet/minecraft/class_634;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)V ARG 4 stats ARG 5 recipeBook METHOD method_18654 updateNausea ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index 9d0f41b573..26b97c8789 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -39,7 +39,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti METHOD method_2900 clickButton (II)V ARG 1 syncId ARG 2 buttonId - METHOD method_2901 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;)Lnet/minecraft/class_746; + METHOD method_2901 createPlayer (Lnet/minecraft/class_638;Lnet/minecraft/class_3469;Lnet/minecraft/class_299;ZZ)Lnet/minecraft/class_746; ARG 1 world ARG 2 stateHandler ARG 3 recipeBook diff --git a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping index 08ba1fcc64..03185cc8aa 100644 --- a/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping +++ b/mappings/net/minecraft/client/particle/ItemPickupParticle.mapping @@ -14,6 +14,5 @@ CLASS net/minecraft/class_693 net/minecraft/client/particle/ItemPickupParticle ARG 1 dispatcher ARG 2 bufferStorage ARG 3 world - ARG 4 itemEntity ARG 5 interactingEntity ARG 6 velocity diff --git a/mappings/net/minecraft/client/render/RenderLayers.mapping b/mappings/net/minecraft/client/render/RenderLayers.mapping index 086eb50194..b4a02cd948 100644 --- a/mappings/net/minecraft/client/render/RenderLayers.mapping +++ b/mappings/net/minecraft/client/render/RenderLayers.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_4696 net/minecraft/client/render/RenderLayers FIELD field_21469 BLOCKS Ljava/util/Map; FIELD field_21471 FLUIDS Ljava/util/Map; FIELD field_21472 fancyGraphics Z - METHOD method_23678 getItemLayer (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1921; + METHOD method_23678 getItemLayer (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_1921; ARG 0 stack METHOD method_23679 getBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921; ARG 0 state @@ -10,5 +10,5 @@ CLASS net/minecraft/class_4696 net/minecraft/client/render/RenderLayers ARG 0 state METHOD method_23682 setFancyGraphics (Z)V ARG 0 fancyGraphics - METHOD method_23683 getEntityBlockLayer (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1921; + METHOD method_23683 getEntityBlockLayer (Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_1921; ARG 0 state diff --git a/mappings/net/minecraft/client/render/SkyProperties.mapping b/mappings/net/minecraft/client/render/SkyProperties.mapping index 55c4437586..8d95f61bef 100644 --- a/mappings/net/minecraft/client/render/SkyProperties.mapping +++ b/mappings/net/minecraft/client/render/SkyProperties.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_5294 net/minecraft/client/render/SkyProperties METHOD method_28110 useThickFog (II)Z ARG 1 camX ARG 2 camY - METHOD method_28111 byDimensionType (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5294; + METHOD method_28111 byDimensionType (Ljava/util/Optional;)Lnet/minecraft/class_5294; METHOD method_28112 adjustSkyColor (Lnet/minecraft/class_243;F)Lnet/minecraft/class_243; ARG 1 color ARG 2 sunHeight diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index e6aec7c260..761c097089 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -88,7 +88,6 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 5 renderBlockOutline ARG 6 camera ARG 7 gameRenderer - ARG 8 lightmapTextureManager METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V METHOD method_22713 (Lnet/minecraft/class_4184;)V ARG 1 camera diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 49112e16bb..3e32df48f5 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -63,7 +63,6 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen FIELD field_19330 path Lnet/minecraft/class_11; FIELD field_19373 wantsGolem Z METHOD (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;IFFLnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;Z)V - ARG 1 uuid ARG 4 profession ARG 5 xp METHOD method_23149 getUuid ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/client/resource/language/I18n.mapping b/mappings/net/minecraft/client/resource/language/I18n.mapping index 3509209361..badf16ec97 100644 --- a/mappings/net/minecraft/client/resource/language/I18n.mapping +++ b/mappings/net/minecraft/client/resource/language/I18n.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_1074 net/minecraft/client/resource/language/I18n - FIELD field_5319 storage Lnet/minecraft/class_1078; - METHOD method_4661 setLanguage (Lnet/minecraft/class_1078;)V - ARG 0 storage METHOD method_4662 translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; ARG 0 key ARG 1 args diff --git a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping index 7a67250c1d..47bfd4e17d 100644 --- a/mappings/net/minecraft/client/resource/language/LanguageManager.mapping +++ b/mappings/net/minecraft/client/resource/language/LanguageManager.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/class_1076 net/minecraft/client/resource/language/LanguageManager - FIELD field_5322 STORAGE Lnet/minecraft/class_1078; FIELD field_5323 currentLanguageCode Ljava/lang/String; FIELD field_5324 languageDefs Ljava/util/Map; FIELD field_5325 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_4665 getAllLanguages ()Ljava/util/SortedSet; - METHOD method_4666 isRightToLeft ()Z METHOD method_4667 setLanguage (Lnet/minecraft/class_1077;)V METHOD method_4668 getLanguage (Ljava/lang/String;)Lnet/minecraft/class_1077; ARG 1 code METHOD method_4669 getLanguage ()Lnet/minecraft/class_1077; - METHOD method_4670 reloadResources (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping index 25b9b341b4..61863e6031 100644 --- a/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping +++ b/mappings/net/minecraft/client/resource/language/TranslationStorage.mapping @@ -1,13 +1,5 @@ CLASS net/minecraft/class_1078 net/minecraft/client/resource/language/TranslationStorage FIELD field_5330 translations Ljava/util/Map; - FIELD field_5331 PARAM_PATTERN Ljava/util/regex/Pattern; FIELD field_5332 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_5333 GSON Lcom/google/gson/Gson; - METHOD method_4674 load (Ljava/io/InputStream;)V - METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;)V - ARG 1 container - METHOD method_4676 load (Ljava/util/List;)V - METHOD method_4677 translate (Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; - ARG 1 key - METHOD method_4678 containsKey (Ljava/lang/String;)Z - METHOD method_4679 get (Ljava/lang/String;)Ljava/lang/String; + METHOD method_4675 load (Lnet/minecraft/class_3300;Ljava/util/List;)Lnet/minecraft/class_1078; + METHOD method_4676 load (Ljava/util/List;Ljava/util/Map;)V diff --git a/mappings/net/minecraft/client/util/ChatMessages.mapping b/mappings/net/minecraft/client/util/ChatMessages.mapping index 9e7cb10404..e2c6b12457 100644 --- a/mappings/net/minecraft/client/util/ChatMessages.mapping +++ b/mappings/net/minecraft/client/util/ChatMessages.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_341 net/minecraft/client/util/ChatMessages METHOD method_1849 getRenderedChatMessage (Ljava/lang/String;)Ljava/lang/String; ARG 0 message - METHOD method_1850 breakRenderedChatMessageLines (Lnet/minecraft/class_2561;ILnet/minecraft/class_327;)Ljava/util/List; - ARG 0 text + METHOD method_1850 breakRenderedChatMessageLines (Lnet/minecraft/class_5348;ILnet/minecraft/class_327;)Ljava/util/List; ARG 1 width ARG 2 textRenderer diff --git a/mappings/net/minecraft/client/util/TextCollector.mapping b/mappings/net/minecraft/client/util/TextCollector.mapping index 404b1c29d4..ace45b04ae 100644 --- a/mappings/net/minecraft/client/util/TextCollector.mapping +++ b/mappings/net/minecraft/client/util/TextCollector.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_5222 net/minecraft/client/util/TextCollector - FIELD field_24209 needsFakeRoot Z - FIELD field_24210 root Lnet/minecraft/class_5250; - METHOD method_27461 getRawCombined ()Lnet/minecraft/class_5250; - METHOD method_27462 add (Lnet/minecraft/class_5250;)V - ARG 1 text - METHOD method_27463 getCombined ()Lnet/minecraft/class_5250; + METHOD method_27461 getRawCombined ()Lnet/minecraft/class_5348; + METHOD method_27462 add (Lnet/minecraft/class_5348;)V + METHOD method_27463 getCombined ()Lnet/minecraft/class_5348; diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 4351f6c86f..02a1a6f834 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld FIELD field_3727 netHandler Lnet/minecraft/class_634; FIELD field_3729 client Lnet/minecraft/class_310; FIELD field_3733 scoreboard Lnet/minecraft/class_269; - METHOD (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_2874;ILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V - ARG 4 chunkLoadDistance METHOD method_18107 addPlayer (ILnet/minecraft/class_742;)V ARG 1 id ARG 2 player @@ -114,10 +112,10 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 difficulty ARG 2 hardcore ARG 3 flatWorld - METHOD method_27875 setDifficulty (Lnet/minecraft/class_1267;)V METHOD method_165 setTimeOfDay (J)V METHOD method_177 setTime (J)V ARG 1 difficulty + METHOD method_27875 setDifficulty (Lnet/minecraft/class_1267;)V METHOD method_27876 setDifficultyLocked (Z)V ARG 1 difficultyLocked METHOD method_28105 getSkyDarknessHeight ()D diff --git a/mappings/net/minecraft/command/arguments/BlockArgumentParser.mapping b/mappings/net/minecraft/command/arguments/BlockArgumentParser.mapping index 88c5bfc008..f11cf82499 100644 --- a/mappings/net/minecraft/command/arguments/BlockArgumentParser.mapping +++ b/mappings/net/minecraft/command/arguments/BlockArgumentParser.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_2259 net/minecraft/command/arguments/BlockArgumentParser FIELD field_10681 tagId Lnet/minecraft/class_2960; - FIELD field_10682 SUGGEST_DEFAULT Ljava/util/function/Function; + FIELD field_10682 SUGGEST_DEFAULT Ljava/util/function/BiFunction; FIELD field_10683 INVALID_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; FIELD field_10684 UNCLOSED_PROPERTIES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_10685 tagProperties Ljava/util/Map; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2259 net/minecraft/command/arguments/BlockArgumentPars FIELD field_10693 data Lnet/minecraft/class_2487; FIELD field_10694 cursorPos I FIELD field_10695 UNKNOWN_PROPERTY_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; - FIELD field_10696 suggestions Ljava/util/function/Function; + FIELD field_10696 suggestions Ljava/util/function/BiFunction; FIELD field_10697 blockId Lnet/minecraft/class_2960; FIELD field_10698 reader Lcom/mojang/brigadier/StringReader; FIELD field_10699 blockProperties Ljava/util/Map; @@ -25,29 +25,29 @@ CLASS net/minecraft/class_2259 net/minecraft/command/arguments/BlockArgumentPars METHOD method_9662 suggestPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_2769;)Lcom/mojang/brigadier/suggestion/SuggestionsBuilder; METHOD method_9663 stringifyProperty (Ljava/lang/StringBuilder;Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V METHOD method_9664 getTagId ()Lnet/minecraft/class_2960; - METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9666 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9665 suggestBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9666 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9667 suggestTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9668 parsePropertyValue (Lnet/minecraft/class_2769;Ljava/lang/String;I)V METHOD method_9669 getBlockState ()Lnet/minecraft/class_2680; - METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9670 suggestIdentifiers (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9671 suggestBlockPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9672 parseSnbt ()V - METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9673 suggestBlockOrTagId (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9674 suggestTagPropertiesOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9675 parseBlockId ()V - METHOD method_9676 hasBlockEntity ()Z + METHOD method_9676 hasBlockEntity (Lnet/minecraft/class_3503;)Z METHOD method_9677 parseTagId ()V METHOD method_9678 parse (Z)Lnet/minecraft/class_2259; ARG 1 allowNbt - METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9679 suggestSnbtOrTagProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9680 parseTagProperties ()V - METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9681 suggestSnbtOrBlockProperties (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9685 stringifyBlockState (Lnet/minecraft/class_2680;)Ljava/lang/String; - METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9687 suggestSnbt (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9688 getProperties ()Ljava/util/Map; - METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9689 suggestCommaOrEnd (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9690 suggestTagPropertyValues (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; METHOD method_9692 getBlockProperties ()Ljava/util/Map; - METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9693 suggestEqualsCharacter (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9694 getNbtData ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/command/arguments/ItemStringReader.mapping b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping index d828dd4a85..3f741b1b57 100644 --- a/mappings/net/minecraft/command/arguments/ItemStringReader.mapping +++ b/mappings/net/minecraft/command/arguments/ItemStringReader.mapping @@ -4,8 +4,8 @@ CLASS net/minecraft/class_2291 net/minecraft/command/arguments/ItemStringReader FIELD field_10802 reader Lcom/mojang/brigadier/StringReader; FIELD field_10803 item Lnet/minecraft/class_1792; FIELD field_10804 allowTag Z - FIELD field_10805 suggestions Ljava/util/function/Function; - FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/Function; + FIELD field_10805 suggestions Ljava/util/function/BiFunction; + FIELD field_10806 NBT_SUGGESTION_PROVIDER Ljava/util/function/BiFunction; FIELD field_10807 tag Lnet/minecraft/class_2487; FIELD field_10808 id Lnet/minecraft/class_2960; FIELD field_10809 cursor I @@ -17,11 +17,11 @@ CLASS net/minecraft/class_2291 net/minecraft/command/arguments/ItemStringReader METHOD method_9788 readNbt ()V METHOD method_9789 consume ()Lnet/minecraft/class_2291; METHOD method_9790 getId ()Lnet/minecraft/class_2960; - METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9791 suggestAny (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9793 getSuggestions (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; ARG 1 builder - METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9794 suggestItem (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; METHOD method_9795 readItem ()V - METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + METHOD method_9796 suggestTag (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/class_3503;)Ljava/util/concurrent/CompletableFuture; ARG 1 suggestionsBuilder METHOD method_9797 getTag ()Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping index 18237ef563..dce824c3ac 100644 --- a/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/BlockLootTableGenerator.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator - FIELD field_11336 WITH_SILK_TOUCH Lnet/minecraft/class_4570$class_210; - FIELD field_11337 WITHOUT_SILK_TOUCH Lnet/minecraft/class_4570$class_210; + FIELD field_11336 WITH_SILK_TOUCH Lnet/minecraft/class_5341$class_210; + FIELD field_11337 WITHOUT_SILK_TOUCH Lnet/minecraft/class_5341$class_210; FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCE [F FIELD field_11339 SAPLING_DROP_CHANCE [F FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set; - FIELD field_11341 WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/class_4570$class_210; - FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_4570$class_210; - FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_4570$class_210; + FIELD field_11341 WITHOUT_SILK_TOUCH_NOR_SHEARS Lnet/minecraft/class_5341$class_210; + FIELD field_11342 WITH_SILK_TOUCH_OR_SHEARS Lnet/minecraft/class_5341$class_210; + FIELD field_11343 WITH_SHEARS Lnet/minecraft/class_5341$class_210; FIELD field_16493 lootTables Ljava/util/Map; METHOD method_10371 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 dropWithShears @@ -26,7 +26,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator METHOD method_10380 dropsWithShears (Lnet/minecraft/class_2248;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; ARG 0 drop ARG 1 child - METHOD method_10381 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_4570$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; + METHOD method_10381 drops (Lnet/minecraft/class_2248;Lnet/minecraft/class_5341$class_210;Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_52$class_53; ARG 0 drop ARG 1 conditionBuilder ARG 2 child @@ -57,7 +57,7 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator ARG 0 leaves ARG 1 drop ARG 2 chance - METHOD method_10391 cropDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_52$class_53; + METHOD method_10391 cropDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_52$class_53; ARG 0 crop ARG 1 product ARG 2 seeds diff --git a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping index 01c7eae99e..39b3e726bd 100644 --- a/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/FishingLootTableGenerator.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_2437 net/minecraft/data/server/FishingLootTableGenerator - FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11347 NEEDS_JUNGLE_HILLS_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11348 NEEDS_MODIFIED_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11350 NEEDS_JUNGLE_EDGE_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11351 NEEDS_MODIFIED_JUNGLE_EDGE_BIOME Lnet/minecraft/class_4570$class_210; - FIELD field_11352 NEEDS_BAMBOO_JUNGLE_HILLS_BIOME Lnet/minecraft/class_4570$class_210; + FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11347 NEEDS_JUNGLE_HILLS_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11348 NEEDS_MODIFIED_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11350 NEEDS_JUNGLE_EDGE_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11351 NEEDS_MODIFIED_JUNGLE_EDGE_BIOME Lnet/minecraft/class_5341$class_210; + FIELD field_11352 NEEDS_BAMBOO_JUNGLE_HILLS_BIOME Lnet/minecraft/class_5341$class_210; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 96a867414f..0d71fb1ebf 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -203,11 +203,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 x ARG 3 y ARG 5 z - METHOD method_24200 updatePositionsRecursively (Lnet/minecraft/class_1297$class_4738;)V - ARG 1 positionUpdater METHOD method_24201 updatePassengerPosition (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297$class_4738;)V ARG 1 passenger - ARG 2 positionUpdater METHOD method_24203 positAfterTeleport (DDD)V ARG 1 x ARG 3 y @@ -448,9 +445,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5742 onStoppedTrackingBy (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_5743 getItemsEquipped ()Ljava/lang/Iterable; - METHOD method_5744 isSubmergedIn (Lnet/minecraft/class_3494;Z)Z - ARG 1 fluidTag - ARG 2 requireLoadedChunk METHOD method_5745 rayTrace (DFZ)Lnet/minecraft/class_239; ARG 1 maxDistance ARG 3 tickDelta @@ -513,7 +507,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 stack METHOD method_5776 hasWings ()Z METHOD method_5777 isSubmergedIn (Lnet/minecraft/class_3494;)Z - ARG 1 fluidTag METHOD method_5778 isBeingRainedOn ()Z METHOD method_5779 isPartOf (Lnet/minecraft/class_1297;)Z ARG 1 entity diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 9f36e83323..a21f473bc0 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -170,6 +170,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT

This checks both the entity's main and off hand. METHOD method_24831 getPoses ()Lcom/google/common/collect/ImmutableList; METHOD method_24833 getBoundingBox (Lnet/minecraft/class_4050;)Lnet/minecraft/class_238; + METHOD method_25937 applySoulSpeedClientEffects ()V METHOD method_26319 canWalkOnLava (Lnet/minecraft/class_3611;)Z METHOD method_26825 getAttributeValue (Lnet/minecraft/class_1320;)D ARG 1 attribute @@ -177,6 +178,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 attribute METHOD method_26827 createLivingAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_27071 shouldDropLoot ()Z + METHOD method_27302 shouldGetSoulSpeedBoost ()Z + METHOD method_27303 isOnSoulSpeedBlock ()Z METHOD method_28306 createBrainProfile ()Lnet/minecraft/class_4095$class_5303; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type @@ -406,6 +409,3 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6132 applyArmorToDamage (Lnet/minecraft/class_1282;F)F ARG 1 source ARG 2 amount - METHOD method_27303 isOnSoulSpeedBlock ()Z - METHOD method_25937 applySoulSpeedClientEffects ()V - METHOD method_27302 shouldGetSoulSpeedBoost ()Z \ No newline at end of file diff --git a/mappings/net/minecraft/entity/SpawnGroup.mapping b/mappings/net/minecraft/entity/SpawnGroup.mapping index 6f4036f1bb..39b4a1bc5f 100644 --- a/mappings/net/minecraft/entity/SpawnGroup.mapping +++ b/mappings/net/minecraft/entity/SpawnGroup.mapping @@ -6,15 +6,10 @@ CLASS net/minecraft/class_1311 net/minecraft/entity/SpawnGroup FIELD field_6297 capacity I FIELD field_6298 peaceful Z FIELD field_6304 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;IZ)V - ARG 3 name - ARG 4 capacity - ARG 5 peaceful - METHOD (Ljava/lang/String;ILjava/lang/String;IZI)V + METHOD (Ljava/lang/String;ILjava/lang/String;IZZI)V ARG 3 name ARG 4 spawnCap ARG 5 peaceful - ARG 6 immediateDespawnRange METHOD method_27919 getImmediateDespawnRange ()I METHOD method_27920 getDespawnStartRange ()I METHOD method_6133 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping index d8ef4322c8..14e0245872 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/DefeatTargetTask.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4825 net/minecraft/entity/ai/brain/task/DefeatTargetTask FIELD field_22327 duration I - METHOD (I)V + METHOD (ILjava/util/function/BiPredicate;)V ARG 1 duration METHOD method_24616 getAttackTarget (Lnet/minecraft/class_1309;)Lnet/minecraft/class_1309; ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping index 77ebcaa625..e1228a94fc 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FarmerVillagerTask.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4217 net/minecraft/entity/ai/brain/task/FarmerVillagerTask FIELD field_18858 currentTarget Lnet/minecraft/class_2338; - FIELD field_18859 ableToPlant Z FIELD field_18861 nextResponseTime J FIELD field_19239 ticksRan I FIELD field_19351 targetPositions Ljava/util/List; diff --git a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping index e2f881cb38..fb1d7339c1 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/FindPointOfInterestTask.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt FIELD field_19289 foundPositionsToExpiry Lit/unimi/dsi/fastutil/longs/Long2LongMap; FIELD field_19290 tries I FIELD field_20287 targetMemoryModuleType Lnet/minecraft/class_4140; - METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Z)V + METHOD (Lnet/minecraft/class_4158;Lnet/minecraft/class_4140;Lnet/minecraft/class_4140;Z)V ARG 1 poiType - ARG 2 targetMemoryModule - ARG 3 onlyRunIfChild diff --git a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping index cb0e680058..5d2a8ca68b 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/StayAboveWaterTask.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_4125 net/minecraft/entity/ai/brain/task/StayAboveWaterTask - FIELD field_18386 minWaterHeight F FIELD field_18387 chance F - METHOD (FF)V + METHOD (F)V ARG 1 minWaterHeight - ARG 2 chance diff --git a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping index ecd0431307..9d4bc6cfc0 100644 --- a/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/LandPathNodeMaker.mapping @@ -6,11 +6,6 @@ CLASS net/minecraft/class_14 net/minecraft/entity/ai/pathing/LandPathNodeMaker ARG 3 successor2 ARG 4 diagonalSuccessor METHOD method_23476 getLandNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;)Lnet/minecraft/class_7; - METHOD method_57 getNodeType (Lnet/minecraft/class_1308;III)Lnet/minecraft/class_7; - ARG 1 entity - ARG 2 x - ARG 3 y - ARG 4 z METHOD method_58 getCommonNodeType (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_7; METHOD method_59 getNodeTypeFromNeighbors (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_7;)Lnet/minecraft/class_7; METHOD method_60 getFeetY (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)D diff --git a/mappings/net/minecraft/entity/boss/BossBarManager.mapping b/mappings/net/minecraft/entity/boss/BossBarManager.mapping index 467259ad28..90d6df3cda 100644 --- a/mappings/net/minecraft/entity/boss/BossBarManager.mapping +++ b/mappings/net/minecraft/entity/boss/BossBarManager.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_3004 net/minecraft/entity/boss/BossBarManager FIELD field_13447 commandBossBars Ljava/util/Map; - FIELD field_13448 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;)V - ARG 1 server METHOD method_12968 getIds ()Ljava/util/Collection; METHOD method_12969 getAll ()Ljava/util/Collection; METHOD method_12970 add (Lnet/minecraft/class_2960;Lnet/minecraft/class_2561;)Lnet/minecraft/class_3002; diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index d6a1c75870..9e6710b725 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_13120 dragonSpawnState Lnet/minecraft/class_2876; FIELD field_13121 gateways Ljava/util/List; FIELD field_13122 playerUpdateTimer I - METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V ARG 1 world METHOD method_12514 worldContainsEndPortal ()Z METHOD method_12515 convertFromLegacy ()V diff --git a/mappings/net/minecraft/entity/damage/DamageSource.mapping b/mappings/net/minecraft/entity/damage/DamageSource.mapping index 8d3170d6f3..c6b16a3fa6 100644 --- a/mappings/net/minecraft/entity/damage/DamageSource.mapping +++ b/mappings/net/minecraft/entity/damage/DamageSource.mapping @@ -62,8 +62,7 @@ CLASS net/minecraft/class_1282 net/minecraft/entity/damage/DamageSource METHOD method_5520 trident (Lnet/minecraft/class_1297;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; ARG 0 trident ARG 1 attacker - METHOD method_5521 explosiveProjectile (Lnet/minecraft/class_1668;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; - ARG 0 projectile + METHOD method_5521 explosiveProjectile (Lnet/minecraft/class_3855;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; ARG 1 attacker METHOD method_5522 arrow (Lnet/minecraft/class_1665;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1282; ARG 0 projectile diff --git a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping index 814d5a4e33..1128a9a102 100644 --- a/mappings/net/minecraft/entity/mob/PiglinBrain.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinBrain.mapping @@ -139,8 +139,6 @@ CLASS net/minecraft/class_4838 net/minecraft/entity/mob/PiglinBrain ARG 0 piglin METHOD method_24785 hasOutnumberedHoglins (Lnet/minecraft/class_4836;)Z ARG 0 piglins - METHOD method_24786 hasPlayerHoldingWantedItemNearby (Lnet/minecraft/class_4836;)Z - ARG 0 piglin METHOD method_24787 setEatenRecently (Lnet/minecraft/class_4836;)V ARG 0 piglin METHOD method_24788 findGround (Lnet/minecraft/class_4836;)Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping index bb11efe54a..8495bc0f7e 100644 --- a/mappings/net/minecraft/entity/mob/PiglinEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PiglinEntity.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity FIELD field_22419 IMMUNE_TO_ZOMBIFICATION Lnet/minecraft/class_2940; FIELD field_23738 cannotHunt Z METHOD method_24694 zombify (Lnet/minecraft/class_3218;)V - ARG 1 world METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type ARG 1 world diff --git a/mappings/net/minecraft/entity/player/PlayerInventory.mapping b/mappings/net/minecraft/entity/player/PlayerInventory.mapping index adff145303..86242adfa7 100644 --- a/mappings/net/minecraft/entity/player/PlayerInventory.mapping +++ b/mappings/net/minecraft/entity/player/PlayerInventory.mapping @@ -18,9 +18,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory ARG 1 slot ARG 2 stack METHOD method_7368 getHotbarSize ()I - METHOD method_7369 clearItem (Ljava/util/function/Predicate;I)I - ARG 1 itemPredicate - ARG 2 amount METHOD method_7370 getBlockBreakingSpeed (Lnet/minecraft/class_2680;)F ARG 1 block METHOD method_7372 getArmorStack (I)Lnet/minecraft/class_1799; @@ -43,8 +40,6 @@ CLASS net/minecraft/class_1661 net/minecraft/entity/player/PlayerInventory METHOD method_7381 updateItems ()V METHOD method_7382 contains (Lnet/minecraft/class_3494;)Z ARG 1 tag - METHOD method_7383 isUsingEffectiveTool (Lnet/minecraft/class_2680;)Z - ARG 1 state METHOD method_7384 serialize (Lnet/minecraft/class_2499;)Lnet/minecraft/class_2499; ARG 1 tag METHOD method_7385 addStack (ILnet/minecraft/class_1799;)I diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 3ba42b3177..7d3176fc37 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -90,7 +90,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item METHOD method_7869 getOrCreateTranslationKey ()Ljava/lang/String; METHOD method_7870 isEnchantable (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_7872 rayTrace (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_3959$class_242;)Lnet/minecraft/class_239; + METHOD method_7872 rayTrace (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_3959$class_242;)Lnet/minecraft/class_3965; ARG 0 world ARG 1 player ARG 2 fluidHandling diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index 6c77997f21..1425052a9c 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool FIELD field_952 javaFunctions Ljava/util/function/BiFunction; FIELD field_953 entries [Lnet/minecraft/class_79; - FIELD field_954 conditions [Lnet/minecraft/class_4570; + FIELD field_954 conditions [Lnet/minecraft/class_5341; FIELD field_955 predicate Ljava/util/function/Predicate; FIELD field_956 functions [Lnet/minecraft/class_117; FIELD field_957 rolls Lnet/minecraft/class_59; FIELD field_958 bonusRolls Lnet/minecraft/class_61; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;Lnet/minecraft/class_59;Lnet/minecraft/class_61;)V + METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;Lnet/minecraft/class_59;Lnet/minecraft/class_61;)V ARG 1 entries ARG 2 conditions ARG 3 functions diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index ddf0daaaa8..3ff3a0b391 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter ARG 1 id METHOD method_22574 getTable (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id - METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + METHOD method_22576 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; ARG 1 id METHOD method_359 getName ()Ljava/lang/String; METHOD method_360 report (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 8cadda6401..5f39babf02 100644 --- a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondition - FIELD field_1246 terms [Lnet/minecraft/class_4570; + FIELD field_1246 terms [Lnet/minecraft/class_5341; FIELD field_1247 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 terms - METHOD method_826 builder ([Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_186$class_187; + METHOD method_826 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; ARG 0 terms METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_187 Builder FIELD field_1248 terms Ljava/util/List; - METHOD ([Lnet/minecraft/class_4570$class_210;)V + METHOD ([Lnet/minecraft/class_5341$class_210;)V ARG 1 terms CLASS class_188 Factory diff --git a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index a784599617..930a724a2a 100644 --- a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_190 net/minecraft/loot/condition/DamageSourcePropertie FIELD field_1256 predicate Lnet/minecraft/class_2022; METHOD (Lnet/minecraft/class_2022;)V ARG 1 predicate - METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_4570$class_210; + METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_5341$class_210; ARG 0 builder METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index 344402a6f6..910e0753d6 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootC METHOD (Lnet/minecraft/class_2048;Lnet/minecraft/class_47$class_50;)V ARG 1 predicate ARG 2 entity - METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_4570$class_210; + METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5341$class_210; ARG 0 entity - METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_4570$class_210; + METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_5341$class_210; ARG 0 entity ARG 1 predicate - METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_4570$class_210; + METHOD method_917 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_5341$class_210; ARG 0 entity ARG 1 predicateBuilder METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index c2a094b797..6bcefc2b17 100644 --- a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_207 net/minecraft/loot/condition/InvertedLootCondition - FIELD field_1283 term Lnet/minecraft/class_4570; - METHOD (Lnet/minecraft/class_4570;)V + FIELD field_1283 term Lnet/minecraft/class_5341; + METHOD (Lnet/minecraft/class_5341;)V ARG 1 term - METHOD method_889 builder (Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_4570$class_210; + METHOD method_889 builder (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_5341$class_210; ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping index dca78a9b7a..bd5f0fe824 100644 --- a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_221 net/minecraft/loot/condition/KilledByPlayerLootCondition FIELD field_1297 INSTANCE Lnet/minecraft/class_221; - METHOD method_939 builder ()Lnet/minecraft/class_4570$class_210; + METHOD method_939 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_222 Factory diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index a78bf27640..ffb722bb27 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCond METHOD (Lnet/minecraft/class_2090;Lnet/minecraft/class_2338;)V ARG 1 predicate ARG 2 offset - METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_4570$class_210; + METHOD method_884 builder (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_5341$class_210; ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/LootCondition.mapping b/mappings/net/minecraft/loot/condition/LootCondition.mapping deleted file mode 100644 index a566a21c6c..0000000000 --- a/mappings/net/minecraft/loot/condition/LootCondition.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/class_4570 net/minecraft/loot/condition/LootCondition - CLASS class_210 Builder - METHOD method_16780 invert ()Lnet/minecraft/class_4570$class_210; - METHOD method_893 or (Lnet/minecraft/class_4570$class_210;)Lnet/minecraft/class_186$class_187; - ARG 1 condition - CLASS class_211 Factory - FIELD field_1284 id Lnet/minecraft/class_2960; - FIELD field_1285 conditionClass Ljava/lang/Class; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/Class;)V - ARG 1 id - ARG 2 clazz - METHOD method_894 getId ()Lnet/minecraft/class_2960; - METHOD method_895 toJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4570;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 condition - ARG 3 context - METHOD method_896 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_4570; - ARG 1 json - ARG 2 context - METHOD method_897 getConditionClass ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping index 4cb38ad542..bce28db714 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionConsumingBuilder.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_192 net/minecraft/loot/condition/LootConditionConsumingBuilder METHOD method_512 getThis ()Ljava/lang/Object; - METHOD method_840 conditionally (Lnet/minecraft/class_4570$class_210;)Ljava/lang/Object; + METHOD method_840 conditionally (Lnet/minecraft/class_5341$class_210;)Ljava/lang/Object; ARG 1 condition diff --git a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping index 3ca69eebc2..8b98694adb 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionManager.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionManager.mapping @@ -3,5 +3,5 @@ CLASS net/minecraft/class_4567 net/minecraft/loot/condition/LootConditionManager FIELD field_20754 GSON Lcom/google/gson/Gson; FIELD field_20755 conditions Ljava/util/Map; METHOD method_22559 getIds ()Ljava/util/Set; - METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + METHOD method_22564 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; ARG 1 id diff --git a/mappings/net/minecraft/loot/condition/LootConditions.mapping b/mappings/net/minecraft/loot/condition/LootConditions.mapping index eb747a3845..b3cd03733e 100644 --- a/mappings/net/minecraft/loot/condition/LootConditions.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditions.mapping @@ -1,30 +1,13 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditions - FIELD field_1294 byId Ljava/util/Map; - FIELD field_1295 byClass Ljava/util/Map; METHOD method_921 (Ljava/lang/Object;)Z ARG 0 predicates - METHOD method_922 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570$class_211; - ARG 0 id - METHOD method_923 getFactory (Lnet/minecraft/class_4570;)Lnet/minecraft/class_4570$class_211; - ARG 0 condition METHOD method_924 joinAnd ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; ARG 0 predicates METHOD method_925 joinOr ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; ARG 0 predicates - METHOD method_926 register (Lnet/minecraft/class_4570$class_211;)V - ARG 0 condition METHOD method_927 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z ARG 1 operand METHOD method_928 (Ljava/lang/Object;)Z ARG 0 predicates METHOD method_929 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z ARG 1 operand - CLASS class_218 Factory - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 condition - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index 4e9173a06e..d1184c1c83 100644 --- a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_223 net/minecraft/loot/condition/MatchToolLootConditio FIELD field_1298 predicate Lnet/minecraft/class_2073; METHOD (Lnet/minecraft/class_2073;)V ARG 1 predicate - METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4570$class_210; + METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_5341$class_210; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index 01f9fd4834..2c74a8b475 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_219 net/minecraft/loot/condition/RandomChanceLootCondi FIELD field_1296 chance F METHOD (F)V ARG 1 chance - METHOD method_932 builder (F)Lnet/minecraft/class_4570$class_210; + METHOD method_932 builder (F)Lnet/minecraft/class_5341$class_210; ARG 0 chance METHOD test (Ljava/lang/Object;)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index 48aa7e4353..f828bd0068 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_225 net/minecraft/loot/condition/RandomChanceWithLooti METHOD (FF)V ARG 1 chance ARG 2 lootingMultiplier - METHOD method_953 builder (FF)Lnet/minecraft/class_4570$class_210; + METHOD method_953 builder (FF)Lnet/minecraft/class_5341$class_210; ARG 0 chance ARG 1 lootingMultiplier METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping index d25cc5f7f7..58cd1fa0c8 100644 --- a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_201 net/minecraft/loot/condition/SurvivesExplosionLootCondition FIELD field_1280 INSTANCE Lnet/minecraft/class_201; - METHOD method_871 builder ()Lnet/minecraft/class_4570$class_210; + METHOD method_871 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_202 Factory diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index d8702928a2..90462ec9f8 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootConditi METHOD (Lnet/minecraft/class_1887;[F)V ARG 1 enchantment ARG 2 chances - METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_4570$class_210; + METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_5341$class_210; ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 1f9e76677b..fff7c65329 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -16,13 +16,13 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext ARG 5 conditionSetter ARG 6 parameters ARG 7 drops - METHOD method_22555 addCondition (Lnet/minecraft/class_4570;)Z + METHOD method_22555 addCondition (Lnet/minecraft/class_5341;)Z ARG 1 condition METHOD method_22556 getSupplier (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52; ARG 1 id - METHOD method_22557 removeCondition (Lnet/minecraft/class_4570;)V + METHOD method_22557 removeCondition (Lnet/minecraft/class_5341;)V ARG 1 condition - METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4570; + METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341; ARG 1 id METHOD method_294 getRandom ()Ljava/util/Random; METHOD method_295 markInactive (Lnet/minecraft/class_52;)V diff --git a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index 919488cc64..b0046f7c16 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -1,22 +1,13 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry FIELD field_982 children [Lnet/minecraft/class_79; FIELD field_983 predicate Lnet/minecraft/class_64; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)V ARG 1 children ARG 2 conditions METHOD method_394 combine ([Lnet/minecraft/class_64;)Lnet/minecraft/class_64; ARG 1 children - METHOD method_395 createSerializer (Lnet/minecraft/class_2960;Ljava/lang/Class;Lnet/minecraft/class_69$class_70;)Lnet/minecraft/class_69$class_71; - ARG 0 id - ARG 1 type - ARG 2 entry + METHOD method_395 createSerializer (Lnet/minecraft/class_69$class_70;)Lnet/minecraft/class_79$class_5337; CLASS class_70 Factory - METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_69; + METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_69; ARG 1 children ARG 2 conditions - CLASS class_71 Serializer - METHOD method_398 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_79;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_69; - ARG 1 json - ARG 2 context - ARG 3 children - ARG 4 conditions diff --git a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping index d889ce8f48..83aff06090 100644 --- a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry FIELD field_980 name Lnet/minecraft/class_2960; - FIELD field_981 instance Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 name ARG 2 weight ARG 3 quality @@ -9,7 +8,7 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry ARG 5 functions METHOD method_390 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping index a08c5aae49..213750f8e5 100644 --- a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_73 net/minecraft/loot/entry/EmptyEntry - METHOD (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping index 7649f23903..55b43f6107 100644 --- a/mappings/net/minecraft/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_72 net/minecraft/loot/entry/GroupEntry - METHOD method_399 (Lnet/minecraft/class_64;Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z - ARG 2 context - ARG 3 lootChoiceExpander METHOD method_400 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander diff --git a/mappings/net/minecraft/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping index 1fb32b2990..3648cdb1be 100644 --- a/mappings/net/minecraft/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_77 net/minecraft/loot/entry/ItemEntry FIELD field_987 item Lnet/minecraft/class_1792; - METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 item ARG 2 weight ARG 3 quality ARG 4 conditions ARG 5 functions - METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index 61be6ff891..a40eef2769 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry FIELD field_996 functions [Lnet/minecraft/class_117; FIELD field_997 compiledFunctions Ljava/util/function/BiFunction; FIELD field_998 choice Lnet/minecraft/class_82; - METHOD (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 weight ARG 2 quality ARG 3 conditions @@ -29,13 +29,13 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry ARG 1 factory CLASS class_88 Choice CLASS class_89 Factory - METHOD build (II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD build (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions ARG 4 functions CLASS class_90 Serializer - METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 entryJson ARG 2 context ARG 3 weight diff --git a/mappings/net/minecraft/loot/entry/LootEntries.mapping b/mappings/net/minecraft/loot/entry/LootEntries.mapping index e91919caf9..b087673a1f 100644 --- a/mappings/net/minecraft/loot/entry/LootEntries.mapping +++ b/mappings/net/minecraft/loot/entry/LootEntries.mapping @@ -1,16 +1 @@ CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootEntries - FIELD field_985 idSerializers Ljava/util/Map; - FIELD field_986 classSerializers Ljava/util/Map; - METHOD method_403 register (Lnet/minecraft/class_79$class_81;)V - ARG 0 serializer - CLASS class_76 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD method_406 getSerializer (Ljava/lang/Class;)Lnet/minecraft/class_79$class_81; - ARG 0 clazz - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/entry/LootEntry.mapping b/mappings/net/minecraft/loot/entry/LootEntry.mapping index a7c23dfbe8..74517565f0 100644 --- a/mappings/net/minecraft/loot/entry/LootEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootEntry.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootEntry - FIELD field_988 conditions [Lnet/minecraft/class_4570; + FIELD field_988 conditions [Lnet/minecraft/class_5341; FIELD field_989 conditionPredicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 conditions METHOD method_414 test (Lnet/minecraft/class_47;)Z ARG 1 context @@ -13,20 +13,6 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootEntry ARG 1 builder METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; METHOD method_419 build ()Lnet/minecraft/class_79; - METHOD method_420 getConditions ()[Lnet/minecraft/class_4570; - CLASS class_81 Serializer - FIELD field_991 id Lnet/minecraft/class_2960; - FIELD field_992 type Ljava/lang/Class; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/Class;)V - ARG 1 id - ARG 2 type - METHOD method_422 toJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_79;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 entry - ARG 3 context - METHOD method_423 getIdentifier ()Lnet/minecraft/class_2960; - METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_79; - ARG 1 json - ARG 2 context - ARG 3 conditions - METHOD method_425 getType ()Ljava/lang/Class; + METHOD method_420 getConditions ()[Lnet/minecraft/class_5341; + CLASS class_5337 + METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_79; diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index f806e558ef..4758d4a337 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry FIELD field_993 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 id ARG 2 weight ARG 3 quality @@ -8,7 +8,7 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry ARG 5 functions METHOD method_428 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 id - METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index 92f33b4269..6dbe611f06 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,14 +1,14 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry FIELD field_1005 name Lnet/minecraft/class_3494; FIELD field_1006 expand Z - METHOD (Lnet/minecraft/class_3494;ZII[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_3494;ZII[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V ARG 1 name ARG 2 expand ARG 3 weight ARG 4 quality ARG 5 conditions ARG 6 functions - METHOD method_444 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_4570;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_444 (Lnet/minecraft/class_3494;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality ARG 3 conditions diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 3e406d750e..b38d8eb0c3 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -2,24 +2,24 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction FIELD field_1009 formula Lnet/minecraft/class_94$class_96; FIELD field_1010 FACTORIES Ljava/util/Map; FIELD field_1011 enchantment Lnet/minecraft/class_1887; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V ARG 1 conditions ARG 2 enchantment ARG 3 formula - METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_455 oreDrops (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment METHOD method_456 uniformBonusCount (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment - METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions - METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 3 conditions METHOD method_461 uniformBonusCount (Lnet/minecraft/class_1887;I)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 bonusMultiplier - METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 2 conditions METHOD method_463 binomialWithBonusCount (Lnet/minecraft/class_1887;FI)Lnet/minecraft/class_120$class_121; ARG 0 enchantment diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index 016fe69326..2db3b67254 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunction - FIELD field_1047 conditions [Lnet/minecraft/class_4570; + FIELD field_1047 conditions [Lnet/minecraft/class_5341; FIELD field_1048 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 conditions METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack @@ -14,13 +14,13 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunctio CLASS class_121 Builder FIELD field_1049 conditionList Ljava/util/List; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; - METHOD method_526 getConditions ()[Lnet/minecraft/class_4570; + METHOD method_526 getConditions ()[Lnet/minecraft/class_5341; CLASS class_122 Joiner FIELD field_1050 joiner Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 joiner CLASS class_123 Factory - METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_120; + METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_120; ARG 1 json ARG 2 context ARG 3 conditions diff --git a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index b837e23dec..00ccfcb705 100644 --- a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_101 net/minecraft/loot/function/CopyNameLootFunction FIELD field_1018 source Lnet/minecraft/class_101$class_102; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_101$class_102;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_101$class_102;)V ARG 1 conditions ARG 2 source METHOD method_473 builder (Lnet/minecraft/class_101$class_102;)Lnet/minecraft/class_120$class_121; ARG 0 source - METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions CLASS class_102 Source FIELD field_1024 parameter Lnet/minecraft/class_169; diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 21c3525ef3..b8a1c15d37 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction FIELD field_17014 operations Ljava/util/List; FIELD field_17015 ENTITY_TAG_GETTER Ljava/util/function/Function; FIELD field_17016 BLOCK_ENTITY_TAG_GETTER Ljava/util/function/Function; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_3837$class_3840;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_3837$class_3840;Ljava/util/List;)V ARG 1 conditions ARG 2 source ARG 3 operations diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index f6dcaf249a..a0de7e25da 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction FIELD field_20449 block Lnet/minecraft/class_2248; FIELD field_20450 properties Ljava/util/Set; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2248;Ljava/util/Set;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2248;Ljava/util/Set;)V ARG 3 properties METHOD method_21892 getBuilder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; CLASS class_4489 Builder diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 1316bb15c1..145d14fc13 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFunction FIELD field_1030 enchantments Ljava/util/List; FIELD field_1031 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;Ljava/util/Collection;)V + METHOD ([Lnet/minecraft/class_5341;Ljava/util/Collection;)V ARG 1 conditions ARG 2 enchantments - METHOD method_488 ([Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_488 ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; CLASS class_110 Factory diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index 65704569c8..6d763fa263 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootFunction FIELD field_1026 range Lnet/minecraft/class_59; FIELD field_1027 treasureEnchantmentsAllowed Z - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_59;Z)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_59;Z)V ARG 1 conditions ARG 2 range ARG 3 treasureEnchantmentsAllowed diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 450dd33262..b04c82b277 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B FIELD field_1038 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;BIZ)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_3195;Lnet/minecraft/class_20$class_21;BIZ)V ARG 1 conditions ARG 3 decoration ARG 4 zoom diff --git a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index 51dc5ac460..3de3da31e6 100644 --- a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_104 net/minecraft/loot/function/ExplosionDecayLootFunction - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 conditions METHOD method_478 builder ()Lnet/minecraft/class_120$class_121; CLASS class_105 Factory diff --git a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index 9e06020407..8d034f2133 100644 --- a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_3668 net/minecraft/loot/function/FillPlayerHeadLootFunction FIELD field_16227 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 entity CLASS class_3669 Factory diff --git a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index 8f24b1572c..0bdc1001b1 100644 --- a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_165 net/minecraft/loot/function/FurnaceSmeltLootFunction FIELD field_1159 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 conditions METHOD method_724 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_166 Factory diff --git a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index a124a4b3dd..2b16285ed4 100644 --- a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_114 net/minecraft/loot/function/LimitCountLootFunction FIELD field_1044 limit Lnet/minecraft/class_42; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_42;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_42;)V ARG 1 conditions ARG 2 limit METHOD method_506 builder (Lnet/minecraft/class_42;)Lnet/minecraft/class_120$class_121; ARG 0 limit - METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions CLASS class_115 Factory diff --git a/mappings/net/minecraft/loot/function/LootFunction.mapping b/mappings/net/minecraft/loot/function/LootFunction.mapping index f726089a8c..49163dc67f 100644 --- a/mappings/net/minecraft/loot/function/LootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootFunction.mapping @@ -7,18 +7,3 @@ CLASS net/minecraft/class_117 net/minecraft/loot/function/LootFunction ARG 3 stack CLASS class_118 Builder METHOD method_515 build ()Lnet/minecraft/class_117; - CLASS class_119 Factory - FIELD field_1045 id Lnet/minecraft/class_2960; - FIELD field_1046 functionClass Ljava/lang/Class; - METHOD (Lnet/minecraft/class_2960;Ljava/lang/Class;)V - ARG 1 id - ARG 2 clazz - METHOD method_516 toJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_117;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 function - ARG 3 context - METHOD method_517 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_117; - ARG 1 json - ARG 2 context - METHOD method_518 getId ()Lnet/minecraft/class_2960; - METHOD method_519 getFunctionClass ()Ljava/lang/Class; diff --git a/mappings/net/minecraft/loot/function/LootFunctions.mapping b/mappings/net/minecraft/loot/function/LootFunctions.mapping index a76beeef3a..9cda46beb4 100644 --- a/mappings/net/minecraft/loot/function/LootFunctions.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctions.mapping @@ -1,30 +1,13 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctions - FIELD field_1100 byId Ljava/util/Map; - FIELD field_1101 byClass Ljava/util/Map; FIELD field_1102 NOOP Ljava/util/function/BiFunction; - METHOD method_589 register (Lnet/minecraft/class_117$class_119;)V - ARG 0 function - METHOD method_590 getFactory (Lnet/minecraft/class_117;)Lnet/minecraft/class_117$class_119; - ARG 0 function METHOD method_591 (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 2 stack ARG 3 context METHOD method_592 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 context - METHOD method_593 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_117$class_119; - ARG 0 id METHOD method_594 join ([Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; ARG 0 lootFunctions METHOD method_595 ([Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 1 stack ARG 2 context - CLASS class_132 Factory - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 function - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index 20cca76f0c..487eacbf22 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction FIELD field_1082 countRange Lnet/minecraft/class_61; FIELD field_1083 limit I - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_61;I)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_61;I)V ARG 1 conditions ARG 2 countRange ARG 3 limit diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 2a1c3436cb..fdb9bdff17 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction FIELD field_1105 attributes Ljava/util/List; - METHOD ([Lnet/minecraft/class_4570;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;)V ARG 1 conditions ARG 2 attributes CLASS class_138 Attribute diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 803cf9db51..f16ff71d74 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction FIELD field_1103 entries Ljava/util/List; - METHOD ([Lnet/minecraft/class_4570;Ljava/util/List;)V + METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;)V ARG 1 conditions ARG 2 entries METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 1c197ef81a..6dd882618c 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction FIELD field_1114 countRange Lnet/minecraft/class_59; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_59;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_59;)V ARG 1 conditions ARG 2 countRange - METHOD method_620 (Lnet/minecraft/class_59;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_620 (Lnet/minecraft/class_59;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_621 builder (Lnet/minecraft/class_59;)Lnet/minecraft/class_120$class_121; ARG 0 countRange diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index e9b656df74..f4157d150e 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction FIELD field_1120 durabilityRange Lnet/minecraft/class_61; FIELD field_1121 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_61;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_61;)V ARG 1 contents ARG 2 durabilityRange METHOD method_633 builder (Lnet/minecraft/class_61;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange - METHOD method_634 (Lnet/minecraft/class_61;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_634 (Lnet/minecraft/class_61;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions CLASS class_150 Factory diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index a6abe2078d..03b64f00e2 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction FIELD field_1116 id Lnet/minecraft/class_2960; FIELD field_1117 seed J - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2960;J)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2960;J)V ARG 1 conditions ARG 2 id ARG 3 seed diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index f775322463..19760fc070 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction FIELD field_16231 lore Ljava/util/List; FIELD field_16232 replace Z FIELD field_16233 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_4570;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_5341;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 replace ARG 3 lore diff --git a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index a015ec33eb..85038f7c97 100644 --- a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction FIELD field_16228 name Lnet/minecraft/class_2561; FIELD field_16229 entity Lnet/minecraft/class_47$class_50; FIELD field_16230 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V ARG 1 conditions ARG 2 name ARG 3 entity diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index 0758dc7277..46f34b310c 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction FIELD field_1138 tag Lnet/minecraft/class_2487; - METHOD ([Lnet/minecraft/class_4570;Lnet/minecraft/class_2487;)V + METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2487;)V ARG 1 conditions ARG 2 tag - METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_4570;)Lnet/minecraft/class_117; + METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; ARG 0 tag diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index f7b6d1d324..3c628a89a7 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunction FIELD field_1122 effects Ljava/util/Map; - METHOD ([Lnet/minecraft/class_4570;Ljava/util/Map;)V + METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;)V ARG 1 conditions ARG 2 effects METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; diff --git a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping index 70034d9dd3..8efa3f2ac0 100644 --- a/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5194 net/minecraft/network/packet/c2s/play/JigsawGeneratingC2SPacket FIELD field_24054 pos Lnet/minecraft/class_2338; FIELD field_24055 maxDepth I - METHOD (Lnet/minecraft/class_2338;I)V + METHOD (Lnet/minecraft/class_2338;IZ)V ARG 1 pos ARG 2 maxDepth METHOD method_27275 getPos ()Lnet/minecraft/class_2338; diff --git a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping index 9c367acd15..ba7bacf913 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/GameJoinS2CPacket.mapping @@ -10,20 +10,12 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C FIELD field_20666 flatWorld Z FIELD field_24618 reducedDebugInfo Z FIELD field_24619 showDeathScreen Z - FIELD field_25134 dimensionId Lnet/minecraft/class_2960; - METHOD (ILnet/minecraft/class_1934;JZLnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_2960;IIZZZZ)V + FIELD field_25134 dimensionId Lnet/minecraft/class_5321; + METHOD (ILnet/minecraft/class_1934;JZLjava/util/Set;Lnet/minecraft/class_5318$class_5319;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;IIZZZZ)V ARG 1 playerEntityId ARG 2 gameMode ARG 3 seed ARG 5 hardcore - ARG 6 dimensionTracker - ARG 7 dimensionId - ARG 8 maxPlayers - ARG 9 chunkLoadDistance - ARG 10 reducedDebugInfo - ARG 11 showDeathScreen - ARG 12 debugWorld - ARG 13 flatWorld METHOD method_11561 getGameMode ()Lnet/minecraft/class_1934; METHOD method_11562 hasReducedDebugInfo ()Z METHOD method_11564 getEntityId ()I @@ -34,4 +26,4 @@ CLASS net/minecraft/class_2678 net/minecraft/network/packet/s2c/play/GameJoinS2C METHOD method_22424 showsDeathScreen ()Z METHOD method_28118 isHardcore ()Z METHOD method_28119 isDebugWorld ()Z - METHOD method_29176 getDimensionId ()Lnet/minecraft/class_2960; + METHOD method_29176 getDimensionId ()Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping index 111c6dc379..2813e10d8e 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket.mapping @@ -1,16 +1,11 @@ CLASS net/minecraft/class_2724 net/minecraft/network/packet/s2c/play/PlayerRespawnS2CPacket - FIELD field_12431 dimension Lnet/minecraft/class_2960; + FIELD field_12431 dimension Lnet/minecraft/class_5321; FIELD field_12434 gameMode Lnet/minecraft/class_1934; FIELD field_20667 sha256Seed J FIELD field_24451 keepPlayerAttributes Z FIELD field_24620 debugWorld Z FIELD field_24621 flatWorld Z - METHOD (Lnet/minecraft/class_2960;JLnet/minecraft/class_1934;ZZZ)V - ARG 2 sha256Seed - ARG 5 debugWorld - ARG 6 flatWorld - ARG 7 keepPlayerAttributes - METHOD method_11779 getDimension ()Lnet/minecraft/class_2960; + METHOD method_11779 getDimension ()Lnet/minecraft/class_5321; METHOD method_11780 getGameMode ()Lnet/minecraft/class_1934; METHOD method_22425 getSha256Seed ()J METHOD method_27904 shouldKeepPlayerAttributes ()Z diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index 5f19fd239a..ed5da06877 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityP ARG 1 advancementId ARG 2 conditionManager METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; - METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)[Lnet/minecraft/class_4570; + METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)[Lnet/minecraft/class_5341; ARG 1 array ARG 2 key ARG 3 contextType diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping index da5f4b7e39..6ab091f11c 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5267 net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer FIELD field_24420 INSTANCE Lnet/minecraft/class_5267; FIELD field_24421 gson Lcom/google/gson/Gson; - METHOD method_27849 conditionsToJson ([Lnet/minecraft/class_4570;)Lcom/google/gson/JsonElement; + METHOD method_27849 conditionsToJson ([Lnet/minecraft/class_5341;)Lcom/google/gson/JsonElement; ARG 1 conditions diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 50cf9affae..0926658f06 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -90,9 +90,9 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 distance CLASS class_5258 Extended FIELD field_24388 EMPTY Lnet/minecraft/class_2048$class_5258; - FIELD field_24389 conditions [Lnet/minecraft/class_4570; + FIELD field_24389 conditions [Lnet/minecraft/class_5341; FIELD field_24390 combinedCondition Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_4570;)V + METHOD ([Lnet/minecraft/class_5341;)V ARG 1 conditions METHOD method_27803 ofLegacy (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_5258; ARG 0 predicate @@ -123,5 +123,5 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 0 root ARG 1 key ARG 2 predicateDeserializer - METHOD method_27973 create ([Lnet/minecraft/class_4570;)Lnet/minecraft/class_2048$class_5258; + METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_2048$class_5258; ARG 0 conditions diff --git a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping index 670d33f651..d5acd5916b 100644 --- a/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping +++ b/mappings/net/minecraft/resource/ReloadableResourceManagerImpl.mapping @@ -5,12 +5,9 @@ CLASS net/minecraft/class_3304 net/minecraft/resource/ReloadableResourceManagerI FIELD field_14295 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17935 listeners Ljava/util/List; FIELD field_17936 initialListeners Ljava/util/List; - FIELD field_17937 mainThread Ljava/lang/Thread; - METHOD (Lnet/minecraft/class_3264;Ljava/lang/Thread;)V + METHOD (Lnet/minecraft/class_3264;)V ARG 1 type - ARG 2 mainThread METHOD method_14475 addPack (Lnet/minecraft/class_3262;)V - ARG 1 pack METHOD method_14495 clear ()V METHOD method_18240 beginReloadInner (Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_4011; ARG 1 prepareExecutor diff --git a/mappings/net/minecraft/resource/ResourcePackManager.mapping b/mappings/net/minecraft/resource/ResourcePackManager.mapping index 93e7a8e93a..db76a44b1a 100644 --- a/mappings/net/minecraft/resource/ResourcePackManager.mapping +++ b/mappings/net/minecraft/resource/ResourcePackManager.mapping @@ -3,16 +3,10 @@ CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager FIELD field_14226 profiles Ljava/util/Map; FIELD field_14227 providers Ljava/util/Set; FIELD field_14228 profileFactory Lnet/minecraft/class_3288$class_3290; - METHOD (Lnet/minecraft/class_3288$class_3290;)V - ARG 1 factory METHOD method_14441 getProfiles ()Ljava/util/Collection; - METHOD method_14442 getDisabledProfiles ()Ljava/util/Collection; - METHOD method_14443 registerProvider (Lnet/minecraft/class_3285;)V - ARG 1 provider METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection; METHOD method_14445 scanPacks ()V METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V ARG 1 enabled - METHOD method_14448 sort ()V METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288; ARG 1 name diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 6273670646..c182e31685 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -7,9 +7,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_17601 serverId Ljava/lang/String; FIELD field_17704 DEMO_LEVEL_INFO Lnet/minecraft/class_1940; FIELD field_19249 waitingForNextTick Z - FIELD field_20279 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; - FIELD field_20851 predicateManager Lnet/minecraft/class_4567; FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757; FIELD field_23784 session Lnet/minecraft/class_32$class_5143; FIELD field_24370 structureManager Lnet/minecraft/class_3485; @@ -23,7 +21,6 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4550 playerManager Lnet/minecraft/class_3324; FIELD field_4551 lastPlayerSampleUpdate J FIELD field_4552 keyPair Ljava/security/KeyPair; - FIELD field_4553 fileDataPackProvider Lnet/minecraft/class_3279; FIELD field_4554 flightEnabled Z FIELD field_4555 serverPort I FIELD field_4556 userCache Lnet/minecraft/class_3312; @@ -31,23 +28,17 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4558 scoreboard Lnet/minecraft/class_2995; FIELD field_4560 preventProxyConnections Z FIELD field_4561 stopped Z - FIELD field_4562 commandManager Lnet/minecraft/class_2170; FIELD field_4563 networkIo Lnet/minecraft/class_3242; FIELD field_4564 motd Ljava/lang/String; - FIELD field_4566 recipeManager Lnet/minecraft/class_1863; - FIELD field_4567 advancementLoader Lnet/minecraft/class_2989; FIELD field_4568 serverGuiTickables Ljava/util/List; FIELD field_4570 enforceWhitelist Z FIELD field_4571 timeReference J FIELD field_4572 ticks I FIELD field_4573 lastTickLengths [J - FIELD field_4576 dataManager Lnet/minecraft/class_3296; FIELD field_4577 iconFilePresent Z FIELD field_4578 userName Ljava/lang/String; FIELD field_4579 worldHeight I - FIELD field_4580 lootManager Lnet/minecraft/class_60; FIELD field_4582 snooper Lnet/minecraft/class_1276; - FIELD field_4583 tagManager Lnet/minecraft/class_3505; FIELD field_4584 resourcePackHash Ljava/lang/String; FIELD field_4585 serverIp Ljava/lang/String; FIELD field_4587 dataFixer Lcom/mojang/datafixers/DataFixer; @@ -68,7 +59,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; - METHOD method_17191 getWorkerExecutor ()Ljava/util/concurrent/Executor; METHOD method_17819 setServerId (Ljava/lang/String;)V ARG 1 serverId METHOD method_17976 initScoreboard (Lnet/minecraft/class_26;)V @@ -136,7 +126,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 1 shouldKeepTicking METHOD method_3749 getMaxWorldBorderRadius ()I METHOD method_3750 isStopped ()Z - METHOD method_3752 reloadDataPacks ()V METHOD method_3754 isHardcore ()Z METHOD method_3756 getServerPort ()I METHOD method_3758 getFile (Ljava/lang/String;)Ljava/io/File; @@ -179,14 +168,12 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3796 shouldSpawnAnimals ()Z METHOD method_3798 getOpPermissionLevel ()I METHOD method_3799 isDemo ()Z - METHOD method_3800 loadWorldDataPacks ()V METHOD method_3801 getTagManager ()Lnet/minecraft/class_3505; METHOD method_3802 getMaxPlayerCount ()I METHOD method_3803 setPlayerIdleTimeout (I)V ARG 1 playerIdleTimeout METHOD method_3805 getResourcePackHash ()Ljava/lang/String; METHOD method_3806 isRunning ()Z - METHOD method_3809 getDataManager ()Lnet/minecraft/class_3296; METHOD method_3811 getUserName ()Ljava/lang/String; METHOD method_3812 areCommandBlocksEnabled ()Z METHOD method_3813 tickWorlds (Ljava/util/function/BooleanSupplier;)V @@ -228,7 +215,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_3846 setPlayerManager (Lnet/minecraft/class_3324;)V ARG 1 playerManager METHOD method_3847 getWorld (Lnet/minecraft/class_5321;)Lnet/minecraft/class_3218; - METHOD method_3848 reload ()V METHOD method_3849 setServerName (Ljava/lang/String;)V ARG 1 serverName METHOD method_3850 setWorldHeight (I)V diff --git a/mappings/net/minecraft/server/PlayerManager.mapping b/mappings/net/minecraft/server/PlayerManager.mapping index b7a5da0442..e3b05e90d7 100644 --- a/mappings/net/minecraft/server/PlayerManager.mapping +++ b/mappings/net/minecraft/server/PlayerManager.mapping @@ -55,7 +55,6 @@ CLASS net/minecraft/class_3324 net/minecraft/server/PlayerManager METHOD method_14577 savePlayerData (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_14578 getAdvancementTracker (Lnet/minecraft/class_3222;)Lnet/minecraft/class_2985; - ARG 1 player METHOD method_14579 areCheatsAllowed ()Z METHOD method_14580 getPlayerNames ()[Ljava/lang/String; METHOD method_14581 sendToAll (Lnet/minecraft/class_2596;)V diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index f9a238eb0f..6b62af67e1 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -71,7 +71,7 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_13323 getExistsConditionExecute (ZLnet/minecraft/class_3050$class_3051;)Lcom/mojang/brigadier/Command; ARG 0 positive ARG 1 condition - METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_4570;)Z + METHOD method_22829 testLootCondition (Lnet/minecraft/class_2168;Lnet/minecraft/class_5341;)Z CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 4997e03a6c..76ffa9f35b 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -5,10 +5,10 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22265 executeClearAll (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 radius - METHOD method_22266 executeRun (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;)I + METHOD method_22266 executeRun (Lnet/minecraft/class_2168;Lnet/minecraft/class_4529;I)I ARG 0 source ARG 1 testFunction - METHOD method_22267 executeRunAll (Lnet/minecraft/class_2168;Ljava/lang/String;)I + METHOD method_22267 executeRunAll (Lnet/minecraft/class_2168;Ljava/lang/String;II)I ARG 0 source ARG 1 testClass METHOD method_22268 executeCreate (Lnet/minecraft/class_2168;Ljava/lang/String;III)I @@ -17,7 +17,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 2 x ARG 3 y ARG 4 z - METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;)V + METHOD method_22269 run (Lnet/minecraft/class_2168;Ljava/util/Collection;II)V ARG 0 source ARG 1 testFunctions METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;)V @@ -43,7 +43,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 structure - METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;)I + METHOD method_22284 executeRunAll (Lnet/minecraft/class_2168;II)I ARG 0 source METHOD method_22285 executeImport (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source diff --git a/mappings/net/minecraft/server/function/CommandFunction.mapping b/mappings/net/minecraft/server/function/CommandFunction.mapping index f62d1dd5d2..cd3451f773 100644 --- a/mappings/net/minecraft/server/function/CommandFunction.mapping +++ b/mappings/net/minecraft/server/function/CommandFunction.mapping @@ -6,10 +6,8 @@ CLASS net/minecraft/class_2158 net/minecraft/server/function/CommandFunction ARG 2 elements METHOD method_9193 getElements ()[Lnet/minecraft/class_2158$class_2161; METHOD method_9194 getId ()Lnet/minecraft/class_2960; - METHOD method_9195 create (Lnet/minecraft/class_2960;Lnet/minecraft/class_2991;Ljava/util/List;)Lnet/minecraft/class_2158; + METHOD method_9195 create (Lnet/minecraft/class_2960;Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_2168;Ljava/util/List;)Lnet/minecraft/class_2158; ARG 0 id - ARG 1 commandFunctionManager - ARG 2 fileLines CLASS class_2159 LazyContainer FIELD field_9807 id Lnet/minecraft/class_2960; FIELD field_9808 function Ljava/util/Optional; diff --git a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping index 0cb89a7c4a..793fa72fae 100644 --- a/mappings/net/minecraft/server/function/CommandFunctionManager.mapping +++ b/mappings/net/minecraft/server/function/CommandFunctionManager.mapping @@ -2,38 +2,20 @@ CLASS net/minecraft/class_2991 net/minecraft/server/function/CommandFunctionMana FIELD field_13411 executing Z FIELD field_13412 LOAD_FUNCTION Lnet/minecraft/class_2960; FIELD field_13413 chain Ljava/util/ArrayDeque; - FIELD field_13414 EXTENSION_LENGTH I - FIELD field_13415 PATH_PREFIX_LENGTH I - FIELD field_13416 tags Lnet/minecraft/class_3503; FIELD field_13417 TICK_FUNCTION Lnet/minecraft/class_2960; FIELD field_13418 tickFunctions Ljava/util/List; FIELD field_13419 server Lnet/minecraft/server/MinecraftServer; - FIELD field_13420 idMap Ljava/util/Map; - FIELD field_13421 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13422 needToRunLoadFunctions Z FIELD field_19332 pending Ljava/util/List; - METHOD (Lnet/minecraft/server/MinecraftServer;)V - ARG 1 server METHOD method_12899 getTaggedFunctionSource ()Lnet/minecraft/class_2168; METHOD method_12900 getDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; - METHOD method_12901 getTags ()Lnet/minecraft/class_3503; METHOD method_12902 getMaxCommandChainLength ()I - METHOD method_12903 load (Lnet/minecraft/class_2158;Ljava/lang/Throwable;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2158; - ARG 1 function - ARG 2 exception - ARG 3 id METHOD method_12904 execute (Lnet/minecraft/class_2158;Lnet/minecraft/class_2168;)I ARG 1 function ARG 2 source METHOD method_12905 getFunction (Lnet/minecraft/class_2960;)Ljava/util/Optional; ARG 1 id - METHOD method_12906 readLines (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Ljava/util/List; - ARG 0 resourceManager - ARG 1 id - METHOD method_12907 getServer ()Lnet/minecraft/server/MinecraftServer; - METHOD method_12912 getFunctions ()Ljava/util/Map; METHOD method_18699 tick ()V - METHOD method_20796 getCommandFunctionSource ()Lnet/minecraft/class_2168; CLASS class_2992 Entry FIELD field_13423 manager Lnet/minecraft/class_2991; FIELD field_13424 source Lnet/minecraft/class_2168; diff --git a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping index 92360835e3..4a61f75606 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServer.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServer.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_1132 net/minecraft/server/integrated/IntegratedServer FIELD field_5521 localPlayerUuid Ljava/util/UUID; FIELD field_5522 lanPort I FIELD field_5524 paused Z - METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_5350;Lnet/minecraft/class_5219;Lcom/mojang/authlib/minecraft/MinecraftSessionService;Lcom/mojang/authlib/GameProfileRepository;Lnet/minecraft/class_3312;Lnet/minecraft/class_3950;)V ARG 1 client METHOD method_4817 setLocalPlayerUuid (Ljava/util/UUID;)V ARG 1 localPlayerUuid diff --git a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping index e7ebc119ab..776ce55da6 100644 --- a/mappings/net/minecraft/server/network/ServerRecipeBook.mapping +++ b/mappings/net/minecraft/server/network/ServerRecipeBook.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook FIELD field_15303 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_15304 manager Lnet/minecraft/class_1863; - METHOD (Lnet/minecraft/class_1863;)V - ARG 1 manager METHOD method_14899 sendUnlockRecipesPacket (Lnet/minecraft/class_2713$class_2714;Lnet/minecraft/class_3222;Ljava/util/List;)V ARG 1 action ARG 2 player @@ -10,7 +7,7 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook METHOD method_14900 lockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I ARG 1 recipes ARG 2 player - METHOD method_14901 fromTag (Lnet/minecraft/class_2487;)V + METHOD method_14901 fromTag (Lnet/minecraft/class_2487;Lnet/minecraft/class_1863;)V ARG 1 tag METHOD method_14902 toTag ()Lnet/minecraft/class_2487; METHOD method_14903 unlockRecipes (Ljava/util/Collection;Lnet/minecraft/class_3222;)I @@ -18,6 +15,6 @@ CLASS net/minecraft/class_3441 net/minecraft/server/network/ServerRecipeBook ARG 2 player METHOD method_14904 sendInitRecipesPacket (Lnet/minecraft/class_3222;)V ARG 1 player - METHOD method_20732 handleList (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;)V + METHOD method_20732 handleList (Lnet/minecraft/class_2499;Ljava/util/function/Consumer;Lnet/minecraft/class_1863;)V ARG 1 list ARG 2 handler diff --git a/mappings/net/minecraft/server/world/ChunkHolder.mapping b/mappings/net/minecraft/server/world/ChunkHolder.mapping index 93dba58fd8..ecdb5e996c 100644 --- a/mappings/net/minecraft/server/world/ChunkHolder.mapping +++ b/mappings/net/minecraft/server/world/ChunkHolder.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder FIELD field_13872 sectionsNeedingUpdateMask I FIELD field_13873 LEVEL_TYPES [Lnet/minecraft/class_3193$class_3194; FIELD field_13874 blockUpdateCount I - FIELD field_16209 lightSentWithBlocksBits I FIELD field_16425 futuresByStatus Ljava/util/concurrent/atomic/AtomicReferenceArray; FIELD field_16426 UNLOADED_CHUNK Lcom/mojang/datafixers/util/Either; FIELD field_16427 UNLOADED_WORLD_CHUNK Lcom/mojang/datafixers/util/Either; @@ -37,10 +36,7 @@ CLASS net/minecraft/class_3193 net/minecraft/server/world/ChunkHolder ARG 2 chunkStorage METHOD method_13994 getPos ()Lnet/minecraft/class_1923; METHOD method_14000 getFuture ()Ljava/util/concurrent/CompletableFuture; - METHOD method_14002 markForBlockUpdate (III)V - ARG 1 x - ARG 2 y - ARG 3 z + METHOD method_14002 markForBlockUpdate (Lnet/minecraft/class_3215;III)V METHOD method_14003 getEntityTickingFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_14005 getLevel ()I METHOD method_14006 flushUpdates (Lnet/minecraft/class_2818;)V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 525767f92b..bed902eab4 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -19,8 +19,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_18811 raidManager Lnet/minecraft/class_3767; FIELD field_23787 structureAccessor Lnet/minecraft/class_5138; FIELD field_25142 enderDragonFight Lnet/minecraft/class_2881; - METHOD (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_5268;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;Lnet/minecraft/class_2794;ZJLjava/util/List;Z)V - ARG 5 dimensionType METHOD method_14166 spawnParticles (Lnet/minecraft/class_3222;Lnet/minecraft/class_2394;ZDDDIDDDD)Z ARG 1 viewer ARG 2 particle diff --git a/mappings/net/minecraft/structure/Structure.mapping b/mappings/net/minecraft/structure/Structure.mapping index 1ccfb5403f..400e99eed9 100644 --- a/mappings/net/minecraft/structure/Structure.mapping +++ b/mappings/net/minecraft/structure/Structure.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 placementData ARG 1 pos - METHOD method_15172 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;I)Z + METHOD method_15172 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;I)Z ARG 1 world ARG 2 pos ARG 4 placementData @@ -45,7 +45,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure METHOD method_15177 loadPalettedBlockInfo (Lnet/minecraft/class_2499;Lnet/minecraft/class_2499;)V ARG 1 paletteTag ARG 2 blocksTag - METHOD method_15178 placeAndNotifyListeners (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V + METHOD method_15178 placeAndNotifyListeners (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;)V ARG 1 world ARG 2 pos ARG 3 data @@ -60,7 +60,7 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure ARG 3 placementData2 ARG 4 pos2 METHOD method_15181 getAuthor ()Ljava/lang/String; - METHOD method_15182 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;)V + METHOD method_15182 place (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;)V ARG 1 world ARG 2 pos ARG 3 placementData diff --git a/mappings/net/minecraft/structure/StructureManager.mapping b/mappings/net/minecraft/structure/StructureManager.mapping index 22f3aeea8f..96ca6022e1 100644 --- a/mappings/net/minecraft/structure/StructureManager.mapping +++ b/mappings/net/minecraft/structure/StructureManager.mapping @@ -3,9 +3,7 @@ CLASS net/minecraft/class_3485 net/minecraft/structure/StructureManager FIELD field_15513 structures Ljava/util/Map; FIELD field_15514 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15515 dataFixer Lcom/mojang/datafixers/DataFixer; - FIELD field_15516 server Lnet/minecraft/server/MinecraftServer; - METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V - ARG 1 server + METHOD (Lnet/minecraft/class_3300;Lnet/minecraft/class_32$class_5143;Lcom/mojang/datafixers/DataFixer;)V ARG 3 dataFixer METHOD method_15085 getStructurePath (Lnet/minecraft/class_2960;Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 id diff --git a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping index e015be7d13..0ed9d8858c 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping @@ -15,12 +15,11 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe ARG 6 elementBounds CLASS class_4181 ShapedPoolStructurePiece FIELD field_18696 piece Lnet/minecraft/class_3790; - FIELD field_18697 pieceShape Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_18697 pieceShape Lorg/apache/commons/lang3/mutable/MutableObject; FIELD field_18698 minY I FIELD field_18699 currentSize I - METHOD (Lnet/minecraft/class_3790;Ljava/util/concurrent/atomic/AtomicReference;II)V + METHOD (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;II)V ARG 1 piece - ARG 2 pieceShape ARG 3 minY ARG 4 currentSize CLASS class_4182 StructurePoolGenerator @@ -31,8 +30,7 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe FIELD field_18704 children Ljava/util/List; FIELD field_18705 random Ljava/util/Random; FIELD field_18706 structurePieces Ljava/util/Deque; - METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Ljava/util/concurrent/atomic/AtomicReference;IIZ)V + METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IIZ)V ARG 1 piece - ARG 2 pieceShape ARG 3 minY ARG 4 currentSize diff --git a/mappings/net/minecraft/test/GameTest.mapping b/mappings/net/minecraft/test/GameTest.mapping index 5c1405a222..35834c6371 100644 --- a/mappings/net/minecraft/test/GameTest.mapping +++ b/mappings/net/minecraft/test/GameTest.mapping @@ -9,22 +9,14 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest FIELD field_20569 throwable Ljava/lang/Throwable; FIELD field_21454 expectedStopTime J FIELD field_21456 stopwatch Lcom/google/common/base/Stopwatch; - METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V - ARG 1 testFunction - ARG 2 pos - ARG 3 world - METHOD (Lnet/minecraft/class_4529;Lnet/minecraft/class_3218;)V - ARG 1 testFunction - ARG 2 world METHOD method_22165 tick ()V - METHOD method_22166 init (I)V + METHOD method_22166 init (Lnet/minecraft/class_2338;I)V METHOD method_22167 addListener (Lnet/minecraft/class_4518;)V ARG 1 listener METHOD method_22168 fail (Ljava/lang/Throwable;)V ARG 1 throwable METHOD method_22169 getStructurePath ()Ljava/lang/String; METHOD method_22172 getPos ()Lnet/minecraft/class_2338; - METHOD method_22174 getSize ()Lnet/minecraft/class_2338; METHOD method_22176 getWorld ()Lnet/minecraft/class_3218; METHOD method_22177 isPassed ()Z METHOD method_22178 isFailed ()Z @@ -33,7 +25,6 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTest METHOD method_22182 getThrowable ()Ljava/lang/Throwable; METHOD method_22183 isRequired ()Z METHOD method_22184 isOptional ()Z - METHOD method_22185 getBlockEntity ()Lnet/minecraft/class_2633; METHOD method_23634 startCountdown ()V METHOD method_23635 setPos (Lnet/minecraft/class_2338;)V ARG 1 pos diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 5a454405b9..556563ec30 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -13,24 +13,15 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 structureBlockPos ARG 1 pos ARG 2 world - METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;)V - ARG 0 pos - ARG 1 world - METHOD method_22250 (Ljava/lang/String;Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; - ARG 0 structureId - ARG 1 pos - ARG 3 world - METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)V + METHOD method_22248 placeStartButton (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V + METHOD method_22251 createTestArea (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)V ARG 0 structure ARG 1 pos ARG 2 size - ARG 3 margin ARG 4 world - METHOD method_22252 placeStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; + METHOD method_22252 placeStructure (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Z)Lnet/minecraft/class_2633; ARG 0 name ARG 1 pos - ARG 2 world - ARG 3 resizeDisabled METHOD method_22253 loadSnbt (Ljava/nio/file/Path;)Lnet/minecraft/class_2487; ARG 0 path METHOD method_22255 findNearestStructureBlock (Lnet/minecraft/class_2338;ILnet/minecraft/class_3218;)Lnet/minecraft/class_2338; @@ -51,7 +42,3 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil METHOD method_22369 createStructure (Ljava/lang/String;Lnet/minecraft/class_3218;)Lnet/minecraft/class_3499; ARG 0 structureId ARG 1 world - METHOD method_23646 createArea (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)Lnet/minecraft/class_3341; - ARG 0 pos - ARG 1 size - ARG 2 margin diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index 986b345f4b..d09294a7b6 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -9,11 +9,8 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20554 currentBatchIndex I FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; FIELD field_20556 sizeZ I - METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;)V - ARG 1 batches + METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V ARG 2 pos - ARG 3 world - ARG 4 testManager METHOD method_22155 getTests ()Ljava/util/List; METHOD method_22156 runBatch (I)V ARG 1 index diff --git a/mappings/net/minecraft/test/TestSet.mapping b/mappings/net/minecraft/test/TestSet.mapping index 5fee507211..e83dbae5e4 100644 --- a/mappings/net/minecraft/test/TestSet.mapping +++ b/mappings/net/minecraft/test/TestSet.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_4524 net/minecraft/test/TestSet FIELD field_20577 tests Ljava/util/Collection; - FIELD field_20578 listener Lnet/minecraft/class_4518; METHOD (Ljava/util/Collection;)V ARG 1 tests METHOD method_22229 getFailedRequiredTestCount ()I diff --git a/mappings/net/minecraft/test/TestUtil.mapping b/mappings/net/minecraft/test/TestUtil.mapping index 98b7accb88..e67c842f9f 100644 --- a/mappings/net/minecraft/test/TestUtil.mapping +++ b/mappings/net/minecraft/test/TestUtil.mapping @@ -1,16 +1,14 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil - METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_4521;)V + METHOD method_22203 startTest (Lnet/minecraft/class_4517;Lnet/minecraft/class_2338;Lnet/minecraft/class_4521;)V METHOD method_22207 createBook (Ljava/lang/String;ZLjava/lang/String;)Lnet/minecraft/class_1799; ARG 0 structureName ARG 1 required ARG 2 message METHOD method_22209 createBatches (Ljava/util/Collection;)Ljava/util/Collection; ARG 0 testFunctions - METHOD method_22210 runTestBatches (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;)Ljava/util/Collection; + METHOD method_22210 runTestBatches (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; ARG 0 batches ARG 1 pos - ARG 2 world - ARG 3 testManager METHOD method_22213 clearDebugMarkers (Lnet/minecraft/class_3218;)V ARG 0 world METHOD method_22214 sendMessage (Lnet/minecraft/class_3218;Lnet/minecraft/class_124;Ljava/lang/String;)V @@ -32,10 +30,8 @@ CLASS net/minecraft/class_4520 net/minecraft/test/TestUtil METHOD method_22221 createLectern (Lnet/minecraft/class_4517;Ljava/lang/String;)V ARG 0 test ARG 1 message - METHOD method_22222 runTestFunctions (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;)Ljava/util/Collection; + METHOD method_22222 runTestFunctions (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)Ljava/util/Collection; ARG 0 testFunctions ARG 1 pos - ARG 2 world - ARG 3 testManager METHOD method_22224 handleTestFail (Lnet/minecraft/class_4517;)V ARG 0 test diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index e3cc047d56..cc31319a12 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -9,11 +9,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT refer to {@link MutableText}.

COMMENT COMMENT @see MutableText - FIELD field_24340 TERMINATE_VISIT Ljava/util/Optional; - COMMENT An {@link Optional} that indicates a text visitor should be terminated. - COMMENT - COMMENT @see Visitor#accept(String) - COMMENT @see StyledVisitor#accept(Style, String) METHOD getString ()Ljava/lang/String; COMMENT Returns the full string representation of this text, including siblings. COMMENT @@ -29,39 +24,14 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT the max length allowed for the string representation of the text METHOD method_10866 getStyle ()Lnet/minecraft/class_2583; COMMENT Returns the style of this text. - METHOD method_27657 visit (Lnet/minecraft/class_2561$class_5245;)Ljava/util/Optional; - COMMENT Visits this text and its siblings. - COMMENT - COMMENT

When the visitor returns a {@link Optional#isPresent() non-empty - COMMENT optional} during visit, the visit is immediately terminated and the - COMMENT result is returned.

- COMMENT - COMMENT @return what the visitor returns, or {@link Optional#empty()} if the - COMMENT visitor always returned {@code Optional.empty()}. - ARG 1 visitor - COMMENT the text visitor - METHOD method_27658 visit (Lnet/minecraft/class_2561$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; - COMMENT Visits the code points of in each {@link Text#asString() partial string} - COMMENT representation of {@code text} and its siblings, applying the formatting - COMMENT codes within. - COMMENT - COMMENT

The visit is in forward direction.

- COMMENT - COMMENT @return {@code true} if the full string was visited, or {@code false} indicating - COMMENT the {@code visitor} terminated half-way - COMMENT @see Text#visit(Text.StyledVisitor, Style) - ARG 1 visitor - COMMENT the styled text visitor - ARG 2 style - COMMENT the starting style - METHOD method_27659 visitSelf (Lnet/minecraft/class_2561$class_5245;)Ljava/util/Optional; + METHOD method_27659 visitSelf (Lnet/minecraft/class_5348$class_5245;)Ljava/util/Optional; COMMENT Visits the text itself. COMMENT COMMENT @see #visit(Visitor) COMMENT @return the visitor's return value ARG 1 visitor COMMENT the visitor - METHOD method_27660 visitSelf (Lnet/minecraft/class_2561$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; + METHOD method_27660 visitSelf (Lnet/minecraft/class_5348$class_5246;Lnet/minecraft/class_2583;)Ljava/util/Optional; COMMENT Visits the text itself. COMMENT COMMENT @see #visit(StyledVisitor, Style) @@ -107,27 +77,3 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 1 text ARG 2 type ARG 3 context - CLASS class_5245 Visitor - COMMENT A visitor for text content. - METHOD accept (Ljava/lang/String;)Ljava/util/Optional; - COMMENT Visits a text's {@link Text#asString() asString result}. - COMMENT - COMMENT

When a {@link Optional#isPresent() present optional} is returned, - COMMENT the visit is terminated before visiting all text. Can return {@link - COMMENT Text#TERMINATE_VISIT} for convenience.

- ARG 1 asString - CLASS class_5246 StyledVisitor - COMMENT A visitor for text content and a contextual {@link Style}. - METHOD accept (Lnet/minecraft/class_2583;Ljava/lang/String;)Ljava/util/Optional; - COMMENT Visits a text's contextual style and {@link Text#asString() asString - COMMENT result}. - COMMENT - COMMENT

A contextual style is obtained by calling {@link Style#withParent(Style)} - COMMENT on the current's text style, passing the previous contextual style or - COMMENT the starting style if it is the beginning of a visit.

- COMMENT - COMMENT

When a {@link Optional#isPresent() present optional} is returned, - COMMENT the visit is terminated before visiting all text. Can return {@link - COMMENT Text#TERMINATE_VISIT} for convenience.

- ARG 1 style - ARG 2 asString diff --git a/mappings/net/minecraft/text/TranslatableText.mapping b/mappings/net/minecraft/text/TranslatableText.mapping index ab8bac88d3..0d8a16ae89 100644 --- a/mappings/net/minecraft/text/TranslatableText.mapping +++ b/mappings/net/minecraft/text/TranslatableText.mapping @@ -1,23 +1,18 @@ CLASS net/minecraft/class_2588 net/minecraft/text/TranslatableText - FIELD field_11870 EMPTY_LANGUAGE Lnet/minecraft/class_2477; - FIELD field_11871 languageReloadTimestamp J FIELD field_11872 ARG_FORMAT Ljava/util/regex/Pattern; - FIELD field_11874 LANGUAGE Lnet/minecraft/class_2477; FIELD field_11875 args [Ljava/lang/Object; FIELD field_11876 key Ljava/lang/String; FIELD field_11877 translations Ljava/util/List; FIELD field_24367 EMPTY_ARGUMENTS [Ljava/lang/Object; - FIELD field_24368 LITERAL_PERCENT_SIGN Lnet/minecraft/class_2585; - FIELD field_24369 NULL_ARGUMENT Lnet/minecraft/class_2585; + FIELD field_24368 LITERAL_PERCENT_SIGN Lnet/minecraft/class_5348; + FIELD field_24369 NULL_ARGUMENT Lnet/minecraft/class_5348; METHOD (Ljava/lang/String;)V ARG 1 key METHOD (Ljava/lang/String;[Ljava/lang/Object;)V ARG 1 key ARG 2 args - METHOD method_11021 getArg (I)Lnet/minecraft/class_2561; - ARG 1 index METHOD method_11022 getKey ()Ljava/lang/String; METHOD method_11023 getArgs ()[Ljava/lang/Object; - METHOD method_11024 setTranslation (Ljava/lang/String;)V + METHOD method_11024 setTranslation (Ljava/lang/String;Lnet/minecraft/class_2477;)V ARG 1 translation METHOD method_11025 updateTranslations ()V diff --git a/mappings/net/minecraft/util/Language.mapping b/mappings/net/minecraft/util/Language.mapping index e46e93c39e..8ca5b9829d 100644 --- a/mappings/net/minecraft/util/Language.mapping +++ b/mappings/net/minecraft/util/Language.mapping @@ -1,16 +1,8 @@ CLASS net/minecraft/class_2477 net/minecraft/util/Language FIELD field_11486 INSTANCE Lnet/minecraft/class_2477; - FIELD field_11487 translations Ljava/util/Map; - FIELD field_11488 timeLoaded J FIELD field_11489 TOKEN_PATTERN Ljava/util/regex/Pattern; FIELD field_11490 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_10515 load (Ljava/util/Map;)V - ARG 0 map - METHOD method_10516 hasTranslation (Ljava/lang/String;)Z - ARG 1 key METHOD method_10517 getInstance ()Lnet/minecraft/class_2477; - METHOD method_10518 getTranslation (Ljava/lang/String;)Ljava/lang/String; - ARG 1 key - METHOD method_10519 getTimeLoaded ()J - METHOD method_10520 translate (Ljava/lang/String;)Ljava/lang/String; + METHOD method_4678 hasTranslation (Ljava/lang/String;)Z ARG 1 key + METHOD method_4679 get (Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index ce992c8bbf..5d800e5e3b 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -141,6 +141,5 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 3 defaultEntry METHOD method_29111 containsId (I)Z ARG 1 id - METHOD method_29112 containsKey (Lnet/minecraft/class_5321;)Z - METHOD method_29113 getKey (Ljava/lang/Object;)Lnet/minecraft/class_5321; + METHOD method_29113 getKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 value diff --git a/mappings/net/minecraft/world/FeatureUpdater.mapping b/mappings/net/minecraft/world/FeatureUpdater.mapping index b2146076e9..4296a94e25 100644 --- a/mappings/net/minecraft/world/FeatureUpdater.mapping +++ b/mappings/net/minecraft/world/FeatureUpdater.mapping @@ -15,4 +15,4 @@ CLASS net/minecraft/class_3360 net/minecraft/world/FeatureUpdater ARG 3 id METHOD method_14741 getUpdatedStarts (Lnet/minecraft/class_2487;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487; METHOD method_14744 markResolved (J)V - METHOD method_14745 create (Lnet/minecraft/class_2874;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; + METHOD method_14745 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_26;)Lnet/minecraft/class_3360; diff --git a/mappings/net/minecraft/world/StructureHolder.mapping b/mappings/net/minecraft/world/StructureHolder.mapping index 36b725b8b6..7cb9b01a0e 100644 --- a/mappings/net/minecraft/world/StructureHolder.mapping +++ b/mappings/net/minecraft/world/StructureHolder.mapping @@ -1,14 +1,10 @@ CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder METHOD method_12179 getStructureReferences ()Ljava/util/Map; - METHOD method_12180 getStructureReferences (Ljava/lang/String;)Lit/unimi/dsi/fastutil/longs/LongSet; - ARG 1 structure - METHOD method_12181 getStructureStart (Ljava/lang/String;)Lnet/minecraft/class_3449; - ARG 1 structure - METHOD method_12182 addStructureReference (Ljava/lang/String;J)V - ARG 1 structure + METHOD method_12180 getStructureReferences (Lnet/minecraft/class_3195;)Lit/unimi/dsi/fastutil/longs/LongSet; + METHOD method_12181 getStructureStart (Lnet/minecraft/class_3195;)Lnet/minecraft/class_3449; + METHOD method_12182 addStructureReference (Lnet/minecraft/class_3195;J)V ARG 2 reference METHOD method_12183 setStructureReferences (Ljava/util/Map;)V ARG 1 structureReferences - METHOD method_12184 setStructureStart (Ljava/lang/String;Lnet/minecraft/class_3449;)V - ARG 1 structure + METHOD method_12184 setStructureStart (Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;)V ARG 2 start diff --git a/mappings/net/minecraft/world/chunk/Palette.mapping b/mappings/net/minecraft/world/chunk/Palette.mapping index a6f7885450..798936e669 100644 --- a/mappings/net/minecraft/world/chunk/Palette.mapping +++ b/mappings/net/minecraft/world/chunk/Palette.mapping @@ -10,5 +10,4 @@ CLASS net/minecraft/class_2837 net/minecraft/world/chunk/Palette METHOD method_12290 getPacketSize ()I METHOD method_12291 getIndex (Ljava/lang/Object;)I ARG 1 object - METHOD method_19525 accepts (Ljava/lang/Object;)Z - ARG 1 object + METHOD method_19525 accepts (Ljava/util/function/Predicate;)Z diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 43a13a2570..81892fd6d5 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType - FIELD field_13072 OVERWORLD Lnet/minecraft/class_2874; FIELD field_13073 hasSkyLight Z - FIELD field_13076 THE_NETHER Lnet/minecraft/class_2874; FIELD field_13077 suffix Ljava/lang/String; - FIELD field_13078 THE_END Lnet/minecraft/class_2874; FIELD field_20658 biomeAccessType Lnet/minecraft/class_4545; FIELD field_24504 hasCeiling Z FIELD field_24505 ultrawarm Z @@ -43,7 +40,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545; METHOD method_27998 hasCeiling ()Z METHOD method_27999 isUltrawarm ()Z - METHOD method_28514 getDefaultDimensionType ()Lnet/minecraft/class_2874; METHOD method_28523 addDefaults (Lnet/minecraft/class_5318$class_5319;)Lnet/minecraft/class_5318$class_5319; ARG 0 tracker METHOD method_28537 isNatural ()Z diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 5ccea17a58..f879d2153d 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 14 yaw ARG 16 pitch ARG 18 carvingMask - METHOD method_16581 carveAtPoint (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;IIIIIIIILjava/util/concurrent/atomic/AtomicBoolean;)Z + METHOD method_16581 carveAtPoint (Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;IIIIIIIILorg/apache/commons/lang3/mutable/MutableBoolean;)Z ARG 1 chunk ARG 2 posToBiome ARG 3 carvingMask @@ -77,7 +77,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 13 relativeX ARG 14 y ARG 15 relativeZ - ARG 16 foundSurface METHOD method_16582 isPositionExcluded (DDDI)Z ARG 1 scaledRelativeX ARG 3 scaledRelativeY diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping index 5f30665895..fc1c487954 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -13,7 +13,6 @@ CLASS net/minecraft/class_3232 net/minecraft/world/gen/chunk/FlatChunkGeneratorC ARG 1 config METHOD method_14309 getDefaultConfig ()Lnet/minecraft/class_3232; METHOD method_14312 getLayerBlocks ()[Lnet/minecraft/class_2680; - METHOD method_14314 addStructure (Lnet/minecraft/class_3195;)V METHOD method_14325 setBiome (Lnet/minecraft/class_1959;)V METHOD method_14326 getBiome ()Lnet/minecraft/class_1959; METHOD method_14327 getLayers ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping index ab173db8b4..c1ad4b791d 100644 --- a/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping +++ b/mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 2 randomRadius ARG 3 offset ARG 4 randomOffset - METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;I)V + METHOD method_23448 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;ILnet/minecraft/class_3341;)V COMMENT This is the main method used to generate foliage. ARG 1 world ARG 2 random @@ -17,12 +17,11 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 6 foliageHeight ARG 7 radius ARG 8 leaves - METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;ILjava/util/Set;IZ)V + METHOD method_23449 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;ILjava/util/Set;IZLnet/minecraft/class_3341;)V ARG 1 world ARG 2 random ARG 3 config ARG 5 baseHeight - ARG 6 leaves ARG 8 giantTrunk METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIIZ)Z ARG 2 baseHeight @@ -36,7 +35,7 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer ARG 1 random ARG 2 trunkHeight ARG 3 config - METHOD method_27385 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;)V + METHOD method_27385 generate (Lnet/minecraft/class_3747;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;IILjava/util/Set;Lnet/minecraft/class_3341;)V ARG 1 world ARG 3 config ARG 4 trunkHeight diff --git a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping index b939c00c2e..78a427d18c 100644 --- a/mappings/net/minecraft/world/poi/PointOfInterestType.mapping +++ b/mappings/net/minecraft/world/poi/PointOfInterestType.mapping @@ -23,7 +23,6 @@ CLASS net/minecraft/class_4158 net/minecraft/world/poi/PointOfInterestType METHOD method_19164 getCompletionCondition ()Ljava/util/function/Predicate; METHOD method_19516 from (Lnet/minecraft/class_2680;)Ljava/util/Optional; ARG 0 state - METHOD method_19518 getAllAssociatedStates ()Ljava/util/stream/Stream; METHOD method_20354 setup (Lnet/minecraft/class_4158;)Lnet/minecraft/class_4158; METHOD method_20356 getAllStatesOf (Lnet/minecraft/class_2248;)Ljava/util/Set; ARG 0 block diff --git a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping index 69b9f5e5d7..47f0945f6c 100644 --- a/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping +++ b/mappings/net/minecraft/world/storage/VersionedChunkStorage.mapping @@ -2,8 +2,7 @@ CLASS net/minecraft/class_3977 net/minecraft/world/storage/VersionedChunkStorage FIELD field_17654 featureUpdater Lnet/minecraft/class_3360; FIELD field_17655 dataFixer Lcom/mojang/datafixers/DataFixer; FIELD field_21494 worker Lnet/minecraft/class_4698; - METHOD method_17907 updateChunkTag (Lnet/minecraft/class_2874;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 dimensionType + METHOD method_17907 updateChunkTag (Lnet/minecraft/class_5321;Ljava/util/function/Supplier;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 2 persistentStateManagerFactory ARG 3 tag METHOD method_17908 getDataVersion (Lnet/minecraft/class_2487;)I diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping index 11eb9d940d..492d0730f1 100644 --- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping +++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1257 net/minecraft/world/updater/WorldUpdater FIELD field_5767 updateThread Ljava/lang/Thread; FIELD field_5768 totalChunkCount I METHOD method_17830 getChunkPositions (Lnet/minecraft/class_5321;)Ljava/util/List; - METHOD method_5393 getProgress (Lnet/minecraft/class_2874;)F + METHOD method_5393 getProgress (Lnet/minecraft/class_5321;)F METHOD method_5394 getStatus ()Lnet/minecraft/class_2561; METHOD method_5397 getTotalChunkCount ()I METHOD method_5399 getSkippedChunkCount ()I