diff --git a/gradle.properties b/gradle.properties index 654a6438a7..f8226627c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -enigma_version=0.23.0 +enigma_version=0.24.0 stitch_version=0.5.1+build.77 # Loader is only used by javadoc generation/linking fabric_loader_version=0.11.1 diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 66f67158d0..123893e8ed 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -30,7 +30,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock ARG 1 state ARG 2 world ARG 3 pos - METHOD method_26159 getVisualShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; + METHOD method_26159 getCameraCollisionShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 state ARG 2 world ARG 3 pos @@ -511,7 +511,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock METHOD method_26201 getCullingShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265; ARG 1 world ARG 2 pos - METHOD method_26202 getVisualShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; + METHOD method_26202 getCameraCollisionShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Lnet/minecraft/class_265; ARG 1 world ARG 2 pos ARG 3 context diff --git a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping index 6980244c53..b96312d626 100644 --- a/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/AbstractFurnaceBlockEntity.mapping @@ -50,6 +50,7 @@ CLASS net/minecraft/class_2609 net/minecraft/block/entity/AbstractFurnaceBlockEn METHOD method_17763 dropExperienceForRecipesUsed (Lnet/minecraft/class_3222;)V ARG 1 player METHOD method_26395 isNonFlammableWood (Lnet/minecraft/class_1792;)Z + COMMENT Returns whether the provided {@code item} is in the {@linkplain ItemTags#NON_FLAMMABLE_WOOD} tag. ARG 0 item METHOD method_27354 getRecipesUsedAndDropExperience (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Ljava/util/List; ARG 1 world diff --git a/mappings/net/minecraft/block/piston/PistonHandler.mapping b/mappings/net/minecraft/block/piston/PistonHandler.mapping index 91474b227b..1342262d7b 100644 --- a/mappings/net/minecraft/block/piston/PistonHandler.mapping +++ b/mappings/net/minecraft/block/piston/PistonHandler.mapping @@ -14,7 +14,7 @@ CLASS net/minecraft/class_2674 net/minecraft/block/piston/PistonHandler ARG 4 retracted METHOD method_11536 getBrokenBlocks ()Ljava/util/List; METHOD method_11537 calculatePush ()Z - METHOD method_11538 canMoveAdjacentBlock (Lnet/minecraft/class_2338;)Z + METHOD method_11538 tryMoveAdjacentBlock (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_11539 setMovedBlocks (II)V ARG 1 from diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 1ee64b8aee..3b2605faf2 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -191,27 +191,27 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_27027 MAGENTA_CANDLE Lnet/minecraft/class_1792; FIELD field_27028 LIGHT_BLUE_CANDLE Lnet/minecraft/class_1792; FIELD field_27029 YELLOW_CANDLE Lnet/minecraft/class_1792; - FIELD field_27030 WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; + FIELD field_27030 OXIDIZED_CUT_COPPER Lnet/minecraft/class_1792; FIELD field_27031 CUT_COPPER_STAIRS Lnet/minecraft/class_1792; - FIELD field_27032 LIGHTLY_WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; - FIELD field_27033 SEMI_WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; - FIELD field_27034 WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; + FIELD field_27032 EXPOSED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; + FIELD field_27033 WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; + FIELD field_27034 OXIDIZED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; FIELD field_27035 CUT_COPPER_SLAB Lnet/minecraft/class_1792; - FIELD field_27036 LIGHTLY_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; - FIELD field_27037 SEMI_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; - FIELD field_27038 WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; + FIELD field_27036 EXPOSED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; + FIELD field_27037 WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; + FIELD field_27038 OXIDIZED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; FIELD field_27039 WAXED_COPPER Lnet/minecraft/class_1792; - FIELD field_27040 WAXED_LIGHTLY_WEATHERED_COPPER Lnet/minecraft/class_1792; - FIELD field_27041 WAXED_SEMI_WEATHERED_COPPER Lnet/minecraft/class_1792; + FIELD field_27040 WAXED_EXPOSED_COPPER Lnet/minecraft/class_1792; + FIELD field_27041 WAXED_WEATHERED_COPPER Lnet/minecraft/class_1792; FIELD field_27042 WAXED_CUT_COPPER Lnet/minecraft/class_1792; - FIELD field_27043 WAXED_LIGHTLY_WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; - FIELD field_27044 WAXED_SEMI_WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; + FIELD field_27043 WAXED_EXPOSED_CUT_COPPER Lnet/minecraft/class_1792; + FIELD field_27044 WAXED_WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; FIELD field_27045 WAXED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; - FIELD field_27046 WAXED_LIGHTLY_WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; - FIELD field_27047 WAXED_SEMI_WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; + FIELD field_27046 WAXED_EXPOSED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; + FIELD field_27047 WAXED_WEATHERED_CUT_COPPER_STAIRS Lnet/minecraft/class_1792; FIELD field_27048 WAXED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; - FIELD field_27049 WAXED_LIGHTLY_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; - FIELD field_27050 WAXED_SEMI_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; + FIELD field_27049 WAXED_EXPOSED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; + FIELD field_27050 WAXED_WEATHERED_CUT_COPPER_SLAB Lnet/minecraft/class_1792; FIELD field_27051 LIGHTNING_ROD Lnet/minecraft/class_1792; FIELD field_27052 LIME_CANDLE Lnet/minecraft/class_1792; FIELD field_27053 PINK_CANDLE Lnet/minecraft/class_1792; @@ -231,12 +231,12 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_27068 LARGE_AMETHYST_BUD Lnet/minecraft/class_1792; FIELD field_27069 AMETHYST_CLUSTER Lnet/minecraft/class_1792; FIELD field_27071 COPPER_BLOCK Lnet/minecraft/class_1792; - FIELD field_27072 LIGHTLY_WEATHERED_COPPER_BLOCK Lnet/minecraft/class_1792; - FIELD field_27073 SEMI_WEATHERED_COPPER_BLOCK Lnet/minecraft/class_1792; - FIELD field_27074 WEATHERED_COPPER_BLOCK Lnet/minecraft/class_1792; + FIELD field_27072 EXPOSED_COPPER Lnet/minecraft/class_1792; + FIELD field_27073 WEATHERED_COPPER Lnet/minecraft/class_1792; + FIELD field_27074 OXIDIZED_COPPER Lnet/minecraft/class_1792; FIELD field_27075 CUT_COPPER Lnet/minecraft/class_1792; - FIELD field_27076 LIGHTLY_WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; - FIELD field_27077 SEMI_WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; + FIELD field_27076 EXPOSED_CUT_COPPER Lnet/minecraft/class_1792; + FIELD field_27077 WEATHERED_CUT_COPPER Lnet/minecraft/class_1792; FIELD field_28042 POINTED_DRIPSTONE Lnet/minecraft/class_1792; FIELD field_28043 DRIPSTONE_BLOCK Lnet/minecraft/class_1792; FIELD field_28101 SCULK_SENSOR Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/world/BlockStateRaycastContext.mapping b/mappings/net/minecraft/world/BlockStateRaycastContext.mapping index 29bcacdd44..4057f9b032 100644 --- a/mappings/net/minecraft/world/BlockStateRaycastContext.mapping +++ b/mappings/net/minecraft/world/BlockStateRaycastContext.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_5702 net/minecraft/world/BlockStateRaycastContext FIELD field_28102 start Lnet/minecraft/class_243; FIELD field_28103 end Lnet/minecraft/class_243; - FIELD field_28104 state Ljava/util/function/Predicate; + FIELD field_28104 statePredicate Ljava/util/function/Predicate; METHOD (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Ljava/util/function/Predicate;)V ARG 1 start ARG 2 end - ARG 3 state + ARG 3 statePredicate METHOD method_32883 getEnd ()Lnet/minecraft/class_243; METHOD method_32884 getStart ()Lnet/minecraft/class_243; - METHOD method_32885 getState ()Ljava/util/function/Predicate; + METHOD method_32885 getStatePredicate ()Ljava/util/function/Predicate;