diff --git a/mappings/net/minecraft/data/server/advancement/OneTwentyAdvancementProviders.mapping b/mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyAdvancementProviders.mapping similarity index 84% rename from mappings/net/minecraft/data/server/advancement/OneTwentyAdvancementProviders.mapping rename to mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyAdvancementProviders.mapping index a90d17a588..71720189fb 100644 --- a/mappings/net/minecraft/data/server/advancement/OneTwentyAdvancementProviders.mapping +++ b/mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyAdvancementProviders.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7986 net/minecraft/data/server/advancement/OneTwentyAdvancementProviders +CLASS net/minecraft/class_7986 net/minecraft/data/server/advancement/onetwenty/OneTwentyAdvancementProviders METHOD method_47806 createOneTwentyProvider (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/OneTwentyHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyHusbandryTabAdvancementGenerator.mapping similarity index 52% rename from mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyHusbandryTabAdvancementGenerator.mapping index e599a8e7dc..04e5c00e58 100644 --- a/mappings/net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/onetwenty/OneTwentyHusbandryTabAdvancementGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_8068 net/minecraft/data/server/advancement/OneTwentyHusbandryTabAdvancementGenerator +CLASS net/minecraft/class_8068 net/minecraft/data/server/advancement/onetwenty/OneTwentyHusbandryTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/advancement/VanillaAdvancementProviders.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping similarity index 85% rename from mappings/net/minecraft/data/server/advancement/VanillaAdvancementProviders.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping index af90d99cb3..9b019b8edd 100644 --- a/mappings/net/minecraft/data/server/advancement/VanillaAdvancementProviders.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7786 net/minecraft/data/server/advancement/VanillaAdvancementProviders +CLASS net/minecraft/class_7786 net/minecraft/data/server/advancement/vanilla/VanillaAdvancementProviders METHOD method_45974 createVanillaProvider (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/AdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping similarity index 94% rename from mappings/net/minecraft/data/server/advancement/AdventureTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 49cd2e77df..44d79980eb 100644 --- a/mappings/net/minecraft/data/server/advancement/AdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/AdventureTabAdvancementGenerator +CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; FIELD field_35091 OVERWORLD_HEIGHT I FIELD field_35092 OVERWORLD_MAX_Y I diff --git a/mappings/net/minecraft/data/server/advancement/EndTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping similarity index 57% rename from mappings/net/minecraft/data/server/advancement/EndTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping index 8efd476806..311ed2e4b3 100644 --- a/mappings/net/minecraft/data/server/advancement/EndTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_2419 net/minecraft/data/server/advancement/EndTabAdvancementGenerator +CLASS net/minecraft/class_2419 net/minecraft/data/server/advancement/vanilla/VanillaEndTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping similarity index 97% rename from mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping index 7564fdc0e3..9884837a8f 100644 --- a/mappings/net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/VanillaHusbandryTabAdvancementGenerator +CLASS net/minecraft/class_2414 net/minecraft/data/server/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator FIELD field_11295 FISH_ITEMS [Lnet/minecraft/class_1792; FIELD field_11296 BREEDABLE_ANIMALS Ljava/util/List; FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/data/server/advancement/NetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping similarity index 80% rename from mappings/net/minecraft/data/server/advancement/NetherTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping index 23133116b4..f4e694caa0 100644 --- a/mappings/net/minecraft/data/server/advancement/NetherTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_2416 net/minecraft/data/server/advancement/NetherTabAdvancementGenerator +CLASS net/minecraft/class_2416 net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator FIELD field_24614 NETHER_BIOMES Ljava/util/List; FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258; diff --git a/mappings/net/minecraft/data/server/advancement/StoryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping similarity index 56% rename from mappings/net/minecraft/data/server/advancement/StoryTabAdvancementGenerator.mapping rename to mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping index f954d0c92b..3ed98bdf47 100644 --- a/mappings/net/minecraft/data/server/advancement/StoryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_2417 net/minecraft/data/server/advancement/StoryTabAdvancementGenerator +CLASS net/minecraft/class_2417 net/minecraft/data/server/advancement/vanilla/VanillaStoryTabAdvancementGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyBlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyBlockLootTableGenerator.mapping similarity index 90% rename from mappings/net/minecraft/data/server/loottable/OneTwentyBlockLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyBlockLootTableGenerator.mapping index 29e169232c..a854601963 100644 --- a/mappings/net/minecraft/data/server/loottable/OneTwentyBlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyBlockLootTableGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7792 net/minecraft/data/server/loottable/OneTwentyBlockLootTableGenerator +CLASS net/minecraft/class_7792 net/minecraft/data/server/loottable/onetwenty/OneTwentyBlockLootTableGenerator METHOD method_46036 (Lnet/minecraft/class_7792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; ARG 1 block METHOD method_46037 (Lnet/minecraft/class_7792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyChestLootTableGenerator.mapping similarity index 58% rename from mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyChestLootTableGenerator.mapping index 1c7e96529a..c4d74cf601 100644 --- a/mappings/net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyChestLootTableGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_8069 net/minecraft/data/server/loottable/OneTwentyChestLootTableGenerator +CLASS net/minecraft/class_8069 net/minecraft/data/server/loottable/onetwenty/OneTwentyChestLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyEntityLootTableGenerator.mapping similarity index 57% rename from mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyEntityLootTableGenerator.mapping index f8bc7e2854..fb8a63d957 100644 --- a/mappings/net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyEntityLootTableGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_8070 net/minecraft/data/server/loottable/OneTwentyEntityLootTableGenerator +CLASS net/minecraft/class_8070 net/minecraft/data/server/loottable/onetwenty/OneTwentyEntityLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyFishingLootTableGenerator.mapping similarity index 57% rename from mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyFishingLootTableGenerator.mapping index bf812c414d..b5db1a3fc2 100644 --- a/mappings/net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyFishingLootTableGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_8071 net/minecraft/data/server/loottable/OneTwentyFishingLootTableGenerator +CLASS net/minecraft/class_8071 net/minecraft/data/server/loottable/onetwenty/OneTwentyFishingLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/OneTwentyLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyLootTableProviders.mapping similarity index 81% rename from mappings/net/minecraft/data/server/loottable/OneTwentyLootTableProviders.mapping rename to mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyLootTableProviders.mapping index 08a15dc40f..62912ef5f0 100644 --- a/mappings/net/minecraft/data/server/loottable/OneTwentyLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/onetwenty/OneTwentyLootTableProviders.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7793 net/minecraft/data/server/loottable/OneTwentyLootTableProviders +CLASS net/minecraft/class_7793 net/minecraft/data/server/loottable/onetwenty/OneTwentyLootTableProviders METHOD method_46039 createOneTwentyProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; ARG 0 output diff --git a/mappings/net/minecraft/data/server/loottable/BarterLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping similarity index 59% rename from mappings/net/minecraft/data/server/loottable/BarterLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping index 07545b27a9..af13ac559b 100644 --- a/mappings/net/minecraft/data/server/loottable/BarterLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_4845 net/minecraft/data/server/loottable/BarterLootTableGenerator +CLASS net/minecraft/class_4845 net/minecraft/data/server/loottable/vanilla/VanillaBarterLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/VanillaBlockLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping similarity index 99% rename from mappings/net/minecraft/data/server/loottable/VanillaBlockLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping index 72170d77ad..a629523db6 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaBlockLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2430 net/minecraft/data/server/loottable/VanillaBlockLootTableGenerator +CLASS net/minecraft/class_2430 net/minecraft/data/server/loottable/vanilla/VanillaBlockLootTableGenerator FIELD field_11338 JUNGLE_SAPLING_DROP_CHANCE [F FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set; METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping similarity index 97% rename from mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping index 60575e8213..729e7d7ead 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaChestLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/VanillaChestLootTableGenerator +CLASS net/minecraft/class_2432 net/minecraft/data/server/loottable/vanilla/VanillaChestLootTableGenerator METHOD method_48499 createShipwreckSupplyChestTableBuilder ()Lnet/minecraft/class_52$class_53; METHOD method_48500 createShipwreckMapChestTableBuilder ()Lnet/minecraft/class_52$class_53; METHOD method_48501 createBastionHoglinStableChestTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping similarity index 78% rename from mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping index e56ced3f41..72ac1904d2 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator.mapping @@ -1,2 +1,2 @@ -CLASS net/minecraft/class_2434 net/minecraft/data/server/loottable/VanillaEntityLootTableGenerator +CLASS net/minecraft/class_2434 net/minecraft/data/server/loottable/vanilla/VanillaEntityLootTableGenerator METHOD method_48515 createElderGuardianTableBuilder ()Lnet/minecraft/class_52$class_53; diff --git a/mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping similarity index 89% rename from mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping index 9eef65f70f..8390a86a1e 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2437 net/minecraft/data/server/loottable/VanillaFishingLootTableGenerator +CLASS net/minecraft/class_2437 net/minecraft/data/server/loottable/vanilla/VanillaFishingLootTableGenerator FIELD field_11346 NEEDS_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; diff --git a/mappings/net/minecraft/data/server/loottable/GiftLootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping similarity index 60% rename from mappings/net/minecraft/data/server/loottable/GiftLootTableGenerator.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping index a7879ade3c..e9781ae38c 100644 --- a/mappings/net/minecraft/data/server/loottable/GiftLootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_3714 net/minecraft/data/server/loottable/GiftLootTableGenerator +CLASS net/minecraft/class_3714 net/minecraft/data/server/loottable/vanilla/VanillaGiftLootTableGenerator diff --git a/mappings/net/minecraft/data/server/loottable/VanillaLootTableProviders.mapping b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping similarity index 82% rename from mappings/net/minecraft/data/server/loottable/VanillaLootTableProviders.mapping rename to mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping index aebdc2d1be..251fb1c5bf 100644 --- a/mappings/net/minecraft/data/server/loottable/VanillaLootTableProviders.mapping +++ b/mappings/net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/VanillaLootTableProviders +CLASS net/minecraft/class_7794 net/minecraft/data/server/loottable/vanilla/VanillaLootTableProviders METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438; ARG 0 output diff --git a/mappings/net/minecraft/data/server/tag/AbstractItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping similarity index 83% rename from mappings/net/minecraft/data/server/tag/AbstractItemTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping index d2af171a15..d4d85be935 100644 --- a/mappings/net/minecraft/data/server/tag/AbstractItemTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/ItemTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7805 net/minecraft/data/server/tag/AbstractItemTagProvider +CLASS net/minecraft/class_7805 net/minecraft/data/server/tag/ItemTagProvider FIELD field_40664 blockTags Ljava/util/function/Function; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;)V ARG 1 output diff --git a/mappings/net/minecraft/data/server/tag/OneTwentyItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/OneTwentyItemTagProvider.mapping deleted file mode 100644 index c1e8a9d338..0000000000 --- a/mappings/net/minecraft/data/server/tag/OneTwentyItemTagProvider.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_7807 net/minecraft/data/server/tag/OneTwentyItemTagProvider diff --git a/mappings/net/minecraft/data/server/tag/PaintingVariantTagProvider.mapping b/mappings/net/minecraft/data/server/tag/PaintingVariantTagProvider.mapping deleted file mode 100644 index 6d724ca90d..0000000000 --- a/mappings/net/minecraft/data/server/tag/PaintingVariantTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7416 net/minecraft/data/server/tag/PaintingVariantTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/PointOfInterestTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/PointOfInterestTypeTagProvider.mapping deleted file mode 100644 index 7622f7135e..0000000000 --- a/mappings/net/minecraft/data/server/tag/PointOfInterestTypeTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7491 net/minecraft/data/server/tag/PointOfInterestTypeTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/StructureTagProvider.mapping b/mappings/net/minecraft/data/server/tag/StructureTagProvider.mapping deleted file mode 100644 index 295fe6f5e7..0000000000 --- a/mappings/net/minecraft/data/server/tag/StructureTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7071 net/minecraft/data/server/tag/StructureTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/tag/TagProvider.mapping similarity index 96% rename from mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/TagProvider.mapping index 396a66b173..4fae529c15 100644 --- a/mappings/net/minecraft/data/server/tag/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/TagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/AbstractTagProvider +CLASS net/minecraft/class_2474 net/minecraft/data/server/tag/TagProvider FIELD field_11479 LOGGER Lorg/slf4j/Logger; FIELD field_11481 tagBuilders Ljava/util/Map; FIELD field_39380 pathResolver Lnet/minecraft/class_7784$class_7489; diff --git a/mappings/net/minecraft/data/server/tag/VanillaItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/VanillaItemTagProvider.mapping deleted file mode 100644 index 6581e24b52..0000000000 --- a/mappings/net/minecraft/data/server/tag/VanillaItemTagProvider.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_2471 net/minecraft/data/server/tag/VanillaItemTagProvider diff --git a/mappings/net/minecraft/data/server/tag/WorldPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/WorldPresetTagProvider.mapping deleted file mode 100644 index 0589592124..0000000000 --- a/mappings/net/minecraft/data/server/tag/WorldPresetTagProvider.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_7230 net/minecraft/data/server/tag/WorldPresetTagProvider - METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/OneTwentyBlockTagProvider.mapping b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping similarity index 69% rename from mappings/net/minecraft/data/server/tag/OneTwentyBlockTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping index b9d4a9ea0e..5ebe8d4776 100644 --- a/mappings/net/minecraft/data/server/tag/OneTwentyBlockTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7806 net/minecraft/data/server/tag/OneTwentyBlockTagProvider +CLASS net/minecraft/class_7806 net/minecraft/data/server/tag/onetwenty/OneTwentyBlockTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyItemTagProvider.mapping new file mode 100644 index 0000000000..238f2d2d5b --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/onetwenty/OneTwentyItemTagProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_7807 net/minecraft/data/server/tag/onetwenty/OneTwentyItemTagProvider diff --git a/mappings/net/minecraft/data/server/tag/BannerPatternTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping similarity index 57% rename from mappings/net/minecraft/data/server/tag/BannerPatternTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping index 229d4ff9d6..cd258b790a 100644 --- a/mappings/net/minecraft/data/server/tag/BannerPatternTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7458 net/minecraft/data/server/tag/BannerPatternTagProvider +CLASS net/minecraft/class_7458 net/minecraft/data/server/tag/vanilla/VanillaBannerPatternTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 dataGenerator ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/InstrumentTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping similarity index 58% rename from mappings/net/minecraft/data/server/tag/InstrumentTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping index 761f36afdf..57d97775c3 100644 --- a/mappings/net/minecraft/data/server/tag/InstrumentTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7459 net/minecraft/data/server/tag/InstrumentTagProvider +CLASS net/minecraft/class_6957 net/minecraft/data/server/tag/vanilla/VanillaBiomeTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/VanillaBlockTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping similarity index 70% rename from mappings/net/minecraft/data/server/tag/VanillaBlockTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping index 51c677a0f0..b081382699 100644 --- a/mappings/net/minecraft/data/server/tag/VanillaBlockTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2466 net/minecraft/data/server/tag/VanillaBlockTagProvider +CLASS net/minecraft/class_2466 net/minecraft/data/server/tag/vanilla/VanillaBlockTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/CatVariantTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping similarity index 56% rename from mappings/net/minecraft/data/server/tag/CatVariantTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping index 09bd9ad2a7..6b7acde8dc 100644 --- a/mappings/net/minecraft/data/server/tag/CatVariantTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7393 net/minecraft/data/server/tag/CatVariantTagProvider +CLASS net/minecraft/class_7393 net/minecraft/data/server/tag/vanilla/VanillaCatVariantTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/EntityTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping similarity index 69% rename from mappings/net/minecraft/data/server/tag/EntityTypeTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping index a985876cab..e8f1a50b93 100644 --- a/mappings/net/minecraft/data/server/tag/EntityTypeTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2467 net/minecraft/data/server/tag/EntityTypeTagProvider +CLASS net/minecraft/class_2467 net/minecraft/data/server/tag/vanilla/VanillaEntityTypeTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping new file mode 100644 index 0000000000..03da1887a1 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7229 net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/FluidTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping similarity index 70% rename from mappings/net/minecraft/data/server/tag/FluidTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping index ae3fce1af4..277452f16f 100644 --- a/mappings/net/minecraft/data/server/tag/FluidTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_2469 net/minecraft/data/server/tag/FluidTagProvider +CLASS net/minecraft/class_2469 net/minecraft/data/server/tag/vanilla/VanillaFluidTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/GameEventTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping similarity index 74% rename from mappings/net/minecraft/data/server/tag/GameEventTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping index c4c9771f43..4cfbb297d5 100644 --- a/mappings/net/minecraft/data/server/tag/GameEventTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_5746 net/minecraft/data/server/tag/GameEventTagProvider +CLASS net/minecraft/class_5746 net/minecraft/data/server/tag/vanilla/VanillaGameEventTagProvider FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output diff --git a/mappings/net/minecraft/data/server/tag/FlatLevelGeneratorPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping similarity index 56% rename from mappings/net/minecraft/data/server/tag/FlatLevelGeneratorPresetTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping index 6f0c835b22..351011895a 100644 --- a/mappings/net/minecraft/data/server/tag/FlatLevelGeneratorPresetTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_7229 net/minecraft/data/server/tag/FlatLevelGeneratorPresetTagProvider +CLASS net/minecraft/class_7459 net/minecraft/data/server/tag/vanilla/VanillaInstrumentTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping new file mode 100644 index 0000000000..38fac40682 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_2471 net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping new file mode 100644 index 0000000000..78972528ee --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7416 net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping new file mode 100644 index 0000000000..18ec856845 --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7491 net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/BiomeTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping similarity index 57% rename from mappings/net/minecraft/data/server/tag/BiomeTagProvider.mapping rename to mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping index 13eb9fcdce..4576f2ecab 100644 --- a/mappings/net/minecraft/data/server/tag/BiomeTagProvider.mapping +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_6957 net/minecraft/data/server/tag/BiomeTagProvider +CLASS net/minecraft/class_7071 net/minecraft/data/server/tag/vanilla/VanillaStructureTagProvider METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output ARG 2 registryLookupFuture diff --git a/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping b/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping new file mode 100644 index 0000000000..0c5be0857b --- /dev/null +++ b/mappings/net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_7230 net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider + METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registryLookupFuture