Data package restructure (#3465)

With the introduction of sub-packs included in the base game, there are several classes for the 1.20 datapack and several for the vanilla datapack which would benefit from being renamed and put into packages to make this clearer.

Classes which are only used for the vanilla datapack have been put into a `vanilla` subpackage, and ones for the 1.20 datapack have been put into a `onetwenty` subpackage.

Furthermore, classes which are only used for the vanilla datapack have been prefixed with `Vanilla`.

The above changes should not be considered impactful as these classes are strictly for generating the vanilla and 1.20 datapacks and are incredibly unlikely to be referenced by modders.

However, tag providers which were named with an `Abstract` prefix have had this removed. This makes them match with other providers. This is a somewhat impactful refactor.
This commit is contained in:
Shnupbups 2023-02-01 21:42:58 +11:00 committed by GitHub
parent 70790a9c6a
commit 1df1065b4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 50 additions and 50 deletions

View File

@ -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; METHOD method_47806 createOneTwentyProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2409;
ARG 0 output ARG 0 output
ARG 1 registryLookupFuture ARG 1 registryLookupFuture

View File

@ -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

View File

@ -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; METHOD method_45974 createVanillaProvider (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/class_2409;
ARG 0 output ARG 0 output
ARG 1 registryLookupFuture ARG 1 registryLookupFuture

View File

@ -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_11294 MONSTERS [Lnet/minecraft/class_1299;
FIELD field_35091 OVERWORLD_HEIGHT I FIELD field_35091 OVERWORLD_HEIGHT I
FIELD field_35092 OVERWORLD_MAX_Y I FIELD field_35092 OVERWORLD_MAX_Y I

View File

@ -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

View File

@ -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_11295 FISH_ITEMS [Lnet/minecraft/class_1792;
FIELD field_11296 BREEDABLE_ANIMALS Ljava/util/List; FIELD field_11296 BREEDABLE_ANIMALS Ljava/util/List;
FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792; FIELD field_11297 FISH_BUCKET_ITEMS [Lnet/minecraft/class_1792;

View File

@ -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_24614 NETHER_BIOMES Ljava/util/List;
FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258; FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258;

View File

@ -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

View File

@ -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; METHOD method_46036 (Lnet/minecraft/class_7792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 1 block ARG 1 block
METHOD method_46037 (Lnet/minecraft/class_7792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; METHOD method_46037 (Lnet/minecraft/class_7792;Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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; METHOD method_46039 createOneTwentyProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438;
ARG 0 output ARG 0 output

View File

@ -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

View File

@ -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_11338 JUNGLE_SAPLING_DROP_CHANCE [F
FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set; FIELD field_11340 EXPLOSION_IMMUNE Ljava/util/Set;
METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; METHOD method_16232 (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;

View File

@ -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_48499 createShipwreckSupplyChestTableBuilder ()Lnet/minecraft/class_52$class_53;
METHOD method_48500 createShipwreckMapChestTableBuilder ()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; METHOD method_48501 createBastionHoglinStableChestTableBuilder ()Lnet/minecraft/class_52$class_53;

View File

@ -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; METHOD method_48515 createElderGuardianTableBuilder ()Lnet/minecraft/class_52$class_53;

View File

@ -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_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_11349 NEEDS_BAMBOO_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210;
FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210; FIELD field_35165 NEEDS_SPARSE_JUNGLE_BIOME Lnet/minecraft/class_5341$class_210;

View File

@ -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

View File

@ -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; METHOD method_46184 createVanillaProvider (Lnet/minecraft/class_7784;)Lnet/minecraft/class_2438;
ARG 0 output ARG 0 output

View File

@ -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; FIELD field_40664 blockTags Ljava/util/function/Function;
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_2474;)V
ARG 1 output ARG 1 output

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_7807 net/minecraft/data/server/tag/OneTwentyItemTagProvider

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_7416 net/minecraft/data/server/tag/PaintingVariantTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_7491 net/minecraft/data/server/tag/PointOfInterestTypeTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_7071 net/minecraft/data/server/tag/StructureTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -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_11479 LOGGER Lorg/slf4j/Logger;
FIELD field_11481 tagBuilders Ljava/util/Map; FIELD field_11481 tagBuilders Ljava/util/Map;
FIELD field_39380 pathResolver Lnet/minecraft/class_7784$class_7489; FIELD field_39380 pathResolver Lnet/minecraft/class_7784$class_7489;

View File

@ -1 +0,0 @@
CLASS net/minecraft/class_2471 net/minecraft/data/server/tag/VanillaItemTagProvider

View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_7230 net/minecraft/data/server/tag/WorldPresetTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_7807 net/minecraft/data/server/tag/onetwenty/OneTwentyItemTagProvider

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 dataGenerator ARG 1 dataGenerator
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7229 net/minecraft/data/server/tag/vanilla/VanillaFlatLevelGeneratorPresetTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -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; FIELD field_38363 BASIC_GAME_EVENTS [Lnet/minecraft/class_5712;
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -0,0 +1 @@
CLASS net/minecraft/class_2471 net/minecraft/data/server/tag/vanilla/VanillaItemTagProvider

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7416 net/minecraft/data/server/tag/vanilla/VanillaPaintingVariantTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7491 net/minecraft/data/server/tag/vanilla/VanillaPointOfInterestTypeTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture

View File

@ -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 <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output ARG 1 output
ARG 2 registryLookupFuture ARG 2 registryLookupFuture

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7230 net/minecraft/data/server/tag/vanilla/VanillaWorldPresetTagProvider
METHOD <init> (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V
ARG 1 output
ARG 2 registryLookupFuture