diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index 6947c9604c..5b28f87c81 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement METHOD method_690 addChild (Lnet/minecraft/class_161;)V ARG 1 child METHOD method_691 getRewards ()Lnet/minecraft/class_170; - CLASS class_162 Task + CLASS class_162 Builder FIELD field_1147 display Lnet/minecraft/class_185; FIELD field_1148 criteria Ljava/util/Map; FIELD field_1149 parentObj Lnet/minecraft/class_161; diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping similarity index 94% rename from mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping index 35c6b9d00a..f34523eb76 100644 --- a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJsonFactory +CLASS net/minecraft/class_2456 net/minecraft/data/server/recipe/ComplexRecipeJsonBuilder FIELD field_11429 serializer Lnet/minecraft/class_1866; METHOD (Lnet/minecraft/class_1866;)V ARG 1 serializer diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping similarity index 92% rename from mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping index 248d3aad64..36d5b62c9b 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonBuilder.mapping @@ -1,7 +1,7 @@ -CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJsonFactory +CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJsonBuilder FIELD field_11414 experience F FIELD field_11415 cookingTime I - FIELD field_11416 builder Lnet/minecraft/class_161$class_162; + FIELD field_11416 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11417 output Lnet/minecraft/class_1792; FIELD field_11418 input Lnet/minecraft/class_1856; FIELD field_11419 group Ljava/lang/String; @@ -43,7 +43,7 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso CLASS class_2455 CookingRecipeJsonProvider FIELD field_11421 experience F FIELD field_11422 cookingTime I - FIELD field_11423 builder Lnet/minecraft/class_161$class_162; + FIELD field_11423 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11424 recipeId Lnet/minecraft/class_2960; FIELD field_11425 input Lnet/minecraft/class_1856; FIELD field_11426 group Ljava/lang/String; @@ -57,6 +57,6 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 4 result ARG 5 experience ARG 6 cookingTime - ARG 7 builder + ARG 7 advancementBuilder ARG 8 advancementId ARG 9 serializer diff --git a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping similarity index 96% rename from mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping index 2a0e4207cb..2c85c02a06 100644 --- a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5797 net/minecraft/data/server/recipe/CraftingRecipeJsonFactory +CLASS net/minecraft/class_5797 net/minecraft/data/server/recipe/CraftingRecipeJsonBuilder METHOD method_10431 offerTo (Ljava/util/function/Consumer;)V ARG 1 exporter METHOD method_17972 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping similarity index 90% rename from mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping index c769f975b5..7840928193 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJsonFactory +CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJsonBuilder FIELD field_11376 inputs Ljava/util/Map; FIELD field_11377 pattern Ljava/util/List; FIELD field_11378 outputCount I - FIELD field_11379 builder Lnet/minecraft/class_161$class_162; + FIELD field_11379 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11380 output Lnet/minecraft/class_1792; FIELD field_11381 group Ljava/lang/String; METHOD (Lnet/minecraft/class_1935;I)V @@ -33,7 +33,7 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_11386 resultCount I FIELD field_11387 group Ljava/lang/String; FIELD field_11388 inputs Ljava/util/Map; - FIELD field_11389 builder Lnet/minecraft/class_161$class_162; + FIELD field_11389 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11390 advancementId Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V ARG 1 recipeId @@ -42,5 +42,5 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson ARG 4 group ARG 5 pattern ARG 6 inputs - ARG 7 builder + ARG 7 advancementBuilder ARG 8 advancementId diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping similarity index 89% rename from mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping index f31e9d54f5..12cac46837 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory - FIELD field_11393 builder Lnet/minecraft/class_161$class_162; +CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder + FIELD field_11393 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11394 inputs Ljava/util/List; FIELD field_11395 outputCount I FIELD field_11396 output Lnet/minecraft/class_1792; @@ -29,7 +29,7 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ CLASS class_2451 ShapelessRecipeJsonProvider FIELD field_11399 group Ljava/lang/String; FIELD field_11400 count I - FIELD field_11401 builder Lnet/minecraft/class_161$class_162; + FIELD field_11401 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_11402 recipeId Lnet/minecraft/class_2960; FIELD field_11403 output Lnet/minecraft/class_1792; FIELD field_11404 inputs Ljava/util/List; @@ -40,5 +40,5 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ ARG 3 outputCount ARG 4 group ARG 5 inputs - ARG 6 builder + ARG 6 advancementBuilder ARG 7 advancementId diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping similarity index 88% rename from mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping index a8e528e4dd..56641d7f95 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory +CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipeJsonBuilder FIELD field_17690 output Lnet/minecraft/class_1792; FIELD field_17691 input Lnet/minecraft/class_1856; FIELD field_17692 count I - FIELD field_17693 builder Lnet/minecraft/class_161$class_162; + FIELD field_17693 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_17694 group Ljava/lang/String; FIELD field_17695 serializer Lnet/minecraft/class_1865; METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;I)V @@ -25,7 +25,7 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe FIELD field_17698 input Lnet/minecraft/class_1856; FIELD field_17699 output Lnet/minecraft/class_1792; FIELD field_17700 count I - FIELD field_17701 builder Lnet/minecraft/class_161$class_162; + FIELD field_17701 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_17702 advancementId Lnet/minecraft/class_2960; FIELD field_17703 serializer Lnet/minecraft/class_1865; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;ILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V @@ -35,5 +35,5 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe ARG 4 input ARG 5 output ARG 6 outputCount - ARG 7 builder + ARG 7 advancementBuilder ARG 8 advancementId diff --git a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping similarity index 89% rename from mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonFactory.mapping rename to mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping index a014b956f6..d9d392818d 100644 --- a/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder.mapping @@ -1,8 +1,8 @@ -CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJsonFactory +CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJsonBuilder FIELD field_25491 base Lnet/minecraft/class_1856; FIELD field_25492 addition Lnet/minecraft/class_1856; FIELD field_25493 result Lnet/minecraft/class_1792; - FIELD field_25494 builder Lnet/minecraft/class_161$class_162; + FIELD field_25494 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_25495 serializer Lnet/minecraft/class_1865; METHOD (Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;)V ARG 1 serializer @@ -29,7 +29,7 @@ CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJs FIELD field_25497 base Lnet/minecraft/class_1856; FIELD field_25498 addition Lnet/minecraft/class_1856; FIELD field_25499 result Lnet/minecraft/class_1792; - FIELD field_25500 builder Lnet/minecraft/class_161$class_162; + FIELD field_25500 advancementBuilder Lnet/minecraft/class_161$class_162; FIELD field_25501 advancementId Lnet/minecraft/class_2960; FIELD field_25502 serializer Lnet/minecraft/class_1865; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;Lnet/minecraft/class_1856;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V @@ -38,5 +38,5 @@ CLASS net/minecraft/class_5377 net/minecraft/data/server/recipe/SmithingRecipeJs ARG 3 base ARG 4 addition ARG 5 result - ARG 6 builder + ARG 6 advancementBuilder ARG 7 advancementId