diff --git a/gradle.properties b/gradle.properties index 5b6aa82e06..65e71d8ad1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.19+build.190 +enigma_version=0.19+build.197 stitch_version=0.5.0+build.76 \ No newline at end of file diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping index 5c825731d4..2681d55623 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJsonFactory - FIELD field_11414 exp F - FIELD field_11415 time I + FIELD field_11414 experience F + FIELD field_11415 cookingTime I FIELD field_11416 builder Lnet/minecraft/class_161$class_162; - FIELD field_11417 output Lnet/minecraft/class_1792; - FIELD field_11418 input Lnet/minecraft/class_1856; + FIELD field_11417 result Lnet/minecraft/class_1792; + FIELD field_11418 ingredient Lnet/minecraft/class_1856; FIELD field_11419 group Ljava/lang/String; FIELD field_17599 serializer Lnet/minecraft/class_3957; METHOD (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;FILnet/minecraft/class_3957;)V - ARG 1 ouptut - ARG 2 input - ARG 3 exp - ARG 4 time + ARG 1 result + ARG 2 ingredient + ARG 3 experience + ARG 4 cookingTime ARG 5 serializer METHOD method_10468 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter @@ -26,21 +26,21 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 1 exporter ARG 2 recipeIdStr METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 input - ARG 1 output - ARG 2 exp - ARG 3 time + ARG 0 ingredient + ARG 1 result + ARG 2 experience + ARG 3 cookingTime METHOD method_17801 create (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FILnet/minecraft/class_3957;)Lnet/minecraft/class_2454; - ARG 0 input - ARG 1 output - ARG 2 exp - ARG 3 time + ARG 0 ingredient + ARG 1 result + ARG 2 experience + ARG 3 cookingTime ARG 4 serializer METHOD method_17802 createSmelting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; - ARG 0 input - ARG 1 output - ARG 2 exp - ARG 3 time + ARG 0 ingredient + ARG 1 result + ARG 2 experience + ARG 3 cookingTime CLASS class_2455 CookingRecipeJsonProvider FIELD field_11421 experience F FIELD field_11422 cookingTime I @@ -50,14 +50,14 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso FIELD field_11426 group Ljava/lang/String; FIELD field_11427 advancementId Lnet/minecraft/class_2960; FIELD field_11428 result Lnet/minecraft/class_1792; - FIELD field_17600 cookingRecipeSerializer Lnet/minecraft/class_1865; + FIELD field_17600 serializer Lnet/minecraft/class_1865; METHOD (Lnet/minecraft/class_2960;Ljava/lang/String;Lnet/minecraft/class_1856;Lnet/minecraft/class_1792;FILnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;Lnet/minecraft/class_1865;)V ARG 1 recipeId ARG 2 group - ARG 3 input - ARG 4 output - ARG 5 exp - ARG 6 time + ARG 3 ingredient + ARG 4 result + ARG 5 experience + ARG 6 cookingTime ARG 7 builder ARG 8 advancementId ARG 9 serializer diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping index c8df1f05f4..ae00e3ae27 100644 --- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping +++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping @@ -32,5 +32,5 @@ CLASS net/minecraft/class_1593 net/minecraft/entity/mob/PhantomEntity METHOD (Lnet/minecraft/class_1593;Lnet/minecraft/class_1308;)V ARG 2 owner CLASS class_1601 MovementGoal - METHOD method_7104 isCloseToTarget ()Z + METHOD method_7104 isNearTarget ()Z CLASS class_1602 SwoopMovementGoal diff --git a/mappings/net/minecraft/server/function/FunctionLoader.mapping b/mappings/net/minecraft/server/function/FunctionLoader.mapping index 381136a204..9036d9e14c 100644 --- a/mappings/net/minecraft/server/function/FunctionLoader.mapping +++ b/mappings/net/minecraft/server/function/FunctionLoader.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader FIELD field_25326 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_25327 PATH_PREFIX_LENGHT I - FIELD field_25328 PATH_SUFFIX_LENGHT I + FIELD field_25327 PATH_PREFIX_LENGTH I + FIELD field_25328 PATH_SUFFIX_LENGTH I FIELD field_25329 functions Ljava/util/Map; FIELD field_25330 tags Lnet/minecraft/class_3503; FIELD field_25331 level I diff --git a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping similarity index 93% rename from mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping rename to mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping index ccf0922a4b..8cfe9b5f98 100644 --- a/mappings/net/minecraft/world/gen/feature/RuinedPortalFeaturePiece.mapping +++ b/mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5189 net/minecraft/world/gen/feature/RuinedPortalFeaturePiece +CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiece FIELD field_24018 template Lnet/minecraft/class_2960; FIELD field_24019 rotation Lnet/minecraft/class_2470; FIELD field_24020 mirror Lnet/minecraft/class_2415; @@ -67,6 +67,13 @@ CLASS net/minecraft/class_5189 net/minecraft/world/gen/feature/RuinedPortalFeatu FIELD field_24027 vines Z FIELD field_24028 replaceWithBlackstone Z FIELD field_24993 CODEC Lcom/mojang/serialization/Codec; + METHOD (ZFZZZZ)V + ARG 1 cold + ARG 2 mossiness + ARG 3 airPocket + ARG 4 overgrown + ARG 5 vines + ARG 6 replaceWithBlackstone CLASS class_5191 VerticalPlacement FIELD field_24035 VERTICAL_PLACEMENTS Ljava/util/Map; FIELD field_24036 id Ljava/lang/String; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 336e121a1d..c568e4aa86 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk - COMMENT Represents a scoped, modifable view of biomes, block states, fluid states and block entities. + COMMENT Represents a scoped, modifiable view of biomes, block states, fluid states and block entities. METHOD method_12002 addEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_12003 getUpgradeData ()Lnet/minecraft/class_2843; diff --git a/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/ForestRockFeatureConfig.mapping similarity index 71% rename from mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping rename to mappings/net/minecraft/world/gen/feature/ForestRockFeatureConfig.mapping index 67aebdcc27..42f1a2b1b7 100644 --- a/mappings/net/minecraft/world/gen/feature/BoulderFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/ForestRockFeatureConfig.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2951 net/minecraft/world/gen/feature/BoulderFeatureConfig +CLASS net/minecraft/class_2951 net/minecraft/world/gen/feature/ForestRockFeatureConfig FIELD field_13345 state Lnet/minecraft/class_2680; FIELD field_13346 startRadius I FIELD field_24872 CODEC Lcom/mojang/serialization/Codec;