mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '23w35a' of https://github.com/FabricMC/yarn into 23w35a-shnupbups-stuff 

# Conflicts:
#	mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping
#	mappings/net/minecraft/recipe/BlastingRecipe.mapping
#	mappings/net/minecraft/recipe/CampfireCookingRecipe.mapping
#	mappings/net/minecraft/recipe/CookingRecipeSerializer.mapping
#	mappings/net/minecraft/recipe/CuttingRecipe.mapping
#	mappings/net/minecraft/recipe/Ingredient.mapping
#	mappings/net/minecraft/recipe/RecipeSerializer.mapping
#	mappings/net/minecraft/recipe/ShapedRecipe.mapping
#	mappings/net/minecraft/recipe/ShapelessRecipe.mapping
#	mappings/net/minecraft/recipe/SmeltingRecipe.mapping
#	mappings/net/minecraft/recipe/SmokingRecipe.mapping
#	mappings/net/minecraft/recipe/StonecuttingRecipe.mapping
This commit is contained in:
apple502j 2023-08-31 22:01:10 +09:00
parent a2bab9dada 9a4cb6c19f
commit 45b727b739
No known key found for this signature in database
GPG Key ID: AFDA4829AC6D8993
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping
View File

@ -2,9 +2,9 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe
FIELD field_17544 type Lnet/minecraft/class_3956;
FIELD field_40241 category Lnet/minecraft/class_7709;
FIELD field_9057 experience F
FIELD field_9058 cookTime I
FIELD field_9059 output Lnet/minecraft/class_1799;
FIELD field_9061 input Lnet/minecraft/class_1856;
FIELD field_9058 cookingTime I
FIELD field_9059 result Lnet/minecraft/class_1799;
FIELD field_9061 ingredient Lnet/minecraft/class_1856;
FIELD field_9062 group Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_3956;Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)V
ARG 1 type
@ -15,5 +15,5 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe
ARG 6 experience
ARG 7 cookTime
METHOD method_45438 getCategory ()Lnet/minecraft/class_7709;
METHOD method_8167 getCookTime ()I
METHOD method_8167 getCookingTime ()I
METHOD method_8171 getExperience ()F

4
mappings/net/minecraft/recipe/CuttingRecipe.mapping
View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_3972 net/minecraft/recipe/CuttingRecipe
COMMENT A recipe that has only one input ingredient. It can be used by any type
COMMENT of recipe as long as its subclass implements the proper interface.
FIELD field_17642 input Lnet/minecraft/class_1856;
FIELD field_17643 output Lnet/minecraft/class_1799;
FIELD field_17642 ingredient Lnet/minecraft/class_1856;
FIELD field_17643 result Lnet/minecraft/class_1799;
FIELD field_17645 group Ljava/lang/String;
FIELD field_17646 type Lnet/minecraft/class_3956;
FIELD field_17647 serializer Lnet/minecraft/class_1865;

2
mappings/net/minecraft/recipe/MapExtendingRecipe.mapping
View File

@ -1,3 +1,5 @@
CLASS net/minecraft/class_1861 net/minecraft/recipe/MapExtendingRecipe
METHOD <init> (Lnet/minecraft/class_7710;)V
ARG 1 category
METHOD method_51165 findFilledMap (Lnet/minecraft/class_8566;)Lnet/minecraft/class_1799;
ARG 0 inventory

2
mappings/net/minecraft/recipe/Recipe.mapping
View File

@ -25,7 +25,7 @@ CLASS net/minecraft/class_1860 net/minecraft/recipe/Recipe
COMMENT {@return whether this recipe has no ingredient or has any empty ingredient}
COMMENT The recipe book uses this to ignore recipes for display.
METHOD method_49188 showNotification ()Z
METHOD method_8110 getOutput (Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799;
METHOD method_8110 getResult (Lnet/minecraft/class_5455;)Lnet/minecraft/class_1799;
COMMENT {@return a preview of the recipe's output}
COMMENT
COMMENT <p>The returned stack should not be modified. To obtain the actual output,

2
mappings/net/minecraft/recipe/RecipeSerializer.mapping
View File

@ -32,7 +32,7 @@ CLASS net/minecraft/class_1865 net/minecraft/recipe/RecipeSerializer
METHOD method_17724 register (Ljava/lang/String;Lnet/minecraft/class_1865;)Lnet/minecraft/class_1865;
ARG 0 id
ARG 1 serializer
METHOD method_53736 getCodec ()Lcom/mojang/serialization/Codec;
METHOD method_53736 codec ()Lcom/mojang/serialization/Codec;
METHOD method_8122 read (Lnet/minecraft/class_2540;)Lnet/minecraft/class_1860;
COMMENT Reads a recipe from a packet byte buf, usually on the client.
COMMENT

4
mappings/net/minecraft/recipe/ShapedRecipe.mapping
View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_1869 net/minecraft/recipe/ShapedRecipe
FIELD field_40256 category Lnet/minecraft/class_7710;
FIELD field_42719 showNotification Z
FIELD field_9052 input Lnet/minecraft/class_2371;
FIELD field_9053 output Lnet/minecraft/class_1799;
FIELD field_9052 ingredients Lnet/minecraft/class_2371;
FIELD field_9053 result Lnet/minecraft/class_1799;
FIELD field_9054 height I
FIELD field_9055 width I
FIELD field_9056 group Ljava/lang/String;

2
mappings/net/minecraft/recipe/ShapelessRecipe.mapping
View File

@ -1,6 +1,6 @@
CLASS net/minecraft/class_1867 net/minecraft/recipe/ShapelessRecipe
FIELD field_40257 category Lnet/minecraft/class_7710;
FIELD field_9047 input Lnet/minecraft/class_2371;
FIELD field_9047 ingredients Lnet/minecraft/class_2371;
FIELD field_9049 group Ljava/lang/String;
FIELD field_9050 output Lnet/minecraft/class_1799;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7710;Lnet/minecraft/class_1799;Lnet/minecraft/class_2371;)V