From 71c5dfbd0e4586b4ffbbdf751abf911c74e87616 Mon Sep 17 00:00:00 2001 From: YanisBft Date: Tue, 21 Nov 2023 09:14:36 +0100 Subject: [PATCH 1/3] Rename grass to short grass (#3733) * Rename grass to short grass * forgot the params --- gradle.properties | 2 +- .../block/{FernBlock.mapping => ShortPlantBlock.mapping} | 2 +- .../data/client/BlockStateModelGenerator.mapping | 2 +- .../data/server/loottable/BlockLootTableGenerator.mapping | 8 ++++---- mappings/net/minecraft/item/Items.mapping | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename mappings/net/minecraft/block/{FernBlock.mapping => ShortPlantBlock.mapping} (62%) 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..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; From cb1d6f6611f6f52785d3b1c2abffe4d2a56beacf Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 21 Nov 2023 22:30:45 +1100 Subject: [PATCH 2/3] 1.20.3-pre1 Advancement Data (#3734) --- .../data/server/advancement/AdvancementTabGenerator.mapping | 2 ++ .../onetwentyone/OneTwentyOneAdvancementProviders.mapping | 4 ++++ .../OneTwentyOneAdventureTabAdvancementGenerator.mapping | 1 + .../vanilla/VanillaAdventureTabAdvancementGenerator.mapping | 4 ++++ 4 files changed, 11 insertions(+) create mode 100644 mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdvancementProviders.mapping create mode 100644 mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdventureTabAdvancementGenerator.mapping diff --git a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping index e233a5b3bf..8f432efecf 100644 --- a/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/AdvancementTabGenerator.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_7785 net/minecraft/data/server/advancement/Advancement METHOD method_10335 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/Consumer;)V ARG 1 lookup ARG 2 exporter + METHOD method_55578 createDummyEntry (Ljava/lang/String;)Lnet/minecraft/class_8779; + ARG 0 id diff --git a/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdvancementProviders.mapping b/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdvancementProviders.mapping new file mode 100644 index 0000000000..a447f00f3b --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdvancementProviders.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9051 net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdvancementProviders + METHOD method_55579 createOneTwentyOneProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2409; + ARG 0 output + ARG 1 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdventureTabAdvancementGenerator.mapping new file mode 100644 index 0000000000..0db1cc3e08 --- /dev/null +++ b/mappings/net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdventureTabAdvancementGenerator.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9052 net/minecraft/data/server/advancement/onetwentyone/OneTwentyOneAdventureTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 19e35b7e27..05466d7049 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -41,3 +41,7 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van ARG 1 pair METHOD method_54652 (Ljava/util/Set;Lnet/minecraft/class_7803$class_8905;)Z ARG 1 template + 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 From d558fe51b6d6c06949e3776f741a2e4728ba2cd7 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Tue, 21 Nov 2023 22:31:23 +1100 Subject: [PATCH 3/3] 1.20.3 pre1 stuff (#3735) No serverpack stuff, will leave that to apple or whoever --- .../client/gui/widget/TextFieldWidget.mapping | 2 ++ .../minecraft/client/toast/SystemToast.mapping | 16 ++++++++++++++++ .../task/BreezeShootWhenNotStandingTask.mapping | 1 + .../entity/projectile/WindChargeEntity.mapping | 2 ++ mappings/net/minecraft/scoreboard/Scores.mapping | 2 +- .../world/explosion/ExplosionBehavior.mapping | 3 +++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 mappings/net/minecraft/entity/ai/brain/task/BreezeShootWhenNotStandingTask.mapping diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index c185ba664c..f1f054b46b 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -124,3 +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 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 03117948ad..3060338f7a 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -9,6 +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 hidden Z METHOD (Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Ljava/util/List;I)V ARG 1 type ARG 2 title @@ -49,3 +50,18 @@ 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 hide (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;)V + ARG 0 manager + ARG 1 type + 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_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; + FIELD field_47589 UNSECURE_SERVER_WARNING Lnet/minecraft/class_370$class_9037; + FIELD field_47590 displayDuration J + METHOD (J)V + ARG 1 displayDuration diff --git a/mappings/net/minecraft/entity/ai/brain/task/BreezeShootWhenNotStandingTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/BreezeShootWhenNotStandingTask.mapping new file mode 100644 index 0000000000..6c78c2ab3f --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/BreezeShootWhenNotStandingTask.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9035 net/minecraft/entity/ai/brain/task/BreezeShootWhenNotStandingTask diff --git a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping index 62d955f081..a8a377a1a0 100644 --- a/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping +++ b/mappings/net/minecraft/entity/projectile/WindChargeEntity.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8956 net/minecraft/entity/projectile/WindChargeEntity + FIELD field_47579 EXPLOSION_BEHAVIOR Lnet/minecraft/class_8956$class_9036; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_8949;Lnet/minecraft/class_1937;)V ARG 1 type ARG 2 breeze ARG 3 world METHOD method_55055 createExplosion ()V + CLASS class_9036 WindChargeExplosionBehavior diff --git a/mappings/net/minecraft/scoreboard/Scores.mapping b/mappings/net/minecraft/scoreboard/Scores.mapping index 6e582c8bca..51c383c5e2 100644 --- a/mappings/net/minecraft/scoreboard/Scores.mapping +++ b/mappings/net/minecraft/scoreboard/Scores.mapping @@ -13,6 +13,6 @@ CLASS net/minecraft/class_9012 net/minecraft/scoreboard/Scores ARG 1 objective ARG 2 score METHOD method_55394 getScoresAsIntMap ()Lit/unimi/dsi/fastutil/objects/Object2IntMap; - METHOD method_55395 hasScore (Lnet/minecraft/class_266;)Z + METHOD method_55395 removeScore (Lnet/minecraft/class_266;)Z ARG 1 objective METHOD method_55396 getScores ()Ljava/util/Map; diff --git a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping index 331304fa24..12884ce2f0 100644 --- a/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping +++ b/mappings/net/minecraft/world/explosion/ExplosionBehavior.mapping @@ -14,3 +14,6 @@ CLASS net/minecraft/class_5362 net/minecraft/world/explosion/ExplosionBehavior METHOD method_55115 calculateDamage (Lnet/minecraft/class_1927;Lnet/minecraft/class_1297;)F ARG 1 explosion ARG 2 entity + METHOD method_55504 shouldDamageEntity (Lnet/minecraft/class_1927;Lnet/minecraft/class_1297;)Z + ARG 1 explosion + ARG 2 entity