Skip to content

Commit 545c471

Browse files
MrHell228MrHell228
committed
update new tag groups to use DefaultedTag
1 parent d739860 commit 545c471

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎src/main/java/org/spongepowered/api/tag/ArtTypeTags.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
@RegistryScopes(scopes = RegistryScope.GAME)
3838
public final class ArtTypeTags {
3939

40-
public static final Tag<ArtType> PLACEABLE = ArtTypeTags.key(ResourceKey.minecraft("placeable"));
40+
public static final DefaultedTag<ArtType> PLACEABLE = ArtTypeTags.key(ResourceKey.minecraft("placeable"));
4141

4242
private ArtTypeTags() {
4343
}
4444

45-
private static Tag<ArtType> key(final ResourceKey key) {
46-
return Tag.of(RegistryTypes.ART_TYPE, key);
45+
private static DefaultedTag<ArtType> key(final ResourceKey key) {
46+
return DefaultedTag.of(RegistryTypes.ART_TYPE, key);
4747
}
4848
}

‎src/main/java/org/spongepowered/api/tag/BannerPatternShapeTags.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,32 @@
3737
@RegistryScopes(scopes = RegistryScope.GAME)
3838
public final class BannerPatternShapeTags {
3939

40-
public static final Tag<BannerPatternShape> NO_ITEM_REQUIRED = BannerPatternShapeTags.key(ResourceKey.minecraft("no_item_required"));
40+
public static final DefaultedTag<BannerPatternShape> NO_ITEM_REQUIRED = BannerPatternShapeTags.key(ResourceKey.minecraft("no_item_required"));
4141

42-
public static final Tag<BannerPatternShape> PATTERN_ITEM_BORDURE_INDENTED = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/bordure_indented"));
42+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_BORDURE_INDENTED = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/bordure_indented"));
4343

44-
public static final Tag<BannerPatternShape> PATTERN_ITEM_CREEPER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/creeper"));
44+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_CREEPER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/creeper"));
4545

46-
public static final Tag<BannerPatternShape> PATTERN_ITEM_FIELD_MASONED = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/field_masoned"));
46+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_FIELD_MASONED = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/field_masoned"));
4747

48-
public static final Tag<BannerPatternShape> PATTERN_ITEM_FLOW = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/flow"));
48+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_FLOW = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/flow"));
4949

50-
public static final Tag<BannerPatternShape> PATTERN_ITEM_FLOWER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/flower"));
50+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_FLOWER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/flower"));
5151

52-
public static final Tag<BannerPatternShape> PATTERN_ITEM_GLOBE = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/globe"));
52+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_GLOBE = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/globe"));
5353

54-
public static final Tag<BannerPatternShape> PATTERN_ITEM_GUSTER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/guster"));
54+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_GUSTER = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/guster"));
5555

56-
public static final Tag<BannerPatternShape> PATTERN_ITEM_MOJANG = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/mojang"));
56+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_MOJANG = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/mojang"));
5757

58-
public static final Tag<BannerPatternShape> PATTERN_ITEM_PIGLIN = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/piglin"));
58+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_PIGLIN = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/piglin"));
5959

60-
public static final Tag<BannerPatternShape> PATTERN_ITEM_SKULL = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/skull"));
60+
public static final DefaultedTag<BannerPatternShape> PATTERN_ITEM_SKULL = BannerPatternShapeTags.key(ResourceKey.minecraft("pattern_item/skull"));
6161

6262
private BannerPatternShapeTags() {
6363
}
6464

65-
private static Tag<BannerPatternShape> key(final ResourceKey key) {
66-
return Tag.of(RegistryTypes.BANNER_PATTERN_SHAPE, key);
65+
private static DefaultedTag<BannerPatternShape> key(final ResourceKey key) {
66+
return DefaultedTag.of(RegistryTypes.BANNER_PATTERN_SHAPE, key);
6767
}
6868
}

‎src/main/java/org/spongepowered/api/tag/CatTypeTags.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
@RegistryScopes(scopes = RegistryScope.GAME)
3838
public final class CatTypeTags {
3939

40-
public static final Tag<CatType> DEFAULT_SPAWNS = CatTypeTags.key(ResourceKey.minecraft("default_spawns"));
40+
public static final DefaultedTag<CatType> DEFAULT_SPAWNS = CatTypeTags.key(ResourceKey.minecraft("default_spawns"));
4141

42-
public static final Tag<CatType> FULL_MOON_SPAWNS = CatTypeTags.key(ResourceKey.minecraft("full_moon_spawns"));
42+
public static final DefaultedTag<CatType> FULL_MOON_SPAWNS = CatTypeTags.key(ResourceKey.minecraft("full_moon_spawns"));
4343

4444
private CatTypeTags() {
4545
}
4646

47-
private static Tag<CatType> key(final ResourceKey key) {
48-
return Tag.of(RegistryTypes.CAT_TYPE, key);
47+
private static DefaultedTag<CatType> key(final ResourceKey key) {
48+
return DefaultedTag.of(RegistryTypes.CAT_TYPE, key);
4949
}
5050
}

‎src/main/java/org/spongepowered/api/tag/StructureTags.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,36 +37,36 @@
3737
@RegistryScopes(scopes = RegistryScope.GAME)
3838
public final class StructureTags {
3939

40-
public static final Tag<Structure> CATS_SPAWN_AS_BLACK = StructureTags.key(ResourceKey.minecraft("cats_spawn_as_black"));
40+
public static final DefaultedTag<Structure> CATS_SPAWN_AS_BLACK = StructureTags.key(ResourceKey.minecraft("cats_spawn_as_black"));
4141

42-
public static final Tag<Structure> CATS_SPAWN_IN = StructureTags.key(ResourceKey.minecraft("cats_spawn_in"));
42+
public static final DefaultedTag<Structure> CATS_SPAWN_IN = StructureTags.key(ResourceKey.minecraft("cats_spawn_in"));
4343

44-
public static final Tag<Structure> DOLPHIN_LOCATED = StructureTags.key(ResourceKey.minecraft("dolphin_located"));
44+
public static final DefaultedTag<Structure> DOLPHIN_LOCATED = StructureTags.key(ResourceKey.minecraft("dolphin_located"));
4545

46-
public static final Tag<Structure> EYE_OF_ENDER_LOCATED = StructureTags.key(ResourceKey.minecraft("eye_of_ender_located"));
46+
public static final DefaultedTag<Structure> EYE_OF_ENDER_LOCATED = StructureTags.key(ResourceKey.minecraft("eye_of_ender_located"));
4747

48-
public static final Tag<Structure> MINESHAFT = StructureTags.key(ResourceKey.minecraft("mineshaft"));
48+
public static final DefaultedTag<Structure> MINESHAFT = StructureTags.key(ResourceKey.minecraft("mineshaft"));
4949

50-
public static final Tag<Structure> OCEAN_RUIN = StructureTags.key(ResourceKey.minecraft("ocean_ruin"));
50+
public static final DefaultedTag<Structure> OCEAN_RUIN = StructureTags.key(ResourceKey.minecraft("ocean_ruin"));
5151

52-
public static final Tag<Structure> ON_OCEAN_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_ocean_explorer_maps"));
52+
public static final DefaultedTag<Structure> ON_OCEAN_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_ocean_explorer_maps"));
5353

54-
public static final Tag<Structure> ON_TREASURE_MAPS = StructureTags.key(ResourceKey.minecraft("on_treasure_maps"));
54+
public static final DefaultedTag<Structure> ON_TREASURE_MAPS = StructureTags.key(ResourceKey.minecraft("on_treasure_maps"));
5555

56-
public static final Tag<Structure> ON_TRIAL_CHAMBERS_MAPS = StructureTags.key(ResourceKey.minecraft("on_trial_chambers_maps"));
56+
public static final DefaultedTag<Structure> ON_TRIAL_CHAMBERS_MAPS = StructureTags.key(ResourceKey.minecraft("on_trial_chambers_maps"));
5757

58-
public static final Tag<Structure> ON_WOODLAND_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_woodland_explorer_maps"));
58+
public static final DefaultedTag<Structure> ON_WOODLAND_EXPLORER_MAPS = StructureTags.key(ResourceKey.minecraft("on_woodland_explorer_maps"));
5959

60-
public static final Tag<Structure> RUINED_PORTAL = StructureTags.key(ResourceKey.minecraft("ruined_portal"));
60+
public static final DefaultedTag<Structure> RUINED_PORTAL = StructureTags.key(ResourceKey.minecraft("ruined_portal"));
6161

62-
public static final Tag<Structure> SHIPWRECK = StructureTags.key(ResourceKey.minecraft("shipwreck"));
62+
public static final DefaultedTag<Structure> SHIPWRECK = StructureTags.key(ResourceKey.minecraft("shipwreck"));
6363

64-
public static final Tag<Structure> VILLAGE = StructureTags.key(ResourceKey.minecraft("village"));
64+
public static final DefaultedTag<Structure> VILLAGE = StructureTags.key(ResourceKey.minecraft("village"));
6565

6666
private StructureTags() {
6767
}
6868

69-
private static Tag<Structure> key(final ResourceKey key) {
70-
return Tag.of(RegistryTypes.STRUCTURE, key);
69+
private static DefaultedTag<Structure> key(final ResourceKey key) {
70+
return DefaultedTag.of(RegistryTypes.STRUCTURE, key);
7171
}
7272
}

0 commit comments

Comments
 (0)