From 0b322ae73ee596d02e255635c248f8ef1a660c07 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:26:37 +0900 Subject: [PATCH] 1.21.2 pre1 stuff (#4014) * 1.21.2-pre2 stuff * Map recipe and loot context * Glyph renames --- .../block/CreakingHeartBlock.mapping | 2 +- .../minecraft/block/RedstoneWireBlock.mapping | 10 ++++++ .../entity/CreakingHeartBlockEntity.mapping | 5 +++ ...yphRenderer.mapping => BakedGlyph.mapping} | 8 ++++- .../client/font/EmptyBakedGlyph.mapping | 2 ++ .../client/font/EmptyGlyphRenderer.mapping | 2 -- .../minecraft/client/font/FontStorage.mapping | 18 +++++----- .../client/font/GlyphAtlasTexture.mapping | 2 +- .../client/font/TextRenderer.mapping | 3 ++ .../net/minecraft/client/gl/GlUniform.mapping | 5 +++ .../client/gl/PostEffectPass.mapping | 1 + .../minecraft/client/gl/ShaderProgram.mapping | 3 ++ .../client/gui/hud/InGameHud.mapping | 23 ++++++++++++ .../client/gui/screen/Screen.mapping | 2 ++ .../recipebook/RecipeBookWidget.mapping | 4 +-- .../client/particle/RedDustParticle.mapping | 1 + .../screen/RealmsPendingInvitesScreen.mapping | 3 ++ .../recipebook/ClientRecipeBook.mapping | 1 + .../client/recipebook/RecipeBookType.mapping | 6 ++-- .../equipment/EquipmentRenderer.mapping | 7 ++++ .../type/EquippableComponent.mapping | 3 ++ .../fix/LockComponentPredicateFix.mapping | 1 + .../net/minecraft/item/BundleItem.mapping | 4 +++ .../minecraft/loot/LootTableReporter.mapping | 1 + .../loot/context/LootContext.mapping | 10 +++--- .../loot/context/LootContextAware.mapping | 2 +- .../context/LootContextParameters.mapping | 12 +++++++ ...erSet.mapping => LootWorldContext.mapping} | 5 ++- .../network/codec/PacketCodec.mapping | 18 ++++++++++ .../DustColorTransitionParticleEffect.mapping | 10 ++++++ .../particle/DustParticleEffect.mapping | 5 +++ .../recipe/CraftingDecoratedPotRecipe.mapping | 8 +++++ .../net/minecraft/recipe/Ingredient.mapping | 4 +++ .../net/minecraft/recipe/RecipeFinder.mapping | 1 + .../recipe/ServerRecipeManager.mapping | 35 +++++++++++++++++++ .../recipe/SmithingTrimRecipe.mapping | 5 +++ .../recipe/book/RecipeBookCategories.mapping | 5 +++ .../recipe/book/RecipeBookCategory.mapping | 2 +- .../recipe/book/RecipeBookGroup.mapping | 2 +- .../display/DisplayedItemFactory.mapping | 12 +++++++ .../recipe/display/SlotDisplay.mapping | 19 ++++++++++ .../display/SlotDisplayContexts.mapping | 6 ++++ .../net/minecraft/registry/Registries.mapping | 1 + .../server/command/RotateCommand.mapping | 2 ++ .../server/command/TeleportCommand.mapping | 1 + .../network/ServerPlayNetworkHandler.mapping | 2 ++ .../context/ContextParameter.mapping} | 4 ++- .../util/context/ContextParameterMap.mapping | 27 ++++++++++++++ .../context/ContextType.mapping} | 3 +- .../minecraft/util/math/ColorHelper.mapping | 2 ++ .../net/minecraft/village/TradeOffers.mapping | 4 +++ 51 files changed, 295 insertions(+), 29 deletions(-) rename mappings/net/minecraft/client/font/{GlyphRenderer.mapping => BakedGlyph.mapping} (83%) create mode 100644 mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping delete mode 100644 mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping rename mappings/net/minecraft/loot/context/{LootContextParameterSet.mapping => LootWorldContext.mapping} (91%) create mode 100644 mappings/net/minecraft/recipe/book/RecipeBookCategories.mapping create mode 100644 mappings/net/minecraft/recipe/display/DisplayedItemFactory.mapping create mode 100644 mappings/net/minecraft/recipe/display/SlotDisplayContexts.mapping rename mappings/net/minecraft/{loot/context/LootContextParameter.mapping => util/context/ContextParameter.mapping} (50%) create mode 100644 mappings/net/minecraft/util/context/ContextParameterMap.mapping rename mappings/net/minecraft/{loot/context/LootContextType.mapping => util/context/ContextType.mapping} (86%) diff --git a/mappings/net/minecraft/block/CreakingHeartBlock.mapping b/mappings/net/minecraft/block/CreakingHeartBlock.mapping index f960174a6a..fcc34604d2 100644 --- a/mappings/net/minecraft/block/CreakingHeartBlock.mapping +++ b/mappings/net/minecraft/block/CreakingHeartBlock.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_10319 net/minecraft/block/CreakingHeartBlock FIELD field_54740 CREAKING Lnet/minecraft/class_2754; METHOD method_64782 isWorldNaturalAndNight (Lnet/minecraft/class_1937;)Z ARG 0 world - METHOD method_64783 isSurroundedByLogs (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z + METHOD method_64783 isSurroundedByPaleOakLogs (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos METHOD method_64784 shouldBeEnabled (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping index 4a0243f8da..a16c605515 100644 --- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping @@ -54,6 +54,14 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock METHOD method_27846 isFullyConnected (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_27936 addPoweredParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;ILnet/minecraft/class_2350;Lnet/minecraft/class_2350;FF)V + ARG 0 world + ARG 1 random + ARG 2 pos + ARG 3 color + ARG 4 perpendicular + ARG 5 direction + ARG 6 minOffset + ARG 7 maxOffset METHOD method_27937 canRunOnTop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos @@ -70,3 +78,5 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock METHOD method_61746 getStrongPower (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos + METHOD method_61747 ([I)V + ARG 0 colors diff --git a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping index 234855a7e5..c45bfa4a70 100644 --- a/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/CreakingHeartBlockEntity.mapping @@ -3,12 +3,14 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt FIELD field_54787 creakingUpdateTimer I FIELD field_54788 trailParticlesSpawnTimer I FIELD field_54789 lastCreakingPuppetPos Lnet/minecraft/class_243; + FIELD field_54910 comparatorOutput I METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state METHOD method_64800 spawnTrailParticles (Lnet/minecraft/class_3218;IZ)V ARG 1 world ARG 2 count + ARG 3 towardsPuppet METHOD method_64801 spawnCreakingPuppet (Lnet/minecraft/class_3218;Lnet/minecraft/class_10323;)Lnet/minecraft/class_10281; ARG 0 world ARG 1 blockEntity @@ -22,3 +24,6 @@ CLASS net/minecraft/class_10323 net/minecraft/block/entity/CreakingHeartBlockEnt ARG 2 state ARG 3 blockEntity METHOD method_64806 onPuppetDamage ()V + METHOD method_65010 getComparatorOutput ()I + METHOD method_65011 calcComparatorOutput ()I + METHOD method_65012 getDistanceToPuppet ()D diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/BakedGlyph.mapping similarity index 83% rename from mappings/net/minecraft/client/font/GlyphRenderer.mapping rename to mappings/net/minecraft/client/font/BakedGlyph.mapping index 3d8651db7c..380b528501 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/BakedGlyph.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer +CLASS net/minecraft/class_382 net/minecraft/client/font/BakedGlyph FIELD field_2272 minX F FIELD field_2273 maxV F FIELD field_2274 minV F @@ -33,6 +33,12 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 4 light METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; ARG 1 layerType + METHOD method_65025 draw (Lnet/minecraft/class_382$class_10364;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V + ARG 1 glyph + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + CLASS class_10364 DrawnGlyph CLASS class_328 Rectangle FIELD comp_3307 minX F FIELD comp_3308 minY F diff --git a/mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping b/mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping new file mode 100644 index 0000000000..f00f3c52c4 --- /dev/null +++ b/mappings/net/minecraft/client/font/EmptyBakedGlyph.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_384 net/minecraft/client/font/EmptyBakedGlyph + FIELD field_38311 INSTANCE Lnet/minecraft/class_384; diff --git a/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping b/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping deleted file mode 100644 index ac12831a0e..0000000000 --- a/mappings/net/minecraft/client/font/EmptyGlyphRenderer.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_384 net/minecraft/client/font/EmptyGlyphRenderer - FIELD field_38311 INSTANCE Lnet/minecraft/class_384; diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index 38de593b3e..67e65ad2e2 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage - FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382; + FIELD field_20910 whiteRectangleBakedGlyph Lnet/minecraft/class_382; FIELD field_2246 id Lnet/minecraft/class_2960; FIELD field_2248 textureManager Lnet/minecraft/class_1060; FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_2252 RANDOM Lnet/minecraft/class_5819; - FIELD field_2253 glyphRendererCache Lnet/minecraft/class_8532; + FIELD field_2253 bakedGlyphCache Lnet/minecraft/class_8532; FIELD field_2254 glyphAtlases Ljava/util/List; - FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382; + FIELD field_2256 blankBakedGlyph Lnet/minecraft/class_382; FIELD field_2257 glyphCache Lnet/minecraft/class_8532; FIELD field_39934 MAX_ADVANCE F FIELD field_49120 allFonts Ljava/util/List; FIELD field_49121 availableFonts Ljava/util/List; FIELD field_54819 glyphFinder Ljava/util/function/IntFunction; - FIELD field_54820 glyphRendererFinder Ljava/util/function/IntFunction; + FIELD field_54820 glyphBaker Ljava/util/function/IntFunction; METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V ARG 1 textureManager ARG 2 id @@ -26,19 +26,19 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage COMMENT @implNote {@link BuiltinEmptyGlyph#MISSING} is returned for missing code points. ARG 1 codePoint ARG 2 validateAdvance - METHOD method_2012 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; + METHOD method_2012 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 c - METHOD method_2013 getObfuscatedGlyphRenderer (Lnet/minecraft/class_379;)Lnet/minecraft/class_382; + METHOD method_2013 getObfuscatedBakedGlyph (Lnet/minecraft/class_379;)Lnet/minecraft/class_382; ARG 1 glyph - METHOD method_2014 getGlyphRenderer (I)Lnet/minecraft/class_382; + METHOD method_2014 getBaked (I)Lnet/minecraft/class_382; ARG 1 codePoint - METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382; + METHOD method_22943 getRectangleBakedGlyph ()Lnet/minecraft/class_382; METHOD method_40038 findGlyph (I)Lnet/minecraft/class_377$class_7647; COMMENT {@return the glyph of {@code codePoint}} COMMENT COMMENT @apiNote Call {@link #getGlyph} instead, as that method provides caching. ARG 1 codePoint - METHOD method_41832 findGlyphRenderer (I)Lnet/minecraft/class_382; + METHOD method_41832 bake (I)Lnet/minecraft/class_382; ARG 1 codePoint METHOD method_45079 isAdvanceInvalid (Lnet/minecraft/class_379;)Z ARG 0 glyph diff --git a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping index cac392ab3e..8df5c6845b 100644 --- a/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping +++ b/mappings/net/minecraft/client/font/GlyphAtlasTexture.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_380 net/minecraft/client/font/GlyphAtlasTexture METHOD (Lnet/minecraft/class_8538;Z)V ARG 1 textRenderLayers ARG 2 hasColor - METHOD method_2022 getGlyphRenderer (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; + METHOD method_2022 bake (Lnet/minecraft/class_383;)Lnet/minecraft/class_382; ARG 1 glyph METHOD method_51640 (I)I ARG 0 color diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index 1aeedc6b6b..8c726b6b33 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -202,7 +202,9 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_33997 layerType Lnet/minecraft/class_327$class_6415; FIELD field_54817 color I FIELD field_54818 backgroundColor I + FIELD field_54911 glyphs Ljava/util/List; METHOD (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIIZLorg/joml/Matrix4f;Lnet/minecraft/class_327$class_6415;I)V + ARG 2 vertexConsumers ARG 3 x ARG 4 y ARG 5 color @@ -221,6 +223,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 8 layerType ARG 9 light METHOD method_27531 drawLayer (F)F + ARG 1 x METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V ARG 1 rectangle CLASS class_6415 TextLayerType diff --git a/mappings/net/minecraft/client/gl/GlUniform.mapping b/mappings/net/minecraft/client/gl/GlUniform.mapping index 78006dcc8a..9c043c1593 100644 --- a/mappings/net/minecraft/client/gl/GlUniform.mapping +++ b/mappings/net/minecraft/client/gl/GlUniform.mapping @@ -38,3 +38,8 @@ CLASS net/minecraft/class_284 net/minecraft/client/gl/GlUniform METHOD method_35662 getDataType ()I METHOD method_35663 getIntData ()Ljava/nio/IntBuffer; METHOD method_35664 getFloatData ()Ljava/nio/FloatBuffer; + METHOD method_65015 set (Lnet/minecraft/class_10157$class_10159;)V + ARG 1 uniform + METHOD method_65016 set (Ljava/util/List;I)V + ARG 1 values + ARG 2 count diff --git a/mappings/net/minecraft/client/gl/PostEffectPass.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping index d0a4f14fb5..f86860173a 100644 --- a/mappings/net/minecraft/client/gl/PostEffectPass.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -19,6 +19,7 @@ CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass METHOD method_62258 addSampler (Lnet/minecraft/class_283$class_9971;)V ARG 1 sampler METHOD method_62922 getProgram ()Lnet/minecraft/class_5944; + METHOD method_65029 setUniforms ()V CLASS class_9971 Sampler METHOD method_62259 preRender (Lnet/minecraft/class_9916;Ljava/util/Map;)V ARG 1 pass diff --git a/mappings/net/minecraft/client/gl/ShaderProgram.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping index e50905a8c8..9357975ca3 100644 --- a/mappings/net/minecraft/client/gl/ShaderProgram.mapping +++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram FIELD field_53839 samplerTextures Lit/unimi/dsi/fastutil/objects/Object2IntMap; FIELD field_53840 samplerLocations Lit/unimi/dsi/fastutil/ints/IntList; FIELD field_53841 uniformsByName Ljava/util/Map; + FIELD field_54926 uniformDefinitionsByName Ljava/util/Map; METHOD (I)V ARG 1 glRef METHOD method_1270 getGlRef ()I @@ -59,3 +60,5 @@ CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram METHOD method_62900 set (Ljava/util/List;Ljava/util/List;)V ARG 1 uniforms ARG 2 samplers + METHOD method_65028 getUniformDefinition (Ljava/lang/String;)Lnet/minecraft/class_10157$class_10159; + ARG 1 name diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index a434c48d2d..f659d193ec 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -71,6 +71,9 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_47550 SCOREBOARD_ENTRY_COMPARATOR Ljava/util/Comparator; FIELD field_47847 layeredDrawer Lnet/minecraft/class_9080; FIELD field_52771 NAUSEA_TEXTURE Lnet/minecraft/class_2960; + FIELD field_54912 AIR_BURSTING_TEXTURE Lnet/minecraft/class_2960; + FIELD field_54913 AIR_EMPTY_TEXTURE Lnet/minecraft/class_2960; + FIELD field_54919 lastBurstBubble I METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_1731 updateVignetteDarkness (Lnet/minecraft/class_1297;)V @@ -244,6 +247,26 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_61980 renderNauseaOverlay (Lnet/minecraft/class_332;F)V ARG 1 context ARG 2 nauseaStrength + METHOD method_65019 getAirBubbleY (II)I + ARG 1 heartCount + ARG 2 top + METHOD method_65020 playBurstSound (ILnet/minecraft/class_1657;I)V + ARG 1 bubble + ARG 2 player + ARG 3 burstBubbles + METHOD method_65021 getAirBubbleDelay (IZ)I + ARG 0 air + ARG 1 submergedInWater + METHOD method_65022 renderAirBubbles (Lnet/minecraft/class_332;Lnet/minecraft/class_1657;III)V + ARG 1 context + ARG 2 player + ARG 3 heartCount + ARG 4 top + ARG 5 left + METHOD method_65024 getAirBubbles (III)I + ARG 0 air + ARG 1 maxAir + ARG 2 delay CLASS class_6411 HeartType FIELD field_33946 POISONED Lnet/minecraft/class_329$class_6411; FIELD field_45329 fullTexture Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/gui/screen/Screen.mapping b/mappings/net/minecraft/client/gui/screen/Screen.mapping index b8865b53b2..0e79fb06e4 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -191,6 +191,8 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 previouslyDisabled METHOD method_64506 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_64507 shouldHideStatusEffectHud ()Z + METHOD method_65027 addCrashReportSection (Lnet/minecraft/class_128;)V + ARG 1 report CLASS class_6390 SelectedElementNarrationData FIELD field_33825 selectable Lnet/minecraft/class_6379; FIELD field_33826 index I diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index 46a0a46179..c67fd309b0 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -115,8 +115,8 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 1 type METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V ARG 1 primaryIcon - ARG 2 group + ARG 2 category METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V ARG 1 primaryIcon ARG 2 secondaryIcon - ARG 3 group + ARG 3 category diff --git a/mappings/net/minecraft/client/particle/RedDustParticle.mapping b/mappings/net/minecraft/client/particle/RedDustParticle.mapping index e3402a7789..6f7a27f289 100644 --- a/mappings/net/minecraft/client/particle/RedDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/RedDustParticle.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_671 net/minecraft/client/particle/RedDustParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + ARG 14 parameters ARG 15 spriteProvider CLASS class_672 Factory FIELD field_17802 spriteProvider Lnet/minecraft/class_4002; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping index f4ea41ca9f..4868ef0e0f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend METHOD method_25179 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_52672 handle (Z)V + ARG 1 accepted METHOD method_52673 (Lnet/minecraft/class_4401$class_4403;ZLjava/lang/Boolean;)V ARG 3 result METHOD method_52674 (Lnet/minecraft/class_4871;)Lnet/minecraft/class_4401$class_4403; @@ -32,6 +33,8 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend ARG 1 pendingInvites CLASS class_4402 PendingInvitationSelectionList METHOD method_64846 isEmpty ()Z + METHOD method_65017 remove (Lnet/minecraft/class_4401$class_4403;)V + ARG 1 invitation CLASS class_4403 PendingInvitationSelectionListEntry FIELD field_19953 mPendingInvite Lnet/minecraft/class_4871; FIELD field_19955 buttons Ljava/util/List; diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index 031f8f837a..fa4092b7d0 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -28,3 +28,4 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook ARG 1 recipeId METHOD method_64857 markHighlighted (Lnet/minecraft/class_10298;)V ARG 1 recipeId + METHOD method_65018 clear ()V diff --git a/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping b/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping index f1450bdb2f..bf44de2e57 100644 --- a/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping +++ b/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_10331 net/minecraft/client/recipebook/RecipeBookType - FIELD field_54841 groups Ljava/util/List; + FIELD field_54841 categories Ljava/util/List; METHOD (Ljava/lang/String;I[Lnet/minecraft/class_10355;)V - ARG 3 groups - METHOD method_64888 getGroups ()Ljava/util/List; + ARG 3 categories + METHOD method_64888 getCategories ()Ljava/util/List; diff --git a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping index 99394a67a4..e238444901 100644 --- a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping @@ -13,11 +13,18 @@ CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/Equ ARG 2 modelId ARG 3 model ARG 4 stack + ARG 5 matrices + ARG 6 vertexConsumers + ARG 7 light METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V ARG 1 layerType ARG 2 modelId ARG 3 model ARG 4 stack + ARG 5 matrices + ARG 6 vertexConsumers + ARG 7 light + ARG 8 texture METHOD method_64079 (Lnet/minecraft/class_10197$class_10198;)Lnet/minecraft/class_2960; ARG 0 key METHOD method_64080 (Lnet/minecraft/class_1059;Lnet/minecraft/class_10197$class_10199;)Lnet/minecraft/class_1058; diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping index ea393a41c4..06ea7e6175 100644 --- a/mappings/net/minecraft/component/type/EquippableComponent.mapping +++ b/mappings/net/minecraft/component/type/EquippableComponent.mapping @@ -20,6 +20,7 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent FIELD field_54238 dispensable Z FIELD field_54239 swappable Z FIELD field_54240 damageOnHurt Z + FIELD field_54908 cameraOverlay Ljava/util/Optional; METHOD (Lnet/minecraft/class_1304;)V ARG 1 slot METHOD method_64203 build ()Lnet/minecraft/class_10192; @@ -37,3 +38,5 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent ARG 1 swappable METHOD method_64210 damageOnHurt (Z)Lnet/minecraft/class_10192$class_10217; ARG 1 damageOnHurt + METHOD method_65009 cameraOverlay (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10192$class_10217; + ARG 1 cameraOverlay diff --git a/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping b/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping index acaa67d334..7f48990dc4 100644 --- a/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/LockComponentPredicateFix.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_10248 net/minecraft/datafixer/fix/LockComponentPredicateFix + FIELD field_54895 ESCAPER Lcom/google/common/escape/Escaper; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD method_64411 fixLock (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/item/BundleItem.mapping b/mappings/net/minecraft/item/BundleItem.mapping index c3f178da91..ce73b68fba 100644 --- a/mappings/net/minecraft/item/BundleItem.mapping +++ b/mappings/net/minecraft/item/BundleItem.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem FIELD field_52577 MAX_TOOLTIP_STACKS_SHOWN I FIELD field_52578 MAX_TOOLTIP_STACKS_SHOWN_WHEN_TOO_MANY_TYPES I FIELD field_52579 FULL_ITEM_BAR_COLOR I + FIELD field_54111 MAX_USE_TIME I FIELD field_54112 openFrontTexture Lnet/minecraft/class_2960; FIELD field_54113 openBackTexture Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;Lnet/minecraft/class_1792$class_1793;)V @@ -50,3 +51,6 @@ CLASS net/minecraft/class_5537 net/minecraft/item/BundleItem ARG 0 color METHOD method_64502 onContentChanged (Lnet/minecraft/class_1657;)V ARG 1 user + METHOD method_64974 (Lnet/minecraft/class_1792;)Lnet/minecraft/class_5537; + ARG 0 item + METHOD method_64975 getBundles ()Ljava/util/List; diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 48121fc114..30191c9740 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_58 net/minecraft/loot/LootTableReporter ARG 2 contextType ARG 3 dataLookup METHOD method_22567 validateContext (Lnet/minecraft/class_46;)V + ARG 1 contextAware METHOD method_22568 withContextType (Lnet/minecraft/class_176;)Lnet/minecraft/class_58; ARG 1 contextType METHOD method_360 report (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index 6ee824ecc2..5ffbc2df9b 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext FIELD field_44490 lookup Lnet/minecraft/class_7871$class_7872; - FIELD field_44881 parameters Lnet/minecraft/class_8567; + FIELD field_44881 worldContext Lnet/minecraft/class_8567; FIELD field_923 random Lnet/minecraft/class_5819; FIELD field_927 activeEntries Ljava/util/Set; METHOD (Lnet/minecraft/class_8567;Lnet/minecraft/class_5819;Lnet/minecraft/class_7871$class_7872;)V - ARG 1 parameters + ARG 1 worldContext ARG 2 random ARG 3 lookup METHOD method_294 getRandom ()Lnet/minecraft/class_5819; @@ -30,11 +30,13 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext ARG 0 itemModifier METHOD method_51187 predicate (Lnet/minecraft/class_5341;)Lnet/minecraft/class_47$class_8487; ARG 0 predicate + METHOD method_65013 get (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter CLASS class_48 Builder - FIELD field_44882 parameters Lnet/minecraft/class_8567; + FIELD field_44882 worldContext Lnet/minecraft/class_8567; FIELD field_934 random Lnet/minecraft/class_5819; METHOD (Lnet/minecraft/class_8567;)V - ARG 1 parameters + ARG 1 worldContext METHOD method_304 random (J)Lnet/minecraft/class_47$class_48; ARG 1 seed METHOD method_309 build (Ljava/util/Optional;)Lnet/minecraft/class_47; diff --git a/mappings/net/minecraft/loot/context/LootContextAware.mapping b/mappings/net/minecraft/loot/context/LootContextAware.mapping index 1e1e0326cb..9045829926 100644 --- a/mappings/net/minecraft/loot/context/LootContextAware.mapping +++ b/mappings/net/minecraft/loot/context/LootContextAware.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_46 net/minecraft/loot/context/LootContextAware METHOD method_292 validate (Lnet/minecraft/class_58;)V ARG 1 reporter - METHOD method_293 getRequiredParameters ()Ljava/util/Set; + METHOD method_293 getAllowedParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/loot/context/LootContextParameters.mapping index e7c6f115f8..4e663a88ff 100644 --- a/mappings/net/minecraft/loot/context/LootContextParameters.mapping +++ b/mappings/net/minecraft/loot/context/LootContextParameters.mapping @@ -1 +1,13 @@ CLASS net/minecraft/class_181 net/minecraft/loot/context/LootContextParameters + FIELD field_1224 BLOCK_STATE Lnet/minecraft/class_169; + FIELD field_1225 EXPLOSION_RADIUS Lnet/minecraft/class_169; + FIELD field_1226 THIS_ENTITY Lnet/minecraft/class_169; + FIELD field_1227 DIRECT_ATTACKING_ENTITY Lnet/minecraft/class_169; + FIELD field_1228 BLOCK_ENTITY Lnet/minecraft/class_169; + FIELD field_1229 TOOL Lnet/minecraft/class_169; + FIELD field_1230 ATTACKING_ENTITY Lnet/minecraft/class_169; + FIELD field_1231 DAMAGE_SOURCE Lnet/minecraft/class_169; + FIELD field_1233 LAST_DAMAGE_PLAYER Lnet/minecraft/class_169; + FIELD field_24424 ORIGIN Lnet/minecraft/class_169; + FIELD field_51805 ENCHANTMENT_LEVEL Lnet/minecraft/class_169; + FIELD field_51806 ENCHANTMENT_ACTIVE Lnet/minecraft/class_169; diff --git a/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping b/mappings/net/minecraft/loot/context/LootWorldContext.mapping similarity index 91% rename from mappings/net/minecraft/loot/context/LootContextParameterSet.mapping rename to mappings/net/minecraft/loot/context/LootWorldContext.mapping index d5efa66eab..da0e354c38 100644 --- a/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping +++ b/mappings/net/minecraft/loot/context/LootWorldContext.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootContextParameterSet +CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootWorldContext FIELD field_44883 world Lnet/minecraft/class_3218; FIELD field_44884 parameters Lnet/minecraft/class_10352; FIELD field_44885 dynamicDrops Ljava/util/Map; FIELD field_44886 luck F METHOD (Lnet/minecraft/class_3218;Lnet/minecraft/class_10352;Ljava/util/Map;F)V ARG 1 world + ARG 2 parameters ARG 3 dynamicDrops ARG 4 luck METHOD method_51863 getWorld ()Lnet/minecraft/class_3218; @@ -12,6 +13,7 @@ CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootContextParameterSe ARG 1 id ARG 2 lootConsumer METHOD method_51866 getLuck ()F + METHOD method_65014 getParameters ()Lnet/minecraft/class_10352; CLASS class_49 DynamicDrop METHOD add (Ljava/util/function/Consumer;)V ARG 1 lootConsumer @@ -39,3 +41,4 @@ CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootContextParameterSe ARG 1 parameter METHOD method_51877 addOptional (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_8567$class_8568; ARG 1 parameter + ARG 2 value diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 01eceb9896..769092600f 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -184,6 +184,24 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 12 codec7 ARG 13 from7 ARG 14 to + METHOD method_65036 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function8;)Lnet/minecraft/class_9139; + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 codec3 + ARG 5 from3 + ARG 6 codec4 + ARG 7 from4 + ARG 8 codec5 + ARG 9 from5 + ARG 10 codec6 + ARG 11 from6 + ARG 12 codec7 + ARG 13 from7 + ARG 14 codec8 + ARG 15 from8 + ARG 16 to CLASS 7 FIELD field_49712 codecSupplier Ljava/util/function/Supplier; CLASS class_9140 ResultFunction diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index ead3790cf1..766946106e 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -6,8 +6,18 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticl FIELD field_48454 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_51491 fromColor I METHOD (IIF)V + ARG 1 fromColor + ARG 2 toColor ARG 3 scale METHOD method_33107 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_33110 getFromColor ()Lorg/joml/Vector3f; METHOD method_33112 getToColor ()Lorg/joml/Vector3f; + METHOD method_65030 (Lnet/minecraft/class_5743;)Ljava/lang/Integer; + ARG 0 particle + METHOD method_65031 (Lnet/minecraft/class_5743;)Ljava/lang/Integer; + ARG 0 particle + METHOD method_65032 (Lnet/minecraft/class_5743;)Ljava/lang/Integer; + ARG 0 particle + METHOD method_65033 (Lnet/minecraft/class_5743;)Ljava/lang/Integer; + ARG 0 particle diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index f5738b8efb..66054455b6 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -5,7 +5,12 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_48455 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_51492 color I METHOD (IF)V + ARG 1 color ARG 2 scale METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_59843 getColor ()Lorg/joml/Vector3f; + METHOD method_65034 (Lnet/minecraft/class_2390;)Ljava/lang/Integer; + ARG 0 particle + METHOD method_65035 (Lnet/minecraft/class_2390;)Ljava/lang/Integer; + ARG 0 particle diff --git a/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping b/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping index 1aab230728..cfb7e04a6c 100644 --- a/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping +++ b/mappings/net/minecraft/recipe/CraftingDecoratedPotRecipe.mapping @@ -1 +1,9 @@ CLASS net/minecraft/class_8164 net/minecraft/recipe/CraftingDecoratedPotRecipe + METHOD method_64976 getBack (Lnet/minecraft/class_9694;)Lnet/minecraft/class_1799; + ARG 0 input + METHOD method_64977 getLeft (Lnet/minecraft/class_9694;)Lnet/minecraft/class_1799; + ARG 0 input + METHOD method_64978 getRight (Lnet/minecraft/class_9694;)Lnet/minecraft/class_1799; + ARG 0 input + METHOD method_64979 getFront (Lnet/minecraft/class_9694;)Lnet/minecraft/class_1799; + ARG 0 input diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 501bffafc2..a67e4f9118 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -33,6 +33,10 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_64672 (Ljava/util/List;)Ljava/lang/Record; ARG 0 displays METHOD method_64673 toDisplay ()Lnet/minecraft/class_10302; + METHOD method_64980 toDisplay (Ljava/util/Optional;)Lnet/minecraft/class_10302; + ARG 0 ingredient + METHOD method_64981 createDisplayWithRemainder (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10302; + ARG 0 displayedItem METHOD method_8091 ofItems ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; ARG 0 items METHOD method_8101 ofItem (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1856; diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index f1ea7af0ee..6f508488a3 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_9875 net/minecraft/recipe/RecipeFinder ARG 1 item ARG 2 maxCount METHOD method_61537 isCraftable (Lnet/minecraft/class_1860;ILnet/minecraft/class_1662$class_9874;)Z + ARG 1 recipe ARG 2 quantity ARG 3 itemCallback METHOD method_61538 isCraftable (Lnet/minecraft/class_1860;Lnet/minecraft/class_1662$class_9874;)Z diff --git a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping index f1ae092cc0..e9038d75c9 100644 --- a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping +++ b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager FIELD field_54640 stonecutterRecipes Lnet/minecraft/class_10291$class_10293; FIELD field_54641 recipes Ljava/util/List; FIELD field_54642 recipesByKey Ljava/util/Map; + FIELD field_54897 SOLE_INGREDIENT_GETTERS Ljava/util/Map; FIELD field_9027 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_7225$class_7874;)V ARG 1 registries @@ -76,6 +77,26 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager METHOD method_64693 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1856;)Z ARG 1 ingredient METHOD method_64694 getStonecutterRecipeForSync ()Lnet/minecraft/class_10291$class_10293; + METHOD method_64984 (Lnet/minecraft/class_7699;Lnet/minecraft/class_1863$class_10356;)Lnet/minecraft/class_10290; + ARG 1 builder + METHOD method_64985 (Lnet/minecraft/class_1860;)Ljava/util/Optional; + ARG 0 recipe + METHOD method_64986 (Lnet/minecraft/class_1860;Lnet/minecraft/class_1863$class_10356;)V + ARG 1 builder + METHOD method_64987 (Lnet/minecraft/class_1863$class_10356;)Lnet/minecraft/class_5321; + ARG 0 builder + METHOD method_64988 (Lnet/minecraft/class_3956;Lnet/minecraft/class_1860;)Ljava/util/Optional; + ARG 1 recipe + METHOD method_64989 (Ljava/util/List;Lnet/minecraft/class_7699;Ljava/util/List;Lnet/minecraft/class_8786;)V + ARG 3 recipe + METHOD method_64990 (Ljava/util/Map$Entry;)Lnet/minecraft/class_1863$class_10356; + ARG 0 entry + METHOD method_64991 (Lnet/minecraft/class_1860;)Ljava/util/Optional; + ARG 0 recipe + METHOD method_64992 cookingIngredientGetter (Lnet/minecraft/class_3956;)Lnet/minecraft/class_1863$class_10357; + ARG 0 expectedType + METHOD method_64993 (Lnet/minecraft/class_1860;)Ljava/util/Optional; + ARG 0 recipe METHOD method_8126 values ()Ljava/util/Collection; COMMENT {@return all recipes in this manager} COMMENT @@ -99,6 +120,20 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager CLASS 1 FIELD field_38221 id Lnet/minecraft/class_5321; CLASS class_10288 ServerRecipe + CLASS class_10356 PropertySetBuilder + FIELD field_54898 propertySetKey Lnet/minecraft/class_5321; + FIELD field_54899 ingredientGetter Lnet/minecraft/class_1863$class_10357; + FIELD field_54900 ingredients Ljava/util/List; + METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_1863$class_10357;)V + ARG 1 propertySetKey + ARG 2 ingredientGetter + METHOD accept (Ljava/lang/Object;)V + ARG 1 recipe + METHOD method_64994 build (Lnet/minecraft/class_7699;)Lnet/minecraft/class_10290; + ARG 1 enabledFeatures + CLASS class_10357 SoleIngredientGetter + METHOD apply (Lnet/minecraft/class_1860;)Ljava/util/Optional; + ARG 1 recipe CLASS class_7266 MatchGetter METHOD method_42303 getFirstMatch (Lnet/minecraft/class_9695;Lnet/minecraft/class_3218;)Ljava/util/Optional; ARG 1 input diff --git a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping index 408418a4dd..1a1e152d9f 100644 --- a/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping +++ b/mappings/net/minecraft/recipe/SmithingTrimRecipe.mapping @@ -7,6 +7,11 @@ CLASS net/minecraft/class_8062 net/minecraft/recipe/SmithingTrimRecipe ARG 1 template ARG 2 base ARG 3 addition + METHOD method_64996 craft (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 0 registries + ARG 1 base + ARG 2 addition + ARG 3 template CLASS class_8063 Serializer FIELD field_46109 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_48365 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/recipe/book/RecipeBookCategories.mapping b/mappings/net/minecraft/recipe/book/RecipeBookCategories.mapping new file mode 100644 index 0000000000..8378074a17 --- /dev/null +++ b/mappings/net/minecraft/recipe/book/RecipeBookCategories.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_314 net/minecraft/recipe/book/RecipeBookCategories + METHOD method_64982 register (Ljava/lang/String;)Lnet/minecraft/class_10355; + ARG 0 id + METHOD method_64983 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_10355; + ARG 0 registry diff --git a/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping b/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping index e8f24e3876..94fbe1270f 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_10287 net/minecraft/recipe/book/RecipeBookCategory +CLASS net/minecraft/class_10355 net/minecraft/recipe/book/RecipeBookCategory diff --git a/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping b/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping index e23179d6d1..5b28fd5d94 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_314 net/minecraft/recipe/book/RecipeBookGroup +CLASS net/minecraft/class_10287 net/minecraft/recipe/book/RecipeBookGroup diff --git a/mappings/net/minecraft/recipe/display/DisplayedItemFactory.mapping b/mappings/net/minecraft/recipe/display/DisplayedItemFactory.mapping new file mode 100644 index 0000000000..57eb564255 --- /dev/null +++ b/mappings/net/minecraft/recipe/display/DisplayedItemFactory.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_10358 net/minecraft/recipe/display/DisplayedItemFactory + CLASS class_10359 FromRemainder + METHOD method_64997 toDisplayed (Ljava/lang/Object;Ljava/util/List;)Ljava/lang/Object; + ARG 1 input + ARG 2 remainders + CLASS class_10360 FromStack + METHOD method_64998 toDisplayed (Lnet/minecraft/class_1792;)Ljava/lang/Object; + ARG 1 item + METHOD method_64999 toDisplayed (Lnet/minecraft/class_1799;)Ljava/lang/Object; + ARG 1 stack + METHOD method_65000 toDisplayed (Lnet/minecraft/class_6880;)Ljava/lang/Object; + ARG 1 item diff --git a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping index 03a6536ce6..4b1f3ce0d1 100644 --- a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping +++ b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping @@ -5,7 +5,10 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay METHOD method_64737 isEnabled (Lnet/minecraft/class_7699;)Z ARG 1 features METHOD method_64738 getStacks (Lnet/minecraft/class_10352;)Ljava/util/List; + ARG 1 parameters METHOD method_64739 appendStacks (Lnet/minecraft/class_10352;Lnet/minecraft/class_10358;)Ljava/util/stream/Stream; + ARG 1 parameters + ARG 2 factory METHOD method_64742 getFirst (Lnet/minecraft/class_10352;)Lnet/minecraft/class_1799; ARG 1 context CLASS class_10303 AnyFuelSlotDisplay @@ -48,6 +51,10 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay FIELD field_54693 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_54694 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_54695 SERIALIZER Lnet/minecraft/class_10302$class_10312; + METHOD method_65002 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_65003 (Lnet/minecraft/class_1799;)Z + ARG 0 stack CLASS class_10311 TagSlotDisplay FIELD field_54696 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_54697 PACKET_CODEC Lnet/minecraft/class_9139; @@ -56,4 +63,16 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay ARG 0 instance METHOD method_64755 (Lnet/minecraft/class_10358$class_10360;Lnet/minecraft/class_6885$class_6888;)Ljava/util/stream/Stream; ARG 1 tag + METHOD method_65005 (Ljava/util/stream/Stream;)Ljava/util/stream/Stream; + ARG 0 values CLASS class_10312 Serializer + CLASS class_10361 NoopDisplayedItemFactory + FIELD field_54901 INSTANCE Lnet/minecraft/class_10302$class_10361; + CLASS class_10362 WithRemainderSlotDisplay + FIELD field_54902 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_54903 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_54904 SERIALIZER Lnet/minecraft/class_10302$class_10312; + METHOD method_65006 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_65007 (Lnet/minecraft/class_10358$class_10359;Ljava/util/List;Ljava/lang/Object;)Ljava/lang/Object; + ARG 2 input diff --git a/mappings/net/minecraft/recipe/display/SlotDisplayContexts.mapping b/mappings/net/minecraft/recipe/display/SlotDisplayContexts.mapping new file mode 100644 index 0000000000..7321c07032 --- /dev/null +++ b/mappings/net/minecraft/recipe/display/SlotDisplayContexts.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10363 net/minecraft/recipe/display/SlotDisplayContexts + FIELD field_54905 FUEL_REGISTRY Lnet/minecraft/class_169; + FIELD field_54906 REGISTRIES Lnet/minecraft/class_169; + FIELD field_54907 CONTEXT_TYPE Lnet/minecraft/class_176; + METHOD method_65008 createParameters (Lnet/minecraft/class_1937;)Lnet/minecraft/class_10352; + ARG 0 world diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 68016f01b3..e79c87248c 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -82,6 +82,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_53967 CONSUME_EFFECT_TYPE Lnet/minecraft/class_2378; FIELD field_54873 SLOT_DISPLAY Lnet/minecraft/class_2378; FIELD field_54874 RECIPE_DISPLAY Lnet/minecraft/class_2378; + FIELD field_54927 RECIPE_BOOK_CATEGORY Lnet/minecraft/class_2378; METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/server/command/RotateCommand.mapping b/mappings/net/minecraft/server/command/RotateCommand.mapping index 388f21b98b..43121a843a 100644 --- a/mappings/net/minecraft/server/command/RotateCommand.mapping +++ b/mappings/net/minecraft/server/command/RotateCommand.mapping @@ -17,3 +17,5 @@ CLASS net/minecraft/class_10270 net/minecraft/server/command/RotateCommand ARG 0 context METHOD method_64576 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context + METHOD method_64961 (Lnet/minecraft/class_2168;)Z + ARG 0 source diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index bab3ee5480..360a4cb6e8 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -49,3 +49,4 @@ CLASS net/minecraft/class_3143 net/minecraft/server/command/TeleportCommand METHOD method_64266 getFlags (Lnet/minecraft/class_2267;Lnet/minecraft/class_2267;Z)Ljava/util/Set; ARG 0 pos ARG 1 rotation + ARG 2 sameDimension diff --git a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping index 929e4b105d..e78ac44ac2 100644 --- a/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping @@ -182,6 +182,8 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan METHOD method_60947 handlePendingTeleport ()Z METHOD method_61290 handleMovement (Lnet/minecraft/class_243;)V ARG 1 movement + METHOD method_64962 shouldCheckMovement (Z)Z + ARG 1 elytra CLASS 1 METHOD method_33897 processInteract (Lnet/minecraft/class_1268;Lnet/minecraft/class_3244$class_5860;)V ARG 1 hand diff --git a/mappings/net/minecraft/loot/context/LootContextParameter.mapping b/mappings/net/minecraft/util/context/ContextParameter.mapping similarity index 50% rename from mappings/net/minecraft/loot/context/LootContextParameter.mapping rename to mappings/net/minecraft/util/context/ContextParameter.mapping index fc9efc0398..1499e3d20d 100644 --- a/mappings/net/minecraft/loot/context/LootContextParameter.mapping +++ b/mappings/net/minecraft/util/context/ContextParameter.mapping @@ -1,5 +1,7 @@ -CLASS net/minecraft/class_169 net/minecraft/loot/context/LootContextParameter +CLASS net/minecraft/class_169 net/minecraft/util/context/ContextParameter FIELD field_1162 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD method_64964 of (Ljava/lang/String;)Lnet/minecraft/class_169; + ARG 0 id METHOD method_746 getId ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/util/context/ContextParameterMap.mapping b/mappings/net/minecraft/util/context/ContextParameterMap.mapping new file mode 100644 index 0000000000..69413c8744 --- /dev/null +++ b/mappings/net/minecraft/util/context/ContextParameterMap.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/class_10352 net/minecraft/util/context/ContextParameterMap + FIELD field_54893 map Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 map + METHOD method_64965 contains (Lnet/minecraft/class_169;)Z + ARG 1 parameter + METHOD method_64966 getOrDefault (Lnet/minecraft/class_169;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 parameter + ARG 2 defaultValue + METHOD method_64967 getOrThrow (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_64968 getNullable (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + CLASS class_10353 Builder + FIELD field_54894 map Ljava/util/Map; + METHOD method_64969 getOrThrow (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_64970 add (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_10352$class_10353; + ARG 1 parameter + ARG 2 value + METHOD method_64971 build (Lnet/minecraft/class_176;)Lnet/minecraft/class_10352; + ARG 1 type + METHOD method_64972 getNullable (Lnet/minecraft/class_169;)Ljava/lang/Object; + ARG 1 parameter + METHOD method_64973 addNullable (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_10352$class_10353; + ARG 1 parameter + ARG 2 value diff --git a/mappings/net/minecraft/loot/context/LootContextType.mapping b/mappings/net/minecraft/util/context/ContextType.mapping similarity index 86% rename from mappings/net/minecraft/loot/context/LootContextType.mapping rename to mappings/net/minecraft/util/context/ContextType.mapping index 05d3568bbb..350bd51707 100644 --- a/mappings/net/minecraft/loot/context/LootContextType.mapping +++ b/mappings/net/minecraft/util/context/ContextType.mapping @@ -1,5 +1,6 @@ -CLASS net/minecraft/class_176 net/minecraft/loot/context/LootContextType +CLASS net/minecraft/class_176 net/minecraft/util/context/ContextType FIELD field_1216 required Ljava/util/Set; + FIELD field_54892 allowed Ljava/util/Set; METHOD (Ljava/util/Set;Ljava/util/Set;)V ARG 1 required ARG 2 allowed diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping index a78e3ae696..4622db12ff 100644 --- a/mappings/net/minecraft/util/math/ColorHelper.mapping +++ b/mappings/net/minecraft/util/math/ColorHelper.mapping @@ -78,3 +78,5 @@ CLASS net/minecraft/class_9848 net/minecraft/util/math/ColorHelper ARG 1 redScale ARG 2 greenScale ARG 3 blueScale + METHOD method_64963 toVector (I)Lorg/joml/Vector3f; + ARG 0 rgb diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index a87718b47e..7dbf5144bb 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -199,11 +199,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 3 count ARG 4 experience METHOD (Lnet/minecraft/class_1792;IIII)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1792;IIIIF)V + ARG 1 item ARG 2 price ARG 3 count ARG 4 maxUses @@ -218,11 +220,13 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 6 multiplier ARG 7 enchantmentProviderKey METHOD (Lnet/minecraft/class_1799;IIII)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses ARG 5 experience METHOD (Lnet/minecraft/class_1799;IIIIF)V + ARG 1 stack ARG 2 price ARG 3 count ARG 4 maxUses