diff --git a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java index 3301377423..3d785100e3 100644 --- a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java +++ b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java @@ -34,18 +34,17 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of all the available {@link Trigger}s in minecraft. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class Triggers { + //@formatter:off public static final DefaultedRegistryReference> ALLAY_DROP_ITEM_ON_BLOCK = Triggers.key(ResourceKey.minecraft("allay_drop_item_on_block")); public static final DefaultedRegistryReference> AVOID_VIBRATION = Triggers.key(ResourceKey.minecraft("avoid_vibration")); - public static final DefaultedRegistryReference> BAD_OMEN = Triggers.key(ResourceKey.minecraft("voluntary_exile")); - public static final DefaultedRegistryReference> BEE_NEST_DESTROYED = Triggers.key(ResourceKey.minecraft("bee_nest_destroyed")); public static final DefaultedRegistryReference> BRED_ANIMALS = Triggers.key(ResourceKey.minecraft("bred_animals")); @@ -78,9 +77,7 @@ public final class Triggers { public static final DefaultedRegistryReference> FISHING_ROD_HOOKED = Triggers.key(ResourceKey.minecraft("fishing_rod_hooked")); - public static final DefaultedRegistryReference> GENERATE_LOOT = Triggers.key(ResourceKey.minecraft("player_generates_container_loot")); - - public static final DefaultedRegistryReference> HONEY_BLOCK_SIDE = Triggers.key(ResourceKey.minecraft("slide_down_block")); + public static final DefaultedRegistryReference> HERO_OF_THE_VILLAGE = Triggers.key(ResourceKey.minecraft("hero_of_the_village")); public static final DefaultedRegistryReference> IMPOSSIBLE = Triggers.key(ResourceKey.minecraft("impossible")); @@ -88,14 +85,12 @@ public final class Triggers { public static final DefaultedRegistryReference> ITEM_DURABILITY_CHANGED = Triggers.key(ResourceKey.minecraft("item_durability_changed")); - public static final DefaultedRegistryReference> ITEM_PICKED_UP_BY_ENTITY = Triggers.key(ResourceKey.minecraft("thrown_item_picked_up_by_entity")); - public static final DefaultedRegistryReference> ITEM_USED_ON_BLOCK = Triggers.key(ResourceKey.minecraft("item_used_on_block")); - public static final DefaultedRegistryReference> KILLED_BY_CROSSBOW = Triggers.key(ResourceKey.minecraft("killed_by_crossbow")); - public static final DefaultedRegistryReference> KILL_MOB_NEAR_SCULK_CATALYST = Triggers.key(ResourceKey.minecraft("kill_mob_near_sculk_catalyst")); + public static final DefaultedRegistryReference> KILLED_BY_CROSSBOW = Triggers.key(ResourceKey.minecraft("killed_by_crossbow")); + public static final DefaultedRegistryReference> LEVITATION = Triggers.key(ResourceKey.minecraft("levitation")); public static final DefaultedRegistryReference> LIGHTNING_STRIKE = Triggers.key(ResourceKey.minecraft("lightning_strike")); @@ -106,14 +101,14 @@ public final class Triggers { public static final DefaultedRegistryReference> PLACED_BLOCK = Triggers.key(ResourceKey.minecraft("placed_block")); + public static final DefaultedRegistryReference> PLAYER_GENERATES_CONTAINER_LOOT = Triggers.key(ResourceKey.minecraft("player_generates_container_loot")); + public static final DefaultedRegistryReference> PLAYER_HURT_ENTITY = Triggers.key(ResourceKey.minecraft("player_hurt_entity")); public static final DefaultedRegistryReference> PLAYER_INTERACTED_WITH_ENTITY = Triggers.key(ResourceKey.minecraft("player_interacted_with_entity")); public static final DefaultedRegistryReference> PLAYER_KILLED_ENTITY = Triggers.key(ResourceKey.minecraft("player_killed_entity")); - public static final DefaultedRegistryReference> RAID_WIN = Triggers.key(ResourceKey.minecraft("hero_of_the_village")); - public static final DefaultedRegistryReference> RECIPE_CRAFTED = Triggers.key(ResourceKey.minecraft("recipe_crafted")); public static final DefaultedRegistryReference> RECIPE_UNLOCKED = Triggers.key(ResourceKey.minecraft("recipe_unlocked")); @@ -124,13 +119,17 @@ public final class Triggers { public static final DefaultedRegistryReference> SLEPT_IN_BED = Triggers.key(ResourceKey.minecraft("slept_in_bed")); + public static final DefaultedRegistryReference> SLIDE_DOWN_BLOCK = Triggers.key(ResourceKey.minecraft("slide_down_block")); + public static final DefaultedRegistryReference> STARTED_RIDING = Triggers.key(ResourceKey.minecraft("started_riding")); public static final DefaultedRegistryReference> SUMMONED_ENTITY = Triggers.key(ResourceKey.minecraft("summoned_entity")); public static final DefaultedRegistryReference> TAME_ANIMAL = Triggers.key(ResourceKey.minecraft("tame_animal")); - public static final DefaultedRegistryReference> TARGET_BLOCK_HIT = Triggers.key(ResourceKey.minecraft("target_hit")); + public static final DefaultedRegistryReference> TARGET_HIT = Triggers.key(ResourceKey.minecraft("target_hit")); + + public static final DefaultedRegistryReference> THROWN_ITEM_PICKED_UP_BY_ENTITY = Triggers.key(ResourceKey.minecraft("thrown_item_picked_up_by_entity")); public static final DefaultedRegistryReference> THROWN_ITEM_PICKED_UP_BY_PLAYER = Triggers.key(ResourceKey.minecraft("thrown_item_picked_up_by_player")); @@ -144,6 +143,9 @@ public final class Triggers { public static final DefaultedRegistryReference> VILLAGER_TRADE = Triggers.key(ResourceKey.minecraft("villager_trade")); + public static final DefaultedRegistryReference> VOLUNTARY_EXILE = Triggers.key(ResourceKey.minecraft("voluntary_exile")); + + //@formatter:on private Triggers() { } diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java index b1e0ff6a22..fce72a982e 100644 --- a/src/main/java/org/spongepowered/api/block/BlockTypes.java +++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BlockTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ACACIA_BUTTON = BlockTypes.key(ResourceKey.minecraft("acacia_button")); public static final DefaultedRegistryReference ACACIA_DOOR = BlockTypes.key(ResourceKey.minecraft("acacia_door")); @@ -409,6 +409,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference CHISELED_BOOKSHELF = BlockTypes.key(ResourceKey.minecraft("chiseled_bookshelf")); + public static final DefaultedRegistryReference CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("chiseled_copper")); + public static final DefaultedRegistryReference CHISELED_DEEPSLATE = BlockTypes.key(ResourceKey.minecraft("chiseled_deepslate")); public static final DefaultedRegistryReference CHISELED_NETHER_BRICKS = BlockTypes.key(ResourceKey.minecraft("chiseled_nether_bricks")); @@ -423,6 +425,10 @@ public final class BlockTypes { public static final DefaultedRegistryReference CHISELED_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("chiseled_stone_bricks")); + public static final DefaultedRegistryReference CHISELED_TUFF = BlockTypes.key(ResourceKey.minecraft("chiseled_tuff")); + + public static final DefaultedRegistryReference CHISELED_TUFF_BRICKS = BlockTypes.key(ResourceKey.minecraft("chiseled_tuff_bricks")); + public static final DefaultedRegistryReference CHORUS_FLOWER = BlockTypes.key(ResourceKey.minecraft("chorus_flower")); public static final DefaultedRegistryReference CHORUS_PLANT = BlockTypes.key(ResourceKey.minecraft("chorus_plant")); @@ -465,8 +471,16 @@ public final class BlockTypes { public static final DefaultedRegistryReference COPPER_BLOCK = BlockTypes.key(ResourceKey.minecraft("copper_block")); + public static final DefaultedRegistryReference COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("copper_bulb")); + + public static final DefaultedRegistryReference COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("copper_door")); + + public static final DefaultedRegistryReference COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("copper_grate")); + public static final DefaultedRegistryReference COPPER_ORE = BlockTypes.key(ResourceKey.minecraft("copper_ore")); + public static final DefaultedRegistryReference COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("copper_trapdoor")); + public static final DefaultedRegistryReference CORNFLOWER = BlockTypes.key(ResourceKey.minecraft("cornflower")); public static final DefaultedRegistryReference CRACKED_DEEPSLATE_BRICKS = BlockTypes.key(ResourceKey.minecraft("cracked_deepslate_bricks")); @@ -479,6 +493,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference CRACKED_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("cracked_stone_bricks")); + public static final DefaultedRegistryReference CRAFTER = BlockTypes.key(ResourceKey.minecraft("crafter")); + public static final DefaultedRegistryReference CRAFTING_TABLE = BlockTypes.key(ResourceKey.minecraft("crafting_table")); public static final DefaultedRegistryReference CREEPER_HEAD = BlockTypes.key(ResourceKey.minecraft("creeper_head")); @@ -747,8 +763,18 @@ public final class BlockTypes { public static final DefaultedRegistryReference ENDER_CHEST = BlockTypes.key(ResourceKey.minecraft("ender_chest")); + public static final DefaultedRegistryReference EXPOSED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("exposed_chiseled_copper")); + public static final DefaultedRegistryReference EXPOSED_COPPER = BlockTypes.key(ResourceKey.minecraft("exposed_copper")); + public static final DefaultedRegistryReference EXPOSED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("exposed_copper_bulb")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("exposed_copper_door")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("exposed_copper_grate")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("exposed_copper_trapdoor")); + public static final DefaultedRegistryReference EXPOSED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("exposed_cut_copper")); public static final DefaultedRegistryReference EXPOSED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("exposed_cut_copper_slab")); @@ -805,8 +831,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference GRANITE_WALL = BlockTypes.key(ResourceKey.minecraft("granite_wall")); - public static final DefaultedRegistryReference GRASS = BlockTypes.key(ResourceKey.minecraft("grass")); - public static final DefaultedRegistryReference GRASS_BLOCK = BlockTypes.key(ResourceKey.minecraft("grass_block")); public static final DefaultedRegistryReference GRAVEL = BlockTypes.key(ResourceKey.minecraft("gravel")); @@ -1289,8 +1313,18 @@ public final class BlockTypes { public static final DefaultedRegistryReference OXEYE_DAISY = BlockTypes.key(ResourceKey.minecraft("oxeye_daisy")); + public static final DefaultedRegistryReference OXIDIZED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("oxidized_chiseled_copper")); + public static final DefaultedRegistryReference OXIDIZED_COPPER = BlockTypes.key(ResourceKey.minecraft("oxidized_copper")); + public static final DefaultedRegistryReference OXIDIZED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("oxidized_copper_bulb")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("oxidized_copper_door")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("oxidized_copper_grate")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("oxidized_copper_trapdoor")); + public static final DefaultedRegistryReference OXIDIZED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("oxidized_cut_copper")); public static final DefaultedRegistryReference OXIDIZED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("oxidized_cut_copper_slab")); @@ -1407,6 +1441,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference POLISHED_GRANITE_STAIRS = BlockTypes.key(ResourceKey.minecraft("polished_granite_stairs")); + public static final DefaultedRegistryReference POLISHED_TUFF = BlockTypes.key(ResourceKey.minecraft("polished_tuff")); + + public static final DefaultedRegistryReference POLISHED_TUFF_SLAB = BlockTypes.key(ResourceKey.minecraft("polished_tuff_slab")); + + public static final DefaultedRegistryReference POLISHED_TUFF_STAIRS = BlockTypes.key(ResourceKey.minecraft("polished_tuff_stairs")); + + public static final DefaultedRegistryReference POLISHED_TUFF_WALL = BlockTypes.key(ResourceKey.minecraft("polished_tuff_wall")); + public static final DefaultedRegistryReference POPPY = BlockTypes.key(ResourceKey.minecraft("poppy")); public static final DefaultedRegistryReference POTATOES = BlockTypes.key(ResourceKey.minecraft("potatoes")); @@ -1661,6 +1703,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference SEAGRASS = BlockTypes.key(ResourceKey.minecraft("seagrass")); + public static final DefaultedRegistryReference SHORT_GRASS = BlockTypes.key(ResourceKey.minecraft("short_grass")); + public static final DefaultedRegistryReference SHROOMLIGHT = BlockTypes.key(ResourceKey.minecraft("shroomlight")); public static final DefaultedRegistryReference SHULKER_BOX = BlockTypes.key(ResourceKey.minecraft("shulker_box")); @@ -1861,6 +1905,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference TRAPPED_CHEST = BlockTypes.key(ResourceKey.minecraft("trapped_chest")); + public static final DefaultedRegistryReference TRIAL_SPAWNER = BlockTypes.key(ResourceKey.minecraft("trial_spawner")); + public static final DefaultedRegistryReference TRIPWIRE = BlockTypes.key(ResourceKey.minecraft("tripwire")); public static final DefaultedRegistryReference TRIPWIRE_HOOK = BlockTypes.key(ResourceKey.minecraft("tripwire_hook")); @@ -1875,6 +1921,20 @@ public final class BlockTypes { public static final DefaultedRegistryReference TUFF = BlockTypes.key(ResourceKey.minecraft("tuff")); + public static final DefaultedRegistryReference TUFF_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("tuff_brick_slab")); + + public static final DefaultedRegistryReference TUFF_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("tuff_brick_stairs")); + + public static final DefaultedRegistryReference TUFF_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("tuff_brick_wall")); + + public static final DefaultedRegistryReference TUFF_BRICKS = BlockTypes.key(ResourceKey.minecraft("tuff_bricks")); + + public static final DefaultedRegistryReference TUFF_SLAB = BlockTypes.key(ResourceKey.minecraft("tuff_slab")); + + public static final DefaultedRegistryReference TUFF_STAIRS = BlockTypes.key(ResourceKey.minecraft("tuff_stairs")); + + public static final DefaultedRegistryReference TUFF_WALL = BlockTypes.key(ResourceKey.minecraft("tuff_wall")); + public static final DefaultedRegistryReference TURTLE_EGG = BlockTypes.key(ResourceKey.minecraft("turtle_egg")); public static final DefaultedRegistryReference TWISTING_VINES = BlockTypes.key(ResourceKey.minecraft("twisting_vines")); @@ -1931,40 +1991,90 @@ public final class BlockTypes { public static final DefaultedRegistryReference WATER_CAULDRON = BlockTypes.key(ResourceKey.minecraft("water_cauldron")); + public static final DefaultedRegistryReference WAXED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_COPPER_BLOCK = BlockTypes.key(ResourceKey.minecraft("waxed_copper_block")); + public static final DefaultedRegistryReference WAXED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("waxed_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("waxed_copper_door")); + + public static final DefaultedRegistryReference WAXED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("waxed_copper_grate")); + + public static final DefaultedRegistryReference WAXED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("waxed_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_cut_copper")); public static final DefaultedRegistryReference WAXED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("waxed_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_CUT_COPPER_STAIRS = BlockTypes.key(ResourceKey.minecraft("waxed_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_EXPOSED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_copper")); + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_copper_door")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_copper_grate")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper")); public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER_STAIRS = BlockTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_copper")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_door")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_grate")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper")); public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER_STAIRS = BlockTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_WEATHERED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_copper")); + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_copper_door")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_copper_grate")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_WEATHERED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_cut_copper")); public static final DefaultedRegistryReference WAXED_WEATHERED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_WEATHERED_CUT_COPPER_STAIRS = BlockTypes.key(ResourceKey.minecraft("waxed_weathered_cut_copper_stairs")); + public static final DefaultedRegistryReference WEATHERED_CHISELED_COPPER = BlockTypes.key(ResourceKey.minecraft("weathered_chiseled_copper")); + public static final DefaultedRegistryReference WEATHERED_COPPER = BlockTypes.key(ResourceKey.minecraft("weathered_copper")); + public static final DefaultedRegistryReference WEATHERED_COPPER_BULB = BlockTypes.key(ResourceKey.minecraft("weathered_copper_bulb")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_DOOR = BlockTypes.key(ResourceKey.minecraft("weathered_copper_door")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_GRATE = BlockTypes.key(ResourceKey.minecraft("weathered_copper_grate")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("weathered_copper_trapdoor")); + public static final DefaultedRegistryReference WEATHERED_CUT_COPPER = BlockTypes.key(ResourceKey.minecraft("weathered_cut_copper")); public static final DefaultedRegistryReference WEATHERED_CUT_COPPER_SLAB = BlockTypes.key(ResourceKey.minecraft("weathered_cut_copper_slab")); @@ -2047,7 +2157,7 @@ public final class BlockTypes { public static final DefaultedRegistryReference ZOMBIE_WALL_HEAD = BlockTypes.key(ResourceKey.minecraft("zombie_wall_head")); - // @formatter:on + //@formatter:on private BlockTypes() { } diff --git a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java index 2bfefc93dc..b42fb18adb 100644 --- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java +++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BlockEntityTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BANNER = BlockEntityTypes.key(ResourceKey.minecraft("banner")); public static final DefaultedRegistryReference BARREL = BlockEntityTypes.key(ResourceKey.minecraft("barrel")); @@ -73,6 +73,8 @@ public final class BlockEntityTypes { public static final DefaultedRegistryReference CONDUIT = BlockEntityTypes.key(ResourceKey.minecraft("conduit")); + public static final DefaultedRegistryReference CRAFTER = BlockEntityTypes.key(ResourceKey.minecraft("crafter")); + public static final DefaultedRegistryReference DAYLIGHT_DETECTOR = BlockEntityTypes.key(ResourceKey.minecraft("daylight_detector")); public static final DefaultedRegistryReference DECORATED_POT = BlockEntityTypes.key(ResourceKey.minecraft("decorated_pot")); @@ -123,7 +125,9 @@ public final class BlockEntityTypes { public static final DefaultedRegistryReference TRAPPED_CHEST = BlockEntityTypes.key(ResourceKey.minecraft("trapped_chest")); - // @formatter:on + public static final DefaultedRegistryReference TRIAL_SPAWNER = BlockEntityTypes.key(ResourceKey.minecraft("trial_spawner")); + + //@formatter:on private BlockEntityTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java index 7255316d38..7e848bb25c 100644 --- a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java +++ b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java @@ -112,6 +112,8 @@ public final class BlockStateKeys { public static final Key> CRACKED = BlockStateKeys.key(ResourceKey.minecraft("property/cracked"), Boolean.class); + public static final Key> CRAFTING = BlockStateKeys.key(ResourceKey.minecraft("property/crafting"), Boolean.class); + public static final Key> DELAY = BlockStateKeys.key(ResourceKey.minecraft("property/delay"), Integer.class); public static final Key> DISARMED = BlockStateKeys.key(ResourceKey.minecraft("property/disarmed"), Boolean.class); diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java index 8fe2a24725..81e20b7fd9 100644 --- a/src/main/java/org/spongepowered/api/data/Keys.java +++ b/src/main/java/org/spongepowered/api/data/Keys.java @@ -1135,7 +1135,7 @@ public final class Keys { /** * The color override for grass in a {@link Biome}. - *

Such as {@link BlockTypes#GRASS_BLOCK}, {@link BlockTypes#GRASS}, {@link BlockTypes#TALL_GRASS}, {@link BlockTypes#FERN}, {@link BlockTypes#LARGE_FERN}, {@link BlockTypes#SUGAR_CANE}

+ *

Such as {@link BlockTypes#GRASS_BLOCK}, {@link BlockTypes#SHORT_GRASS}, {@link BlockTypes#TALL_GRASS}, {@link BlockTypes#FERN}, {@link BlockTypes#LARGE_FERN}, {@link BlockTypes#SUGAR_CANE}

*

If not present grass color is instead determined by {@link #BIOME_TEMPERATURE} and {@link #HUMIDITY}

* Readonly */ diff --git a/src/main/java/org/spongepowered/api/data/type/ArtTypes.java b/src/main/java/org/spongepowered/api/data/type/ArtTypes.java index a0844daa5a..2647ef96fa 100644 --- a/src/main/java/org/spongepowered/api/data/type/ArtTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/ArtTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ArtTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ALBAN = ArtTypes.key(ResourceKey.minecraft("alban")); public static final DefaultedRegistryReference AZTEC = ArtTypes.key(ResourceKey.minecraft("aztec")); @@ -101,7 +101,7 @@ public final class ArtTypes { public static final DefaultedRegistryReference WITHER = ArtTypes.key(ResourceKey.minecraft("wither")); - // @formatter:on + //@formatter:on private ArtTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java index 4a561f474e..9f21579b90 100644 --- a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java +++ b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BannerPatternShapes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BASE = BannerPatternShapes.key(ResourceKey.minecraft("base")); public static final DefaultedRegistryReference BORDER = BannerPatternShapes.key(ResourceKey.minecraft("border")); @@ -123,7 +123,7 @@ public final class BannerPatternShapes { public static final DefaultedRegistryReference TRIANGLES_TOP = BannerPatternShapes.key(ResourceKey.minecraft("triangles_top")); - // @formatter:on + //@formatter:on private BannerPatternShapes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/CatTypes.java b/src/main/java/org/spongepowered/api/data/type/CatTypes.java index fb1555bedd..c0a33b2704 100644 --- a/src/main/java/org/spongepowered/api/data/type/CatTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/CatTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class CatTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ALL_BLACK = CatTypes.key(ResourceKey.minecraft("all_black")); public static final DefaultedRegistryReference BLACK = CatTypes.key(ResourceKey.minecraft("black")); @@ -63,7 +63,7 @@ public final class CatTypes { public static final DefaultedRegistryReference WHITE = CatTypes.key(ResourceKey.minecraft("white")); - // @formatter:on + //@formatter:on private CatTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java index 89f53793e7..ae6d037fe6 100644 --- a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java @@ -40,14 +40,14 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class FrogTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference COLD = FrogTypes.key(ResourceKey.minecraft("cold")); public static final DefaultedRegistryReference TEMPERATE = FrogTypes.key(ResourceKey.minecraft("temperate")); public static final DefaultedRegistryReference WARM = FrogTypes.key(ResourceKey.minecraft("warm")); - // @formatter:on + //@formatter:on private FrogTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java b/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java index 29c407cbdd..3dbad29013 100644 --- a/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/ProfessionTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ProfessionTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ARMORER = ProfessionTypes.key(ResourceKey.minecraft("armorer")); public static final DefaultedRegistryReference BUTCHER = ProfessionTypes.key(ResourceKey.minecraft("butcher")); @@ -71,7 +71,7 @@ public final class ProfessionTypes { public static final DefaultedRegistryReference WEAPONSMITH = ProfessionTypes.key(ResourceKey.minecraft("weaponsmith")); - // @formatter:on + //@formatter:on private ProfessionTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java b/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java index c4fa10aff1..7e1510fe18 100644 --- a/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/VillagerTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class VillagerTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference DESERT = VillagerTypes.key(ResourceKey.minecraft("desert")); public static final DefaultedRegistryReference JUNGLE = VillagerTypes.key(ResourceKey.minecraft("jungle")); @@ -55,7 +55,7 @@ public final class VillagerTypes { public static final DefaultedRegistryReference TAIGA = VillagerTypes.key(ResourceKey.minecraft("taiga")); - // @formatter:on + //@formatter:on private VillagerTypes() { } diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java index 3ba58942e0..2120d6d4ab 100644 --- a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java +++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ParticleTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference AMBIENT_ENTITY_EFFECT = ParticleTypes.key(ResourceKey.minecraft("ambient_entity_effect")); public static final DefaultedRegistryReference ANGRY_VILLAGER = ParticleTypes.key(ResourceKey.minecraft("angry_villager")); @@ -95,6 +95,8 @@ public final class ParticleTypes { public static final DefaultedRegistryReference DUST_COLOR_TRANSITION = ParticleTypes.key(ResourceKey.minecraft("dust_color_transition")); + public static final DefaultedRegistryReference DUST_PLUME = ParticleTypes.key(ResourceKey.minecraft("dust_plume")); + public static final DefaultedRegistryReference EFFECT = ParticleTypes.key(ResourceKey.minecraft("effect")); public static final DefaultedRegistryReference EGG_CRACK = ParticleTypes.key(ResourceKey.minecraft("egg_crack")); @@ -145,6 +147,12 @@ public final class ParticleTypes { public static final DefaultedRegistryReference GLOW_SQUID_INK = ParticleTypes.key(ResourceKey.minecraft("glow_squid_ink")); + public static final DefaultedRegistryReference GUST = ParticleTypes.key(ResourceKey.minecraft("gust")); + + public static final DefaultedRegistryReference GUST_DUST = ParticleTypes.key(ResourceKey.minecraft("gust_dust")); + + public static final DefaultedRegistryReference GUST_EMITTER = ParticleTypes.key(ResourceKey.minecraft("gust_emitter")); + public static final DefaultedRegistryReference HAPPY_VILLAGER = ParticleTypes.key(ResourceKey.minecraft("happy_villager")); public static final DefaultedRegistryReference HEART = ParticleTypes.key(ResourceKey.minecraft("heart")); @@ -217,6 +225,8 @@ public final class ParticleTypes { public static final DefaultedRegistryReference TOTEM_OF_UNDYING = ParticleTypes.key(ResourceKey.minecraft("totem_of_undying")); + public static final DefaultedRegistryReference TRIAL_SPAWNER_DETECTION = ParticleTypes.key(ResourceKey.minecraft("trial_spawner_detection")); + public static final DefaultedRegistryReference UNDERWATER = ParticleTypes.key(ResourceKey.minecraft("underwater")); public static final DefaultedRegistryReference VIBRATION = ParticleTypes.key(ResourceKey.minecraft("vibration")); @@ -229,9 +239,11 @@ public final class ParticleTypes { public static final DefaultedRegistryReference WHITE_ASH = ParticleTypes.key(ResourceKey.minecraft("white_ash")); + public static final DefaultedRegistryReference WHITE_SMOKE = ParticleTypes.key(ResourceKey.minecraft("white_smoke")); + public static final DefaultedRegistryReference WITCH = ParticleTypes.key(ResourceKey.minecraft("witch")); - // @formatter:on + //@formatter:on private ParticleTypes() { } diff --git a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java index a97056a111..b66a2a63a1 100644 --- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java +++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class PotionEffectTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ABSORPTION = PotionEffectTypes.key(ResourceKey.minecraft("absorption")); public static final DefaultedRegistryReference BAD_OMEN = PotionEffectTypes.key(ResourceKey.minecraft("bad_omen")); @@ -107,7 +107,7 @@ public final class PotionEffectTypes { public static final DefaultedRegistryReference WITHER = PotionEffectTypes.key(ResourceKey.minecraft("wither")); - // @formatter:on + //@formatter:on private PotionEffectTypes() { } diff --git a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java index aa76ceaf85..2d44fb8aa6 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class SoundTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference AMBIENT_BASALT_DELTAS_ADDITIONS = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.additions")); public static final DefaultedRegistryReference AMBIENT_BASALT_DELTAS_LOOP = SoundTypes.key(ResourceKey.minecraft("ambient.basalt_deltas.loop")); @@ -453,6 +453,38 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_COPPER_STEP = SoundTypes.key(ResourceKey.minecraft("block.copper.step")); + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_BREAK = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.break")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_FALL = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.fall")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_HIT = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.hit")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_PLACE = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.place")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_STEP = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.step")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_TURN_OFF = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.turn_off")); + + public static final DefaultedRegistryReference BLOCK_COPPER_BULB_TURN_ON = SoundTypes.key(ResourceKey.minecraft("block.copper_bulb.turn_on")); + + public static final DefaultedRegistryReference BLOCK_COPPER_DOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.copper_door.close")); + + public static final DefaultedRegistryReference BLOCK_COPPER_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.copper_door.open")); + + public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.break")); + + public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_FALL = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.fall")); + + public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_HIT = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.hit")); + + public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_PLACE = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.place")); + + public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_STEP = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.step")); + + public static final DefaultedRegistryReference BLOCK_COPPER_TRAPDOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.copper_trapdoor.close")); + + public static final DefaultedRegistryReference BLOCK_COPPER_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.copper_trapdoor.open")); + public static final DefaultedRegistryReference BLOCK_CORAL_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.coral_block.break")); public static final DefaultedRegistryReference BLOCK_CORAL_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.coral_block.fall")); @@ -463,6 +495,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_CORAL_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.coral_block.step")); + public static final DefaultedRegistryReference BLOCK_CRAFTER_CRAFT = SoundTypes.key(ResourceKey.minecraft("block.crafter.craft")); + + public static final DefaultedRegistryReference BLOCK_CRAFTER_FAIL = SoundTypes.key(ResourceKey.minecraft("block.crafter.fail")); + public static final DefaultedRegistryReference BLOCK_CROP_BREAK = SoundTypes.key(ResourceKey.minecraft("block.crop.break")); public static final DefaultedRegistryReference BLOCK_DECORATED_POT_BREAK = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.break")); @@ -471,6 +507,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_DECORATED_POT_HIT = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.hit")); + public static final DefaultedRegistryReference BLOCK_DECORATED_POT_INSERT = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.insert")); + + public static final DefaultedRegistryReference BLOCK_DECORATED_POT_INSERT_FAIL = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.insert_fail")); + public static final DefaultedRegistryReference BLOCK_DECORATED_POT_PLACE = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.place")); public static final DefaultedRegistryReference BLOCK_DECORATED_POT_SHATTER = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.shatter")); @@ -651,6 +691,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_HANGING_SIGN_STEP = SoundTypes.key(ResourceKey.minecraft("block.hanging_sign.step")); + public static final DefaultedRegistryReference BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL = SoundTypes.key(ResourceKey.minecraft("block.hanging_sign.waxed_interact_fail")); + public static final DefaultedRegistryReference BLOCK_HONEY_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.honey_block.break")); public static final DefaultedRegistryReference BLOCK_HONEY_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.honey_block.fall")); @@ -1003,6 +1045,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_POLISHED_DEEPSLATE_STEP = SoundTypes.key(ResourceKey.minecraft("block.polished_deepslate.step")); + public static final DefaultedRegistryReference BLOCK_POLISHED_TUFF_BREAK = SoundTypes.key(ResourceKey.minecraft("block.polished_tuff.break")); + + public static final DefaultedRegistryReference BLOCK_POLISHED_TUFF_FALL = SoundTypes.key(ResourceKey.minecraft("block.polished_tuff.fall")); + + public static final DefaultedRegistryReference BLOCK_POLISHED_TUFF_HIT = SoundTypes.key(ResourceKey.minecraft("block.polished_tuff.hit")); + + public static final DefaultedRegistryReference BLOCK_POLISHED_TUFF_PLACE = SoundTypes.key(ResourceKey.minecraft("block.polished_tuff.place")); + + public static final DefaultedRegistryReference BLOCK_POLISHED_TUFF_STEP = SoundTypes.key(ResourceKey.minecraft("block.polished_tuff.step")); + public static final DefaultedRegistryReference BLOCK_PORTAL_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.portal.ambient")); public static final DefaultedRegistryReference BLOCK_PORTAL_TRAVEL = SoundTypes.key(ResourceKey.minecraft("block.portal.travel")); @@ -1289,6 +1341,28 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_SWEET_BERRY_BUSH_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sweet_berry_bush.place")); + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.ambient")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_BREAK = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.break")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.close_shutter")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_DETECT_PLAYER = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.detect_player")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_EJECT_ITEM = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.eject_item")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_FALL = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.fall")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_HIT = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.hit")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.open_shutter")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.place")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_SPAWN_MOB = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.spawn_mob")); + + public static final DefaultedRegistryReference BLOCK_TRIAL_SPAWNER_STEP = SoundTypes.key(ResourceKey.minecraft("block.trial_spawner.step")); + public static final DefaultedRegistryReference BLOCK_TRIPWIRE_ATTACH = SoundTypes.key(ResourceKey.minecraft("block.tripwire.attach")); public static final DefaultedRegistryReference BLOCK_TRIPWIRE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.tripwire.click_off")); @@ -1307,6 +1381,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_TUFF_STEP = SoundTypes.key(ResourceKey.minecraft("block.tuff.step")); + public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.break")); + + public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_FALL = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.fall")); + + public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_HIT = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.hit")); + + public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_PLACE = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.place")); + + public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_STEP = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.step")); + public static final DefaultedRegistryReference BLOCK_VINE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.vine.break")); public static final DefaultedRegistryReference BLOCK_VINE_FALL = SoundTypes.key(ResourceKey.minecraft("block.vine.fall")); @@ -1475,6 +1559,24 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_BOAT_PADDLE_WATER = SoundTypes.key(ResourceKey.minecraft("entity.boat.paddle_water")); + public static final DefaultedRegistryReference ENTITY_BREEZE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.breeze.death")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.breeze.hurt")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_IDLE_AIR = SoundTypes.key(ResourceKey.minecraft("entity.breeze.idle_air")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_IDLE_GROUND = SoundTypes.key(ResourceKey.minecraft("entity.breeze.idle_ground")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_INHALE = SoundTypes.key(ResourceKey.minecraft("entity.breeze.inhale")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_JUMP = SoundTypes.key(ResourceKey.minecraft("entity.breeze.jump")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_LAND = SoundTypes.key(ResourceKey.minecraft("entity.breeze.land")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.breeze.shoot")); + + public static final DefaultedRegistryReference ENTITY_BREEZE_SLIDE = SoundTypes.key(ResourceKey.minecraft("entity.breeze.slide")); + public static final DefaultedRegistryReference ENTITY_CAMEL_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.camel.ambient")); public static final DefaultedRegistryReference ENTITY_CAMEL_DASH = SoundTypes.key(ResourceKey.minecraft("entity.camel.dash")); @@ -1763,6 +1865,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_GENERIC_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.generic.swim")); + public static final DefaultedRegistryReference ENTITY_GENERIC_WIND_BURST = SoundTypes.key(ResourceKey.minecraft("entity.generic.wind_burst")); + public static final DefaultedRegistryReference ENTITY_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ghast.ambient")); public static final DefaultedRegistryReference ENTITY_GHAST_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ghast.death")); @@ -2065,6 +2169,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_BLAZE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.blaze")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_BREEZE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.breeze")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_CREEPER = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.creeper")); public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_DROWNED = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.drowned")); @@ -2233,6 +2339,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PLAYER_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.player.swim")); + public static final DefaultedRegistryReference ENTITY_PLAYER_TELEPORT = SoundTypes.key(ResourceKey.minecraft("entity.player.teleport")); + public static final DefaultedRegistryReference ENTITY_POLAR_BEAR_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.polar_bear.ambient")); public static final DefaultedRegistryReference ENTITY_POLAR_BEAR_AMBIENT_BABY = SoundTypes.key(ResourceKey.minecraft("entity.polar_bear.ambient_baby")); @@ -3011,7 +3119,7 @@ public final class SoundTypes { public static final DefaultedRegistryReference WEATHER_RAIN_ABOVE = SoundTypes.key(ResourceKey.minecraft("weather.rain.above")); - // @formatter:on + //@formatter:on private SoundTypes() { } diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java index 748a9d07d1..8205dfe857 100644 --- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java +++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java @@ -90,6 +90,7 @@ import org.spongepowered.api.entity.living.monster.Zoglin; import org.spongepowered.api.entity.living.monster.boss.Wither; import org.spongepowered.api.entity.living.monster.boss.dragon.EnderDragon; +import org.spongepowered.api.entity.living.monster.breeze.Breeze; import org.spongepowered.api.entity.living.monster.guardian.ElderGuardian; import org.spongepowered.api.entity.living.monster.guardian.Guardian; import org.spongepowered.api.entity.living.monster.hoglin.Hoglin; @@ -126,6 +127,7 @@ import org.spongepowered.api.entity.projectile.Potion; import org.spongepowered.api.entity.projectile.ShulkerBullet; import org.spongepowered.api.entity.projectile.Snowball; +import org.spongepowered.api.entity.projectile.WindCharge; import org.spongepowered.api.entity.projectile.arrow.Arrow; import org.spongepowered.api.entity.projectile.arrow.SpectralArrow; import org.spongepowered.api.entity.projectile.arrow.Trident; @@ -177,6 +179,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> BOAT = EntityTypes.key(ResourceKey.minecraft("boat")); + public static final DefaultedRegistryReference> BREEZE = EntityTypes.key(ResourceKey.minecraft("breeze")); + public static final DefaultedRegistryReference> CAMEL = EntityTypes.key(ResourceKey.minecraft("camel")); public static final DefaultedRegistryReference> CAT = EntityTypes.key(ResourceKey.minecraft("cat")); @@ -387,6 +391,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> WARDEN = EntityTypes.key(ResourceKey.minecraft("warden")); + public static final DefaultedRegistryReference> WIND_CHARGE = EntityTypes.key(ResourceKey.minecraft("wind_charge")); + public static final DefaultedRegistryReference> WITCH = EntityTypes.key(ResourceKey.minecraft("witch")); public static final DefaultedRegistryReference> WITHER = EntityTypes.key(ResourceKey.minecraft("wither")); diff --git a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java index eabab189ea..8fbe1c4dde 100644 --- a/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java +++ b/src/main/java/org/spongepowered/api/entity/attribute/type/AttributeTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class AttributeTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference GENERIC_ARMOR = AttributeTypes.key(ResourceKey.minecraft("generic.armor")); public static final DefaultedRegistryReference GENERIC_ARMOR_TOUGHNESS = AttributeTypes.key(ResourceKey.minecraft("generic.armor_toughness")); @@ -69,7 +69,7 @@ public final class AttributeTypes { public static final DefaultedRegistryReference ZOMBIE_SPAWN_REINFORCEMENTS = AttributeTypes.key(ResourceKey.minecraft("zombie.spawn_reinforcements")); - // @formatter:on + //@formatter:on private AttributeTypes() { } diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/breeze/Breeze.java b/src/main/java/org/spongepowered/api/entity/living/monster/breeze/Breeze.java new file mode 100644 index 0000000000..d666f40c25 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/monster/breeze/Breeze.java @@ -0,0 +1,33 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.entity.living.monster.breeze; + +import org.spongepowered.api.entity.living.Monster; + +/** + * Represents a Breeze. + */ +public interface Breeze extends Monster { +} diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/breeze/package-info.java b/src/main/java/org/spongepowered/api/entity/living/monster/breeze/package-info.java new file mode 100644 index 0000000000..f7d4ffee2c --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/monster/breeze/package-info.java @@ -0,0 +1,26 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +@org.checkerframework.framework.qual.DefaultQualifier(org.checkerframework.checker.nullness.qual.NonNull.class) +package org.spongepowered.api.entity.living.monster.breeze; diff --git a/src/main/java/org/spongepowered/api/entity/projectile/WindCharge.java b/src/main/java/org/spongepowered/api/entity/projectile/WindCharge.java new file mode 100644 index 0000000000..cf7fe6c8d4 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/projectile/WindCharge.java @@ -0,0 +1,31 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.entity.projectile; + +/** + * Represents a WindCharge. + */ +public interface WindCharge extends DamagingProjectile { +} diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java index f53dbdcff7..485f48fb32 100644 --- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java +++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class DamageTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ARROW = DamageTypes.key(ResourceKey.minecraft("arrow")); public static final DefaultedRegistryReference BAD_RESPAWN_POINT = DamageTypes.key(ResourceKey.minecraft("bad_respawn_point")); @@ -129,7 +129,7 @@ public final class DamageTypes { public static final DefaultedRegistryReference WITHER_SKULL = DamageTypes.key(ResourceKey.minecraft("wither_skull")); - // @formatter:on + //@formatter:on private DamageTypes() { } diff --git a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java index 37469c4904..80b7991564 100644 --- a/src/main/java/org/spongepowered/api/fluid/FluidTypes.java +++ b/src/main/java/org/spongepowered/api/fluid/FluidTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class FluidTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference EMPTY = FluidTypes.key(ResourceKey.minecraft("empty")); public static final DefaultedRegistryReference FLOWING_LAVA = FluidTypes.key(ResourceKey.minecraft("flowing_lava")); @@ -51,7 +51,7 @@ public final class FluidTypes { public static final DefaultedRegistryReference WATER = FluidTypes.key(ResourceKey.minecraft("water")); - // @formatter:on + //@formatter:on private FluidTypes() { } diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java index 8c1df49790..4837571f89 100644 --- a/src/main/java/org/spongepowered/api/item/ItemTypes.java +++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ItemTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ACACIA_BOAT = ItemTypes.key(ResourceKey.minecraft("acacia_boat")); public static final DefaultedRegistryReference ACACIA_BUTTON = ItemTypes.key(ResourceKey.minecraft("acacia_button")); @@ -321,6 +321,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference BREAD = ItemTypes.key(ResourceKey.minecraft("bread")); + public static final DefaultedRegistryReference BREEZE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("breeze_spawn_egg")); + public static final DefaultedRegistryReference BREWER_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("brewer_pottery_sherd")); public static final DefaultedRegistryReference BREWING_STAND = ItemTypes.key(ResourceKey.minecraft("brewing_stand")); @@ -469,6 +471,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference CHISELED_BOOKSHELF = ItemTypes.key(ResourceKey.minecraft("chiseled_bookshelf")); + public static final DefaultedRegistryReference CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("chiseled_copper")); + public static final DefaultedRegistryReference CHISELED_DEEPSLATE = ItemTypes.key(ResourceKey.minecraft("chiseled_deepslate")); public static final DefaultedRegistryReference CHISELED_NETHER_BRICKS = ItemTypes.key(ResourceKey.minecraft("chiseled_nether_bricks")); @@ -483,6 +487,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference CHISELED_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("chiseled_stone_bricks")); + public static final DefaultedRegistryReference CHISELED_TUFF = ItemTypes.key(ResourceKey.minecraft("chiseled_tuff")); + + public static final DefaultedRegistryReference CHISELED_TUFF_BRICKS = ItemTypes.key(ResourceKey.minecraft("chiseled_tuff_bricks")); + public static final DefaultedRegistryReference CHORUS_FLOWER = ItemTypes.key(ResourceKey.minecraft("chorus_flower")); public static final DefaultedRegistryReference CHORUS_FRUIT = ItemTypes.key(ResourceKey.minecraft("chorus_fruit")); @@ -561,10 +569,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference COPPER_BLOCK = ItemTypes.key(ResourceKey.minecraft("copper_block")); + public static final DefaultedRegistryReference COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("copper_bulb")); + + public static final DefaultedRegistryReference COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("copper_door")); + + public static final DefaultedRegistryReference COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("copper_grate")); + public static final DefaultedRegistryReference COPPER_INGOT = ItemTypes.key(ResourceKey.minecraft("copper_ingot")); public static final DefaultedRegistryReference COPPER_ORE = ItemTypes.key(ResourceKey.minecraft("copper_ore")); + public static final DefaultedRegistryReference COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("copper_trapdoor")); + public static final DefaultedRegistryReference CORNFLOWER = ItemTypes.key(ResourceKey.minecraft("cornflower")); public static final DefaultedRegistryReference COW_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("cow_spawn_egg")); @@ -579,6 +595,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference CRACKED_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("cracked_stone_bricks")); + public static final DefaultedRegistryReference CRAFTER = ItemTypes.key(ResourceKey.minecraft("crafter")); + public static final DefaultedRegistryReference CRAFTING_TABLE = ItemTypes.key(ResourceKey.minecraft("crafting_table")); public static final DefaultedRegistryReference CREEPER_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("creeper_banner_pattern")); @@ -901,8 +919,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference EXPLORER_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("explorer_pottery_sherd")); + public static final DefaultedRegistryReference EXPOSED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("exposed_chiseled_copper")); + public static final DefaultedRegistryReference EXPOSED_COPPER = ItemTypes.key(ResourceKey.minecraft("exposed_copper")); + public static final DefaultedRegistryReference EXPOSED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("exposed_copper_bulb")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("exposed_copper_door")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("exposed_copper_grate")); + + public static final DefaultedRegistryReference EXPOSED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("exposed_copper_trapdoor")); + public static final DefaultedRegistryReference EXPOSED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("exposed_cut_copper")); public static final DefaultedRegistryReference EXPOSED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("exposed_cut_copper_slab")); @@ -1035,8 +1063,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference GRANITE_WALL = ItemTypes.key(ResourceKey.minecraft("granite_wall")); - public static final DefaultedRegistryReference GRASS = ItemTypes.key(ResourceKey.minecraft("grass")); - public static final DefaultedRegistryReference GRASS_BLOCK = ItemTypes.key(ResourceKey.minecraft("grass_block")); public static final DefaultedRegistryReference GRAVEL = ItemTypes.key(ResourceKey.minecraft("gravel")); @@ -1665,8 +1691,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference OXEYE_DAISY = ItemTypes.key(ResourceKey.minecraft("oxeye_daisy")); + public static final DefaultedRegistryReference OXIDIZED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("oxidized_chiseled_copper")); + public static final DefaultedRegistryReference OXIDIZED_COPPER = ItemTypes.key(ResourceKey.minecraft("oxidized_copper")); + public static final DefaultedRegistryReference OXIDIZED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("oxidized_copper_bulb")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("oxidized_copper_door")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("oxidized_copper_grate")); + + public static final DefaultedRegistryReference OXIDIZED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("oxidized_copper_trapdoor")); + public static final DefaultedRegistryReference OXIDIZED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("oxidized_cut_copper")); public static final DefaultedRegistryReference OXIDIZED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("oxidized_cut_copper_slab")); @@ -1803,6 +1839,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference POLISHED_GRANITE_STAIRS = ItemTypes.key(ResourceKey.minecraft("polished_granite_stairs")); + public static final DefaultedRegistryReference POLISHED_TUFF = ItemTypes.key(ResourceKey.minecraft("polished_tuff")); + + public static final DefaultedRegistryReference POLISHED_TUFF_SLAB = ItemTypes.key(ResourceKey.minecraft("polished_tuff_slab")); + + public static final DefaultedRegistryReference POLISHED_TUFF_STAIRS = ItemTypes.key(ResourceKey.minecraft("polished_tuff_stairs")); + + public static final DefaultedRegistryReference POLISHED_TUFF_WALL = ItemTypes.key(ResourceKey.minecraft("polished_tuff_wall")); + public static final DefaultedRegistryReference POPPED_CHORUS_FRUIT = ItemTypes.key(ResourceKey.minecraft("popped_chorus_fruit")); public static final DefaultedRegistryReference POPPY = ItemTypes.key(ResourceKey.minecraft("poppy")); @@ -2053,6 +2097,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference SHIELD = ItemTypes.key(ResourceKey.minecraft("shield")); + public static final DefaultedRegistryReference SHORT_GRASS = ItemTypes.key(ResourceKey.minecraft("short_grass")); + public static final DefaultedRegistryReference SHROOMLIGHT = ItemTypes.key(ResourceKey.minecraft("shroomlight")); public static final DefaultedRegistryReference SHULKER_BOX = ItemTypes.key(ResourceKey.minecraft("shulker_box")); @@ -2325,6 +2371,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference TRAPPED_CHEST = ItemTypes.key(ResourceKey.minecraft("trapped_chest")); + public static final DefaultedRegistryReference TRIAL_KEY = ItemTypes.key(ResourceKey.minecraft("trial_key")); + + public static final DefaultedRegistryReference TRIAL_SPAWNER = ItemTypes.key(ResourceKey.minecraft("trial_spawner")); + public static final DefaultedRegistryReference TRIDENT = ItemTypes.key(ResourceKey.minecraft("trident")); public static final DefaultedRegistryReference TRIPWIRE_HOOK = ItemTypes.key(ResourceKey.minecraft("tripwire_hook")); @@ -2343,6 +2393,20 @@ public final class ItemTypes { public static final DefaultedRegistryReference TUFF = ItemTypes.key(ResourceKey.minecraft("tuff")); + public static final DefaultedRegistryReference TUFF_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("tuff_brick_slab")); + + public static final DefaultedRegistryReference TUFF_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("tuff_brick_stairs")); + + public static final DefaultedRegistryReference TUFF_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("tuff_brick_wall")); + + public static final DefaultedRegistryReference TUFF_BRICKS = ItemTypes.key(ResourceKey.minecraft("tuff_bricks")); + + public static final DefaultedRegistryReference TUFF_SLAB = ItemTypes.key(ResourceKey.minecraft("tuff_slab")); + + public static final DefaultedRegistryReference TUFF_STAIRS = ItemTypes.key(ResourceKey.minecraft("tuff_stairs")); + + public static final DefaultedRegistryReference TUFF_WALL = ItemTypes.key(ResourceKey.minecraft("tuff_wall")); + public static final DefaultedRegistryReference TURTLE_EGG = ItemTypes.key(ResourceKey.minecraft("turtle_egg")); public static final DefaultedRegistryReference TURTLE_HELMET = ItemTypes.key(ResourceKey.minecraft("turtle_helmet")); @@ -2407,32 +2471,72 @@ public final class ItemTypes { public static final DefaultedRegistryReference WATER_BUCKET = ItemTypes.key(ResourceKey.minecraft("water_bucket")); + public static final DefaultedRegistryReference WAXED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_COPPER_BLOCK = ItemTypes.key(ResourceKey.minecraft("waxed_copper_block")); + public static final DefaultedRegistryReference WAXED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("waxed_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("waxed_copper_door")); + + public static final DefaultedRegistryReference WAXED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("waxed_copper_grate")); + + public static final DefaultedRegistryReference WAXED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("waxed_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_cut_copper")); public static final DefaultedRegistryReference WAXED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("waxed_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_CUT_COPPER_STAIRS = ItemTypes.key(ResourceKey.minecraft("waxed_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_EXPOSED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_copper")); + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_copper_door")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_copper_grate")); + + public static final DefaultedRegistryReference WAXED_EXPOSED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper")); public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_EXPOSED_CUT_COPPER_STAIRS = ItemTypes.key(ResourceKey.minecraft("waxed_exposed_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_copper")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_door")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_grate")); + + public static final DefaultedRegistryReference WAXED_OXIDIZED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper")); public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper_slab")); public static final DefaultedRegistryReference WAXED_OXIDIZED_CUT_COPPER_STAIRS = ItemTypes.key(ResourceKey.minecraft("waxed_oxidized_cut_copper_stairs")); + public static final DefaultedRegistryReference WAXED_WEATHERED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_chiseled_copper")); + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_copper")); + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_copper_bulb")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_copper_door")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_copper_grate")); + + public static final DefaultedRegistryReference WAXED_WEATHERED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_copper_trapdoor")); + public static final DefaultedRegistryReference WAXED_WEATHERED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_cut_copper")); public static final DefaultedRegistryReference WAXED_WEATHERED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("waxed_weathered_cut_copper_slab")); @@ -2441,8 +2545,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("wayfinder_armor_trim_smithing_template")); + public static final DefaultedRegistryReference WEATHERED_CHISELED_COPPER = ItemTypes.key(ResourceKey.minecraft("weathered_chiseled_copper")); + public static final DefaultedRegistryReference WEATHERED_COPPER = ItemTypes.key(ResourceKey.minecraft("weathered_copper")); + public static final DefaultedRegistryReference WEATHERED_COPPER_BULB = ItemTypes.key(ResourceKey.minecraft("weathered_copper_bulb")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_DOOR = ItemTypes.key(ResourceKey.minecraft("weathered_copper_door")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_GRATE = ItemTypes.key(ResourceKey.minecraft("weathered_copper_grate")); + + public static final DefaultedRegistryReference WEATHERED_COPPER_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("weathered_copper_trapdoor")); + public static final DefaultedRegistryReference WEATHERED_CUT_COPPER = ItemTypes.key(ResourceKey.minecraft("weathered_cut_copper")); public static final DefaultedRegistryReference WEATHERED_CUT_COPPER_SLAB = ItemTypes.key(ResourceKey.minecraft("weathered_cut_copper_slab")); @@ -2551,7 +2665,7 @@ public final class ItemTypes { public static final DefaultedRegistryReference ZOMBIFIED_PIGLIN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombified_piglin_spawn_egg")); - // @formatter:on + //@formatter:on private ItemTypes() { } diff --git a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java index 14fa2fc00d..e639bec656 100644 --- a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java +++ b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class PotionTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference AWKWARD = PotionTypes.key(ResourceKey.minecraft("awkward")); public static final DefaultedRegistryReference EMPTY = PotionTypes.key(ResourceKey.minecraft("empty")); @@ -127,7 +127,7 @@ public final class PotionTypes { public static final DefaultedRegistryReference WEAKNESS = PotionTypes.key(ResourceKey.minecraft("weakness")); - // @formatter:on + //@formatter:on private PotionTypes() { } diff --git a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java index 5c48414afd..b4a2ac6d29 100644 --- a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java +++ b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java @@ -85,6 +85,10 @@ public static BooleanStateProperty property_CRACKED() { return BooleanStateProperty.of("CRACKED"); } + public static BooleanStateProperty property_CRAFTING() { + return BooleanStateProperty.of("CRAFTING"); + } + public static BooleanStateProperty property_DISARMED() { return BooleanStateProperty.of("DISARMED"); } diff --git a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java index fad8a75c8f..7abe48745b 100644 --- a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java +++ b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java @@ -179,6 +179,10 @@ public static EnumStateProperty property_TILT() { return EnumStateProperty.of("TILT"); } + public static EnumStateProperty property_TRIAL_SPAWNER_STATE() { + return EnumStateProperty.of("TRIAL_SPAWNER_STATE"); + } + public static EnumStateProperty property_VERTICAL_DIRECTION() { return EnumStateProperty.of("VERTICAL_DIRECTION"); } diff --git a/src/main/java/org/spongepowered/api/statistic/Statistics.java b/src/main/java/org/spongepowered/api/statistic/Statistics.java index a013985ba0..8f6d10177a 100644 --- a/src/main/java/org/spongepowered/api/statistic/Statistics.java +++ b/src/main/java/org/spongepowered/api/statistic/Statistics.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class Statistics { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ANIMALS_BRED = Statistics.key(ResourceKey.minecraft("animals_bred")); public static final DefaultedRegistryReference AVIATE_ONE_CM = Statistics.key(ResourceKey.minecraft("aviate_one_cm")); @@ -191,7 +191,7 @@ public final class Statistics { public static final DefaultedRegistryReference WALK_UNDER_WATER_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_under_water_one_cm")); - // @formatter:on + //@formatter:on private Statistics() { } diff --git a/src/main/java/org/spongepowered/api/tag/BiomeTags.java b/src/main/java/org/spongepowered/api/tag/BiomeTags.java index d4e278786a..d8f2254554 100644 --- a/src/main/java/org/spongepowered/api/tag/BiomeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BiomeTags.java @@ -37,7 +37,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BiomeTags { - // @formatter:off + //@formatter:off public static final Tag ALLOWS_SURFACE_SLIME_SPAWNS = BiomeTags.key(ResourceKey.minecraft("allows_surface_slime_spawns")); public static final Tag ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = BiomeTags.key(ResourceKey.minecraft("allows_tropical_fish_spawns_at_any_height")); @@ -176,7 +176,7 @@ public final class BiomeTags { public static final Tag WITHOUT_ZOMBIE_SIEGES = BiomeTags.key(ResourceKey.minecraft("without_zombie_sieges")); - // @formatter:on + //@formatter:on private BiomeTags() { } diff --git a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java index a3bc25cef4..573c38ad05 100644 --- a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java @@ -37,7 +37,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BlockTypeTags { - // @formatter:off + //@formatter:off public static final Tag ACACIA_LOGS = BlockTypeTags.key(ResourceKey.minecraft("acacia_logs")); public static final Tag ALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_hanging_signs")); @@ -382,7 +382,7 @@ public final class BlockTypeTags { public static final Tag WOOL_CARPETS = BlockTypeTags.key(ResourceKey.minecraft("wool_carpets")); - // @formatter:on + //@formatter:on private BlockTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java index 237f98db4d..0e0be13a19 100644 --- a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java @@ -37,7 +37,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class DamageTypeTags { - // @formatter:off + //@formatter:off public static final Tag ALWAYS_HURTS_ENDER_DRAGONS = DamageTypeTags.key(ResourceKey.minecraft("always_hurts_ender_dragons")); public static final Tag ALWAYS_KILLS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("always_kills_armor_stands")); @@ -62,6 +62,8 @@ public final class DamageTypeTags { public static final Tag BYPASSES_SHIELD = DamageTypeTags.key(ResourceKey.minecraft("bypasses_shield")); + public static final Tag CAN_BREAK_ARMOR_STAND = DamageTypeTags.key(ResourceKey.minecraft("can_break_armor_stand")); + public static final Tag DAMAGES_HELMET = DamageTypeTags.key(ResourceKey.minecraft("damages_helmet")); public static final Tag IGNITES_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("ignites_armor_stands")); @@ -90,7 +92,7 @@ public final class DamageTypeTags { public static final Tag WITHER_IMMUNE_TO = DamageTypeTags.key(ResourceKey.minecraft("wither_immune_to")); - // @formatter:on + //@formatter:on private DamageTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java index 99130a72b2..eb61583a89 100644 --- a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java @@ -37,7 +37,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class EntityTypeTags { - // @formatter:off + //@formatter:off public static final Tag> ARROWS = EntityTypeTags.key(ResourceKey.minecraft("arrows")); public static final Tag> AXOLOTL_ALWAYS_HOSTILES = EntityTypeTags.key(ResourceKey.minecraft("axolotl_always_hostiles")); @@ -46,6 +46,8 @@ public final class EntityTypeTags { public static final Tag> BEEHIVE_INHABITORS = EntityTypeTags.key(ResourceKey.minecraft("beehive_inhabitors")); + public static final Tag> CAN_BREATHE_UNDER_WATER = EntityTypeTags.key(ResourceKey.minecraft("can_breathe_under_water")); + public static final Tag> DISMOUNTS_UNDERWATER = EntityTypeTags.key(ResourceKey.minecraft("dismounts_underwater")); public static final Tag> FALL_DAMAGE_IMMUNE = EntityTypeTags.key(ResourceKey.minecraft("fall_damage_immune")); @@ -66,7 +68,11 @@ public final class EntityTypeTags { public static final Tag> SKELETONS = EntityTypeTags.key(ResourceKey.minecraft("skeletons")); - // @formatter:on + public static final Tag> UNDEAD = EntityTypeTags.key(ResourceKey.minecraft("undead")); + + public static final Tag> ZOMBIES = EntityTypeTags.key(ResourceKey.minecraft("zombies")); + + //@formatter:on private EntityTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java index 40c9942e67..e57ca6ac41 100644 --- a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java @@ -37,12 +37,12 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class FluidTypeTags { - // @formatter:off + //@formatter:off public static final Tag LAVA = FluidTypeTags.key(ResourceKey.minecraft("lava")); public static final Tag WATER = FluidTypeTags.key(ResourceKey.minecraft("water")); - // @formatter:on + //@formatter:on private FluidTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java index 13c3bfc0fa..6c92949e69 100644 --- a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java @@ -37,7 +37,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ItemTypeTags { - // @formatter:off + //@formatter:off public static final Tag ACACIA_LOGS = ItemTypeTags.key(ResourceKey.minecraft("acacia_logs")); public static final Tag ANVIL = ItemTypeTags.key(ResourceKey.minecraft("anvil")); @@ -236,7 +236,7 @@ public final class ItemTypeTags { public static final Tag WOOL_CARPETS = ItemTypeTags.key(ResourceKey.minecraft("wool_carpets")); - // @formatter:on + //@formatter:on private ItemTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/world/WorldTypes.java b/src/main/java/org/spongepowered/api/world/WorldTypes.java index 79de13c4ac..22ae58d978 100644 --- a/src/main/java/org/spongepowered/api/world/WorldTypes.java +++ b/src/main/java/org/spongepowered/api/world/WorldTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class WorldTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference OVERWORLD = WorldTypes.key(ResourceKey.minecraft("overworld")); public static final DefaultedRegistryReference OVERWORLD_CAVES = WorldTypes.key(ResourceKey.minecraft("overworld_caves")); @@ -49,7 +49,7 @@ public final class WorldTypes { public static final DefaultedRegistryReference THE_NETHER = WorldTypes.key(ResourceKey.minecraft("the_nether")); - // @formatter:on + //@formatter:on private WorldTypes() { } diff --git a/src/main/java/org/spongepowered/api/world/biome/Biomes.java b/src/main/java/org/spongepowered/api/world/biome/Biomes.java index 0390b94f7e..ea9b42fb4c 100644 --- a/src/main/java/org/spongepowered/api/world/biome/Biomes.java +++ b/src/main/java/org/spongepowered/api/world/biome/Biomes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.WORLD) public final class Biomes { - // @formatter:off + //@formatter:off public static final RegistryReference BADLANDS = Biomes.key(ResourceKey.minecraft("badlands")); public static final RegistryReference BAMBOO_JUNGLE = Biomes.key(ResourceKey.minecraft("bamboo_jungle")); @@ -169,7 +169,7 @@ public final class Biomes { public static final RegistryReference WOODED_BADLANDS = Biomes.key(ResourceKey.minecraft("wooded_badlands")); - // @formatter:on + //@formatter:on private Biomes() { } diff --git a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java index 7a382dd342..faacfa3c6e 100644 --- a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java +++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java @@ -104,6 +104,8 @@ public final class GameRules { public static final DefaultedRegistryReference> MAX_COMMAND_CHAIN_LENGTH = GameRules.key(ResourceKey.sponge("max_command_chain_length")); + public static final DefaultedRegistryReference> MAX_COMMAND_FORK_COUNT = GameRules.key(ResourceKey.sponge("max_command_fork_count")); + public static final DefaultedRegistryReference> MAX_ENTITY_CRAMMING = GameRules.key(ResourceKey.sponge("max_entity_cramming")); public static final DefaultedRegistryReference> MOB_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("mob_explosion_drop_decay")); @@ -112,8 +114,14 @@ public final class GameRules { public static final DefaultedRegistryReference> NATURAL_REGENERATION = GameRules.key(ResourceKey.sponge("natural_regeneration")); + public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_CREATIVE_DELAY = GameRules.key(ResourceKey.sponge("players_nether_portal_creative_delay")); + + public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_DEFAULT_DELAY = GameRules.key(ResourceKey.sponge("players_nether_portal_default_delay")); + public static final DefaultedRegistryReference> PLAYERS_SLEEPING_PERCENTAGE = GameRules.key(ResourceKey.sponge("players_sleeping_percentage")); + public static final DefaultedRegistryReference> PROJECTILES_CAN_BREAK_BLOCKS = GameRules.key(ResourceKey.sponge("projectiles_can_break_blocks")); + public static final DefaultedRegistryReference> RANDOM_TICK_SPEED = GameRules.key(ResourceKey.sponge("random_tick_speed")); public static final DefaultedRegistryReference> REDUCED_DEBUG_INFO = GameRules.key(ResourceKey.sponge("reduced_debug_info")); diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java b/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java index b8053d0c0a..3ff32a9b39 100644 --- a/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java +++ b/src/main/java/org/spongepowered/api/world/generation/carver/CarverTypes.java @@ -40,14 +40,14 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class CarverTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference CANYON = CarverTypes.key(ResourceKey.minecraft("canyon")); public static final DefaultedRegistryReference CAVE = CarverTypes.key(ResourceKey.minecraft("cave")); public static final DefaultedRegistryReference NETHER_CAVE = CarverTypes.key(ResourceKey.minecraft("nether_cave")); - // @formatter:on + //@formatter:on private CarverTypes() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java b/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java index b7bdd10cbf..302c8b58f6 100644 --- a/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java +++ b/src/main/java/org/spongepowered/api/world/generation/carver/Carvers.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class Carvers { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference CANYON = Carvers.key(ResourceKey.minecraft("canyon")); public static final DefaultedRegistryReference CAVE = Carvers.key(ResourceKey.minecraft("cave")); @@ -49,7 +49,7 @@ public final class Carvers { public static final DefaultedRegistryReference NETHER_CAVE = Carvers.key(ResourceKey.minecraft("nether_cave")); - // @formatter:on + //@formatter:on private Carvers() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java index 867b7476b3..456456dbf9 100644 --- a/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java +++ b/src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class FlatGeneratorConfigs { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BOTTOMLESS_PIT = FlatGeneratorConfigs.key(ResourceKey.minecraft("bottomless_pit")); public static final DefaultedRegistryReference CLASSIC_FLAT = FlatGeneratorConfigs.key(ResourceKey.minecraft("classic_flat")); @@ -59,7 +59,7 @@ public final class FlatGeneratorConfigs { public static final DefaultedRegistryReference WATER_WORLD = FlatGeneratorConfigs.key(ResourceKey.minecraft("water_world")); - // @formatter:on + //@formatter:on private FlatGeneratorConfigs() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java index 31112fc75b..9b7b2cd3d9 100644 --- a/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java +++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/DensityFunctions.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class DensityFunctions { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference END_BASE_3D_NOISE = DensityFunctions.key(ResourceKey.minecraft("end/base_3d_noise")); public static final DefaultedRegistryReference END_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("end/sloped_cheese")); @@ -111,7 +111,7 @@ public final class DensityFunctions { public static final DefaultedRegistryReference ZERO = DensityFunctions.key(ResourceKey.minecraft("zero")); - // @formatter:on + //@formatter:on private DensityFunctions() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java index 8b65e36290..8996548bea 100644 --- a/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java +++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/NoiseGeneratorConfigs.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class NoiseGeneratorConfigs { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference AMPLIFIED = NoiseGeneratorConfigs.key(ResourceKey.minecraft("amplified")); public static final DefaultedRegistryReference CAVES = NoiseGeneratorConfigs.key(ResourceKey.minecraft("caves")); @@ -55,7 +55,7 @@ public final class NoiseGeneratorConfigs { public static final DefaultedRegistryReference OVERWORLD = NoiseGeneratorConfigs.key(ResourceKey.minecraft("overworld")); - // @formatter:on + //@formatter:on private NoiseGeneratorConfigs() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java index fffa3f8d20..035fef42f7 100644 --- a/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java +++ b/src/main/java/org/spongepowered/api/world/generation/config/noise/Noises.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class Noises { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference AQUIFER_BARRIER = Noises.key(ResourceKey.minecraft("aquifer_barrier")); public static final DefaultedRegistryReference AQUIFER_FLUID_LEVEL_FLOODEDNESS = Noises.key(ResourceKey.minecraft("aquifer_fluid_level_floodedness")); @@ -161,7 +161,7 @@ public final class Noises { public static final DefaultedRegistryReference VEGETATION_LARGE = Noises.key(ResourceKey.minecraft("vegetation_large")); - // @formatter:on + //@formatter:on private Noises() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java index d2fcec497c..0ef992e4dd 100644 --- a/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java +++ b/src/main/java/org/spongepowered/api/world/generation/feature/FeatureTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class FeatureTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BAMBOO = FeatureTypes.key(ResourceKey.minecraft("bamboo")); public static final DefaultedRegistryReference BASALT_COLUMNS = FeatureTypes.key(ResourceKey.minecraft("basalt_columns")); @@ -163,7 +163,7 @@ public final class FeatureTypes { public static final DefaultedRegistryReference WEEPING_VINES = FeatureTypes.key(ResourceKey.minecraft("weeping_vines")); - // @formatter:on + //@formatter:on private FeatureTypes() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/Features.java b/src/main/java/org/spongepowered/api/world/generation/feature/Features.java index c3ddb8eb20..4bdbcb2f4e 100644 --- a/src/main/java/org/spongepowered/api/world/generation/feature/Features.java +++ b/src/main/java/org/spongepowered/api/world/generation/feature/Features.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class Features { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ACACIA = Features.key(ResourceKey.minecraft("acacia")); public static final DefaultedRegistryReference AMETHYST_GEODE = Features.key(ResourceKey.minecraft("amethyst_geode")); @@ -431,7 +431,7 @@ public final class Features { public static final DefaultedRegistryReference WEEPING_VINES = Features.key(ResourceKey.minecraft("weeping_vines")); - // @formatter:on + //@formatter:on private Features() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java index 09b1257d6a..7b5517d9fb 100644 --- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java +++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class PlacedFeatures { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ACACIA = PlacedFeatures.key(ResourceKey.minecraft("acacia")); public static final DefaultedRegistryReference ACACIA_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("acacia_checked")); @@ -505,7 +505,7 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference WEEPING_VINES = PlacedFeatures.key(ResourceKey.minecraft("weeping_vines")); - // @formatter:on + //@formatter:on private PlacedFeatures() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java index 8d5444f125..218cf969ca 100644 --- a/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java +++ b/src/main/java/org/spongepowered/api/world/generation/feature/PlacementModifierTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class PlacementModifierTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BIOME = PlacementModifierTypes.key(ResourceKey.minecraft("biome")); public static final DefaultedRegistryReference BLOCK_PREDICATE_FILTER = PlacementModifierTypes.key(ResourceKey.minecraft("block_predicate_filter")); @@ -71,7 +71,7 @@ public final class PlacementModifierTypes { public static final DefaultedRegistryReference SURFACE_WATER_DEPTH_FILTER = PlacementModifierTypes.key(ResourceKey.minecraft("surface_water_depth_filter")); - // @formatter:on + //@formatter:on private PlacementModifierTypes() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java index 0cae98e775..20a3098447 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureSets.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class StructureSets { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ANCIENT_CITIES = StructureSets.key(ResourceKey.minecraft("ancient_cities")); public static final DefaultedRegistryReference BURIED_TREASURES = StructureSets.key(ResourceKey.minecraft("buried_treasures")); @@ -79,7 +79,7 @@ public final class StructureSets { public static final DefaultedRegistryReference WOODLAND_MANSIONS = StructureSets.key(ResourceKey.minecraft("woodland_mansions")); - // @formatter:on + //@formatter:on private StructureSets() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java b/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java index f6805dd7e9..9a844f52c5 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/StructureTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class StructureTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BURIED_TREASURE = StructureTypes.key(ResourceKey.minecraft("buried_treasure")); public static final DefaultedRegistryReference DESERT_PYRAMID = StructureTypes.key(ResourceKey.minecraft("desert_pyramid")); @@ -73,7 +73,7 @@ public final class StructureTypes { public static final DefaultedRegistryReference WOODLAND_MANSION = StructureTypes.key(ResourceKey.minecraft("woodland_mansion")); - // @formatter:on + //@formatter:on private StructureTypes() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java b/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java index 500ff8a947..df5705c403 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/Structures.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class Structures { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ANCIENT_CITY = Structures.key(ResourceKey.minecraft("ancient_city")); public static final DefaultedRegistryReference BASTION_REMNANT = Structures.key(ResourceKey.minecraft("bastion_remnant")); @@ -107,7 +107,7 @@ public final class Structures { public static final DefaultedRegistryReference VILLAGE_TAIGA = Structures.key(ResourceKey.minecraft("village_taiga")); - // @formatter:on + //@formatter:on private Structures() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java index 81f31a6f45..1a2d5c8289 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/JigsawPools.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class JigsawPools { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ANCIENT_CITY_CITY_ENTRANCE = JigsawPools.key(ResourceKey.minecraft("ancient_city/city/entrance")); public static final DefaultedRegistryReference ANCIENT_CITY_CITY_CENTER = JigsawPools.key(ResourceKey.minecraft("ancient_city/city_center")); @@ -323,7 +323,7 @@ public final class JigsawPools { public static final DefaultedRegistryReference VILLAGE_TAIGA_ZOMBIE_VILLAGERS = JigsawPools.key(ResourceKey.minecraft("village/taiga/zombie/villagers")); - // @formatter:on + //@formatter:on private JigsawPools() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java index 3cc6c111e2..553ff49a31 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorLists.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class ProcessorLists { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference ANCIENT_CITY_GENERIC_DEGRADATION = ProcessorLists.key(ResourceKey.minecraft("ancient_city_generic_degradation")); public static final DefaultedRegistryReference ANCIENT_CITY_START_DEGRADATION = ProcessorLists.key(ResourceKey.minecraft("ancient_city_start_degradation")); @@ -119,7 +119,7 @@ public final class ProcessorLists { public static final DefaultedRegistryReference ZOMBIE_TAIGA = ProcessorLists.key(ResourceKey.minecraft("zombie_taiga")); - // @formatter:on + //@formatter:on private ProcessorLists() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java index 48c6d43d59..f669ae8a01 100644 --- a/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java +++ b/src/main/java/org/spongepowered/api/world/generation/structure/jigsaw/ProcessorTypes.java @@ -40,7 +40,7 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ProcessorTypes { - // @formatter:off + //@formatter:off public static final DefaultedRegistryReference BLACKSTONE_REPLACE = ProcessorTypes.key(ResourceKey.minecraft("blackstone_replace")); public static final DefaultedRegistryReference BLOCK_AGE = ProcessorTypes.key(ResourceKey.minecraft("block_age")); @@ -63,7 +63,7 @@ public final class ProcessorTypes { public static final DefaultedRegistryReference RULE = ProcessorTypes.key(ResourceKey.minecraft("rule")); - // @formatter:on + //@formatter:on private ProcessorTypes() { }