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/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index d082c020f7..f1f054b46b 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -124,5 +124,5 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget ARG 1 placeholder METHOD method_52719 updateFirstCharacterIndex (I)V ARG 1 cursor - METHOD method_55506 eraseBetween (I)V - ARG 1 endPos + METHOD method_55506 eraseCharactersTo (I)V + ARG 1 position diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index f86068ceda..3060338f7a 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_39926 LINE_HEIGHT I FIELD field_39927 PADDING_Y I FIELD field_45396 TEXTURE Lnet/minecraft/class_2960; - FIELD field_47582 forceHide Z + FIELD field_47582 hidden Z METHOD (Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Ljava/util/List;I)V ARG 1 type ARG 2 title @@ -50,14 +50,14 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_29627 addPackCopyFailure (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 directory - METHOD method_55507 forceHide (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;)V + METHOD method_55507 hide (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;)V ARG 0 manager ARG 1 type - METHOD method_55508 forceHide ()V - CLASS class_9037 ToastType + METHOD method_55508 hide ()V + CLASS class_9037 Type FIELD field_47583 NARRATOR_TOGGLE Lnet/minecraft/class_370$class_9037; FIELD field_47584 WORLD_BACKUP Lnet/minecraft/class_370$class_9037; - FIELD field_47585 PACK_RELOAD_FAILURE Lnet/minecraft/class_370$class_9037; + FIELD field_47585 PACK_LOAD_FAILURE Lnet/minecraft/class_370$class_9037; FIELD field_47586 WORLD_ACCESS_FAILURE Lnet/minecraft/class_370$class_9037; FIELD field_47587 PACK_COPY_FAILURE Lnet/minecraft/class_370$class_9037; FIELD field_47588 PERIODIC_NOTIFICATION Lnet/minecraft/class_370$class_9037; 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/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 991d905c08..dae0124310 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van ARG 1 template METHOD method_55580 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_1299;)V ARG 1 type - METHOD method_55581 createMonsterAdvancements (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/class_8779; - ARG 0 monsterHunterParent + METHOD method_55581 createKillMobAdvancements (Lnet/minecraft/class_8779;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/class_8779; + ARG 0 parent ARG 1 exporter ARG 2 monsters diff --git a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping index 4acce20bca..e4407efa02 100644 --- a/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/BlockLootTableGenerator.mapping @@ -46,9 +46,9 @@ 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; - ARG 1 tallGrass - ARG 2 grass + METHOD method_45985 tallPlantDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; + ARG 1 tallPlant + ARG 2 shortPlant METHOD method_45986 leavesDrops (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;[F)Lnet/minecraft/class_52$class_53; ARG 1 leaves ARG 2 drop @@ -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;