diff --git a/build.gradle b/build.gradle index 98a84447af..b0fb198770 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w40a" +def minecraft_version = "1.21.2-pre1" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping index a279d6c7cd..4a0243f8da 100644 --- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping +++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock FIELD field_24414 DIRECTION_TO_SIDE_SHAPE Ljava/util/Map; FIELD field_24415 DIRECTION_TO_UP_SHAPE Ljava/util/Map; FIELD field_24416 SHAPES Ljava/util/Map; - FIELD field_24466 COLORS [Lorg/joml/Vector3f; + FIELD field_24466 COLORS [I FIELD field_24733 dotState Lnet/minecraft/class_2680; FIELD field_46422 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_52632 redstoneController Lnet/minecraft/class_9906; @@ -53,15 +53,7 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock ARG 1 state 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;Lorg/joml/Vector3f;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;FF)V - ARG 1 world - ARG 2 random - ARG 3 pos - ARG 4 color - ARG 5 perpendicular - ARG 6 direction - ARG 7 minOffset - ARG 8 maxOffset + 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 METHOD method_27937 canRunOnTop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index 98c38ecf48..3d8651db7c 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -34,12 +34,12 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer METHOD method_24045 getLayer (Lnet/minecraft/class_327$class_6415;)Lnet/minecraft/class_1921; ARG 1 layerType CLASS class_328 Rectangle - FIELD field_2005 maxY F - FIELD field_2006 maxX F - FIELD field_2007 minY F - FIELD field_2008 minX F - FIELD field_20911 zIndex F - FIELD field_54821 color I + FIELD comp_3307 minX F + FIELD comp_3308 minY F + FIELD comp_3309 maxX F + FIELD comp_3310 maxY F + FIELD comp_3311 zIndex F + FIELD comp_3312 color I METHOD (FFFFFI)V ARG 1 minX ARG 2 minY @@ -47,3 +47,9 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 4 maxY ARG 5 zIndex ARG 6 color + METHOD comp_3307 minX ()F + METHOD comp_3308 minY ()F + METHOD comp_3309 maxX ()F + METHOD comp_3310 maxY ()F + METHOD comp_3311 zIndex ()F + METHOD comp_3312 color ()I diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index f8f5494873..1aeedc6b6b 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -17,17 +17,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD (Ljava/util/function/Function;Z)V ARG 1 fontStorageAccessor ARG 2 validateAdvance - METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLorg/joml/Matrix4f;Lnet/minecraft/class_4588;II)V - ARG 1 glyphRenderer - ARG 2 bold - ARG 3 italic - ARG 4 weight - ARG 5 x - ARG 6 y - ARG 7 matrix - ARG 8 vertexConsumer - ARG 9 color - ARG 10 light METHOD method_1713 getWrappedLinesHeight (Ljava/lang/String;I)I COMMENT Gets the height of the text when it has been wrapped. COMMENT @@ -214,7 +203,6 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer FIELD field_54817 color I FIELD field_54818 backgroundColor I 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 @@ -232,7 +220,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 7 matrix ARG 8 layerType ARG 9 light - METHOD method_27531 drawLayer ()F + METHOD method_27531 drawLayer (F)F 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/PostEffectPass.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping index ce1f8c84ff..d0a4f14fb5 100644 --- a/mappings/net/minecraft/client/gl/PostEffectPass.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -19,9 +19,6 @@ 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_62923 set (Lnet/minecraft/class_284;Ljava/util/List;)V - ARG 0 uniform - ARG 1 values 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/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 51d00c34fe..a434c48d2d 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_2016 title Lnet/minecraft/class_2561; FIELD field_2017 titleStayTicks I FIELD field_2018 overlayMessage Lnet/minecraft/class_2561; - FIELD field_2019 PUMPKIN_BLUR Lnet/minecraft/class_2960; FIELD field_2020 VIGNETTE_TEXTURE Lnet/minecraft/class_2960; FIELD field_2021 chatHud Lnet/minecraft/class_338; FIELD field_2023 titleRemainTicks I @@ -41,7 +40,6 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud FIELD field_39458 canShowChatDisabledScreen Z FIELD field_45298 FOOD_FULL_TEXTURE Lnet/minecraft/class_2960; FIELD field_45299 AIR_TEXTURE Lnet/minecraft/class_2960; - FIELD field_45300 AIR_BURSTING_TEXTURE Lnet/minecraft/class_2960; FIELD field_45301 VEHICLE_CONTAINER_HEART_TEXTURE Lnet/minecraft/class_2960; FIELD field_45302 VEHICLE_FULL_HEART_TEXTURE Lnet/minecraft/class_2960; FIELD field_45303 VEHICLE_HALF_HEART_TEXTURE 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 ac3daacae4..b8865b53b2 100644 --- a/mappings/net/minecraft/client/gui/screen/Screen.mapping +++ b/mappings/net/minecraft/client/gui/screen/Screen.mapping @@ -40,10 +40,6 @@ CLASS net/minecraft/class_437 net/minecraft/client/gui/screen/Screen ARG 1 client ARG 2 width ARG 3 height - METHOD method_25412 wrapScreenError (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 task - ARG 1 errorTitle - ARG 2 screenName METHOD method_25414 isValidCharacterForName (Ljava/lang/String;CI)Z ARG 1 name ARG 2 character diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractCraftingRecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractCraftingRecipeBookWidget.mapping index 9ad3bd95a7..5ef75de145 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AbstractCraftingRecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AbstractCraftingRecipeBookWidget.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_9933 net/minecraft/client/gui/screen/recipebook/Abstra FIELD field_54827 TABS Ljava/util/List; METHOD (Lnet/minecraft/class_9884;)V ARG 1 screenHandler - METHOD method_64869 (Ljava/util/List;Lnet/minecraft/class_9934;Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302;III)V + METHOD method_64869 (Ljava/util/List;Lnet/minecraft/class_9934;Lnet/minecraft/class_10352;Lnet/minecraft/class_10302;III)V ARG 3 slot ARG 4 index ARG 5 x diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping index 9278fe2501..d8a1f78f12 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/AnimatedResultButton.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate FIELD field_54834 results Ljava/util/List; METHOD (Lnet/minecraft/class_9938;)V ARG 1 currentIndexProvider - METHOD method_2640 showResultCollection (Lnet/minecraft/class_516;ZLnet/minecraft/class_513;Lnet/minecraft/class_10302$class_10308;)V + METHOD method_2640 showResultCollection (Lnet/minecraft/class_516;ZLnet/minecraft/class_513;Lnet/minecraft/class_10352;)V ARG 1 resultCollection ARG 2 filteringCraftable ARG 3 results @@ -20,7 +20,7 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate ARG 1 stack METHOD method_2645 getResultCollection ()Lnet/minecraft/class_516; METHOD method_62048 hasMultipleResults ()Z - METHOD method_64880 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10297;)Lnet/minecraft/class_514$class_10330; + METHOD method_64880 (Lnet/minecraft/class_10352;Lnet/minecraft/class_10297;)Lnet/minecraft/class_514$class_10330; ARG 1 entry METHOD method_64881 getCurrentId ()Lnet/minecraft/class_10298; METHOD method_64882 getDisplayStack ()Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping index 8d416612f4..f8483403ee 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/GhostRecipe.mapping @@ -17,16 +17,16 @@ CLASS net/minecraft/class_9934 net/minecraft/client/gui/screen/recipebook/GhostR ARG 1 context ARG 2 client ARG 3 resultHasPadding - METHOD method_64872 addInputs (Lnet/minecraft/class_1735;Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302;)V + METHOD method_64872 addInputs (Lnet/minecraft/class_1735;Lnet/minecraft/class_10352;Lnet/minecraft/class_10302;)V ARG 1 slot ARG 2 context ARG 3 display - METHOD method_64873 addItems (Lnet/minecraft/class_1735;Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302;Z)V + METHOD method_64873 addItems (Lnet/minecraft/class_1735;Lnet/minecraft/class_10352;Lnet/minecraft/class_10302;Z)V ARG 1 slot ARG 2 context ARG 3 display ARG 4 resultSlot - METHOD method_64874 addResults (Lnet/minecraft/class_1735;Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302;)V + METHOD method_64874 addResults (Lnet/minecraft/class_1735;Lnet/minecraft/class_10352;Lnet/minecraft/class_10302;)V ARG 1 slot ARG 2 context ARG 3 display diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping index 55206272b0..ba78822069 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeAlternativesWidget.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA METHOD method_2614 getResults ()Lnet/minecraft/class_516; METHOD method_2615 getLastClickedRecipe ()Lnet/minecraft/class_10298; METHOD method_2616 isVisible ()Z - METHOD method_2617 showAlternativesForResult (Lnet/minecraft/class_516;Lnet/minecraft/class_10302$class_10308;ZIIIIF)V + METHOD method_2617 showAlternativesForResult (Lnet/minecraft/class_516;Lnet/minecraft/class_10352;ZIIIIF)V ARG 1 resultCollection ARG 2 context ARG 3 filteringCraftable @@ -57,14 +57,14 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA FIELD field_52836 FURNACE_OVERLAY_HIGHLIGHTED Lnet/minecraft/class_2960; FIELD field_52837 FURNACE_OVERLAY_DISABLED Lnet/minecraft/class_2960; FIELD field_52838 FURNACE_OVERLAY_DISABLED_HIGHLIGHTED Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;Z)V + METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10352;Z)V ARG 2 x ARG 3 y ARG 4 recipeId ARG 5 display ARG 6 context ARG 7 craftable - METHOD method_2619 alignRecipe (Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;)Ljava/util/List; + METHOD method_2619 alignRecipe (Lnet/minecraft/class_10295;Lnet/minecraft/class_10352;)Ljava/util/List; ARG 0 display ARG 1 context CLASS class_9936 CraftingAlternativeButtonWidget @@ -72,17 +72,17 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA FIELD field_52831 CRAFTING_OVERLAY_HIGHLIGHTED Lnet/minecraft/class_2960; FIELD field_52832 CRAFTING_OVERLAY_DISABLED Lnet/minecraft/class_2960; FIELD field_52833 CRAFTING_OVERLAY_DISABLED_HIGHLIGHTED Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;Z)V + METHOD (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10352;Z)V ARG 2 x ARG 3 y ARG 4 recipeId ARG 5 display ARG 6 context ARG 7 craftable - METHOD method_62036 collectInputSlots (Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;)Ljava/util/List; + METHOD method_62036 collectInputSlots (Lnet/minecraft/class_10295;Lnet/minecraft/class_10352;)Ljava/util/List; ARG 0 display ARG 1 context - METHOD method_62037 (Lnet/minecraft/class_10302$class_10308;Ljava/util/List;Lnet/minecraft/class_10302;III)V + METHOD method_62037 (Lnet/minecraft/class_10352;Ljava/util/List;Lnet/minecraft/class_10302;III)V ARG 2 slot ARG 3 index ARG 4 x diff --git a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping index e6b7526ae4..46a0a46179 100644 --- a/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/recipebook/RecipeBookWidget.mapping @@ -100,7 +100,7 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB ARG 2 recipeId METHOD method_64366 getTop ()I METHOD method_64367 getLeft ()I - METHOD method_64868 showGhostRecipe (Lnet/minecraft/class_9934;Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;)V + METHOD method_64868 showGhostRecipe (Lnet/minecraft/class_9934;Lnet/minecraft/class_10295;Lnet/minecraft/class_10352;)V ARG 1 ghostRecipe ARG 2 display ARG 3 context @@ -113,10 +113,10 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB CLASS class_10329 Tab METHOD (Lnet/minecraft/class_10331;)V ARG 1 type - METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_314;)V + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V + ARG 1 primaryIcon + ARG 2 group + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_10355;)V ARG 1 primaryIcon ARG 2 secondaryIcon ARG 3 group - METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_314;)V - ARG 1 primaryIcon - ARG 2 group diff --git a/mappings/net/minecraft/client/particle/RedDustParticle.mapping b/mappings/net/minecraft/client/particle/RedDustParticle.mapping index 6f7a27f289..e3402a7789 100644 --- a/mappings/net/minecraft/client/particle/RedDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/RedDustParticle.mapping @@ -7,7 +7,6 @@ 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 09b89be192..f4ea41ca9f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsPendingInvitesScreen.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend FIELD field_19936 parent Lnet/minecraft/class_437; FIELD field_19937 tooltip Lnet/minecraft/class_2561; FIELD field_19939 pendingInvitationSelectionList Lnet/minecraft/class_4401$class_4402; - FIELD field_19941 selectedInvite I FIELD field_19942 acceptButton Lnet/minecraft/class_4185; FIELD field_19943 rejectButton Lnet/minecraft/class_4185; FIELD field_22702 ACCEPT_ICON_TEXTURE Lnet/minecraft/class_2960; @@ -18,28 +17,20 @@ CLASS net/minecraft/class_4401 net/minecraft/client/realms/gui/screen/RealmsPend ARG 1 parent ARG 2 title METHOD method_21307 updateButtonStates ()V - METHOD method_21314 shouldAcceptAndRejectButtonBeVisible (I)Z - ARG 1 invite METHOD method_25175 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25177 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25179 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_52672 handle (IZ)V - ARG 1 index - ARG 2 accepted - METHOD method_52673 (IZLjava/lang/Boolean;)V + METHOD method_52672 handle (Z)V + 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; ARG 1 invite METHOD method_52679 (Ljava/util/List;)V ARG 1 pendingInvites CLASS class_4402 PendingInvitationSelectionList - METHOD method_21321 removeAtIndex (I)V - ARG 1 index - METHOD method_21322 selectInviteListItem (I)V - ARG 1 item METHOD method_64846 isEmpty ()Z CLASS class_4403 PendingInvitationSelectionListEntry FIELD field_19953 mPendingInvite Lnet/minecraft/class_4871; diff --git a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping index 6819110781..031f8f837a 100644 --- a/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping +++ b/mappings/net/minecraft/client/recipebook/ClientRecipeBook.mapping @@ -8,19 +8,19 @@ CLASS net/minecraft/class_299 net/minecraft/client/recipebook/ClientRecipeBook ARG 1 category METHOD method_30283 toGroupedMap (Ljava/lang/Iterable;)Ljava/util/Map; ARG 0 recipes - METHOD method_64848 (Lnet/minecraft/class_314;)Ljava/util/List; + METHOD method_64848 (Lnet/minecraft/class_10355;)Ljava/util/List; ARG 0 group METHOD method_64849 add (Lnet/minecraft/class_10297;)V ARG 1 entry METHOD method_64850 remove (Lnet/minecraft/class_10298;)V ARG 1 recipeId - METHOD method_64851 (Ljava/util/Map;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_314;Ljava/util/List;)V + METHOD method_64851 (Ljava/util/Map;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/class_10355;Ljava/util/List;)V ARG 2 group ARG 3 resultCollections - METHOD method_64852 (Ljava/util/Map;Lnet/minecraft/class_314;)Ljava/util/stream/Stream; + METHOD method_64852 (Ljava/util/Map;Lnet/minecraft/class_10355;)Ljava/util/stream/Stream; ARG 1 group METHOD method_64853 refresh ()V - METHOD method_64854 (Lnet/minecraft/class_314;)Ljava/util/List; + METHOD method_64854 (Lnet/minecraft/class_10355;)Ljava/util/List; ARG 0 group METHOD method_64855 isHighlighted (Lnet/minecraft/class_10298;)Z ARG 1 recipeId diff --git a/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping b/mappings/net/minecraft/client/recipebook/RecipeBookType.mapping index ffd9aeb334..f1450bdb2f 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; - METHOD (Ljava/lang/String;I[Lnet/minecraft/class_314;)V + METHOD (Ljava/lang/String;I[Lnet/minecraft/class_10355;)V ARG 3 groups METHOD method_64888 getGroups ()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 04e862b897..99394a67a4 100644 --- a/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/equipment/EquipmentRenderer.mapping @@ -8,25 +8,16 @@ CLASS net/minecraft/class_10197 net/minecraft/client/render/entity/equipment/Equ METHOD method_64076 getDyeColor (Lnet/minecraft/class_10186$class_10189;I)I ARG 0 layer ARG 1 dyeColor - METHOD method_64077 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + METHOD method_64077 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;I)V ARG 1 layerType ARG 2 modelId ARG 3 model ARG 4 stack - ARG 5 renderLayerFunction - ARG 6 matrices - ARG 7 vertexConsumers - ARG 8 light - METHOD method_64078 render (Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_2960;Lnet/minecraft/class_3879;Lnet/minecraft/class_1799;Ljava/util/function/Function;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_2960;)V + 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 renderLayerFunction - ARG 6 matrices - ARG 7 vertexConsumers - ARG 8 light - ARG 9 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/client/search/SearchManager.mapping b/mappings/net/minecraft/client/search/SearchManager.mapping index 65b73a552c..637efc71bc 100644 --- a/mappings/net/minecraft/client/search/SearchManager.mapping +++ b/mappings/net/minecraft/client/search/SearchManager.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager METHOD method_60357 addItemTooltipReloader (Lnet/minecraft/class_7225$class_7874;Ljava/util/List;)V ARG 1 registries ARG 2 stacks - METHOD method_60360 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;Lnet/minecraft/class_516;)Ljava/util/stream/Stream; + METHOD method_60360 (Lnet/minecraft/class_10352;Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1836;Lnet/minecraft/class_516;)Ljava/util/stream/Stream; ARG 3 resultCollection METHOD method_60363 (Lnet/minecraft/class_2561;)Ljava/lang/String; ARG 0 tooltip @@ -39,12 +39,12 @@ CLASS net/minecraft/class_1124 net/minecraft/client/search/SearchManager ARG 0 stack METHOD method_60370 getItemTagReloadFuture ()Lnet/minecraft/class_1129; METHOD method_60372 getItemTooltipReloadFuture ()Lnet/minecraft/class_1129; - METHOD method_64907 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10297;)Ljava/util/stream/Stream; + METHOD method_64907 (Lnet/minecraft/class_10352;Lnet/minecraft/class_10297;)Ljava/util/stream/Stream; ARG 1 display - METHOD method_64908 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_2378;Lnet/minecraft/class_516;)Ljava/util/stream/Stream; + METHOD method_64908 (Lnet/minecraft/class_10352;Lnet/minecraft/class_2378;Lnet/minecraft/class_516;)Ljava/util/stream/Stream; ARG 2 resultCollection METHOD method_64909 (Lnet/minecraft/class_2378;Lnet/minecraft/class_1799;)Lnet/minecraft/class_2960; ARG 1 stack - METHOD method_64910 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10297;)Ljava/util/stream/Stream; + METHOD method_64910 (Lnet/minecraft/class_10352;Lnet/minecraft/class_10297;)Ljava/util/stream/Stream; ARG 1 display CLASS class_1125 Key diff --git a/mappings/net/minecraft/loot/LootTableReporter.mapping b/mappings/net/minecraft/loot/LootTableReporter.mapping index 30191c9740..48121fc114 100644 --- a/mappings/net/minecraft/loot/LootTableReporter.mapping +++ b/mappings/net/minecraft/loot/LootTableReporter.mapping @@ -16,7 +16,6 @@ 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 39a17c4737..6ee824ecc2 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext METHOD method_294 getRandom ()Lnet/minecraft/class_5819; METHOD method_295 markInactive (Lnet/minecraft/class_47$class_8487;)V ARG 1 entry - METHOD method_296 get (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter METHOD method_297 drop (Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 lootConsumer diff --git a/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping b/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping index 352a89a338..d5efa66eab 100644 --- a/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping +++ b/mappings/net/minecraft/loot/context/LootContextParameterSet.mapping @@ -1,32 +1,23 @@ CLASS net/minecraft/class_8567 net/minecraft/loot/context/LootContextParameterSet FIELD field_44883 world Lnet/minecraft/class_3218; - FIELD field_44884 parameters Ljava/util/Map; + 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;Ljava/util/Map;Ljava/util/Map;F)V + 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; METHOD method_51864 addDynamicDrops (Lnet/minecraft/class_2960;Ljava/util/function/Consumer;)V ARG 1 id ARG 2 lootConsumer - METHOD method_51865 contains (Lnet/minecraft/class_169;)Z - ARG 1 parameter METHOD method_51866 getLuck ()F - METHOD method_51867 get (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_51868 (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter - METHOD method_51869 getOptional (Lnet/minecraft/class_169;)Ljava/lang/Object; - ARG 1 parameter CLASS class_49 DynamicDrop METHOD add (Ljava/util/function/Consumer;)V ARG 1 lootConsumer CLASS class_8568 Builder FIELD field_44887 world Lnet/minecraft/class_3218; - FIELD field_44888 parameters Ljava/util/Map; + FIELD field_44888 parameters Lnet/minecraft/class_10352$class_10353; FIELD field_44889 dynamicDrops Ljava/util/Map; FIELD field_44890 luck F METHOD (Lnet/minecraft/class_3218;)V @@ -48,4 +39,3 @@ 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/loot/context/LootContextParameters.mapping b/mappings/net/minecraft/loot/context/LootContextParameters.mapping index 1598948b45..e7c6f115f8 100644 --- a/mappings/net/minecraft/loot/context/LootContextParameters.mapping +++ b/mappings/net/minecraft/loot/context/LootContextParameters.mapping @@ -1,3 +1 @@ CLASS net/minecraft/class_181 net/minecraft/loot/context/LootContextParameters - METHOD method_798 register (Ljava/lang/String;)Lnet/minecraft/class_169; - ARG 0 name diff --git a/mappings/net/minecraft/loot/context/LootContextType.mapping b/mappings/net/minecraft/loot/context/LootContextType.mapping index 0dda4a137b..05d3568bbb 100644 --- a/mappings/net/minecraft/loot/context/LootContextType.mapping +++ b/mappings/net/minecraft/loot/context/LootContextType.mapping @@ -1,18 +1,8 @@ CLASS net/minecraft/class_176 net/minecraft/loot/context/LootContextType - FIELD field_1215 allowed Ljava/util/Set; FIELD field_1216 required Ljava/util/Set; METHOD (Ljava/util/Set;Ljava/util/Set;)V ARG 1 required ARG 2 allowed - METHOD method_35553 isAllowed (Lnet/minecraft/class_169;)Z - ARG 1 parameter - METHOD method_35554 create ()Lnet/minecraft/class_176$class_177; - METHOD method_60298 validate (Lnet/minecraft/class_58;Lnet/minecraft/class_46;)V - ARG 1 lootTableReporter - ARG 2 parameterConsumer - METHOD method_776 validate (Lnet/minecraft/class_8942;Lnet/minecraft/class_46;)V - ARG 1 errorReporter - ARG 2 parameterConsumer METHOD method_777 getAllowed ()Ljava/util/Set; METHOD method_778 getRequired ()Ljava/util/Set; METHOD method_779 (Lnet/minecraft/class_169;)Ljava/lang/String; diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 910a20428b..01eceb9896 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -184,7 +184,7 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 12 codec7 ARG 13 from7 ARG 14 to - CLASS 6 + CLASS 7 FIELD field_49712 codecSupplier Ljava/util/function/Supplier; CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping index d87abf78b1..ead3790cf1 100644 --- a/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustColorTransitionParticleEffect.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/class_5743 net/minecraft/particle/DustColorTransitionParticleEffect - FIELD field_28267 SCULK_BLUE Lorg/joml/Vector3f; + FIELD field_28267 SCULK_BLUE I FIELD field_28268 DEFAULT Lnet/minecraft/class_5743; FIELD field_28269 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_28271 toColor Lorg/joml/Vector3f; + FIELD field_28271 toColor I FIELD field_48454 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_51491 fromColor Lorg/joml/Vector3f; - METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V - ARG 1 fromColor - ARG 2 toColor + FIELD field_51491 fromColor I + METHOD (IIF)V ARG 3 scale METHOD method_33107 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_33109 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; - ARG 0 effect METHOD method_33110 getFromColor ()Lorg/joml/Vector3f; - METHOD method_33111 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; - ARG 0 effect METHOD method_33112 getToColor ()Lorg/joml/Vector3f; - METHOD method_56172 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; - ARG 0 effect - METHOD method_56173 (Lnet/minecraft/class_5743;)Lorg/joml/Vector3f; - ARG 0 effect diff --git a/mappings/net/minecraft/particle/DustParticleEffect.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping index ccbf933671..f5738b8efb 100644 --- a/mappings/net/minecraft/particle/DustParticleEffect.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -1,16 +1,11 @@ CLASS net/minecraft/class_2390 net/minecraft/particle/DustParticleEffect FIELD field_11188 DEFAULT Lnet/minecraft/class_2390; FIELD field_25124 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_28272 RED Lorg/joml/Vector3f; + FIELD field_28272 RED I FIELD field_48455 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_51492 color Lorg/joml/Vector3f; - METHOD (Lorg/joml/Vector3f;F)V - ARG 1 color + FIELD field_51492 color I + METHOD (IF)V ARG 2 scale METHOD method_33115 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_33117 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; - ARG 0 effect - METHOD method_56175 (Lnet/minecraft/class_2390;)Lorg/joml/Vector3f; - ARG 0 effect METHOD method_59843 getColor ()Lorg/joml/Vector3f; diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping index 0b966d7adc..8af1ac3e5b 100644 --- a/mappings/net/minecraft/recipe/Recipe.mapping +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe METHOD method_49188 showNotification ()Z METHOD method_61671 getIngredientPlacement ()Lnet/minecraft/class_9887; METHOD method_64664 getDisplays ()Ljava/util/List; - METHOD method_64668 getRecipeBookTab ()Lnet/minecraft/class_314; + METHOD method_64668 getRecipeBookTab ()Lnet/minecraft/class_10355; METHOD method_8112 getGroup ()Ljava/lang/String; COMMENT {@return a group this recipe belongs in, or an empty string} This is COMMENT only used by the recipe book. diff --git a/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping b/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping index 48dee3af09..c3c17b3438 100644 --- a/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping +++ b/mappings/net/minecraft/recipe/RecipeDisplayEntry.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_10297 net/minecraft/recipe/RecipeDisplayEntry FIELD field_54663 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_64729 isCraftable (Lnet/minecraft/class_9875;)Z ARG 1 finder - METHOD method_64730 getStacks (Lnet/minecraft/class_10302$class_10308;)Ljava/util/List; + METHOD method_64730 getStacks (Lnet/minecraft/class_10352;)Ljava/util/List; ARG 1 context diff --git a/mappings/net/minecraft/recipe/RecipeFinder.mapping b/mappings/net/minecraft/recipe/RecipeFinder.mapping index 6f508488a3..f1ea7af0ee 100644 --- a/mappings/net/minecraft/recipe/RecipeFinder.mapping +++ b/mappings/net/minecraft/recipe/RecipeFinder.mapping @@ -7,7 +7,6 @@ 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/RepairItemRecipe.mapping b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping index 70540fc480..c6aaee7f09 100644 --- a/mappings/net/minecraft/recipe/RepairItemRecipe.mapping +++ b/mappings/net/minecraft/recipe/RepairItemRecipe.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4317 net/minecraft/recipe/RepairItemRecipe METHOD method_57528 (Lnet/minecraft/class_7225$class_7874;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304;Lnet/minecraft/class_9304$class_9305;)V ARG 3 builder METHOD method_58438 findPair (Lnet/minecraft/class_9694;)Lcom/mojang/datafixers/util/Pair; - ARG 1 input METHOD method_58439 canCombineStacks (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Z ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping index 40921d3902..f1ae092cc0 100644 --- a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping +++ b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping @@ -70,8 +70,6 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager METHOD method_64689 (Ljava/util/List;Lnet/minecraft/class_2960;Lnet/minecraft/class_1860;)V ARG 1 id ARG 2 recipe - METHOD method_64690 (Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_7699;Ljava/util/List;Lnet/minecraft/class_8786;)V - ARG 9 entry METHOD method_64691 (Ljava/util/function/Consumer;Lnet/minecraft/class_1863$class_10288;)V ARG 1 recipe METHOD method_64692 getPropertySets ()Ljava/util/Map; diff --git a/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping b/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping index 997e45e977..e23179d6d1 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBookGroup.mapping @@ -1,10 +1 @@ CLASS net/minecraft/class_314 net/minecraft/recipe/book/RecipeBookGroup - FIELD field_54627 ID_TO_VALUE Ljava/util/function/IntFunction; - FIELD field_54628 PACKET_CODEC Lnet/minecraft/class_9139; - FIELD field_54629 id I - METHOD (Ljava/lang/String;II)V - ARG 3 id - METHOD method_64666 (Lnet/minecraft/class_314;)I - ARG 0 group - METHOD method_64667 (Lnet/minecraft/class_314;)I - ARG 0 group diff --git a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping index 768e6a7704..03a6536ce6 100644 --- a/mappings/net/minecraft/recipe/display/SlotDisplay.mapping +++ b/mappings/net/minecraft/recipe/display/SlotDisplay.mapping @@ -4,17 +4,9 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay METHOD method_64736 serializer ()Lnet/minecraft/class_10302$class_10312; METHOD method_64737 isEnabled (Lnet/minecraft/class_7699;)Z ARG 1 features - METHOD method_64738 getStacks (Lnet/minecraft/class_10302$class_10308;)Ljava/util/List; - ARG 1 context - METHOD method_64739 appendStacks (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302$class_10309;)V - ARG 1 context - ARG 2 consumer - METHOD method_64740 appendStacks (Lnet/minecraft/class_10302$class_10308;Ljava/util/function/Consumer;)V - ARG 1 context - ARG 2 consumer - METHOD method_64741 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_64742 getFirst (Lnet/minecraft/class_10302$class_10308;)Lnet/minecraft/class_1799; + METHOD method_64738 getStacks (Lnet/minecraft/class_10352;)Ljava/util/List; + METHOD method_64739 appendStacks (Lnet/minecraft/class_10352;Lnet/minecraft/class_10358;)Ljava/util/stream/Stream; + METHOD method_64742 getFirst (Lnet/minecraft/class_10352;)Lnet/minecraft/class_1799; ARG 1 context CLASS class_10303 AnyFuelSlotDisplay FIELD field_54674 INSTANCE Lnet/minecraft/class_10302$class_10303; @@ -29,7 +21,7 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay ARG 0 instance METHOD method_64747 (Lnet/minecraft/class_7699;Lnet/minecraft/class_10302;)Z ARG 1 child - METHOD method_64748 (Lnet/minecraft/class_10302$class_10308;Lnet/minecraft/class_10302$class_10309;Lnet/minecraft/class_10302;)V + METHOD method_64748 (Lnet/minecraft/class_10352;Lnet/minecraft/class_10358;Lnet/minecraft/class_10302;)Ljava/util/stream/Stream; ARG 2 display CLASS class_10305 EmptySlotDisplay FIELD field_54681 INSTANCE Lnet/minecraft/class_10302$class_10305; @@ -52,20 +44,7 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay ARG 1 o METHOD method_64750 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - CLASS class_10308 Context - METHOD method_64751 fuelRegistry ()Lnet/minecraft/class_9895; - METHOD method_64752 create (Lnet/minecraft/class_1937;)Lnet/minecraft/class_10302$class_10308; - ARG 0 world - METHOD method_64753 registries ()Lnet/minecraft/class_7225$class_7874; - CLASS class_10309 StackConsumer - METHOD method_64743 append (Lnet/minecraft/class_1792;)V - ARG 1 item - METHOD method_64744 append (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD method_64745 append (Lnet/minecraft/class_6880;)V - ARG 1 item CLASS class_10310 SmithingTrimSlotDisplay - FIELD field_54692 INSTANCE Lnet/minecraft/class_10302$class_10310; 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; @@ -75,6 +54,6 @@ CLASS net/minecraft/class_10302 net/minecraft/recipe/display/SlotDisplay FIELD field_54698 SERIALIZER Lnet/minecraft/class_10302$class_10312; METHOD method_64754 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_64755 (Lnet/minecraft/class_10302$class_10309;Lnet/minecraft/class_6885$class_6888;)V + METHOD method_64755 (Lnet/minecraft/class_10358$class_10360;Lnet/minecraft/class_6885$class_6888;)Ljava/util/stream/Stream; ARG 1 tag CLASS class_10312 Serializer diff --git a/mappings/net/minecraft/server/command/TeleportCommand.mapping b/mappings/net/minecraft/server/command/TeleportCommand.mapping index ae0a149652..bab3ee5480 100644 --- a/mappings/net/minecraft/server/command/TeleportCommand.mapping +++ b/mappings/net/minecraft/server/command/TeleportCommand.mapping @@ -46,6 +46,6 @@ CLASS net/minecraft/class_3143 net/minecraft/server/command/TeleportCommand ARG 2 destination METHOD method_36970 formatFloat (D)Ljava/lang/String; ARG 0 d - METHOD method_64266 getFlags (Lnet/minecraft/class_2267;Lnet/minecraft/class_2267;)Ljava/util/Set; + METHOD method_64266 getFlags (Lnet/minecraft/class_2267;Lnet/minecraft/class_2267;Z)Ljava/util/Set; ARG 0 pos ARG 1 rotation diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo10354.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo10354.mapping new file mode 100644 index 0000000000..f8b3d7c55f --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo10354.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10354 net/minecraft/unused/packageinfo/PackageInfo10354 diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 7dbf5144bb..a87718b47e 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -199,13 +199,11 @@ 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 @@ -220,13 +218,11 @@ 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