diff --git a/gradle.properties b/gradle.properties index ae6f9b2e7d..a8b8a326f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true org.gradle.configuration-cache=true -enigma_version=2.3.2 +enigma_version=2.3.3 unpick_version=2.3.0 cfr_version=0.2.1 name_proposal_version=0.1.5 diff --git a/mappings/net/minecraft/block/FernBlock.mapping b/mappings/net/minecraft/block/ShortPlantBlock.mapping similarity index 62% rename from mappings/net/minecraft/block/FernBlock.mapping rename to mappings/net/minecraft/block/ShortPlantBlock.mapping index 75029a04cf..257a546184 100644 --- a/mappings/net/minecraft/block/FernBlock.mapping +++ b/mappings/net/minecraft/block/ShortPlantBlock.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2526 net/minecraft/block/FernBlock +CLASS net/minecraft/class_2526 net/minecraft/block/ShortPlantBlock FIELD field_11617 SHAPE Lnet/minecraft/class_265; FIELD field_46470 CODEC Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 47265b6186..bf0cf9412c 100644 --- a/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -24,7 +24,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerato METHOD method_25515 registerFrostedIce ()V METHOD method_25516 registerTopSoils ()V METHOD method_25517 registerCocoa ()V - METHOD method_25518 registerGrassPath ()V + METHOD method_25518 registerDirtPath ()V METHOD method_25519 registerHopper ()V METHOD method_25520 registerIronBars ()V METHOD method_25521 registerLever ()V diff --git a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping index 4acce20bca..301a9aeb96 100644 --- a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping @@ -46,7 +46,7 @@ CLASS net/minecraft/class_7788 net/minecraft/data/server/loottable/BlockLootTabl ARG 1 dropWithSilkTouch ARG 2 drop ARG 3 count - METHOD method_45985 tallGrassDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + METHOD method_45985 tallPlantDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 tallGrass ARG 2 grass METHOD method_45986 leavesDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; @@ -127,7 +127,7 @@ CLASS net/minecraft/class_7788 net/minecraft/data/server/loottable/BlockLootTabl ARG 0 drop METHOD method_46016 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 0 drop - METHOD method_46017 grassDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + METHOD method_46017 shortPlantDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 dropWithShears METHOD method_46018 mangroveLeavesDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 leaves diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 4fb3be76d4..54689cd593 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -706,7 +706,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_8595 STONE_SLAB Lnet/minecraft/class_1792; FIELD field_8596 INFESTED_MOSSY_STONE_BRICKS Lnet/minecraft/class_1792; FIELD field_8599 IRON_ORE Lnet/minecraft/class_1792; - FIELD field_8602 GRASS Lnet/minecraft/class_1792; + FIELD field_8602 SHORT_GRASS Lnet/minecraft/class_1792; FIELD field_8603 DIAMOND_BLOCK Lnet/minecraft/class_1792; FIELD field_8604 REDSTONE_ORE Lnet/minecraft/class_1792; FIELD field_8605 ACACIA_BUTTON Lnet/minecraft/class_1792;