Skip to content

Commit

Permalink
24w40a recipe and client (#4012)
Browse files Browse the repository at this point in the history
* 24w40a recipes

* Map client stuff

* Fix typo

* Rename LoadingWidget

* Repackage ModelTransformationMode
  • Loading branch information
apple502j authored Oct 7, 2024
1 parent dbd154f commit 0c697d6
Show file tree
Hide file tree
Showing 66 changed files with 476 additions and 27 deletions.
3 changes: 3 additions & 0 deletions mappings/net/minecraft/client/font/FontStorage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
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;
METHOD <init> (Lnet/minecraft/class_1060;Lnet/minecraft/class_2960;)V
ARG 1 textureManager
ARG 2 id
METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V
ARG 1 allFonts
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/client/font/GlyphRenderer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
ARG 3 y
ARG 4 matrix
ARG 5 vertexConsumer
ARG 6 color
ARG 7 light
METHOD method_22944 drawRectangle (Lnet/minecraft/class_382$class_328;Lorg/joml/Matrix4f;Lnet/minecraft/class_4588;I)V
ARG 1 rectangle
ARG 2 matrix
Expand All @@ -37,9 +39,11 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer
FIELD field_2007 minY F
FIELD field_2008 minX F
FIELD field_20911 zIndex F
FIELD field_54821 color I
METHOD <init> (FFFFFI)V
ARG 1 minX
ARG 2 minY
ARG 3 maxX
ARG 4 maxY
ARG 5 zIndex
ARG 6 color
23 changes: 21 additions & 2 deletions mappings/net/minecraft/client/font/TextRenderer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
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
Expand Down Expand Up @@ -63,7 +65,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 6 matrix
ARG 7 vertexConsumerProvider
ARG 8 layerType
ARG 9 underlineColor
ARG 9 backgroundColor
ARG 10 light
METHOD method_1726 isRightToLeft ()Z
COMMENT Checks if the currently set language uses right to left writing.
Expand Down Expand Up @@ -161,7 +163,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
ARG 6 matrix
ARG 7 vertexConsumerProvider
ARG 8 layerType
ARG 9 underlineColor
ARG 9 backgroundColor
ARG 10 light
METHOD method_30880 getWidth (Lnet/minecraft/class_5481;)I
COMMENT Gets the width of some text when rendered.
Expand Down Expand Up @@ -209,10 +211,27 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
FIELD field_24251 y F
FIELD field_24252 rectangles Ljava/util/List;
FIELD field_33997 layerType Lnet/minecraft/class_327$class_6415;
FIELD field_54817 color I
FIELD field_54818 backgroundColor I
METHOD <init> (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
ARG 6 backgroundColor
ARG 7 shadow
ARG 8 matrix
ARG 9 layerType
ARG 10 light
METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_4597;FFIZLorg/joml/Matrix4f;Lnet/minecraft/class_327$class_6415;I)V
ARG 2 vertexConsumers
ARG 3 x
ARG 4 y
ARG 5 color
ARG 6 shadow
ARG 7 matrix
ARG 8 layerType
ARG 9 light
METHOD method_27531 drawLayer ()F
METHOD method_27532 addRectangle (Lnet/minecraft/class_382$class_328;)V
ARG 1 rectangle
Expand Down
22 changes: 20 additions & 2 deletions mappings/net/minecraft/client/gui/DrawContext.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,17 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 4 y
ARG 5 color
ARG 6 shadow
METHOD method_51431 drawItemInSlot (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V
METHOD method_51431 drawStackOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V
ARG 1 textRenderer
ARG 2 stack
ARG 3 x
ARG 4 y
METHOD method_51432 drawItemInSlot (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V
METHOD method_51432 drawStackOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V
ARG 1 textRenderer
ARG 2 stack
ARG 3 x
ARG 4 y
ARG 5 stackCountText
METHOD method_51433 drawText (Lnet/minecraft/class_327;Ljava/lang/String;IIIZ)I
ARG 1 textRenderer
ARG 2 text
Expand Down Expand Up @@ -486,6 +490,20 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext
ARG 3 x
ARG 4 y
ARG 5 texture
METHOD method_64859 drawStackCount (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V
ARG 1 textRenderer
ARG 2 stack
ARG 3 x
ARG 4 y
ARG 5 stackCountText
METHOD method_64860 drawItemBar (Lnet/minecraft/class_1799;II)V
ARG 1 stack
ARG 2 x
ARG 3 y
METHOD method_64861 drawCooldownProgress (Lnet/minecraft/class_1799;II)V
ARG 1 stack
ARG 2 x
ARG 3 y
CLASS class_8214 ScissorStack
FIELD field_43099 stack Ljava/util/Deque;
METHOD method_49699 pop ()Lnet/minecraft/class_8030;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ CLASS net/minecraft/class_489 net/minecraft/client/gui/screen/ingame/AbstractFur
ARG 5 background
ARG 6 litProgressTexture
ARG 7 burnProgressTexture
ARG 8 recipeBookTabs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3871 net/minecraft/client/gui/screen/ingame/BlastFurna
FIELD field_45446 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45447 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_52804 TOGGLE_BLASTABLE_TEXT Lnet/minecraft/class_2561;
FIELD field_54822 TABS Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_3705;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 container
ARG 2 inventory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3873 net/minecraft/client/gui/screen/ingame/FurnaceScr
FIELD field_45469 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45470 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_52810 TOGGLE_SMELTABLE_TEXT Lnet/minecraft/class_2561;
FIELD field_54823 TABS Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_3858;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 2 inventory
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/class_3874 net/minecraft/client/gui/screen/ingame/SmokerScre
FIELD field_45499 LIT_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45500 BURN_PROGRESS_TEXTURE Lnet/minecraft/class_2960;
FIELD field_52811 TOGGLE_SMOKABLE_TEXT Lnet/minecraft/class_2561;
FIELD field_54824 TABS Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_3706;Lnet/minecraft/class_1661;Lnet/minecraft/class_2561;)V
ARG 1 handler
ARG 2 inventory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
CLASS net/minecraft/class_9933 net/minecraft/client/gui/screen/recipebook/AbstractCraftingRecipeBookWidget
FIELD field_52824 TEXTURES Lnet/minecraft/class_8666;
FIELD field_52825 TOGGLE_CRAFTABLE_TEXT Lnet/minecraft/class_2561;
FIELD field_54827 TABS Ljava/util/List;
METHOD <init> (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
ARG 3 slot
ARG 4 index
ARG 5 x
ARG 6 y
METHOD method_64870 canDisplay (Lnet/minecraft/class_10295;)Z
ARG 1 display
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ CLASS net/minecraft/class_517 net/minecraft/client/gui/screen/recipebook/Abstrac
METHOD <init> (Lnet/minecraft/class_1720;Lnet/minecraft/class_2561;Ljava/util/List;)V
ARG 1 screenHandler
ARG 2 toggleCraftableButtonText
ARG 3 tabs
METHOD method_64871 (Lnet/minecraft/class_10295;)Z
ARG 0 display
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,23 @@ CLASS net/minecraft/class_514 net/minecraft/client/gui/screen/recipebook/Animate
FIELD field_45557 SLOT_MANY_UNCRAFTABLE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_45558 SLOT_UNCRAFTABLE_TEXTURE Lnet/minecraft/class_2960;
FIELD field_52846 currentIndexProvider Lnet/minecraft/class_9938;
FIELD field_54834 results Ljava/util/List;
METHOD <init> (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
ARG 1 resultCollection
ARG 2 filteringCraftable
ARG 3 results
ARG 4 context
METHOD method_2642 hasSingleResult ()Z
METHOD method_2644 getTooltip (Lnet/minecraft/class_1799;)Ljava/util/List;
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;
ARG 1 entry
METHOD method_64881 getCurrentId ()Lnet/minecraft/class_10298;
METHOD method_64882 getDisplayStack ()Lnet/minecraft/class_1799;
CLASS class_10330 Result
METHOD method_64883 getDisplayStack (I)Lnet/minecraft/class_1799;
ARG 1 currentIndex
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ 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
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
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
ARG 1 slot
ARG 2 context
ARG 3 display
CLASS class_9935 CyclingItem
METHOD method_62035 get (I)Lnet/minecraft/class_1799;
ARG 1 index
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,21 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA
METHOD method_2616 isVisible ()Z
METHOD method_2617 showAlternativesForResult (Lnet/minecraft/class_516;Lnet/minecraft/class_10302$class_10308;ZIIIIF)V
ARG 1 resultCollection
ARG 2 context
ARG 3 filteringCraftable
ARG 4 buttonX
ARG 5 buttonY
ARG 6 areaCenterX
ARG 7 areaCenterY
ARG 8 delta
CLASS class_509 AlternativeButtonWidget
FIELD field_3114 recipe Lnet/minecraft/class_10298;
FIELD field_3114 recipeId Lnet/minecraft/class_10298;
FIELD field_3115 craftable Z
FIELD field_52834 inputSlots Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;ZLjava/util/List;)V
ARG 2 x
ARG 3 y
ARG 4 recipeId
ARG 5 craftable
ARG 6 inputSlots
METHOD method_62039 getOverlayTexture (Z)Lnet/minecraft/class_2960;
Expand Down Expand Up @@ -52,7 +60,13 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA
METHOD <init> (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;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;
ARG 0 display
ARG 1 context
CLASS class_9936 CraftingAlternativeButtonWidget
FIELD field_52830 CRAFTING_OVERLAY Lnet/minecraft/class_2960;
FIELD field_52831 CRAFTING_OVERLAY_HIGHLIGHTED Lnet/minecraft/class_2960;
Expand All @@ -61,4 +75,15 @@ CLASS net/minecraft/class_508 net/minecraft/client/gui/screen/recipebook/RecipeA
METHOD <init> (Lnet/minecraft/class_508;IILnet/minecraft/class_10298;Lnet/minecraft/class_10295;Lnet/minecraft/class_10302$class_10308;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;
ARG 0 display
ARG 1 context
METHOD method_62037 (Lnet/minecraft/class_10302$class_10308;Ljava/util/List;Lnet/minecraft/class_10302;III)V
ARG 2 slot
ARG 3 index
ARG 4 x
ARG 5 y
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
CLASS net/minecraft/class_518 net/minecraft/client/gui/screen/recipebook/RecipeBookProvider
METHOD method_16891 refreshRecipeBook ()V
METHOD method_64862 onCraftFailed (Lnet/minecraft/class_10295;)V
ARG 1 display
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
FIELD field_45552 PAGE_FORWARD_TEXTURES Lnet/minecraft/class_8666;
FIELD field_45553 PAGE_BACKWARD_TEXTURES Lnet/minecraft/class_8666;
FIELD field_52844 filteringCraftable Z
FIELD field_54832 recipeBookWidget Lnet/minecraft/class_507;
METHOD <init> (Lnet/minecraft/class_507;Lnet/minecraft/class_9938;Z)V
ARG 1 recipeBookWidget
ARG 2 currentIndexProvider
ARG 3 furnace
METHOD method_2625 refreshResultButtons ()V
METHOD method_2626 hideShowPageButtons ()V
METHOD method_2627 setResults (Ljava/util/List;ZZ)V
Expand Down Expand Up @@ -48,3 +53,6 @@ CLASS net/minecraft/class_513 net/minecraft/client/gui/screen/recipebook/RecipeB
METHOD method_2638 hideAlternates ()V
METHOD method_37083 forEachButton (Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD method_64878 getLastClickedRecipe ()Lnet/minecraft/class_10298;
METHOD method_64879 onRecipeDisplayed (Lnet/minecraft/class_10298;)V
ARG 1 recipeId
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
FIELD field_53832 selectedRecipe Lnet/minecraft/class_10298;
FIELD field_53833 selectedRecipeResults Lnet/minecraft/class_516;
FIELD field_54388 searchFieldRect Lnet/minecraft/class_8030;
FIELD field_54830 selectedRecipeId Lnet/minecraft/class_10298;
FIELD field_54831 tabs Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_1729;Ljava/util/List;)V
ARG 1 craftingScreenHandler
ARG 2 tabs
METHOD method_17064 getToggleCraftableButtonText ()Lnet/minecraft/class_2561;
METHOD method_2576 triggerPirateSpeakEasterEgg (Ljava/lang/String;)V
ARG 1 search
Expand Down Expand Up @@ -94,5 +97,26 @@ CLASS net/minecraft/class_507 net/minecraft/client/gui/screen/recipebook/RecipeB
METHOD method_62045 isFilteringCraftable ()Z
METHOD method_62889 select (Lnet/minecraft/class_516;Lnet/minecraft/class_10298;)Z
ARG 1 results
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
ARG 1 ghostRecipe
ARG 2 display
ARG 3 context
METHOD method_64875 onCraftFailed (Lnet/minecraft/class_10295;)V
ARG 1 display
METHOD method_64876 onRecipeDisplayed (Lnet/minecraft/class_10298;)V
ARG 1 recipeId
METHOD method_64877 (Lnet/minecraft/class_516;)Z
ARG 0 resultCollection
CLASS class_10329 Tab
METHOD <init> (Lnet/minecraft/class_10331;)V
ARG 1 type
METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_314;)V
ARG 1 primaryIcon
ARG 2 secondaryIcon
ARG 3 group
METHOD <init> (Lnet/minecraft/class_1792;Lnet/minecraft/class_314;)V
ARG 1 primaryIcon
ARG 2 group
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
CLASS net/minecraft/class_512 net/minecraft/client/gui/screen/recipebook/RecipeGroupButtonWidget
FIELD field_3122 bounce F
FIELD field_45554 TEXTURES Lnet/minecraft/class_8666;
FIELD field_54833 tab Lnet/minecraft/class_507$class_10329;
METHOD <init> (Lnet/minecraft/class_507$class_10329;)V
ARG 1 category
ARG 1 tab
METHOD method_2621 renderIcons (Lnet/minecraft/class_332;)V
ARG 1 context
METHOD method_2622 checkForNewRecipes (Lnet/minecraft/class_299;Z)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
CLASS net/minecraft/class_516 net/minecraft/client/gui/screen/recipebook/RecipeResultCollection
FIELD field_3146 craftableRecipes Ljava/util/Set;
FIELD field_3148 singleOutput Z
FIELD field_54835 entries Ljava/util/List;
FIELD field_54836 displayableRecipes Ljava/util/Set;
METHOD <init> (Ljava/util/List;)V
ARG 1 entries
METHOD method_2650 getAllRecipes ()Ljava/util/List;
METHOD method_2653 isCraftable (Lnet/minecraft/class_10298;)Z
ARG 1 recipeId
METHOD method_2655 hasCraftableRecipes ()Z
METHOD method_2656 hasSingleOutput ()Z
METHOD method_30295 shouldHaveSingleOutput (Ljava/util/List;)Z
ARG 0 recipes
METHOD method_64884 populateRecipes (Lnet/minecraft/class_9875;Ljava/util/function/Predicate;)V
ARG 1 finder
ARG 2 displayablePredicate
METHOD method_64885 filter (Lnet/minecraft/class_516$class_9937;)Ljava/util/List;
ARG 1 filterMode
METHOD method_64886 hasDisplayableRecipes ()Z
METHOD method_64887 (Lnet/minecraft/class_10298;)Z
ARG 1 recipeId
CLASS class_9937 RecipeFilterMode
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget
COMMENT this has no side effects (like loading more entries).
ARG 1 amount
METHOD method_60322 refreshScroll ()V
METHOD method_64847 setSelected (I)V
ARG 1 index
CLASS class_351 Entry
FIELD field_22752 parentList Lnet/minecraft/class_350;
METHOD method_25343 render (Lnet/minecraft/class_332;IIIIIIIZF)V
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CLASS net/minecraft/class_8661 net/minecraft/client/realms/gui/RealmsLoadingWidget
CLASS net/minecraft/class_8661 net/minecraft/client/gui/widget/LoadingWidget
FIELD field_45361 textRenderer Lnet/minecraft/class_327;
METHOD <init> (Lnet/minecraft/class_327;Lnet/minecraft/class_2561;)V
ARG 1 textRenderer
Expand Down
Loading

0 comments on commit 0c697d6

Please sign in to comment.