From 446aa5e0266be80240b0de98262fa3556110d812 Mon Sep 17 00:00:00 2001 From: Morpheus Date: Tue, 25 Jun 2024 19:14:35 +0000 Subject: [PATCH] Regenerate api data (#2521) --- .../criteria/trigger/Triggers.java | 4 +- .../api/adventure/ResolveOperations.java | 2 +- .../spongepowered/api/block/BlockTypes.java | 138 +++--- .../api/block/entity/BlockEntityTypes.java | 4 +- .../api/data/BlockStateKeys.java | 8 + .../api/data/type/BannerPatternShapes.java | 8 +- .../api/data/type/DripstoneSegments.java | 17 +- .../api/data/type/ItemTiers.java | 10 +- .../api/data/type/LlamaTypes.java | 4 - .../api/data/type/MooshroomTypes.java | 10 +- .../api/data/type/PandaGenes.java | 10 +- .../api/data/type/ParrotTypes.java | 12 +- .../api/data/type/PushReactions.java | 20 +- .../api/data/type/RabbitTypes.java | 16 +- .../api/data/type/SculkSensorStates.java | 12 +- .../api/data/type/SpellTypes.java | 11 +- .../spongepowered/api/data/type/Tilts.java | 19 +- .../api/data/type/TrialSpawnerStates.java | 17 +- .../api/data/type/VaultStates.java | 3 + .../api/effect/potion/PotionEffectTypes.java | 4 +- .../api/effect/sound/SoundTypes.java | 454 +++++++++--------- .../api/effect/sound/music/MusicDiscs.java | 47 +- .../cause/entity/damage/DamageTypes.java | 8 +- .../org/spongepowered/api/item/ItemTypes.java | 258 +++++----- .../inventory/equipment/EquipmentGroups.java | 15 +- .../inventory/equipment/EquipmentTypes.java | 16 +- .../api/item/potion/PotionTypes.java | 8 +- .../map/decoration/MapDecorationTypes.java | 79 +-- .../MapDecorationOrientations.java | 2 +- .../scoreboard/displayslot/DisplaySlots.java | 42 +- .../api/statistic/StatisticCategories.java | 23 +- .../api/statistic/Statistics.java | 8 +- .../api/util/rotation/Rotations.java | 2 +- .../api/world/difficulty/Difficulties.java | 10 +- .../config/noise/DensityFunctions.java | 36 +- .../world/generation/config/noise/Noises.java | 8 +- .../generation/feature/FeatureTypes.java | 12 +- .../world/generation/feature/Features.java | 16 +- .../generation/feature/PlacedFeatures.java | 16 +- .../feature/PlacementModifierTypes.java | 4 +- .../structure/jigsaw/JigsawPools.java | 40 +- 41 files changed, 702 insertions(+), 731 deletions(-) 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 e24f0e4e32..17f5bd3989 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 @@ -94,10 +94,10 @@ public final class Triggers { public static final DefaultedRegistryReference> ITEM_USED_ON_BLOCK = Triggers.key(ResourceKey.minecraft("item_used_on_block")); - 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> KILL_MOB_NEAR_SCULK_CATALYST = Triggers.key(ResourceKey.minecraft("kill_mob_near_sculk_catalyst")); + public static final DefaultedRegistryReference> LEVITATION = Triggers.key(ResourceKey.minecraft("levitation")); public static final DefaultedRegistryReference> LIGHTNING_STRIKE = Triggers.key(ResourceKey.minecraft("lightning_strike")); diff --git a/src/main/java/org/spongepowered/api/adventure/ResolveOperations.java b/src/main/java/org/spongepowered/api/adventure/ResolveOperations.java index b45ed51d82..3c093968ad 100644 --- a/src/main/java/org/spongepowered/api/adventure/ResolveOperations.java +++ b/src/main/java/org/spongepowered/api/adventure/ResolveOperations.java @@ -38,7 +38,7 @@ * Types of rendering that can be applied to components. */ @RegistryScopes(scopes = RegistryScope.GAME) -public class ResolveOperations { +public final class ResolveOperations { // @formatter:off // SORTFIELDS:ON diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java index cde1c5aabf..e41e0b38be 100644 --- a/src/main/java/org/spongepowered/api/block/BlockTypes.java +++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java @@ -154,12 +154,12 @@ public final class BlockTypes { public static final DefaultedRegistryReference BEDROCK = BlockTypes.key(ResourceKey.minecraft("bedrock")); - public static final DefaultedRegistryReference BEE_NEST = BlockTypes.key(ResourceKey.minecraft("bee_nest")); - public static final DefaultedRegistryReference BEEHIVE = BlockTypes.key(ResourceKey.minecraft("beehive")); public static final DefaultedRegistryReference BEETROOTS = BlockTypes.key(ResourceKey.minecraft("beetroots")); + public static final DefaultedRegistryReference BEE_NEST = BlockTypes.key(ResourceKey.minecraft("bee_nest")); + public static final DefaultedRegistryReference BELL = BlockTypes.key(ResourceKey.minecraft("bell")); public static final DefaultedRegistryReference BIG_DRIPLEAF = BlockTypes.key(ResourceKey.minecraft("big_dripleaf")); @@ -200,6 +200,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference BIRCH_WOOD = BlockTypes.key(ResourceKey.minecraft("birch_wood")); + public static final DefaultedRegistryReference BLACKSTONE = BlockTypes.key(ResourceKey.minecraft("blackstone")); + + public static final DefaultedRegistryReference BLACKSTONE_SLAB = BlockTypes.key(ResourceKey.minecraft("blackstone_slab")); + + public static final DefaultedRegistryReference BLACKSTONE_STAIRS = BlockTypes.key(ResourceKey.minecraft("blackstone_stairs")); + + public static final DefaultedRegistryReference BLACKSTONE_WALL = BlockTypes.key(ResourceKey.minecraft("blackstone_wall")); + public static final DefaultedRegistryReference BLACK_BANNER = BlockTypes.key(ResourceKey.minecraft("black_banner")); public static final DefaultedRegistryReference BLACK_BED = BlockTypes.key(ResourceKey.minecraft("black_bed")); @@ -228,14 +236,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference BLACK_WOOL = BlockTypes.key(ResourceKey.minecraft("black_wool")); - public static final DefaultedRegistryReference BLACKSTONE = BlockTypes.key(ResourceKey.minecraft("blackstone")); - - public static final DefaultedRegistryReference BLACKSTONE_SLAB = BlockTypes.key(ResourceKey.minecraft("blackstone_slab")); - - public static final DefaultedRegistryReference BLACKSTONE_STAIRS = BlockTypes.key(ResourceKey.minecraft("blackstone_stairs")); - - public static final DefaultedRegistryReference BLACKSTONE_WALL = BlockTypes.key(ResourceKey.minecraft("blackstone_wall")); - public static final DefaultedRegistryReference BLAST_FURNACE = BlockTypes.key(ResourceKey.minecraft("blast_furnace")); public static final DefaultedRegistryReference BLUE_BANNER = BlockTypes.key(ResourceKey.minecraft("blue_banner")); @@ -284,14 +284,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference BREWING_STAND = BlockTypes.key(ResourceKey.minecraft("brewing_stand")); + public static final DefaultedRegistryReference BRICKS = BlockTypes.key(ResourceKey.minecraft("bricks")); + public static final DefaultedRegistryReference BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("brick_slab")); public static final DefaultedRegistryReference BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("brick_stairs")); public static final DefaultedRegistryReference BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("brick_wall")); - public static final DefaultedRegistryReference BRICKS = BlockTypes.key(ResourceKey.minecraft("bricks")); - public static final DefaultedRegistryReference BROWN_BANNER = BlockTypes.key(ResourceKey.minecraft("brown_banner")); public static final DefaultedRegistryReference BROWN_BED = BlockTypes.key(ResourceKey.minecraft("brown_bed")); @@ -672,14 +672,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference DEEPSLATE = BlockTypes.key(ResourceKey.minecraft("deepslate")); + public static final DefaultedRegistryReference DEEPSLATE_BRICKS = BlockTypes.key(ResourceKey.minecraft("deepslate_bricks")); + public static final DefaultedRegistryReference DEEPSLATE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("deepslate_brick_slab")); public static final DefaultedRegistryReference DEEPSLATE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("deepslate_brick_stairs")); public static final DefaultedRegistryReference DEEPSLATE_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("deepslate_brick_wall")); - public static final DefaultedRegistryReference DEEPSLATE_BRICKS = BlockTypes.key(ResourceKey.minecraft("deepslate_bricks")); - public static final DefaultedRegistryReference DEEPSLATE_COAL_ORE = BlockTypes.key(ResourceKey.minecraft("deepslate_coal_ore")); public static final DefaultedRegistryReference DEEPSLATE_COPPER_ORE = BlockTypes.key(ResourceKey.minecraft("deepslate_copper_ore")); @@ -696,14 +696,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference DEEPSLATE_REDSTONE_ORE = BlockTypes.key(ResourceKey.minecraft("deepslate_redstone_ore")); + public static final DefaultedRegistryReference DEEPSLATE_TILES = BlockTypes.key(ResourceKey.minecraft("deepslate_tiles")); + public static final DefaultedRegistryReference DEEPSLATE_TILE_SLAB = BlockTypes.key(ResourceKey.minecraft("deepslate_tile_slab")); public static final DefaultedRegistryReference DEEPSLATE_TILE_STAIRS = BlockTypes.key(ResourceKey.minecraft("deepslate_tile_stairs")); public static final DefaultedRegistryReference DEEPSLATE_TILE_WALL = BlockTypes.key(ResourceKey.minecraft("deepslate_tile_wall")); - public static final DefaultedRegistryReference DEEPSLATE_TILES = BlockTypes.key(ResourceKey.minecraft("deepslate_tiles")); - public static final DefaultedRegistryReference DETECTOR_RAIL = BlockTypes.key(ResourceKey.minecraft("detector_rail")); public static final DefaultedRegistryReference DIAMOND_BLOCK = BlockTypes.key(ResourceKey.minecraft("diamond_block")); @@ -742,6 +742,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference ENCHANTING_TABLE = BlockTypes.key(ResourceKey.minecraft("enchanting_table")); + public static final DefaultedRegistryReference ENDER_CHEST = BlockTypes.key(ResourceKey.minecraft("ender_chest")); + public static final DefaultedRegistryReference END_GATEWAY = BlockTypes.key(ResourceKey.minecraft("end_gateway")); public static final DefaultedRegistryReference END_PORTAL = BlockTypes.key(ResourceKey.minecraft("end_portal")); @@ -752,16 +754,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference END_STONE = BlockTypes.key(ResourceKey.minecraft("end_stone")); + public static final DefaultedRegistryReference END_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("end_stone_bricks")); + public static final DefaultedRegistryReference END_STONE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("end_stone_brick_slab")); public static final DefaultedRegistryReference END_STONE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("end_stone_brick_stairs")); public static final DefaultedRegistryReference END_STONE_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("end_stone_brick_wall")); - public static final DefaultedRegistryReference END_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("end_stone_bricks")); - - 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")); @@ -796,12 +796,12 @@ public final class BlockTypes { public static final DefaultedRegistryReference FLETCHING_TABLE = BlockTypes.key(ResourceKey.minecraft("fletching_table")); - public static final DefaultedRegistryReference FLOWER_POT = BlockTypes.key(ResourceKey.minecraft("flower_pot")); - public static final DefaultedRegistryReference FLOWERING_AZALEA = BlockTypes.key(ResourceKey.minecraft("flowering_azalea")); public static final DefaultedRegistryReference FLOWERING_AZALEA_LEAVES = BlockTypes.key(ResourceKey.minecraft("flowering_azalea_leaves")); + public static final DefaultedRegistryReference FLOWER_POT = BlockTypes.key(ResourceKey.minecraft("flower_pot")); + public static final DefaultedRegistryReference FROGSPAWN = BlockTypes.key(ResourceKey.minecraft("frogspawn")); public static final DefaultedRegistryReference FROSTED_ICE = BlockTypes.key(ResourceKey.minecraft("frosted_ice")); @@ -814,10 +814,10 @@ public final class BlockTypes { public static final DefaultedRegistryReference GLASS_PANE = BlockTypes.key(ResourceKey.minecraft("glass_pane")); - public static final DefaultedRegistryReference GLOW_LICHEN = BlockTypes.key(ResourceKey.minecraft("glow_lichen")); - public static final DefaultedRegistryReference GLOWSTONE = BlockTypes.key(ResourceKey.minecraft("glowstone")); + public static final DefaultedRegistryReference GLOW_LICHEN = BlockTypes.key(ResourceKey.minecraft("glow_lichen")); + public static final DefaultedRegistryReference GOLD_BLOCK = BlockTypes.key(ResourceKey.minecraft("gold_block")); public static final DefaultedRegistryReference GOLD_ORE = BlockTypes.key(ResourceKey.minecraft("gold_ore")); @@ -900,10 +900,10 @@ public final class BlockTypes { public static final DefaultedRegistryReference HEAVY_WEIGHTED_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("heavy_weighted_pressure_plate")); - public static final DefaultedRegistryReference HONEY_BLOCK = BlockTypes.key(ResourceKey.minecraft("honey_block")); - public static final DefaultedRegistryReference HONEYCOMB_BLOCK = BlockTypes.key(ResourceKey.minecraft("honeycomb_block")); + public static final DefaultedRegistryReference HONEY_BLOCK = BlockTypes.key(ResourceKey.minecraft("honey_block")); + public static final DefaultedRegistryReference HOPPER = BlockTypes.key(ResourceKey.minecraft("hopper")); public static final DefaultedRegistryReference HORN_CORAL = BlockTypes.key(ResourceKey.minecraft("horn_coral")); @@ -1006,6 +1006,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference LIGHT = BlockTypes.key(ResourceKey.minecraft("light")); + public static final DefaultedRegistryReference LIGHTNING_ROD = BlockTypes.key(ResourceKey.minecraft("lightning_rod")); + public static final DefaultedRegistryReference LIGHT_BLUE_BANNER = BlockTypes.key(ResourceKey.minecraft("light_blue_banner")); public static final DefaultedRegistryReference LIGHT_BLUE_BED = BlockTypes.key(ResourceKey.minecraft("light_blue_bed")); @@ -1064,8 +1066,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference LIGHT_WEIGHTED_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("light_weighted_pressure_plate")); - public static final DefaultedRegistryReference LIGHTNING_ROD = BlockTypes.key(ResourceKey.minecraft("lightning_rod")); - public static final DefaultedRegistryReference LILAC = BlockTypes.key(ResourceKey.minecraft("lilac")); public static final DefaultedRegistryReference LILY_OF_THE_VALLEY = BlockTypes.key(ResourceKey.minecraft("lily_of_the_valley")); @@ -1176,10 +1176,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference MELON_STEM = BlockTypes.key(ResourceKey.minecraft("melon_stem")); - public static final DefaultedRegistryReference MOSS_BLOCK = BlockTypes.key(ResourceKey.minecraft("moss_block")); - - public static final DefaultedRegistryReference MOSS_CARPET = BlockTypes.key(ResourceKey.minecraft("moss_carpet")); - public static final DefaultedRegistryReference MOSSY_COBBLESTONE = BlockTypes.key(ResourceKey.minecraft("mossy_cobblestone")); public static final DefaultedRegistryReference MOSSY_COBBLESTONE_SLAB = BlockTypes.key(ResourceKey.minecraft("mossy_cobblestone_slab")); @@ -1188,32 +1184,42 @@ public final class BlockTypes { public static final DefaultedRegistryReference MOSSY_COBBLESTONE_WALL = BlockTypes.key(ResourceKey.minecraft("mossy_cobblestone_wall")); + public static final DefaultedRegistryReference MOSSY_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("mossy_stone_bricks")); + public static final DefaultedRegistryReference MOSSY_STONE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("mossy_stone_brick_slab")); public static final DefaultedRegistryReference MOSSY_STONE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("mossy_stone_brick_stairs")); public static final DefaultedRegistryReference MOSSY_STONE_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("mossy_stone_brick_wall")); - public static final DefaultedRegistryReference MOSSY_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("mossy_stone_bricks")); + public static final DefaultedRegistryReference MOSS_BLOCK = BlockTypes.key(ResourceKey.minecraft("moss_block")); + + public static final DefaultedRegistryReference MOSS_CARPET = BlockTypes.key(ResourceKey.minecraft("moss_carpet")); public static final DefaultedRegistryReference MOVING_PISTON = BlockTypes.key(ResourceKey.minecraft("moving_piston")); public static final DefaultedRegistryReference MUD = BlockTypes.key(ResourceKey.minecraft("mud")); + public static final DefaultedRegistryReference MUDDY_MANGROVE_ROOTS = BlockTypes.key(ResourceKey.minecraft("muddy_mangrove_roots")); + + public static final DefaultedRegistryReference MUD_BRICKS = BlockTypes.key(ResourceKey.minecraft("mud_bricks")); + public static final DefaultedRegistryReference MUD_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("mud_brick_slab")); public static final DefaultedRegistryReference MUD_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("mud_brick_stairs")); public static final DefaultedRegistryReference MUD_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("mud_brick_wall")); - public static final DefaultedRegistryReference MUD_BRICKS = BlockTypes.key(ResourceKey.minecraft("mud_bricks")); - - public static final DefaultedRegistryReference MUDDY_MANGROVE_ROOTS = BlockTypes.key(ResourceKey.minecraft("muddy_mangrove_roots")); - public static final DefaultedRegistryReference MUSHROOM_STEM = BlockTypes.key(ResourceKey.minecraft("mushroom_stem")); public static final DefaultedRegistryReference MYCELIUM = BlockTypes.key(ResourceKey.minecraft("mycelium")); + public static final DefaultedRegistryReference NETHERITE_BLOCK = BlockTypes.key(ResourceKey.minecraft("netherite_block")); + + public static final DefaultedRegistryReference NETHERRACK = BlockTypes.key(ResourceKey.minecraft("netherrack")); + + public static final DefaultedRegistryReference NETHER_BRICKS = BlockTypes.key(ResourceKey.minecraft("nether_bricks")); + public static final DefaultedRegistryReference NETHER_BRICK_FENCE = BlockTypes.key(ResourceKey.minecraft("nether_brick_fence")); public static final DefaultedRegistryReference NETHER_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("nether_brick_slab")); @@ -1222,8 +1228,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference NETHER_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("nether_brick_wall")); - public static final DefaultedRegistryReference NETHER_BRICKS = BlockTypes.key(ResourceKey.minecraft("nether_bricks")); - public static final DefaultedRegistryReference NETHER_GOLD_ORE = BlockTypes.key(ResourceKey.minecraft("nether_gold_ore")); public static final DefaultedRegistryReference NETHER_PORTAL = BlockTypes.key(ResourceKey.minecraft("nether_portal")); @@ -1236,10 +1240,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference NETHER_WART_BLOCK = BlockTypes.key(ResourceKey.minecraft("nether_wart_block")); - public static final DefaultedRegistryReference NETHERITE_BLOCK = BlockTypes.key(ResourceKey.minecraft("netherite_block")); - - public static final DefaultedRegistryReference NETHERRACK = BlockTypes.key(ResourceKey.minecraft("netherrack")); - public static final DefaultedRegistryReference NOTE_BLOCK = BlockTypes.key(ResourceKey.minecraft("note_block")); public static final DefaultedRegistryReference OAK_BUTTON = BlockTypes.key(ResourceKey.minecraft("oak_button")); @@ -1404,14 +1404,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference POLISHED_BLACKSTONE = BlockTypes.key(ResourceKey.minecraft("polished_blackstone")); + public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_bricks")); + public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_brick_slab")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_brick_stairs")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_brick_wall")); - public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_bricks")); - public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BUTTON = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_button")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("polished_blackstone_pressure_plate")); @@ -1530,12 +1530,12 @@ public final class BlockTypes { public static final DefaultedRegistryReference PRISMARINE = BlockTypes.key(ResourceKey.minecraft("prismarine")); + public static final DefaultedRegistryReference PRISMARINE_BRICKS = BlockTypes.key(ResourceKey.minecraft("prismarine_bricks")); + public static final DefaultedRegistryReference PRISMARINE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("prismarine_brick_slab")); public static final DefaultedRegistryReference PRISMARINE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("prismarine_brick_stairs")); - public static final DefaultedRegistryReference PRISMARINE_BRICKS = BlockTypes.key(ResourceKey.minecraft("prismarine_bricks")); - public static final DefaultedRegistryReference PRISMARINE_SLAB = BlockTypes.key(ResourceKey.minecraft("prismarine_slab")); public static final DefaultedRegistryReference PRISMARINE_STAIRS = BlockTypes.key(ResourceKey.minecraft("prismarine_stairs")); @@ -1600,6 +1600,18 @@ public final class BlockTypes { public static final DefaultedRegistryReference RAW_IRON_BLOCK = BlockTypes.key(ResourceKey.minecraft("raw_iron_block")); + public static final DefaultedRegistryReference REDSTONE_BLOCK = BlockTypes.key(ResourceKey.minecraft("redstone_block")); + + public static final DefaultedRegistryReference REDSTONE_LAMP = BlockTypes.key(ResourceKey.minecraft("redstone_lamp")); + + public static final DefaultedRegistryReference REDSTONE_ORE = BlockTypes.key(ResourceKey.minecraft("redstone_ore")); + + public static final DefaultedRegistryReference REDSTONE_TORCH = BlockTypes.key(ResourceKey.minecraft("redstone_torch")); + + public static final DefaultedRegistryReference REDSTONE_WALL_TORCH = BlockTypes.key(ResourceKey.minecraft("redstone_wall_torch")); + + public static final DefaultedRegistryReference REDSTONE_WIRE = BlockTypes.key(ResourceKey.minecraft("redstone_wire")); + public static final DefaultedRegistryReference RED_BANNER = BlockTypes.key(ResourceKey.minecraft("red_banner")); public static final DefaultedRegistryReference RED_BED = BlockTypes.key(ResourceKey.minecraft("red_bed")); @@ -1620,14 +1632,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference RED_MUSHROOM_BLOCK = BlockTypes.key(ResourceKey.minecraft("red_mushroom_block")); + public static final DefaultedRegistryReference RED_NETHER_BRICKS = BlockTypes.key(ResourceKey.minecraft("red_nether_bricks")); + public static final DefaultedRegistryReference RED_NETHER_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("red_nether_brick_slab")); public static final DefaultedRegistryReference RED_NETHER_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("red_nether_brick_stairs")); public static final DefaultedRegistryReference RED_NETHER_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("red_nether_brick_wall")); - public static final DefaultedRegistryReference RED_NETHER_BRICKS = BlockTypes.key(ResourceKey.minecraft("red_nether_bricks")); - public static final DefaultedRegistryReference RED_SAND = BlockTypes.key(ResourceKey.minecraft("red_sand")); public static final DefaultedRegistryReference RED_SANDSTONE = BlockTypes.key(ResourceKey.minecraft("red_sandstone")); @@ -1652,18 +1664,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference RED_WOOL = BlockTypes.key(ResourceKey.minecraft("red_wool")); - public static final DefaultedRegistryReference REDSTONE_BLOCK = BlockTypes.key(ResourceKey.minecraft("redstone_block")); - - public static final DefaultedRegistryReference REDSTONE_LAMP = BlockTypes.key(ResourceKey.minecraft("redstone_lamp")); - - public static final DefaultedRegistryReference REDSTONE_ORE = BlockTypes.key(ResourceKey.minecraft("redstone_ore")); - - public static final DefaultedRegistryReference REDSTONE_TORCH = BlockTypes.key(ResourceKey.minecraft("redstone_torch")); - - public static final DefaultedRegistryReference REDSTONE_WALL_TORCH = BlockTypes.key(ResourceKey.minecraft("redstone_wall_torch")); - - public static final DefaultedRegistryReference REDSTONE_WIRE = BlockTypes.key(ResourceKey.minecraft("redstone_wire")); - public static final DefaultedRegistryReference REINFORCED_DEEPSLATE = BlockTypes.key(ResourceKey.minecraft("reinforced_deepslate")); public static final DefaultedRegistryReference REPEATER = BlockTypes.key(ResourceKey.minecraft("repeater")); @@ -1698,12 +1698,12 @@ public final class BlockTypes { public static final DefaultedRegistryReference SCULK_VEIN = BlockTypes.key(ResourceKey.minecraft("sculk_vein")); + public static final DefaultedRegistryReference SEAGRASS = BlockTypes.key(ResourceKey.minecraft("seagrass")); + public static final DefaultedRegistryReference SEA_LANTERN = BlockTypes.key(ResourceKey.minecraft("sea_lantern")); public static final DefaultedRegistryReference SEA_PICKLE = BlockTypes.key(ResourceKey.minecraft("sea_pickle")); - 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")); @@ -1812,14 +1812,16 @@ public final class BlockTypes { public static final DefaultedRegistryReference STONE = BlockTypes.key(ResourceKey.minecraft("stone")); + public static final DefaultedRegistryReference STONECUTTER = BlockTypes.key(ResourceKey.minecraft("stonecutter")); + + public static final DefaultedRegistryReference STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("stone_bricks")); + public static final DefaultedRegistryReference STONE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("stone_brick_slab")); public static final DefaultedRegistryReference STONE_BRICK_STAIRS = BlockTypes.key(ResourceKey.minecraft("stone_brick_stairs")); public static final DefaultedRegistryReference STONE_BRICK_WALL = BlockTypes.key(ResourceKey.minecraft("stone_brick_wall")); - public static final DefaultedRegistryReference STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("stone_bricks")); - public static final DefaultedRegistryReference STONE_BUTTON = BlockTypes.key(ResourceKey.minecraft("stone_button")); public static final DefaultedRegistryReference STONE_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("stone_pressure_plate")); @@ -1828,8 +1830,6 @@ public final class BlockTypes { public static final DefaultedRegistryReference STONE_STAIRS = BlockTypes.key(ResourceKey.minecraft("stone_stairs")); - public static final DefaultedRegistryReference STONECUTTER = BlockTypes.key(ResourceKey.minecraft("stonecutter")); - public static final DefaultedRegistryReference STRIPPED_ACACIA_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_acacia_log")); public static final DefaultedRegistryReference STRIPPED_ACACIA_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_acacia_wood")); @@ -1922,14 +1922,14 @@ public final class BlockTypes { public static final DefaultedRegistryReference TUFF = BlockTypes.key(ResourceKey.minecraft("tuff")); + public static final DefaultedRegistryReference TUFF_BRICKS = BlockTypes.key(ResourceKey.minecraft("tuff_bricks")); + 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")); 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 9d1cf49f8a..610f4eef81 100644 --- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java +++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java @@ -84,12 +84,12 @@ public final class BlockEntityTypes { public static final DefaultedRegistryReference ENCHANTING_TABLE = BlockEntityTypes.key(ResourceKey.minecraft("enchanting_table")); + public static final DefaultedRegistryReference ENDER_CHEST = BlockEntityTypes.key(ResourceKey.minecraft("ender_chest")); + public static final DefaultedRegistryReference END_GATEWAY = BlockEntityTypes.key(ResourceKey.minecraft("end_gateway")); public static final DefaultedRegistryReference END_PORTAL = BlockEntityTypes.key(ResourceKey.minecraft("end_portal")); - public static final DefaultedRegistryReference ENDER_CHEST = BlockEntityTypes.key(ResourceKey.minecraft("ender_chest")); - public static final DefaultedRegistryReference FURNACE = BlockEntityTypes.key(ResourceKey.minecraft("furnace")); public static final DefaultedRegistryReference HANGING_SIGN = BlockEntityTypes.key(ResourceKey.minecraft("hanging_sign")); diff --git a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java index 7e848bb25c..32c50669fa 100644 --- a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java +++ b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java @@ -42,6 +42,8 @@ import org.spongepowered.api.data.type.StairShape; import org.spongepowered.api.data.type.StructureMode; import org.spongepowered.api.data.type.Tilt; +import org.spongepowered.api.data.type.TrialSpawnerState; +import org.spongepowered.api.data.type.VaultState; import org.spongepowered.api.data.type.WallConnectionState; import org.spongepowered.api.data.type.WireAttachmentType; import org.spongepowered.api.data.value.Value; @@ -210,6 +212,8 @@ public final class BlockStateKeys { public static final Key> OCCUPIED = BlockStateKeys.key(ResourceKey.minecraft("property/occupied"), Boolean.class); + public static final Key> OMINOUS = BlockStateKeys.key(ResourceKey.minecraft("property/ominous"), Boolean.class); + public static final Key> OPEN = BlockStateKeys.key(ResourceKey.minecraft("property/open"), Boolean.class); public static final Key> ORIENTATION = BlockStateKeys.key(ResourceKey.minecraft("property/orientation"), JigsawBlockOrientation.class); @@ -260,12 +264,16 @@ public final class BlockStateKeys { public static final Key> TILT = BlockStateKeys.key(ResourceKey.minecraft("property/tilt"), Tilt.class); + public static final Key> TRIAL_SPAWNER_STATE = BlockStateKeys.key(ResourceKey.minecraft("property/trial_spawner_state"), TrialSpawnerState.class); + public static final Key> TRIGGERED = BlockStateKeys.key(ResourceKey.minecraft("property/triggered"), Boolean.class); public static final Key> UNSTABLE = BlockStateKeys.key(ResourceKey.minecraft("property/unstable"), Boolean.class); public static final Key> UP = BlockStateKeys.key(ResourceKey.minecraft("property/up"), Boolean.class); + public static final Key> VAULT_STATE = BlockStateKeys.key(ResourceKey.minecraft("property/vault_state"), VaultState.class); + public static final Key> VERTICAL_DIRECTION = BlockStateKeys.key(ResourceKey.minecraft("property/vertical_direction"), Direction.class); public static final Key> WATERLOGGED = BlockStateKeys.key(ResourceKey.minecraft("property/waterlogged"), Boolean.class); 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 ef69fec6cc..e9f715523f 100644 --- a/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java +++ b/src/main/java/org/spongepowered/api/data/type/BannerPatternShapes.java @@ -118,14 +118,14 @@ public final class BannerPatternShapes { public static final DefaultedRegistryReference STRIPE_TOP = BannerPatternShapes.key(ResourceKey.minecraft("stripe_top")); - public static final DefaultedRegistryReference TRIANGLE_BOTTOM = BannerPatternShapes.key(ResourceKey.minecraft("triangle_bottom")); - - public static final DefaultedRegistryReference TRIANGLE_TOP = BannerPatternShapes.key(ResourceKey.minecraft("triangle_top")); - public static final DefaultedRegistryReference TRIANGLES_BOTTOM = BannerPatternShapes.key(ResourceKey.minecraft("triangles_bottom")); public static final DefaultedRegistryReference TRIANGLES_TOP = BannerPatternShapes.key(ResourceKey.minecraft("triangles_top")); + public static final DefaultedRegistryReference TRIANGLE_BOTTOM = BannerPatternShapes.key(ResourceKey.minecraft("triangle_bottom")); + + public static final DefaultedRegistryReference TRIANGLE_TOP = BannerPatternShapes.key(ResourceKey.minecraft("triangle_top")); + private BannerPatternShapes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/DripstoneSegments.java b/src/main/java/org/spongepowered/api/data/type/DripstoneSegments.java index a93937b283..bcf1fd795e 100644 --- a/src/main/java/org/spongepowered/api/data/type/DripstoneSegments.java +++ b/src/main/java/org/spongepowered/api/data/type/DripstoneSegments.java @@ -27,30 +27,37 @@ import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; import org.spongepowered.api.registry.DefaultedRegistryReference; +import org.spongepowered.api.registry.Registry; import org.spongepowered.api.registry.RegistryKey; import org.spongepowered.api.registry.RegistryScope; import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class DripstoneSegments { - public static final DefaultedRegistryReference TIP_MERGE = DripstoneSegments.key(ResourceKey.sponge("tip_merge")); - - public static final DefaultedRegistryReference TIP = DripstoneSegments.key(ResourceKey.sponge("tip")); + public static final DefaultedRegistryReference BASE = DripstoneSegments.key(ResourceKey.sponge("base")); public static final DefaultedRegistryReference FRUSTUM = DripstoneSegments.key(ResourceKey.sponge("frustum")); public static final DefaultedRegistryReference MIDDLE = DripstoneSegments.key(ResourceKey.sponge("middle")); - public static final DefaultedRegistryReference BASE = DripstoneSegments.key(ResourceKey.sponge("base")); + public static final DefaultedRegistryReference TIP = DripstoneSegments.key(ResourceKey.sponge("tip")); + + public static final DefaultedRegistryReference TIP_MERGE = DripstoneSegments.key(ResourceKey.sponge("tip_merge")); private DripstoneSegments() { } + public static Registry registry() { + return Sponge.game().registry(RegistryTypes.DRIPSTONE_SEGMENT); + } + private static DefaultedRegistryReference key(final ResourceKey location) { return RegistryKey.of(RegistryTypes.DRIPSTONE_SEGMENT, location).asDefaultedReference(Sponge::game); } - } diff --git a/src/main/java/org/spongepowered/api/data/type/ItemTiers.java b/src/main/java/org/spongepowered/api/data/type/ItemTiers.java index b4244c0fa0..089e50f44d 100644 --- a/src/main/java/org/spongepowered/api/data/type/ItemTiers.java +++ b/src/main/java/org/spongepowered/api/data/type/ItemTiers.java @@ -34,16 +34,12 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of vanilla {@link ItemTier}s. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class ItemTiers { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference DIAMOND = ItemTiers.key(ResourceKey.sponge("diamond")); public static final DefaultedRegistryReference GOLD = ItemTiers.key(ResourceKey.sponge("gold")); @@ -56,10 +52,6 @@ public final class ItemTiers { public static final DefaultedRegistryReference WOOD = ItemTiers.key(ResourceKey.sponge("wood")); - // SORTFIELDS:OFF - - // @formatter:on - private ItemTiers() { } diff --git a/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java b/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java index b210b77ed8..443831ff81 100644 --- a/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/LlamaTypes.java @@ -40,8 +40,6 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class LlamaTypes { - // @formatter:off - // SORTFIELDS:ON public static final DefaultedRegistryReference BROWN = LlamaTypes.key(ResourceKey.sponge("brown")); public static final DefaultedRegistryReference CREAMY = LlamaTypes.key(ResourceKey.sponge("creamy")); @@ -50,8 +48,6 @@ public final class LlamaTypes { public static final DefaultedRegistryReference WHITE = LlamaTypes.key(ResourceKey.sponge("white")); - // SORTFIELDS:OFF - // @formatter:on private LlamaTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java b/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java index 6515ecfcf3..99556f3660 100644 --- a/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/MooshroomTypes.java @@ -34,24 +34,16 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of vanilla {@link MooshroomType}s. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class MooshroomTypes { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference BROWN = MooshroomTypes.key(ResourceKey.sponge("brown")); public static final DefaultedRegistryReference RED = MooshroomTypes.key(ResourceKey.sponge("red")); - // SORTFIELDS:OFF - - // @formatter:on - private MooshroomTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/PandaGenes.java b/src/main/java/org/spongepowered/api/data/type/PandaGenes.java index 29684082c2..1624a0487e 100644 --- a/src/main/java/org/spongepowered/api/data/type/PandaGenes.java +++ b/src/main/java/org/spongepowered/api/data/type/PandaGenes.java @@ -34,16 +34,12 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of vanilla {@link PandaGene}s. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class PandaGenes { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference AGGRESSIVE = PandaGenes.key(ResourceKey.sponge("aggressive")); public static final DefaultedRegistryReference BROWN = PandaGenes.key(ResourceKey.sponge("brown")); @@ -58,10 +54,6 @@ public final class PandaGenes { public static final DefaultedRegistryReference WORRIED = PandaGenes.key(ResourceKey.sponge("worried")); - // SORTFIELDS:OFF - - // @formatter:on - private PandaGenes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java b/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java index bd3090ca1c..b2fccd87b7 100644 --- a/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/ParrotTypes.java @@ -34,19 +34,15 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of vanilla {@link ParrotType}s. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class ParrotTypes { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference BLUE = ParrotTypes.key(ResourceKey.sponge("blue")); - public static final DefaultedRegistryReference GREY = ParrotTypes.key(ResourceKey.sponge("grey")); + public static final DefaultedRegistryReference GRAY = ParrotTypes.key(ResourceKey.sponge("gray")); public static final DefaultedRegistryReference GREEN = ParrotTypes.key(ResourceKey.sponge("green")); @@ -54,10 +50,6 @@ public final class ParrotTypes { public static final DefaultedRegistryReference YELLOW_BLUE = ParrotTypes.key(ResourceKey.sponge("yellow_blue")); - // SORTFIELDS:OFF - - // @formatter:on - private ParrotTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/PushReactions.java b/src/main/java/org/spongepowered/api/data/type/PushReactions.java index 681ec52667..6292689ca6 100644 --- a/src/main/java/org/spongepowered/api/data/type/PushReactions.java +++ b/src/main/java/org/spongepowered/api/data/type/PushReactions.java @@ -33,14 +33,24 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @RegistryScopes(scopes = RegistryScope.GAME) public final class PushReactions { - public static final DefaultedRegistryReference NORMAL = key(ResourceKey.minecraft("NORMAL")); - public static final DefaultedRegistryReference DESTROY = key(ResourceKey.minecraft("DESTROY")); - public static final DefaultedRegistryReference BLOCK = key(ResourceKey.minecraft("BLOCK")); - public static final DefaultedRegistryReference IGNORE = key(ResourceKey.minecraft("IGNORE")); - public static final DefaultedRegistryReference PUSH_ONLY = key(ResourceKey.minecraft("PUSH_ONLY")); + public static final DefaultedRegistryReference BLOCK = PushReactions.key(ResourceKey.sponge("block")); + + public static final DefaultedRegistryReference DESTROY = PushReactions.key(ResourceKey.sponge("destroy")); + + public static final DefaultedRegistryReference IGNORE = PushReactions.key(ResourceKey.sponge("ignore")); + + public static final DefaultedRegistryReference NORMAL = PushReactions.key(ResourceKey.sponge("normal")); + + public static final DefaultedRegistryReference PUSH_ONLY = PushReactions.key(ResourceKey.sponge("push_only")); + + private PushReactions() { + } public static Registry registry() { return Sponge.game().registry(RegistryTypes.PUSH_REACTION); diff --git a/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java b/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java index c7e5eacb64..9fb270ee68 100644 --- a/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/RabbitTypes.java @@ -34,33 +34,25 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * An enumeration of vanilla {@link RabbitType}s. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class RabbitTypes { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference BLACK = RabbitTypes.key(ResourceKey.sponge("black")); - public static final DefaultedRegistryReference WHITE_SPLOTCHED = RabbitTypes.key(ResourceKey.sponge("white_splotched")); - public static final DefaultedRegistryReference BROWN = RabbitTypes.key(ResourceKey.sponge("brown")); - public static final DefaultedRegistryReference GOLD = RabbitTypes.key(ResourceKey.sponge("gold")); - public static final DefaultedRegistryReference EVIL = RabbitTypes.key(ResourceKey.sponge("evil")); + public static final DefaultedRegistryReference GOLD = RabbitTypes.key(ResourceKey.sponge("gold")); + public static final DefaultedRegistryReference SALT = RabbitTypes.key(ResourceKey.sponge("salt")); public static final DefaultedRegistryReference WHITE = RabbitTypes.key(ResourceKey.sponge("white")); - // SORTFIELDS:OFF - - // @formatter:on + public static final DefaultedRegistryReference WHITE_SPLOTCHED = RabbitTypes.key(ResourceKey.sponge("white_splotched")); private RabbitTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/SculkSensorStates.java b/src/main/java/org/spongepowered/api/data/type/SculkSensorStates.java index 3f1b401c3e..8023f3ee9b 100644 --- a/src/main/java/org/spongepowered/api/data/type/SculkSensorStates.java +++ b/src/main/java/org/spongepowered/api/data/type/SculkSensorStates.java @@ -33,21 +33,18 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class SculkSensorStates { - // @formatter:off - // SORTFIELDS:ON - - public static final DefaultedRegistryReference INACTIVE = SculkSensorStates.key(ResourceKey.sponge("inactive")); - public static final DefaultedRegistryReference ACTIVE = SculkSensorStates.key(ResourceKey.sponge("active")); public static final DefaultedRegistryReference COOLDOWN = SculkSensorStates.key(ResourceKey.sponge("cooldown")); - // SORTFIELDS:OFF - // @formatter:on + public static final DefaultedRegistryReference INACTIVE = SculkSensorStates.key(ResourceKey.sponge("inactive")); private SculkSensorStates() { } @@ -59,5 +56,4 @@ public static Registry registry() { private static DefaultedRegistryReference key(final ResourceKey location) { return RegistryKey.of(RegistryTypes.SCULK_SENSOR_STATE, location).asDefaultedReference(Sponge::game); } - } diff --git a/src/main/java/org/spongepowered/api/data/type/SpellTypes.java b/src/main/java/org/spongepowered/api/data/type/SpellTypes.java index abda1454f4..a994f1fad4 100644 --- a/src/main/java/org/spongepowered/api/data/type/SpellTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/SpellTypes.java @@ -33,14 +33,13 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class SpellTypes { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference BLINDNESS = SpellTypes.key(ResourceKey.sponge("blindness")); public static final DefaultedRegistryReference DISAPPEAR = SpellTypes.key(ResourceKey.sponge("disappear")); @@ -53,10 +52,6 @@ public final class SpellTypes { public static final DefaultedRegistryReference WOLOLO = SpellTypes.key(ResourceKey.sponge("wololo")); - // SORTFIELDS:OFF - - // @formatter:on - private SpellTypes() { } diff --git a/src/main/java/org/spongepowered/api/data/type/Tilts.java b/src/main/java/org/spongepowered/api/data/type/Tilts.java index 00ff8ea377..40f1f30df5 100644 --- a/src/main/java/org/spongepowered/api/data/type/Tilts.java +++ b/src/main/java/org/spongepowered/api/data/type/Tilts.java @@ -27,34 +27,35 @@ import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; import org.spongepowered.api.registry.DefaultedRegistryReference; +import org.spongepowered.api.registry.Registry; import org.spongepowered.api.registry.RegistryKey; import org.spongepowered.api.registry.RegistryScope; import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class Tilts { - // @formatter:off - // SORTFIELDS:ON + public static final DefaultedRegistryReference FULL = Tilts.key(ResourceKey.sponge("full")); public static final DefaultedRegistryReference NONE = Tilts.key(ResourceKey.sponge("none")); - public static final DefaultedRegistryReference UNSTABLE = Tilts.key(ResourceKey.sponge("unstable")); - public static final DefaultedRegistryReference PARTIAL = Tilts.key(ResourceKey.sponge("partial")); - public static final DefaultedRegistryReference FULL = Tilts.key(ResourceKey.sponge("full")); - - // SORTFIELDS:OFF - // @formatter:on + public static final DefaultedRegistryReference UNSTABLE = Tilts.key(ResourceKey.sponge("unstable")); private Tilts() { } + public static Registry registry() { + return Sponge.game().registry(RegistryTypes.TILT); + } + private static DefaultedRegistryReference key(final ResourceKey location) { return RegistryKey.of(RegistryTypes.TILT, location).asDefaultedReference(Sponge::game); } - } diff --git a/src/main/java/org/spongepowered/api/data/type/TrialSpawnerStates.java b/src/main/java/org/spongepowered/api/data/type/TrialSpawnerStates.java index 7724165f31..a5b434e73a 100644 --- a/src/main/java/org/spongepowered/api/data/type/TrialSpawnerStates.java +++ b/src/main/java/org/spongepowered/api/data/type/TrialSpawnerStates.java @@ -31,20 +31,25 @@ import org.spongepowered.api.registry.RegistryKey; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ public final class TrialSpawnerStates { - public static final DefaultedRegistryReference INACTIVE = TrialSpawnerStates.key(ResourceKey.sponge("INACTIVE")); + public static final DefaultedRegistryReference ACTIVE = TrialSpawnerStates.key(ResourceKey.sponge("active")); - public static final DefaultedRegistryReference WAITING_FOR_PLAYERS = TrialSpawnerStates.key(ResourceKey.sponge("WAITING_FOR_PLAYERS")); + public static final DefaultedRegistryReference COOLDOWN = TrialSpawnerStates.key(ResourceKey.sponge("cooldown")); - public static final DefaultedRegistryReference ACTIVE = TrialSpawnerStates.key(ResourceKey.sponge("ACTIVE")); + public static final DefaultedRegistryReference EJECTING_REWARD = TrialSpawnerStates.key(ResourceKey.sponge("ejecting_reward")); - public static final DefaultedRegistryReference WAITING_FOR_REWARD_EJECTION = TrialSpawnerStates.key(ResourceKey.sponge("WAITING_FOR_REWARD_EJECTION")); + public static final DefaultedRegistryReference INACTIVE = TrialSpawnerStates.key(ResourceKey.sponge("inactive")); - public static final DefaultedRegistryReference EJECTING_REWARD = TrialSpawnerStates.key(ResourceKey.sponge("EJECTING_REWARD")); + public static final DefaultedRegistryReference WAITING_FOR_PLAYERS = TrialSpawnerStates.key(ResourceKey.sponge("waiting_for_players")); - public static final DefaultedRegistryReference COOLDOWN = TrialSpawnerStates.key(ResourceKey.sponge("COOLDOWN")); + public static final DefaultedRegistryReference WAITING_FOR_REWARD_EJECTION = TrialSpawnerStates.key(ResourceKey.sponge("waiting_for_reward_ejection")); + private TrialSpawnerStates() { + } public static Registry registry() { return Sponge.game().registry(RegistryTypes.TRIAL_SPAWNER_STATE); diff --git a/src/main/java/org/spongepowered/api/data/type/VaultStates.java b/src/main/java/org/spongepowered/api/data/type/VaultStates.java index e017753800..f04c564bc8 100644 --- a/src/main/java/org/spongepowered/api/data/type/VaultStates.java +++ b/src/main/java/org/spongepowered/api/data/type/VaultStates.java @@ -38,6 +38,9 @@ public final class VaultStates { public static final DefaultedRegistryReference UNLOCKING = VaultStates.key(ResourceKey.sponge("unlocking")); public static final DefaultedRegistryReference EJECTING = VaultStates.key(ResourceKey.sponge("ejecting")); + private VaultStates() { + } + public static Registry registry() { return Sponge.game().registry(RegistryTypes.VAULT_STATE); } 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 a882041b5e..23c84a4daa 100644 --- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java +++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java @@ -96,10 +96,10 @@ public final class PotionEffectTypes { public static final DefaultedRegistryReference SATURATION = PotionEffectTypes.key(ResourceKey.minecraft("saturation")); - public static final DefaultedRegistryReference SLOW_FALLING = PotionEffectTypes.key(ResourceKey.minecraft("slow_falling")); - public static final DefaultedRegistryReference SLOWNESS = PotionEffectTypes.key(ResourceKey.minecraft("slowness")); + public static final DefaultedRegistryReference SLOW_FALLING = PotionEffectTypes.key(ResourceKey.minecraft("slow_falling")); + public static final DefaultedRegistryReference SPEED = PotionEffectTypes.key(ResourceKey.minecraft("speed")); public static final DefaultedRegistryReference STRENGTH = PotionEffectTypes.key(ResourceKey.minecraft("strength")); 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 b8e148a05f..b9576c0054 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java @@ -140,10 +140,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_AZALEA_HIT = SoundTypes.key(ResourceKey.minecraft("block.azalea.hit")); - public static final DefaultedRegistryReference BLOCK_AZALEA_PLACE = SoundTypes.key(ResourceKey.minecraft("block.azalea.place")); - - public static final DefaultedRegistryReference BLOCK_AZALEA_STEP = SoundTypes.key(ResourceKey.minecraft("block.azalea.step")); - public static final DefaultedRegistryReference BLOCK_AZALEA_LEAVES_BREAK = SoundTypes.key(ResourceKey.minecraft("block.azalea_leaves.break")); public static final DefaultedRegistryReference BLOCK_AZALEA_LEAVES_FALL = SoundTypes.key(ResourceKey.minecraft("block.azalea_leaves.fall")); @@ -154,6 +150,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_AZALEA_LEAVES_STEP = SoundTypes.key(ResourceKey.minecraft("block.azalea_leaves.step")); + public static final DefaultedRegistryReference BLOCK_AZALEA_PLACE = SoundTypes.key(ResourceKey.minecraft("block.azalea.place")); + + public static final DefaultedRegistryReference BLOCK_AZALEA_STEP = SoundTypes.key(ResourceKey.minecraft("block.azalea.step")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_BREAK = SoundTypes.key(ResourceKey.minecraft("block.bamboo.break")); public static final DefaultedRegistryReference BLOCK_BAMBOO_FALL = SoundTypes.key(ResourceKey.minecraft("block.bamboo.fall")); @@ -162,23 +162,15 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_BAMBOO_PLACE = SoundTypes.key(ResourceKey.minecraft("block.bamboo.place")); - public static final DefaultedRegistryReference BLOCK_BAMBOO_STEP = SoundTypes.key(ResourceKey.minecraft("block.bamboo.step")); - public static final DefaultedRegistryReference BLOCK_BAMBOO_SAPLING_BREAK = SoundTypes.key(ResourceKey.minecraft("block.bamboo_sapling.break")); public static final DefaultedRegistryReference BLOCK_BAMBOO_SAPLING_HIT = SoundTypes.key(ResourceKey.minecraft("block.bamboo_sapling.hit")); public static final DefaultedRegistryReference BLOCK_BAMBOO_SAPLING_PLACE = SoundTypes.key(ResourceKey.minecraft("block.bamboo_sapling.place")); - public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.break")); - - public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.fall")); - - public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.hit")); - - public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.place")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_STEP = SoundTypes.key(ResourceKey.minecraft("block.bamboo.step")); - public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.step")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.break")); public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_button.click_off")); @@ -188,6 +180,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_door.open")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.fall")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_FENCE_GATE_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_fence_gate.close")); public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_fence_gate.open")); @@ -202,10 +196,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_hanging_sign.step")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.hit")); + + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.place")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_pressure_plate.click_off")); public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_pressure_plate.click_on")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood.step")); + public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_TRAPDOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_trapdoor.close")); public static final DefaultedRegistryReference BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.bamboo_wood_trapdoor.open")); @@ -356,14 +356,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.break")); - public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.fall")); - - public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.hit")); - - public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.place")); - - public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.step")); - public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_button.click_off")); public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_button.click_on")); @@ -372,6 +364,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_door.open")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.fall")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_fence_gate.close")); public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_fence_gate.open")); @@ -386,10 +380,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_hanging_sign.step")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.hit")); + + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.place")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_pressure_plate.click_off")); public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_pressure_plate.click_on")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood.step")); + public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_trapdoor.close")); public static final DefaultedRegistryReference BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.cherry_wood_trapdoor.open")); @@ -454,14 +454,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_COPPER_BREAK = SoundTypes.key(ResourceKey.minecraft("block.copper.break")); - public static final DefaultedRegistryReference BLOCK_COPPER_FALL = SoundTypes.key(ResourceKey.minecraft("block.copper.fall")); - - public static final DefaultedRegistryReference BLOCK_COPPER_HIT = SoundTypes.key(ResourceKey.minecraft("block.copper.hit")); - - public static final DefaultedRegistryReference BLOCK_COPPER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.copper.place")); - - 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")); @@ -480,6 +472,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_COPPER_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.copper_door.open")); + public static final DefaultedRegistryReference BLOCK_COPPER_FALL = SoundTypes.key(ResourceKey.minecraft("block.copper.fall")); + 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")); @@ -490,6 +484,12 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_COPPER_GRATE_STEP = SoundTypes.key(ResourceKey.minecraft("block.copper_grate.step")); + public static final DefaultedRegistryReference BLOCK_COPPER_HIT = SoundTypes.key(ResourceKey.minecraft("block.copper.hit")); + + public static final DefaultedRegistryReference BLOCK_COPPER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.copper.place")); + + public static final DefaultedRegistryReference BLOCK_COPPER_STEP = SoundTypes.key(ResourceKey.minecraft("block.copper.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")); @@ -528,14 +528,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_DEEPSLATE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.deepslate.break")); - public static final DefaultedRegistryReference BLOCK_DEEPSLATE_FALL = SoundTypes.key(ResourceKey.minecraft("block.deepslate.fall")); - - public static final DefaultedRegistryReference BLOCK_DEEPSLATE_HIT = SoundTypes.key(ResourceKey.minecraft("block.deepslate.hit")); - - public static final DefaultedRegistryReference BLOCK_DEEPSLATE_PLACE = SoundTypes.key(ResourceKey.minecraft("block.deepslate.place")); - - public static final DefaultedRegistryReference BLOCK_DEEPSLATE_STEP = SoundTypes.key(ResourceKey.minecraft("block.deepslate.step")); - public static final DefaultedRegistryReference BLOCK_DEEPSLATE_BRICKS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.deepslate_bricks.break")); public static final DefaultedRegistryReference BLOCK_DEEPSLATE_BRICKS_FALL = SoundTypes.key(ResourceKey.minecraft("block.deepslate_bricks.fall")); @@ -546,6 +538,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_DEEPSLATE_BRICKS_STEP = SoundTypes.key(ResourceKey.minecraft("block.deepslate_bricks.step")); + public static final DefaultedRegistryReference BLOCK_DEEPSLATE_FALL = SoundTypes.key(ResourceKey.minecraft("block.deepslate.fall")); + + public static final DefaultedRegistryReference BLOCK_DEEPSLATE_HIT = SoundTypes.key(ResourceKey.minecraft("block.deepslate.hit")); + + public static final DefaultedRegistryReference BLOCK_DEEPSLATE_PLACE = SoundTypes.key(ResourceKey.minecraft("block.deepslate.place")); + + public static final DefaultedRegistryReference BLOCK_DEEPSLATE_STEP = SoundTypes.key(ResourceKey.minecraft("block.deepslate.step")); + public static final DefaultedRegistryReference BLOCK_DEEPSLATE_TILES_BREAK = SoundTypes.key(ResourceKey.minecraft("block.deepslate_tiles.break")); public static final DefaultedRegistryReference BLOCK_DEEPSLATE_TILES_FALL = SoundTypes.key(ResourceKey.minecraft("block.deepslate_tiles.fall")); @@ -574,15 +574,15 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_ENCHANTMENT_TABLE_USE = SoundTypes.key(ResourceKey.minecraft("block.enchantment_table.use")); - public static final DefaultedRegistryReference BLOCK_END_GATEWAY_SPAWN = SoundTypes.key(ResourceKey.minecraft("block.end_gateway.spawn")); + public static final DefaultedRegistryReference BLOCK_ENDER_CHEST_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.close")); - public static final DefaultedRegistryReference BLOCK_END_PORTAL_SPAWN = SoundTypes.key(ResourceKey.minecraft("block.end_portal.spawn")); + public static final DefaultedRegistryReference BLOCK_ENDER_CHEST_OPEN = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.open")); - public static final DefaultedRegistryReference BLOCK_END_PORTAL_FRAME_FILL = SoundTypes.key(ResourceKey.minecraft("block.end_portal_frame.fill")); + public static final DefaultedRegistryReference BLOCK_END_GATEWAY_SPAWN = SoundTypes.key(ResourceKey.minecraft("block.end_gateway.spawn")); - public static final DefaultedRegistryReference BLOCK_ENDER_CHEST_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.close")); + public static final DefaultedRegistryReference BLOCK_END_PORTAL_FRAME_FILL = SoundTypes.key(ResourceKey.minecraft("block.end_portal_frame.fill")); - public static final DefaultedRegistryReference BLOCK_ENDER_CHEST_OPEN = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.open")); + public static final DefaultedRegistryReference BLOCK_END_PORTAL_SPAWN = SoundTypes.key(ResourceKey.minecraft("block.end_portal.spawn")); public static final DefaultedRegistryReference BLOCK_FENCE_GATE_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.fence_gate.close")); @@ -798,14 +798,24 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_METAL_PLACE = SoundTypes.key(ResourceKey.minecraft("block.metal.place")); - public static final DefaultedRegistryReference BLOCK_METAL_STEP = SoundTypes.key(ResourceKey.minecraft("block.metal.step")); - public static final DefaultedRegistryReference BLOCK_METAL_PRESSURE_PLATE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.metal_pressure_plate.click_off")); public static final DefaultedRegistryReference BLOCK_METAL_PRESSURE_PLATE_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.metal_pressure_plate.click_on")); + public static final DefaultedRegistryReference BLOCK_METAL_STEP = SoundTypes.key(ResourceKey.minecraft("block.metal.step")); + public static final DefaultedRegistryReference BLOCK_MOSS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.moss.break")); + public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_BREAK = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.break")); + + public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_FALL = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.fall")); + + public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_HIT = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.hit")); + + public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_PLACE = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.place")); + + public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_STEP = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.step")); + public static final DefaultedRegistryReference BLOCK_MOSS_FALL = SoundTypes.key(ResourceKey.minecraft("block.moss.fall")); public static final DefaultedRegistryReference BLOCK_MOSS_HIT = SoundTypes.key(ResourceKey.minecraft("block.moss.hit")); @@ -814,18 +824,28 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_MOSS_STEP = SoundTypes.key(ResourceKey.minecraft("block.moss.step")); - public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_BREAK = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.break")); + public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.break")); - public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_FALL = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.fall")); + public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_FALL = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.fall")); - public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_HIT = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.hit")); + public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_HIT = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.hit")); - public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_PLACE = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.place")); + public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_PLACE = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.place")); - public static final DefaultedRegistryReference BLOCK_MOSS_CARPET_STEP = SoundTypes.key(ResourceKey.minecraft("block.moss_carpet.step")); + public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_STEP = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.step")); public static final DefaultedRegistryReference BLOCK_MUD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.mud.break")); + public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.break")); + + public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_FALL = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.fall")); + + public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_HIT = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.hit")); + + public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_PLACE = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.place")); + + public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_STEP = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.step")); + public static final DefaultedRegistryReference BLOCK_MUD_FALL = SoundTypes.key(ResourceKey.minecraft("block.mud.fall")); public static final DefaultedRegistryReference BLOCK_MUD_HIT = SoundTypes.key(ResourceKey.minecraft("block.mud.hit")); @@ -834,25 +854,25 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_MUD_STEP = SoundTypes.key(ResourceKey.minecraft("block.mud.step")); - public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.break")); + public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.break")); - public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_FALL = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.fall")); + public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.fall")); - public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_HIT = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.hit")); + public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_HIT = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.hit")); - public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_PLACE = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.place")); + public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.place")); - public static final DefaultedRegistryReference BLOCK_MUD_BRICKS_STEP = SoundTypes.key(ResourceKey.minecraft("block.mud_bricks.step")); + public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.step")); - public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.break")); + public static final DefaultedRegistryReference BLOCK_NETHERRACK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.netherrack.break")); - public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_FALL = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.fall")); + public static final DefaultedRegistryReference BLOCK_NETHERRACK_FALL = SoundTypes.key(ResourceKey.minecraft("block.netherrack.fall")); - public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_HIT = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.hit")); + public static final DefaultedRegistryReference BLOCK_NETHERRACK_HIT = SoundTypes.key(ResourceKey.minecraft("block.netherrack.hit")); - public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_PLACE = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.place")); + public static final DefaultedRegistryReference BLOCK_NETHERRACK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.netherrack.place")); - public static final DefaultedRegistryReference BLOCK_MUDDY_MANGROVE_ROOTS_STEP = SoundTypes.key(ResourceKey.minecraft("block.muddy_mangrove_roots.step")); + public static final DefaultedRegistryReference BLOCK_NETHERRACK_STEP = SoundTypes.key(ResourceKey.minecraft("block.netherrack.step")); public static final DefaultedRegistryReference BLOCK_NETHER_BRICKS_BREAK = SoundTypes.key(ResourceKey.minecraft("block.nether_bricks.break")); @@ -898,14 +918,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.break")); - public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.fall")); - - public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.hit")); - - public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.place")); - - public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.step")); - public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_button.click_off")); public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_BUTTON_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_button.click_on")); @@ -914,6 +926,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_door.open")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.fall")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_FENCE_GATE_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_fence_gate.close")); public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_FENCE_GATE_OPEN = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_fence_gate.open")); @@ -928,34 +942,20 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_HANGING_SIGN_STEP = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_hanging_sign.step")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.hit")); + + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.place")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_pressure_plate.click_off")); public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_pressure_plate.click_on")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.nether_wood.step")); + public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_TRAPDOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_trapdoor.close")); public static final DefaultedRegistryReference BLOCK_NETHER_WOOD_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.nether_wood_trapdoor.open")); - public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.break")); - - public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.fall")); - - public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_HIT = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.hit")); - - public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.place")); - - public static final DefaultedRegistryReference BLOCK_NETHERITE_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.netherite_block.step")); - - public static final DefaultedRegistryReference BLOCK_NETHERRACK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.netherrack.break")); - - public static final DefaultedRegistryReference BLOCK_NETHERRACK_FALL = SoundTypes.key(ResourceKey.minecraft("block.netherrack.fall")); - - public static final DefaultedRegistryReference BLOCK_NETHERRACK_HIT = SoundTypes.key(ResourceKey.minecraft("block.netherrack.hit")); - - public static final DefaultedRegistryReference BLOCK_NETHERRACK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.netherrack.place")); - - public static final DefaultedRegistryReference BLOCK_NETHERRACK_STEP = SoundTypes.key(ResourceKey.minecraft("block.netherrack.step")); - public static final DefaultedRegistryReference BLOCK_NOTE_BLOCK_BANJO = SoundTypes.key(ResourceKey.minecraft("block.note_block.banjo")); public static final DefaultedRegistryReference BLOCK_NOTE_BLOCK_BASEDRUM = SoundTypes.key(ResourceKey.minecraft("block.note_block.basedrum")); @@ -1144,18 +1144,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_SCULK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.sculk.break")); - public static final DefaultedRegistryReference BLOCK_SCULK_CHARGE = SoundTypes.key(ResourceKey.minecraft("block.sculk.charge")); - - public static final DefaultedRegistryReference BLOCK_SCULK_FALL = SoundTypes.key(ResourceKey.minecraft("block.sculk.fall")); - - public static final DefaultedRegistryReference BLOCK_SCULK_HIT = SoundTypes.key(ResourceKey.minecraft("block.sculk.hit")); - - public static final DefaultedRegistryReference BLOCK_SCULK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sculk.place")); - - public static final DefaultedRegistryReference BLOCK_SCULK_SPREAD = SoundTypes.key(ResourceKey.minecraft("block.sculk.spread")); - - public static final DefaultedRegistryReference BLOCK_SCULK_STEP = SoundTypes.key(ResourceKey.minecraft("block.sculk.step")); - public static final DefaultedRegistryReference BLOCK_SCULK_CATALYST_BLOOM = SoundTypes.key(ResourceKey.minecraft("block.sculk_catalyst.bloom")); public static final DefaultedRegistryReference BLOCK_SCULK_CATALYST_BREAK = SoundTypes.key(ResourceKey.minecraft("block.sculk_catalyst.break")); @@ -1168,6 +1156,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_SCULK_CATALYST_STEP = SoundTypes.key(ResourceKey.minecraft("block.sculk_catalyst.step")); + public static final DefaultedRegistryReference BLOCK_SCULK_CHARGE = SoundTypes.key(ResourceKey.minecraft("block.sculk.charge")); + + public static final DefaultedRegistryReference BLOCK_SCULK_FALL = SoundTypes.key(ResourceKey.minecraft("block.sculk.fall")); + + public static final DefaultedRegistryReference BLOCK_SCULK_HIT = SoundTypes.key(ResourceKey.minecraft("block.sculk.hit")); + + public static final DefaultedRegistryReference BLOCK_SCULK_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sculk.place")); + public static final DefaultedRegistryReference BLOCK_SCULK_SENSOR_BREAK = SoundTypes.key(ResourceKey.minecraft("block.sculk_sensor.break")); public static final DefaultedRegistryReference BLOCK_SCULK_SENSOR_CLICKING = SoundTypes.key(ResourceKey.minecraft("block.sculk_sensor.clicking")); @@ -1194,6 +1190,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_SCULK_SHRIEKER_STEP = SoundTypes.key(ResourceKey.minecraft("block.sculk_shrieker.step")); + public static final DefaultedRegistryReference BLOCK_SCULK_SPREAD = SoundTypes.key(ResourceKey.minecraft("block.sculk.spread")); + + public static final DefaultedRegistryReference BLOCK_SCULK_STEP = SoundTypes.key(ResourceKey.minecraft("block.sculk.step")); + public static final DefaultedRegistryReference BLOCK_SCULK_VEIN_BREAK = SoundTypes.key(ResourceKey.minecraft("block.sculk_vein.break")); public static final DefaultedRegistryReference BLOCK_SCULK_VEIN_FALL = SoundTypes.key(ResourceKey.minecraft("block.sculk_vein.fall")); @@ -1318,22 +1318,22 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_STONE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.stone.break")); + public static final DefaultedRegistryReference BLOCK_STONE_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.stone_button.click_off")); + + public static final DefaultedRegistryReference BLOCK_STONE_BUTTON_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.stone_button.click_on")); + public static final DefaultedRegistryReference BLOCK_STONE_FALL = SoundTypes.key(ResourceKey.minecraft("block.stone.fall")); public static final DefaultedRegistryReference BLOCK_STONE_HIT = SoundTypes.key(ResourceKey.minecraft("block.stone.hit")); public static final DefaultedRegistryReference BLOCK_STONE_PLACE = SoundTypes.key(ResourceKey.minecraft("block.stone.place")); - public static final DefaultedRegistryReference BLOCK_STONE_STEP = SoundTypes.key(ResourceKey.minecraft("block.stone.step")); - - public static final DefaultedRegistryReference BLOCK_STONE_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.stone_button.click_off")); - - public static final DefaultedRegistryReference BLOCK_STONE_BUTTON_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.stone_button.click_on")); - public static final DefaultedRegistryReference BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.stone_pressure_plate.click_off")); public static final DefaultedRegistryReference BLOCK_STONE_PRESSURE_PLATE_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.stone_pressure_plate.click_on")); + public static final DefaultedRegistryReference BLOCK_STONE_STEP = SoundTypes.key(ResourceKey.minecraft("block.stone.step")); + public static final DefaultedRegistryReference BLOCK_SUSPICIOUS_GRAVEL_BREAK = SoundTypes.key(ResourceKey.minecraft("block.suspicious_gravel.break")); public static final DefaultedRegistryReference BLOCK_SUSPICIOUS_GRAVEL_FALL = SoundTypes.key(ResourceKey.minecraft("block.suspicious_gravel.fall")); @@ -1402,14 +1402,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_TUFF_BREAK = SoundTypes.key(ResourceKey.minecraft("block.tuff.break")); - public static final DefaultedRegistryReference BLOCK_TUFF_FALL = SoundTypes.key(ResourceKey.minecraft("block.tuff.fall")); - - public static final DefaultedRegistryReference BLOCK_TUFF_HIT = SoundTypes.key(ResourceKey.minecraft("block.tuff.hit")); - - public static final DefaultedRegistryReference BLOCK_TUFF_PLACE = SoundTypes.key(ResourceKey.minecraft("block.tuff.place")); - - 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")); @@ -1420,6 +1412,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_TUFF_BRICKS_STEP = SoundTypes.key(ResourceKey.minecraft("block.tuff_bricks.step")); + public static final DefaultedRegistryReference BLOCK_TUFF_FALL = SoundTypes.key(ResourceKey.minecraft("block.tuff.fall")); + + public static final DefaultedRegistryReference BLOCK_TUFF_HIT = SoundTypes.key(ResourceKey.minecraft("block.tuff.hit")); + + public static final DefaultedRegistryReference BLOCK_TUFF_PLACE = SoundTypes.key(ResourceKey.minecraft("block.tuff.place")); + + public static final DefaultedRegistryReference BLOCK_TUFF_STEP = SoundTypes.key(ResourceKey.minecraft("block.tuff.step")); + public static final DefaultedRegistryReference BLOCK_VAULT_ACTIVATE = SoundTypes.key(ResourceKey.minecraft("block.vault.activate")); public static final DefaultedRegistryReference BLOCK_VAULT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.vault.ambient")); @@ -1502,16 +1502,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_WET_SPONGE_STEP = SoundTypes.key(ResourceKey.minecraft("block.wet_sponge.step")); - public static final DefaultedRegistryReference BLOCK_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.wood.break")); - - public static final DefaultedRegistryReference BLOCK_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.wood.fall")); - - public static final DefaultedRegistryReference BLOCK_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.wood.hit")); - - public static final DefaultedRegistryReference BLOCK_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.wood.place")); - - public static final DefaultedRegistryReference BLOCK_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.wood.step")); - public static final DefaultedRegistryReference BLOCK_WOODEN_BUTTON_CLICK_OFF = SoundTypes.key(ResourceKey.minecraft("block.wooden_button.click_off")); public static final DefaultedRegistryReference BLOCK_WOODEN_BUTTON_CLICK_ON = SoundTypes.key(ResourceKey.minecraft("block.wooden_button.click_on")); @@ -1528,6 +1518,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_WOODEN_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.wooden_trapdoor.open")); + public static final DefaultedRegistryReference BLOCK_WOOD_BREAK = SoundTypes.key(ResourceKey.minecraft("block.wood.break")); + + public static final DefaultedRegistryReference BLOCK_WOOD_FALL = SoundTypes.key(ResourceKey.minecraft("block.wood.fall")); + + public static final DefaultedRegistryReference BLOCK_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("block.wood.hit")); + + public static final DefaultedRegistryReference BLOCK_WOOD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.wood.place")); + + public static final DefaultedRegistryReference BLOCK_WOOD_STEP = SoundTypes.key(ResourceKey.minecraft("block.wood.step")); + public static final DefaultedRegistryReference BLOCK_WOOL_BREAK = SoundTypes.key(ResourceKey.minecraft("block.wool.break")); public static final DefaultedRegistryReference BLOCK_WOOL_FALL = SoundTypes.key(ResourceKey.minecraft("block.wool.fall")); @@ -1540,10 +1540,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENCHANT_THORNS_HIT = SoundTypes.key(ResourceKey.minecraft("enchant.thorns.hit")); - public static final DefaultedRegistryReference ENTITY_ALLAY_AMBIENT_WITH_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.allay.ambient_with_item")); - public static final DefaultedRegistryReference ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.allay.ambient_without_item")); + public static final DefaultedRegistryReference ENTITY_ALLAY_AMBIENT_WITH_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.allay.ambient_with_item")); + public static final DefaultedRegistryReference ENTITY_ALLAY_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.allay.death")); public static final DefaultedRegistryReference ENTITY_ALLAY_HURT = SoundTypes.key(ResourceKey.minecraft("entity.allay.hurt")); @@ -1826,24 +1826,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ELDER_GUARDIAN_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.elder_guardian.hurt_land")); - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.ambient")); - - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.death")); - - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_FLAP = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.flap")); - - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.growl")); - - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_HURT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.hurt")); - - public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.shoot")); - - public static final DefaultedRegistryReference ENTITY_ENDER_EYE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ender_eye.death")); - - public static final DefaultedRegistryReference ENTITY_ENDER_EYE_LAUNCH = SoundTypes.key(ResourceKey.minecraft("entity.ender_eye.launch")); - - public static final DefaultedRegistryReference ENTITY_ENDER_PEARL_THROW = SoundTypes.key(ResourceKey.minecraft("entity.ender_pearl.throw")); - public static final DefaultedRegistryReference ENTITY_ENDERMAN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.enderman.ambient")); public static final DefaultedRegistryReference ENTITY_ENDERMAN_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.enderman.death")); @@ -1864,6 +1846,24 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ENDERMITE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.endermite.step")); + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.ambient")); + + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.death")); + + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_FLAP = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.flap")); + + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.growl")); + + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_HURT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.hurt")); + + public static final DefaultedRegistryReference ENTITY_ENDER_DRAGON_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.ender_dragon.shoot")); + + public static final DefaultedRegistryReference ENTITY_ENDER_EYE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ender_eye.death")); + + public static final DefaultedRegistryReference ENTITY_ENDER_EYE_LAUNCH = SoundTypes.key(ResourceKey.minecraft("entity.ender_eye.launch")); + + public static final DefaultedRegistryReference ENTITY_ENDER_PEARL_THROW = SoundTypes.key(ResourceKey.minecraft("entity.ender_pearl.throw")); + public static final DefaultedRegistryReference ENTITY_EVOKER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.evoker.ambient")); public static final DefaultedRegistryReference ENTITY_EVOKER_CAST_SPELL = SoundTypes.key(ResourceKey.minecraft("entity.evoker.cast_spell")); @@ -1872,6 +1872,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_EVOKER_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.evoker.death")); + public static final DefaultedRegistryReference ENTITY_EVOKER_FANGS_ATTACK = SoundTypes.key(ResourceKey.minecraft("entity.evoker_fangs.attack")); + public static final DefaultedRegistryReference ENTITY_EVOKER_HURT = SoundTypes.key(ResourceKey.minecraft("entity.evoker.hurt")); public static final DefaultedRegistryReference ENTITY_EVOKER_PREPARE_ATTACK = SoundTypes.key(ResourceKey.minecraft("entity.evoker.prepare_attack")); @@ -1880,8 +1882,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_EVOKER_PREPARE_WOLOLO = SoundTypes.key(ResourceKey.minecraft("entity.evoker.prepare_wololo")); - public static final DefaultedRegistryReference ENTITY_EVOKER_FANGS_ATTACK = SoundTypes.key(ResourceKey.minecraft("entity.evoker_fangs.attack")); - public static final DefaultedRegistryReference ENTITY_EXPERIENCE_BOTTLE_THROW = SoundTypes.key(ResourceKey.minecraft("entity.experience_bottle.throw")); public static final DefaultedRegistryReference ENTITY_EXPERIENCE_ORB_PICKUP = SoundTypes.key(ResourceKey.minecraft("entity.experience_orb.pickup")); @@ -1902,14 +1902,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_FIREWORK_ROCKET_TWINKLE_FAR = SoundTypes.key(ResourceKey.minecraft("entity.firework_rocket.twinkle_far")); - public static final DefaultedRegistryReference ENTITY_FISH_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.fish.swim")); - public static final DefaultedRegistryReference ENTITY_FISHING_BOBBER_RETRIEVE = SoundTypes.key(ResourceKey.minecraft("entity.fishing_bobber.retrieve")); public static final DefaultedRegistryReference ENTITY_FISHING_BOBBER_SPLASH = SoundTypes.key(ResourceKey.minecraft("entity.fishing_bobber.splash")); public static final DefaultedRegistryReference ENTITY_FISHING_BOBBER_THROW = SoundTypes.key(ResourceKey.minecraft("entity.fishing_bobber.throw")); + public static final DefaultedRegistryReference ENTITY_FISH_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.fish.swim")); + public static final DefaultedRegistryReference ENTITY_FOX_AGGRO = SoundTypes.key(ResourceKey.minecraft("entity.fox.aggro")); public static final DefaultedRegistryReference ENTITY_FOX_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.fox.ambient")); @@ -2146,8 +2146,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ITEM_BREAK = SoundTypes.key(ResourceKey.minecraft("entity.item.break")); - public static final DefaultedRegistryReference ENTITY_ITEM_PICKUP = SoundTypes.key(ResourceKey.minecraft("entity.item.pickup")); - public static final DefaultedRegistryReference ENTITY_ITEM_FRAME_ADD_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.item_frame.add_item")); public static final DefaultedRegistryReference ENTITY_ITEM_FRAME_BREAK = SoundTypes.key(ResourceKey.minecraft("entity.item_frame.break")); @@ -2158,6 +2156,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ITEM_FRAME_ROTATE_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.item_frame.rotate_item")); + public static final DefaultedRegistryReference ENTITY_ITEM_PICKUP = SoundTypes.key(ResourceKey.minecraft("entity.item.pickup")); + public static final DefaultedRegistryReference ENTITY_LEASH_KNOT_BREAK = SoundTypes.key(ResourceKey.minecraft("entity.leash_knot.break")); public static final DefaultedRegistryReference ENTITY_LEASH_KNOT_PLACE = SoundTypes.key(ResourceKey.minecraft("entity.leash_knot.place")); @@ -2284,10 +2284,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ELDER_GUARDIAN = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.elder_guardian")); - public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ENDER_DRAGON = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.ender_dragon")); - public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ENDERMITE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.endermite")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ENDER_DRAGON = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.ender_dragon")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_EVOKER = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.evoker")); public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_GHAST = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.ghast")); @@ -2356,21 +2356,23 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PHANTOM_SWOOP = SoundTypes.key(ResourceKey.minecraft("entity.phantom.swoop")); - public static final DefaultedRegistryReference ENTITY_PIG_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.pig.ambient")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_ADMIRING_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.piglin.admiring_item")); - public static final DefaultedRegistryReference ENTITY_PIG_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.pig.death")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.piglin.ambient")); - public static final DefaultedRegistryReference ENTITY_PIG_HURT = SoundTypes.key(ResourceKey.minecraft("entity.pig.hurt")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.piglin.angry")); - public static final DefaultedRegistryReference ENTITY_PIG_SADDLE = SoundTypes.key(ResourceKey.minecraft("entity.pig.saddle")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.ambient")); - public static final DefaultedRegistryReference ENTITY_PIG_STEP = SoundTypes.key(ResourceKey.minecraft("entity.pig.step")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.angry")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_ADMIRING_ITEM = SoundTypes.key(ResourceKey.minecraft("entity.piglin.admiring_item")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.converted_to_zombified")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.piglin.ambient")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.death")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.piglin.angry")); + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.hurt")); + + public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.step")); public static final DefaultedRegistryReference ENTITY_PIGLIN_CELEBRATE = SoundTypes.key(ResourceKey.minecraft("entity.piglin.celebrate")); @@ -2386,17 +2388,15 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PIGLIN_STEP = SoundTypes.key(ResourceKey.minecraft("entity.piglin.step")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.ambient")); - - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.angry")); + public static final DefaultedRegistryReference ENTITY_PIG_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.pig.ambient")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.converted_to_zombified")); + public static final DefaultedRegistryReference ENTITY_PIG_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.pig.death")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.death")); + public static final DefaultedRegistryReference ENTITY_PIG_HURT = SoundTypes.key(ResourceKey.minecraft("entity.pig.hurt")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.hurt")); + public static final DefaultedRegistryReference ENTITY_PIG_SADDLE = SoundTypes.key(ResourceKey.minecraft("entity.pig.saddle")); - public static final DefaultedRegistryReference ENTITY_PIGLIN_BRUTE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.piglin_brute.step")); + public static final DefaultedRegistryReference ENTITY_PIG_STEP = SoundTypes.key(ResourceKey.minecraft("entity.pig.step")); public static final DefaultedRegistryReference ENTITY_PILLAGER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.pillager.ambient")); @@ -2520,6 +2520,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SHULKER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.shulker.ambient")); + public static final DefaultedRegistryReference ENTITY_SHULKER_BULLET_HIT = SoundTypes.key(ResourceKey.minecraft("entity.shulker_bullet.hit")); + + public static final DefaultedRegistryReference ENTITY_SHULKER_BULLET_HURT = SoundTypes.key(ResourceKey.minecraft("entity.shulker_bullet.hurt")); + public static final DefaultedRegistryReference ENTITY_SHULKER_CLOSE = SoundTypes.key(ResourceKey.minecraft("entity.shulker.close")); public static final DefaultedRegistryReference ENTITY_SHULKER_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.shulker.death")); @@ -2534,10 +2538,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SHULKER_TELEPORT = SoundTypes.key(ResourceKey.minecraft("entity.shulker.teleport")); - public static final DefaultedRegistryReference ENTITY_SHULKER_BULLET_HIT = SoundTypes.key(ResourceKey.minecraft("entity.shulker_bullet.hit")); - - public static final DefaultedRegistryReference ENTITY_SHULKER_BULLET_HURT = SoundTypes.key(ResourceKey.minecraft("entity.shulker_bullet.hurt")); - public static final DefaultedRegistryReference ENTITY_SILVERFISH_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.silverfish.ambient")); public static final DefaultedRegistryReference ENTITY_SILVERFISH_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.silverfish.death")); @@ -2552,12 +2552,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SKELETON_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.death")); - public static final DefaultedRegistryReference ENTITY_SKELETON_HURT = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.hurt")); - - public static final DefaultedRegistryReference ENTITY_SKELETON_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.shoot")); - - public static final DefaultedRegistryReference ENTITY_SKELETON_STEP = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.step")); - public static final DefaultedRegistryReference ENTITY_SKELETON_HORSE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.skeleton_horse.ambient")); public static final DefaultedRegistryReference ENTITY_SKELETON_HORSE_AMBIENT_WATER = SoundTypes.key(ResourceKey.minecraft("entity.skeleton_horse.ambient_water")); @@ -2574,6 +2568,12 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SKELETON_HORSE_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.skeleton_horse.swim")); + public static final DefaultedRegistryReference ENTITY_SKELETON_HURT = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.hurt")); + + public static final DefaultedRegistryReference ENTITY_SKELETON_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.shoot")); + + public static final DefaultedRegistryReference ENTITY_SKELETON_STEP = SoundTypes.key(ResourceKey.minecraft("entity.skeleton.step")); + public static final DefaultedRegistryReference ENTITY_SLIME_ATTACK = SoundTypes.key(ResourceKey.minecraft("entity.slime.attack")); public static final DefaultedRegistryReference ENTITY_SLIME_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.slime.death")); @@ -2616,6 +2616,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SNIFFER_STEP = SoundTypes.key(ResourceKey.minecraft("entity.sniffer.step")); + public static final DefaultedRegistryReference ENTITY_SNOWBALL_THROW = SoundTypes.key(ResourceKey.minecraft("entity.snowball.throw")); + public static final DefaultedRegistryReference ENTITY_SNOW_GOLEM_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.snow_golem.ambient")); public static final DefaultedRegistryReference ENTITY_SNOW_GOLEM_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.snow_golem.death")); @@ -2626,8 +2628,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_SNOW_GOLEM_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.snow_golem.shoot")); - public static final DefaultedRegistryReference ENTITY_SNOWBALL_THROW = SoundTypes.key(ResourceKey.minecraft("entity.snowball.throw")); - public static final DefaultedRegistryReference ENTITY_SPIDER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.spider.ambient")); public static final DefaultedRegistryReference ENTITY_SPIDER_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.spider.death")); @@ -2858,8 +2858,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_WITHER_SHOOT = SoundTypes.key(ResourceKey.minecraft("entity.wither.shoot")); - public static final DefaultedRegistryReference ENTITY_WITHER_SPAWN = SoundTypes.key(ResourceKey.minecraft("entity.wither.spawn")); - public static final DefaultedRegistryReference ENTITY_WITHER_SKELETON_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wither_skeleton.ambient")); public static final DefaultedRegistryReference ENTITY_WITHER_SKELETON_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wither_skeleton.death")); @@ -2868,6 +2866,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_WITHER_SKELETON_STEP = SoundTypes.key(ResourceKey.minecraft("entity.wither_skeleton.step")); + public static final DefaultedRegistryReference ENTITY_WITHER_SPAWN = SoundTypes.key(ResourceKey.minecraft("entity.wither.spawn")); + public static final DefaultedRegistryReference ENTITY_WOLF_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf.ambient")); public static final DefaultedRegistryReference ENTITY_WOLF_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf.death")); @@ -2912,18 +2912,18 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ZOMBIE_DESTROY_EGG = SoundTypes.key(ResourceKey.minecraft("entity.zombie.destroy_egg")); - public static final DefaultedRegistryReference ENTITY_ZOMBIE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.hurt")); - - public static final DefaultedRegistryReference ENTITY_ZOMBIE_INFECT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.infect")); - - public static final DefaultedRegistryReference ENTITY_ZOMBIE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.zombie.step")); - public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.ambient")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.death")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.hurt")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.hurt")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_INFECT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.infect")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.zombie.step")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_VILLAGER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_villager.ambient")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_VILLAGER_CONVERTED = SoundTypes.key(ResourceKey.minecraft("entity.zombie_villager.converted")); @@ -3084,10 +3084,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ITEM_HOE_TILL = SoundTypes.key(ResourceKey.minecraft("item.hoe.till")); - public static final DefaultedRegistryReference ITEM_HONEY_BOTTLE_DRINK = SoundTypes.key(ResourceKey.minecraft("item.honey_bottle.drink")); - public static final DefaultedRegistryReference ITEM_HONEYCOMB_WAX_ON = SoundTypes.key(ResourceKey.minecraft("item.honeycomb.wax_on")); + public static final DefaultedRegistryReference ITEM_HONEY_BOTTLE_DRINK = SoundTypes.key(ResourceKey.minecraft("item.honey_bottle.drink")); + public static final DefaultedRegistryReference ITEM_INK_SAC_USE = SoundTypes.key(ResourceKey.minecraft("item.ink_sac.use")); public static final DefaultedRegistryReference ITEM_LODESTONE_COMPASS_LOCK = SoundTypes.key(ResourceKey.minecraft("item.lodestone_compass.lock")); @@ -3142,6 +3142,44 @@ public final class SoundTypes { public static final DefaultedRegistryReference MUSIC_CREDITS = SoundTypes.key(ResourceKey.minecraft("music.credits")); + public static final DefaultedRegistryReference MUSIC_DISC_11 = SoundTypes.key(ResourceKey.minecraft("music_disc.11")); + + public static final DefaultedRegistryReference MUSIC_DISC_13 = SoundTypes.key(ResourceKey.minecraft("music_disc.13")); + + public static final DefaultedRegistryReference MUSIC_DISC_5 = SoundTypes.key(ResourceKey.minecraft("music_disc.5")); + + public static final DefaultedRegistryReference MUSIC_DISC_BLOCKS = SoundTypes.key(ResourceKey.minecraft("music_disc.blocks")); + + public static final DefaultedRegistryReference MUSIC_DISC_CAT = SoundTypes.key(ResourceKey.minecraft("music_disc.cat")); + + public static final DefaultedRegistryReference MUSIC_DISC_CHIRP = SoundTypes.key(ResourceKey.minecraft("music_disc.chirp")); + + public static final DefaultedRegistryReference MUSIC_DISC_CREATOR = SoundTypes.key(ResourceKey.minecraft("music_disc.creator")); + + public static final DefaultedRegistryReference MUSIC_DISC_CREATOR_MUSIC_BOX = SoundTypes.key(ResourceKey.minecraft("music_disc.creator_music_box")); + + public static final DefaultedRegistryReference MUSIC_DISC_FAR = SoundTypes.key(ResourceKey.minecraft("music_disc.far")); + + public static final DefaultedRegistryReference MUSIC_DISC_MALL = SoundTypes.key(ResourceKey.minecraft("music_disc.mall")); + + public static final DefaultedRegistryReference MUSIC_DISC_MELLOHI = SoundTypes.key(ResourceKey.minecraft("music_disc.mellohi")); + + public static final DefaultedRegistryReference MUSIC_DISC_OTHERSIDE = SoundTypes.key(ResourceKey.minecraft("music_disc.otherside")); + + public static final DefaultedRegistryReference MUSIC_DISC_PIGSTEP = SoundTypes.key(ResourceKey.minecraft("music_disc.pigstep")); + + public static final DefaultedRegistryReference MUSIC_DISC_PRECIPICE = SoundTypes.key(ResourceKey.minecraft("music_disc.precipice")); + + public static final DefaultedRegistryReference MUSIC_DISC_RELIC = SoundTypes.key(ResourceKey.minecraft("music_disc.relic")); + + public static final DefaultedRegistryReference MUSIC_DISC_STAL = SoundTypes.key(ResourceKey.minecraft("music_disc.stal")); + + public static final DefaultedRegistryReference MUSIC_DISC_STRAD = SoundTypes.key(ResourceKey.minecraft("music_disc.strad")); + + public static final DefaultedRegistryReference MUSIC_DISC_WAIT = SoundTypes.key(ResourceKey.minecraft("music_disc.wait")); + + public static final DefaultedRegistryReference MUSIC_DISC_WARD = SoundTypes.key(ResourceKey.minecraft("music_disc.ward")); + public static final DefaultedRegistryReference MUSIC_DRAGON = SoundTypes.key(ResourceKey.minecraft("music.dragon")); public static final DefaultedRegistryReference MUSIC_END = SoundTypes.key(ResourceKey.minecraft("music.end")); @@ -3200,44 +3238,6 @@ public final class SoundTypes { public static final DefaultedRegistryReference MUSIC_UNDER_WATER = SoundTypes.key(ResourceKey.minecraft("music.under_water")); - public static final DefaultedRegistryReference MUSIC_DISC_11 = SoundTypes.key(ResourceKey.minecraft("music_disc.11")); - - public static final DefaultedRegistryReference MUSIC_DISC_13 = SoundTypes.key(ResourceKey.minecraft("music_disc.13")); - - public static final DefaultedRegistryReference MUSIC_DISC_5 = SoundTypes.key(ResourceKey.minecraft("music_disc.5")); - - public static final DefaultedRegistryReference MUSIC_DISC_BLOCKS = SoundTypes.key(ResourceKey.minecraft("music_disc.blocks")); - - public static final DefaultedRegistryReference MUSIC_DISC_CAT = SoundTypes.key(ResourceKey.minecraft("music_disc.cat")); - - public static final DefaultedRegistryReference MUSIC_DISC_CHIRP = SoundTypes.key(ResourceKey.minecraft("music_disc.chirp")); - - public static final DefaultedRegistryReference MUSIC_DISC_CREATOR = SoundTypes.key(ResourceKey.minecraft("music_disc.creator")); - - public static final DefaultedRegistryReference MUSIC_DISC_CREATOR_MUSIC_BOX = SoundTypes.key(ResourceKey.minecraft("music_disc.creator_music_box")); - - public static final DefaultedRegistryReference MUSIC_DISC_FAR = SoundTypes.key(ResourceKey.minecraft("music_disc.far")); - - public static final DefaultedRegistryReference MUSIC_DISC_MALL = SoundTypes.key(ResourceKey.minecraft("music_disc.mall")); - - public static final DefaultedRegistryReference MUSIC_DISC_MELLOHI = SoundTypes.key(ResourceKey.minecraft("music_disc.mellohi")); - - public static final DefaultedRegistryReference MUSIC_DISC_OTHERSIDE = SoundTypes.key(ResourceKey.minecraft("music_disc.otherside")); - - public static final DefaultedRegistryReference MUSIC_DISC_PIGSTEP = SoundTypes.key(ResourceKey.minecraft("music_disc.pigstep")); - - public static final DefaultedRegistryReference MUSIC_DISC_PRECIPICE = SoundTypes.key(ResourceKey.minecraft("music_disc.precipice")); - - public static final DefaultedRegistryReference MUSIC_DISC_RELIC = SoundTypes.key(ResourceKey.minecraft("music_disc.relic")); - - public static final DefaultedRegistryReference MUSIC_DISC_STAL = SoundTypes.key(ResourceKey.minecraft("music_disc.stal")); - - public static final DefaultedRegistryReference MUSIC_DISC_STRAD = SoundTypes.key(ResourceKey.minecraft("music_disc.strad")); - - public static final DefaultedRegistryReference MUSIC_DISC_WAIT = SoundTypes.key(ResourceKey.minecraft("music_disc.wait")); - - public static final DefaultedRegistryReference MUSIC_DISC_WARD = SoundTypes.key(ResourceKey.minecraft("music_disc.ward")); - public static final DefaultedRegistryReference PARTICLE_SOUL_ESCAPE = SoundTypes.key(ResourceKey.minecraft("particle.soul_escape")); public static final DefaultedRegistryReference UI_BUTTON_CLICK = SoundTypes.key(ResourceKey.minecraft("ui.button.click")); diff --git a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java index eb15592704..742eed0d17 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java +++ b/src/main/java/org/spongepowered/api/effect/sound/music/MusicDiscs.java @@ -33,56 +33,59 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") -@RegistryScopes(scopes = RegistryScope.GAME) +@RegistryScopes(scopes = RegistryScope.ENGINE) public final class MusicDiscs { - // @formatter:off + public static final DefaultedRegistryReference BLOCKS = MusicDiscs.key(ResourceKey.minecraft("blocks")); - // SORTFIELDS:ON + public static final DefaultedRegistryReference CAT = MusicDiscs.key(ResourceKey.minecraft("cat")); - public static final DefaultedRegistryReference BLOCKS = MusicDiscs.key(ResourceKey.sponge("blocks")); + public static final DefaultedRegistryReference CHIRP = MusicDiscs.key(ResourceKey.minecraft("chirp")); - public static final DefaultedRegistryReference CAT = MusicDiscs.key(ResourceKey.sponge("cat")); + public static final DefaultedRegistryReference CREATOR = MusicDiscs.key(ResourceKey.minecraft("creator")); - public static final DefaultedRegistryReference CHIRP = MusicDiscs.key(ResourceKey.sponge("chirp")); + public static final DefaultedRegistryReference CREATOR_MUSIC_BOX = MusicDiscs.key(ResourceKey.minecraft("creator_music_box")); - public static final DefaultedRegistryReference FAR = MusicDiscs.key(ResourceKey.sponge("far")); + public static final DefaultedRegistryReference ELEVEN = MusicDiscs.key(ResourceKey.minecraft("11")); - public static final DefaultedRegistryReference MALL = MusicDiscs.key(ResourceKey.sponge("mall")); + public static final DefaultedRegistryReference FAR = MusicDiscs.key(ResourceKey.minecraft("far")); - public static final DefaultedRegistryReference MELLOHI = MusicDiscs.key(ResourceKey.sponge("mellohi")); + public static final DefaultedRegistryReference FIVE = MusicDiscs.key(ResourceKey.minecraft("5")); - public static final DefaultedRegistryReference MUSIC_DISC_5 = MusicDiscs.key(ResourceKey.sponge("5")); + public static final DefaultedRegistryReference MALL = MusicDiscs.key(ResourceKey.minecraft("mall")); - public static final DefaultedRegistryReference MUSIC_DISC_11 = MusicDiscs.key(ResourceKey.sponge("11")); + public static final DefaultedRegistryReference MELLOHI = MusicDiscs.key(ResourceKey.minecraft("mellohi")); - public static final DefaultedRegistryReference MUSIC_DISC_13 = MusicDiscs.key(ResourceKey.sponge("13")); + public static final DefaultedRegistryReference OTHERSIDE = MusicDiscs.key(ResourceKey.minecraft("otherside")); - public static final DefaultedRegistryReference OTHERSIDE = MusicDiscs.key(ResourceKey.sponge("otherside")); + public static final DefaultedRegistryReference PIGSTEP = MusicDiscs.key(ResourceKey.minecraft("pigstep")); - public static final DefaultedRegistryReference PIGSTEP = MusicDiscs.key(ResourceKey.sponge("pigstep")); + public static final DefaultedRegistryReference PRECIPICE = MusicDiscs.key(ResourceKey.minecraft("precipice")); - public static final DefaultedRegistryReference STAL = MusicDiscs.key(ResourceKey.sponge("stal")); + public static final DefaultedRegistryReference RELIC = MusicDiscs.key(ResourceKey.minecraft("relic")); - public static final DefaultedRegistryReference STRAD = MusicDiscs.key(ResourceKey.sponge("strad")); + public static final DefaultedRegistryReference STAL = MusicDiscs.key(ResourceKey.minecraft("stal")); - public static final DefaultedRegistryReference WAIT = MusicDiscs.key(ResourceKey.sponge("wait")); + public static final DefaultedRegistryReference STRAD = MusicDiscs.key(ResourceKey.minecraft("strad")); - public static final DefaultedRegistryReference WARD = MusicDiscs.key(ResourceKey.sponge("ward")); + public static final DefaultedRegistryReference THIRTEEN = MusicDiscs.key(ResourceKey.minecraft("13")); - // SORTFIELDS:OFF + public static final DefaultedRegistryReference WAIT = MusicDiscs.key(ResourceKey.minecraft("wait")); - // @formatter:on + public static final DefaultedRegistryReference WARD = MusicDiscs.key(ResourceKey.minecraft("ward")); private MusicDiscs() { } public static Registry registry() { - return Sponge.game().registry(RegistryTypes.MUSIC_DISC); + return Sponge.server().registry(RegistryTypes.MUSIC_DISC); } private static DefaultedRegistryReference key(final ResourceKey location) { - return RegistryKey.of(RegistryTypes.MUSIC_DISC, location).asDefaultedReference(Sponge::game); + return RegistryKey.of(RegistryTypes.MUSIC_DISC, location).asDefaultedReference(Sponge::server); } } 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 6377383eb9..1c47212b67 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 @@ -80,12 +80,12 @@ public final class DamageTypes { public static final DefaultedRegistryReference HOT_FLOOR = DamageTypes.key(ResourceKey.minecraft("hot_floor")); + public static final DefaultedRegistryReference INDIRECT_MAGIC = DamageTypes.key(ResourceKey.minecraft("indirect_magic")); + public static final DefaultedRegistryReference IN_FIRE = DamageTypes.key(ResourceKey.minecraft("in_fire")); public static final DefaultedRegistryReference IN_WALL = DamageTypes.key(ResourceKey.minecraft("in_wall")); - public static final DefaultedRegistryReference INDIRECT_MAGIC = DamageTypes.key(ResourceKey.minecraft("indirect_magic")); - public static final DefaultedRegistryReference LAVA = DamageTypes.key(ResourceKey.minecraft("lava")); public static final DefaultedRegistryReference LIGHTNING_BOLT = DamageTypes.key(ResourceKey.minecraft("lightning_bolt")); @@ -100,10 +100,10 @@ public final class DamageTypes { public static final DefaultedRegistryReference ON_FIRE = DamageTypes.key(ResourceKey.minecraft("on_fire")); - public static final DefaultedRegistryReference OUT_OF_WORLD = DamageTypes.key(ResourceKey.minecraft("out_of_world")); - public static final DefaultedRegistryReference OUTSIDE_BORDER = DamageTypes.key(ResourceKey.minecraft("outside_border")); + public static final DefaultedRegistryReference OUT_OF_WORLD = DamageTypes.key(ResourceKey.minecraft("out_of_world")); + public static final DefaultedRegistryReference PLAYER_ATTACK = DamageTypes.key(ResourceKey.minecraft("player_attack")); public static final DefaultedRegistryReference PLAYER_EXPLOSION = DamageTypes.key(ResourceKey.minecraft("player_explosion")); diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java index 92b94b12ac..f3512467ea 100644 --- a/src/main/java/org/spongepowered/api/item/ItemTypes.java +++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java @@ -176,10 +176,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference BEDROCK = ItemTypes.key(ResourceKey.minecraft("bedrock")); - public static final DefaultedRegistryReference BEE_NEST = ItemTypes.key(ResourceKey.minecraft("bee_nest")); - - public static final DefaultedRegistryReference BEE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("bee_spawn_egg")); - public static final DefaultedRegistryReference BEEF = ItemTypes.key(ResourceKey.minecraft("beef")); public static final DefaultedRegistryReference BEEHIVE = ItemTypes.key(ResourceKey.minecraft("beehive")); @@ -190,6 +186,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference BEETROOT_SOUP = ItemTypes.key(ResourceKey.minecraft("beetroot_soup")); + public static final DefaultedRegistryReference BEE_NEST = ItemTypes.key(ResourceKey.minecraft("bee_nest")); + + public static final DefaultedRegistryReference BEE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("bee_spawn_egg")); + public static final DefaultedRegistryReference BELL = ItemTypes.key(ResourceKey.minecraft("bell")); public static final DefaultedRegistryReference BIG_DRIPLEAF = ItemTypes.key(ResourceKey.minecraft("big_dripleaf")); @@ -228,6 +228,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference BIRCH_WOOD = ItemTypes.key(ResourceKey.minecraft("birch_wood")); + public static final DefaultedRegistryReference BLACKSTONE = ItemTypes.key(ResourceKey.minecraft("blackstone")); + + public static final DefaultedRegistryReference BLACKSTONE_SLAB = ItemTypes.key(ResourceKey.minecraft("blackstone_slab")); + + public static final DefaultedRegistryReference BLACKSTONE_STAIRS = ItemTypes.key(ResourceKey.minecraft("blackstone_stairs")); + + public static final DefaultedRegistryReference BLACKSTONE_WALL = ItemTypes.key(ResourceKey.minecraft("blackstone_wall")); + public static final DefaultedRegistryReference BLACK_BANNER = ItemTypes.key(ResourceKey.minecraft("black_banner")); public static final DefaultedRegistryReference BLACK_BED = ItemTypes.key(ResourceKey.minecraft("black_bed")); @@ -254,14 +262,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference BLACK_WOOL = ItemTypes.key(ResourceKey.minecraft("black_wool")); - public static final DefaultedRegistryReference BLACKSTONE = ItemTypes.key(ResourceKey.minecraft("blackstone")); - - public static final DefaultedRegistryReference BLACKSTONE_SLAB = ItemTypes.key(ResourceKey.minecraft("blackstone_slab")); - - public static final DefaultedRegistryReference BLACKSTONE_STAIRS = ItemTypes.key(ResourceKey.minecraft("blackstone_stairs")); - - public static final DefaultedRegistryReference BLACKSTONE_WALL = ItemTypes.key(ResourceKey.minecraft("blackstone_wall")); - public static final DefaultedRegistryReference BLADE_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("blade_pottery_sherd")); public static final DefaultedRegistryReference BLAST_FURNACE = ItemTypes.key(ResourceKey.minecraft("blast_furnace")); @@ -338,14 +338,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference BRICK = ItemTypes.key(ResourceKey.minecraft("brick")); + public static final DefaultedRegistryReference BRICKS = ItemTypes.key(ResourceKey.minecraft("bricks")); + public static final DefaultedRegistryReference BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("brick_slab")); public static final DefaultedRegistryReference BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("brick_stairs")); public static final DefaultedRegistryReference BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("brick_wall")); - public static final DefaultedRegistryReference BRICKS = ItemTypes.key(ResourceKey.minecraft("bricks")); - public static final DefaultedRegistryReference BROWN_BANNER = ItemTypes.key(ResourceKey.minecraft("brown_banner")); public static final DefaultedRegistryReference BROWN_BED = ItemTypes.key(ResourceKey.minecraft("brown_bed")); @@ -422,8 +422,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference CHAIN = ItemTypes.key(ResourceKey.minecraft("chain")); - public static final DefaultedRegistryReference CHAIN_COMMAND_BLOCK = ItemTypes.key(ResourceKey.minecraft("chain_command_block")); - public static final DefaultedRegistryReference CHAINMAIL_BOOTS = ItemTypes.key(ResourceKey.minecraft("chainmail_boots")); public static final DefaultedRegistryReference CHAINMAIL_CHESTPLATE = ItemTypes.key(ResourceKey.minecraft("chainmail_chestplate")); @@ -432,6 +430,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference CHAINMAIL_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("chainmail_leggings")); + public static final DefaultedRegistryReference CHAIN_COMMAND_BLOCK = ItemTypes.key(ResourceKey.minecraft("chain_command_block")); + public static final DefaultedRegistryReference CHARCOAL = ItemTypes.key(ResourceKey.minecraft("charcoal")); public static final DefaultedRegistryReference CHERRY_BOAT = ItemTypes.key(ResourceKey.minecraft("cherry_boat")); @@ -776,14 +776,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference DEEPSLATE = ItemTypes.key(ResourceKey.minecraft("deepslate")); + public static final DefaultedRegistryReference DEEPSLATE_BRICKS = ItemTypes.key(ResourceKey.minecraft("deepslate_bricks")); + public static final DefaultedRegistryReference DEEPSLATE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("deepslate_brick_slab")); public static final DefaultedRegistryReference DEEPSLATE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("deepslate_brick_stairs")); public static final DefaultedRegistryReference DEEPSLATE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("deepslate_brick_wall")); - public static final DefaultedRegistryReference DEEPSLATE_BRICKS = ItemTypes.key(ResourceKey.minecraft("deepslate_bricks")); - public static final DefaultedRegistryReference DEEPSLATE_COAL_ORE = ItemTypes.key(ResourceKey.minecraft("deepslate_coal_ore")); public static final DefaultedRegistryReference DEEPSLATE_COPPER_ORE = ItemTypes.key(ResourceKey.minecraft("deepslate_copper_ore")); @@ -800,14 +800,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference DEEPSLATE_REDSTONE_ORE = ItemTypes.key(ResourceKey.minecraft("deepslate_redstone_ore")); + public static final DefaultedRegistryReference DEEPSLATE_TILES = ItemTypes.key(ResourceKey.minecraft("deepslate_tiles")); + public static final DefaultedRegistryReference DEEPSLATE_TILE_SLAB = ItemTypes.key(ResourceKey.minecraft("deepslate_tile_slab")); public static final DefaultedRegistryReference DEEPSLATE_TILE_STAIRS = ItemTypes.key(ResourceKey.minecraft("deepslate_tile_stairs")); public static final DefaultedRegistryReference DEEPSLATE_TILE_WALL = ItemTypes.key(ResourceKey.minecraft("deepslate_tile_wall")); - public static final DefaultedRegistryReference DEEPSLATE_TILES = ItemTypes.key(ResourceKey.minecraft("deepslate_tiles")); - public static final DefaultedRegistryReference DETECTOR_RAIL = ItemTypes.key(ResourceKey.minecraft("detector_rail")); public static final DefaultedRegistryReference DIAMOND = ItemTypes.key(ResourceKey.minecraft("diamond")); @@ -894,33 +894,33 @@ public final class ItemTypes { public static final DefaultedRegistryReference ENCHANTING_TABLE = ItemTypes.key(ResourceKey.minecraft("enchanting_table")); - public static final DefaultedRegistryReference END_CRYSTAL = ItemTypes.key(ResourceKey.minecraft("end_crystal")); + public static final DefaultedRegistryReference ENDERMAN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("enderman_spawn_egg")); - public static final DefaultedRegistryReference END_PORTAL_FRAME = ItemTypes.key(ResourceKey.minecraft("end_portal_frame")); + public static final DefaultedRegistryReference ENDERMITE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("endermite_spawn_egg")); - public static final DefaultedRegistryReference END_ROD = ItemTypes.key(ResourceKey.minecraft("end_rod")); + public static final DefaultedRegistryReference ENDER_CHEST = ItemTypes.key(ResourceKey.minecraft("ender_chest")); - public static final DefaultedRegistryReference END_STONE = ItemTypes.key(ResourceKey.minecraft("end_stone")); + public static final DefaultedRegistryReference ENDER_DRAGON_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("ender_dragon_spawn_egg")); - public static final DefaultedRegistryReference END_STONE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_slab")); + public static final DefaultedRegistryReference ENDER_EYE = ItemTypes.key(ResourceKey.minecraft("ender_eye")); - public static final DefaultedRegistryReference END_STONE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_stairs")); + public static final DefaultedRegistryReference ENDER_PEARL = ItemTypes.key(ResourceKey.minecraft("ender_pearl")); - public static final DefaultedRegistryReference END_STONE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_wall")); + public static final DefaultedRegistryReference END_CRYSTAL = ItemTypes.key(ResourceKey.minecraft("end_crystal")); - public static final DefaultedRegistryReference END_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("end_stone_bricks")); + public static final DefaultedRegistryReference END_PORTAL_FRAME = ItemTypes.key(ResourceKey.minecraft("end_portal_frame")); - public static final DefaultedRegistryReference ENDER_CHEST = ItemTypes.key(ResourceKey.minecraft("ender_chest")); + public static final DefaultedRegistryReference END_ROD = ItemTypes.key(ResourceKey.minecraft("end_rod")); - public static final DefaultedRegistryReference ENDER_DRAGON_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("ender_dragon_spawn_egg")); + public static final DefaultedRegistryReference END_STONE = ItemTypes.key(ResourceKey.minecraft("end_stone")); - public static final DefaultedRegistryReference ENDER_EYE = ItemTypes.key(ResourceKey.minecraft("ender_eye")); + public static final DefaultedRegistryReference END_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("end_stone_bricks")); - public static final DefaultedRegistryReference ENDER_PEARL = ItemTypes.key(ResourceKey.minecraft("ender_pearl")); + public static final DefaultedRegistryReference END_STONE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_slab")); - public static final DefaultedRegistryReference ENDERMAN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("enderman_spawn_egg")); + public static final DefaultedRegistryReference END_STONE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_stairs")); - public static final DefaultedRegistryReference ENDERMITE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("endermite_spawn_egg")); + public static final DefaultedRegistryReference END_STONE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("end_stone_brick_wall")); public static final DefaultedRegistryReference EVOKER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("evoker_spawn_egg")); @@ -958,6 +958,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference FILLED_MAP = ItemTypes.key(ResourceKey.minecraft("filled_map")); + public static final DefaultedRegistryReference FIREWORK_ROCKET = ItemTypes.key(ResourceKey.minecraft("firework_rocket")); + + public static final DefaultedRegistryReference FIREWORK_STAR = ItemTypes.key(ResourceKey.minecraft("firework_star")); + public static final DefaultedRegistryReference FIRE_CHARGE = ItemTypes.key(ResourceKey.minecraft("fire_charge")); public static final DefaultedRegistryReference FIRE_CORAL = ItemTypes.key(ResourceKey.minecraft("fire_coral")); @@ -966,10 +970,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference FIRE_CORAL_FAN = ItemTypes.key(ResourceKey.minecraft("fire_coral_fan")); - public static final DefaultedRegistryReference FIREWORK_ROCKET = ItemTypes.key(ResourceKey.minecraft("firework_rocket")); - - public static final DefaultedRegistryReference FIREWORK_STAR = ItemTypes.key(ResourceKey.minecraft("firework_star")); - public static final DefaultedRegistryReference FISHING_ROD = ItemTypes.key(ResourceKey.minecraft("fishing_rod")); public static final DefaultedRegistryReference FLETCHING_TABLE = ItemTypes.key(ResourceKey.minecraft("fletching_table")); @@ -978,28 +978,28 @@ public final class ItemTypes { public static final DefaultedRegistryReference FLINT_AND_STEEL = ItemTypes.key(ResourceKey.minecraft("flint_and_steel")); - public static final DefaultedRegistryReference FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("flow_armor_trim_smithing_template")); - - public static final DefaultedRegistryReference FLOW_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("flow_banner_pattern")); + public static final DefaultedRegistryReference FLOWERING_AZALEA = ItemTypes.key(ResourceKey.minecraft("flowering_azalea")); - public static final DefaultedRegistryReference FLOW_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("flow_pottery_sherd")); + public static final DefaultedRegistryReference FLOWERING_AZALEA_LEAVES = ItemTypes.key(ResourceKey.minecraft("flowering_azalea_leaves")); public static final DefaultedRegistryReference FLOWER_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("flower_banner_pattern")); public static final DefaultedRegistryReference FLOWER_POT = ItemTypes.key(ResourceKey.minecraft("flower_pot")); - public static final DefaultedRegistryReference FLOWERING_AZALEA = ItemTypes.key(ResourceKey.minecraft("flowering_azalea")); + public static final DefaultedRegistryReference FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("flow_armor_trim_smithing_template")); - public static final DefaultedRegistryReference FLOWERING_AZALEA_LEAVES = ItemTypes.key(ResourceKey.minecraft("flowering_azalea_leaves")); + public static final DefaultedRegistryReference FLOW_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("flow_banner_pattern")); + + public static final DefaultedRegistryReference FLOW_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("flow_pottery_sherd")); public static final DefaultedRegistryReference FOX_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("fox_spawn_egg")); public static final DefaultedRegistryReference FRIEND_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("friend_pottery_sherd")); - public static final DefaultedRegistryReference FROG_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("frog_spawn_egg")); - public static final DefaultedRegistryReference FROGSPAWN = ItemTypes.key(ResourceKey.minecraft("frogspawn")); + public static final DefaultedRegistryReference FROG_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("frog_spawn_egg")); + public static final DefaultedRegistryReference FURNACE = ItemTypes.key(ResourceKey.minecraft("furnace")); public static final DefaultedRegistryReference FURNACE_MINECART = ItemTypes.key(ResourceKey.minecraft("furnace_minecart")); @@ -1020,6 +1020,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference GLOBE_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("globe_banner_pattern")); + public static final DefaultedRegistryReference GLOWSTONE = ItemTypes.key(ResourceKey.minecraft("glowstone")); + + public static final DefaultedRegistryReference GLOWSTONE_DUST = ItemTypes.key(ResourceKey.minecraft("glowstone_dust")); + public static final DefaultedRegistryReference GLOW_BERRIES = ItemTypes.key(ResourceKey.minecraft("glow_berries")); public static final DefaultedRegistryReference GLOW_INK_SAC = ItemTypes.key(ResourceKey.minecraft("glow_ink_sac")); @@ -1030,22 +1034,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference GLOW_SQUID_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("glow_squid_spawn_egg")); - public static final DefaultedRegistryReference GLOWSTONE = ItemTypes.key(ResourceKey.minecraft("glowstone")); - - public static final DefaultedRegistryReference GLOWSTONE_DUST = ItemTypes.key(ResourceKey.minecraft("glowstone_dust")); - public static final DefaultedRegistryReference GOAT_HORN = ItemTypes.key(ResourceKey.minecraft("goat_horn")); public static final DefaultedRegistryReference GOAT_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("goat_spawn_egg")); - public static final DefaultedRegistryReference GOLD_BLOCK = ItemTypes.key(ResourceKey.minecraft("gold_block")); - - public static final DefaultedRegistryReference GOLD_INGOT = ItemTypes.key(ResourceKey.minecraft("gold_ingot")); - - public static final DefaultedRegistryReference GOLD_NUGGET = ItemTypes.key(ResourceKey.minecraft("gold_nugget")); - - public static final DefaultedRegistryReference GOLD_ORE = ItemTypes.key(ResourceKey.minecraft("gold_ore")); - public static final DefaultedRegistryReference GOLDEN_APPLE = ItemTypes.key(ResourceKey.minecraft("golden_apple")); public static final DefaultedRegistryReference GOLDEN_AXE = ItemTypes.key(ResourceKey.minecraft("golden_axe")); @@ -1070,6 +1062,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference GOLDEN_SWORD = ItemTypes.key(ResourceKey.minecraft("golden_sword")); + public static final DefaultedRegistryReference GOLD_BLOCK = ItemTypes.key(ResourceKey.minecraft("gold_block")); + + public static final DefaultedRegistryReference GOLD_INGOT = ItemTypes.key(ResourceKey.minecraft("gold_ingot")); + + public static final DefaultedRegistryReference GOLD_NUGGET = ItemTypes.key(ResourceKey.minecraft("gold_nugget")); + + public static final DefaultedRegistryReference GOLD_ORE = ItemTypes.key(ResourceKey.minecraft("gold_ore")); + public static final DefaultedRegistryReference GRANITE = ItemTypes.key(ResourceKey.minecraft("granite")); public static final DefaultedRegistryReference GRANITE_SLAB = ItemTypes.key(ResourceKey.minecraft("granite_slab")); @@ -1148,26 +1148,26 @@ public final class ItemTypes { public static final DefaultedRegistryReference HAY_BLOCK = ItemTypes.key(ResourceKey.minecraft("hay_block")); + public static final DefaultedRegistryReference HEARTBREAK_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("heartbreak_pottery_sherd")); + public static final DefaultedRegistryReference HEART_OF_THE_SEA = ItemTypes.key(ResourceKey.minecraft("heart_of_the_sea")); public static final DefaultedRegistryReference HEART_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("heart_pottery_sherd")); - public static final DefaultedRegistryReference HEARTBREAK_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("heartbreak_pottery_sherd")); - public static final DefaultedRegistryReference HEAVY_CORE = ItemTypes.key(ResourceKey.minecraft("heavy_core")); public static final DefaultedRegistryReference HEAVY_WEIGHTED_PRESSURE_PLATE = ItemTypes.key(ResourceKey.minecraft("heavy_weighted_pressure_plate")); public static final DefaultedRegistryReference HOGLIN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("hoglin_spawn_egg")); - public static final DefaultedRegistryReference HONEY_BLOCK = ItemTypes.key(ResourceKey.minecraft("honey_block")); - - public static final DefaultedRegistryReference HONEY_BOTTLE = ItemTypes.key(ResourceKey.minecraft("honey_bottle")); - public static final DefaultedRegistryReference HONEYCOMB = ItemTypes.key(ResourceKey.minecraft("honeycomb")); public static final DefaultedRegistryReference HONEYCOMB_BLOCK = ItemTypes.key(ResourceKey.minecraft("honeycomb_block")); + public static final DefaultedRegistryReference HONEY_BLOCK = ItemTypes.key(ResourceKey.minecraft("honey_block")); + + public static final DefaultedRegistryReference HONEY_BOTTLE = ItemTypes.key(ResourceKey.minecraft("honey_bottle")); + public static final DefaultedRegistryReference HOPPER = ItemTypes.key(ResourceKey.minecraft("hopper")); public static final DefaultedRegistryReference HOPPER_MINECART = ItemTypes.key(ResourceKey.minecraft("hopper_minecart")); @@ -1322,6 +1322,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference LIGHT = ItemTypes.key(ResourceKey.minecraft("light")); + public static final DefaultedRegistryReference LIGHTNING_ROD = ItemTypes.key(ResourceKey.minecraft("lightning_rod")); + public static final DefaultedRegistryReference LIGHT_BLUE_BANNER = ItemTypes.key(ResourceKey.minecraft("light_blue_banner")); public static final DefaultedRegistryReference LIGHT_BLUE_BED = ItemTypes.key(ResourceKey.minecraft("light_blue_bed")); @@ -1376,8 +1378,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference LIGHT_WEIGHTED_PRESSURE_PLATE = ItemTypes.key(ResourceKey.minecraft("light_weighted_pressure_plate")); - public static final DefaultedRegistryReference LIGHTNING_ROD = ItemTypes.key(ResourceKey.minecraft("lightning_rod")); - public static final DefaultedRegistryReference LILAC = ItemTypes.key(ResourceKey.minecraft("lilac")); public static final DefaultedRegistryReference LILY_OF_THE_VALLEY = ItemTypes.key(ResourceKey.minecraft("lily_of_the_valley")); @@ -1508,10 +1508,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference MOOSHROOM_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("mooshroom_spawn_egg")); - public static final DefaultedRegistryReference MOSS_BLOCK = ItemTypes.key(ResourceKey.minecraft("moss_block")); - - public static final DefaultedRegistryReference MOSS_CARPET = ItemTypes.key(ResourceKey.minecraft("moss_carpet")); - public static final DefaultedRegistryReference MOSSY_COBBLESTONE = ItemTypes.key(ResourceKey.minecraft("mossy_cobblestone")); public static final DefaultedRegistryReference MOSSY_COBBLESTONE_SLAB = ItemTypes.key(ResourceKey.minecraft("mossy_cobblestone_slab")); @@ -1520,28 +1516,32 @@ public final class ItemTypes { public static final DefaultedRegistryReference MOSSY_COBBLESTONE_WALL = ItemTypes.key(ResourceKey.minecraft("mossy_cobblestone_wall")); + public static final DefaultedRegistryReference MOSSY_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("mossy_stone_bricks")); + public static final DefaultedRegistryReference MOSSY_STONE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("mossy_stone_brick_slab")); public static final DefaultedRegistryReference MOSSY_STONE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("mossy_stone_brick_stairs")); public static final DefaultedRegistryReference MOSSY_STONE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("mossy_stone_brick_wall")); - public static final DefaultedRegistryReference MOSSY_STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("mossy_stone_bricks")); + public static final DefaultedRegistryReference MOSS_BLOCK = ItemTypes.key(ResourceKey.minecraft("moss_block")); + + public static final DefaultedRegistryReference MOSS_CARPET = ItemTypes.key(ResourceKey.minecraft("moss_carpet")); public static final DefaultedRegistryReference MOURNER_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("mourner_pottery_sherd")); public static final DefaultedRegistryReference MUD = ItemTypes.key(ResourceKey.minecraft("mud")); + public static final DefaultedRegistryReference MUDDY_MANGROVE_ROOTS = ItemTypes.key(ResourceKey.minecraft("muddy_mangrove_roots")); + + public static final DefaultedRegistryReference MUD_BRICKS = ItemTypes.key(ResourceKey.minecraft("mud_bricks")); + public static final DefaultedRegistryReference MUD_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("mud_brick_slab")); public static final DefaultedRegistryReference MUD_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("mud_brick_stairs")); public static final DefaultedRegistryReference MUD_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("mud_brick_wall")); - public static final DefaultedRegistryReference MUD_BRICKS = ItemTypes.key(ResourceKey.minecraft("mud_bricks")); - - public static final DefaultedRegistryReference MUDDY_MANGROVE_ROOTS = ItemTypes.key(ResourceKey.minecraft("muddy_mangrove_roots")); - public static final DefaultedRegistryReference MULE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("mule_spawn_egg")); public static final DefaultedRegistryReference MUSHROOM_STEM = ItemTypes.key(ResourceKey.minecraft("mushroom_stem")); @@ -1594,30 +1594,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference NAUTILUS_SHELL = ItemTypes.key(ResourceKey.minecraft("nautilus_shell")); - public static final DefaultedRegistryReference NETHER_BRICK = ItemTypes.key(ResourceKey.minecraft("nether_brick")); - - public static final DefaultedRegistryReference NETHER_BRICK_FENCE = ItemTypes.key(ResourceKey.minecraft("nether_brick_fence")); - - public static final DefaultedRegistryReference NETHER_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("nether_brick_slab")); - - public static final DefaultedRegistryReference NETHER_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("nether_brick_stairs")); - - public static final DefaultedRegistryReference NETHER_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("nether_brick_wall")); - - public static final DefaultedRegistryReference NETHER_BRICKS = ItemTypes.key(ResourceKey.minecraft("nether_bricks")); - - public static final DefaultedRegistryReference NETHER_GOLD_ORE = ItemTypes.key(ResourceKey.minecraft("nether_gold_ore")); - - public static final DefaultedRegistryReference NETHER_QUARTZ_ORE = ItemTypes.key(ResourceKey.minecraft("nether_quartz_ore")); - - public static final DefaultedRegistryReference NETHER_SPROUTS = ItemTypes.key(ResourceKey.minecraft("nether_sprouts")); - - public static final DefaultedRegistryReference NETHER_STAR = ItemTypes.key(ResourceKey.minecraft("nether_star")); - - public static final DefaultedRegistryReference NETHER_WART = ItemTypes.key(ResourceKey.minecraft("nether_wart")); - - public static final DefaultedRegistryReference NETHER_WART_BLOCK = ItemTypes.key(ResourceKey.minecraft("nether_wart_block")); - public static final DefaultedRegistryReference NETHERITE_AXE = ItemTypes.key(ResourceKey.minecraft("netherite_axe")); public static final DefaultedRegistryReference NETHERITE_BLOCK = ItemTypes.key(ResourceKey.minecraft("netherite_block")); @@ -1646,6 +1622,30 @@ public final class ItemTypes { public static final DefaultedRegistryReference NETHERRACK = ItemTypes.key(ResourceKey.minecraft("netherrack")); + public static final DefaultedRegistryReference NETHER_BRICK = ItemTypes.key(ResourceKey.minecraft("nether_brick")); + + public static final DefaultedRegistryReference NETHER_BRICKS = ItemTypes.key(ResourceKey.minecraft("nether_bricks")); + + public static final DefaultedRegistryReference NETHER_BRICK_FENCE = ItemTypes.key(ResourceKey.minecraft("nether_brick_fence")); + + public static final DefaultedRegistryReference NETHER_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("nether_brick_slab")); + + public static final DefaultedRegistryReference NETHER_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("nether_brick_stairs")); + + public static final DefaultedRegistryReference NETHER_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("nether_brick_wall")); + + public static final DefaultedRegistryReference NETHER_GOLD_ORE = ItemTypes.key(ResourceKey.minecraft("nether_gold_ore")); + + public static final DefaultedRegistryReference NETHER_QUARTZ_ORE = ItemTypes.key(ResourceKey.minecraft("nether_quartz_ore")); + + public static final DefaultedRegistryReference NETHER_SPROUTS = ItemTypes.key(ResourceKey.minecraft("nether_sprouts")); + + public static final DefaultedRegistryReference NETHER_STAR = ItemTypes.key(ResourceKey.minecraft("nether_star")); + + public static final DefaultedRegistryReference NETHER_WART = ItemTypes.key(ResourceKey.minecraft("nether_wart")); + + public static final DefaultedRegistryReference NETHER_WART_BLOCK = ItemTypes.key(ResourceKey.minecraft("nether_wart_block")); + public static final DefaultedRegistryReference NOTE_BLOCK = ItemTypes.key(ResourceKey.minecraft("note_block")); public static final DefaultedRegistryReference OAK_BOAT = ItemTypes.key(ResourceKey.minecraft("oak_boat")); @@ -1764,8 +1764,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference PHANTOM_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("phantom_spawn_egg")); - public static final DefaultedRegistryReference PIG_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("pig_spawn_egg")); - public static final DefaultedRegistryReference PIGLIN_BANNER_PATTERN = ItemTypes.key(ResourceKey.minecraft("piglin_banner_pattern")); public static final DefaultedRegistryReference PIGLIN_BRUTE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("piglin_brute_spawn_egg")); @@ -1774,6 +1772,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference PIGLIN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("piglin_spawn_egg")); + public static final DefaultedRegistryReference PIG_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("pig_spawn_egg")); + public static final DefaultedRegistryReference PILLAGER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("pillager_spawn_egg")); public static final DefaultedRegistryReference PINK_BANNER = ItemTypes.key(ResourceKey.minecraft("pink_banner")); @@ -1834,14 +1834,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference POLISHED_BLACKSTONE = ItemTypes.key(ResourceKey.minecraft("polished_blackstone")); + public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_bricks")); + public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_brick_slab")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_brick_stairs")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_brick_wall")); - public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_bricks")); - public static final DefaultedRegistryReference POLISHED_BLACKSTONE_BUTTON = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_button")); public static final DefaultedRegistryReference POLISHED_BLACKSTONE_PRESSURE_PLATE = ItemTypes.key(ResourceKey.minecraft("polished_blackstone_pressure_plate")); @@ -1896,12 +1896,12 @@ public final class ItemTypes { public static final DefaultedRegistryReference PRISMARINE = ItemTypes.key(ResourceKey.minecraft("prismarine")); + public static final DefaultedRegistryReference PRISMARINE_BRICKS = ItemTypes.key(ResourceKey.minecraft("prismarine_bricks")); + public static final DefaultedRegistryReference PRISMARINE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("prismarine_brick_slab")); public static final DefaultedRegistryReference PRISMARINE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("prismarine_brick_stairs")); - public static final DefaultedRegistryReference PRISMARINE_BRICKS = ItemTypes.key(ResourceKey.minecraft("prismarine_bricks")); - public static final DefaultedRegistryReference PRISMARINE_CRYSTALS = ItemTypes.key(ResourceKey.minecraft("prismarine_crystals")); public static final DefaultedRegistryReference PRISMARINE_SHARD = ItemTypes.key(ResourceKey.minecraft("prismarine_shard")); @@ -2002,6 +2002,16 @@ public final class ItemTypes { public static final DefaultedRegistryReference RECOVERY_COMPASS = ItemTypes.key(ResourceKey.minecraft("recovery_compass")); + public static final DefaultedRegistryReference REDSTONE = ItemTypes.key(ResourceKey.minecraft("redstone")); + + public static final DefaultedRegistryReference REDSTONE_BLOCK = ItemTypes.key(ResourceKey.minecraft("redstone_block")); + + public static final DefaultedRegistryReference REDSTONE_LAMP = ItemTypes.key(ResourceKey.minecraft("redstone_lamp")); + + public static final DefaultedRegistryReference REDSTONE_ORE = ItemTypes.key(ResourceKey.minecraft("redstone_ore")); + + public static final DefaultedRegistryReference REDSTONE_TORCH = ItemTypes.key(ResourceKey.minecraft("redstone_torch")); + public static final DefaultedRegistryReference RED_BANNER = ItemTypes.key(ResourceKey.minecraft("red_banner")); public static final DefaultedRegistryReference RED_BED = ItemTypes.key(ResourceKey.minecraft("red_bed")); @@ -2022,14 +2032,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference RED_MUSHROOM_BLOCK = ItemTypes.key(ResourceKey.minecraft("red_mushroom_block")); + public static final DefaultedRegistryReference RED_NETHER_BRICKS = ItemTypes.key(ResourceKey.minecraft("red_nether_bricks")); + public static final DefaultedRegistryReference RED_NETHER_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("red_nether_brick_slab")); public static final DefaultedRegistryReference RED_NETHER_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("red_nether_brick_stairs")); public static final DefaultedRegistryReference RED_NETHER_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("red_nether_brick_wall")); - public static final DefaultedRegistryReference RED_NETHER_BRICKS = ItemTypes.key(ResourceKey.minecraft("red_nether_bricks")); - public static final DefaultedRegistryReference RED_SAND = ItemTypes.key(ResourceKey.minecraft("red_sand")); public static final DefaultedRegistryReference RED_SANDSTONE = ItemTypes.key(ResourceKey.minecraft("red_sandstone")); @@ -2052,16 +2062,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference RED_WOOL = ItemTypes.key(ResourceKey.minecraft("red_wool")); - public static final DefaultedRegistryReference REDSTONE = ItemTypes.key(ResourceKey.minecraft("redstone")); - - public static final DefaultedRegistryReference REDSTONE_BLOCK = ItemTypes.key(ResourceKey.minecraft("redstone_block")); - - public static final DefaultedRegistryReference REDSTONE_LAMP = ItemTypes.key(ResourceKey.minecraft("redstone_lamp")); - - public static final DefaultedRegistryReference REDSTONE_ORE = ItemTypes.key(ResourceKey.minecraft("redstone_ore")); - - public static final DefaultedRegistryReference REDSTONE_TORCH = ItemTypes.key(ResourceKey.minecraft("redstone_torch")); - public static final DefaultedRegistryReference REINFORCED_DEEPSLATE = ItemTypes.key(ResourceKey.minecraft("reinforced_deepslate")); public static final DefaultedRegistryReference REPEATER = ItemTypes.key(ResourceKey.minecraft("repeater")); @@ -2110,12 +2110,12 @@ public final class ItemTypes { public static final DefaultedRegistryReference SCULK_VEIN = ItemTypes.key(ResourceKey.minecraft("sculk_vein")); + public static final DefaultedRegistryReference SEAGRASS = ItemTypes.key(ResourceKey.minecraft("seagrass")); + public static final DefaultedRegistryReference SEA_LANTERN = ItemTypes.key(ResourceKey.minecraft("sea_lantern")); public static final DefaultedRegistryReference SEA_PICKLE = ItemTypes.key(ResourceKey.minecraft("sea_pickle")); - public static final DefaultedRegistryReference SEAGRASS = ItemTypes.key(ResourceKey.minecraft("seagrass")); - public static final DefaultedRegistryReference SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("sentry_armor_trim_smithing_template")); public static final DefaultedRegistryReference SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("shaper_armor_trim_smithing_template")); @@ -2202,12 +2202,12 @@ public final class ItemTypes { public static final DefaultedRegistryReference SNOW = ItemTypes.key(ResourceKey.minecraft("snow")); + public static final DefaultedRegistryReference SNOWBALL = ItemTypes.key(ResourceKey.minecraft("snowball")); + public static final DefaultedRegistryReference SNOW_BLOCK = ItemTypes.key(ResourceKey.minecraft("snow_block")); public static final DefaultedRegistryReference SNOW_GOLEM_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("snow_golem_spawn_egg")); - public static final DefaultedRegistryReference SNOWBALL = ItemTypes.key(ResourceKey.minecraft("snowball")); - public static final DefaultedRegistryReference SOUL_CAMPFIRE = ItemTypes.key(ResourceKey.minecraft("soul_campfire")); public static final DefaultedRegistryReference SOUL_LANTERN = ItemTypes.key(ResourceKey.minecraft("soul_lantern")); @@ -2278,16 +2278,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference STONE = ItemTypes.key(ResourceKey.minecraft("stone")); + public static final DefaultedRegistryReference STONECUTTER = ItemTypes.key(ResourceKey.minecraft("stonecutter")); + public static final DefaultedRegistryReference STONE_AXE = ItemTypes.key(ResourceKey.minecraft("stone_axe")); + public static final DefaultedRegistryReference STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("stone_bricks")); + public static final DefaultedRegistryReference STONE_BRICK_SLAB = ItemTypes.key(ResourceKey.minecraft("stone_brick_slab")); public static final DefaultedRegistryReference STONE_BRICK_STAIRS = ItemTypes.key(ResourceKey.minecraft("stone_brick_stairs")); public static final DefaultedRegistryReference STONE_BRICK_WALL = ItemTypes.key(ResourceKey.minecraft("stone_brick_wall")); - public static final DefaultedRegistryReference STONE_BRICKS = ItemTypes.key(ResourceKey.minecraft("stone_bricks")); - public static final DefaultedRegistryReference STONE_BUTTON = ItemTypes.key(ResourceKey.minecraft("stone_button")); public static final DefaultedRegistryReference STONE_HOE = ItemTypes.key(ResourceKey.minecraft("stone_hoe")); @@ -2304,8 +2306,6 @@ public final class ItemTypes { public static final DefaultedRegistryReference STONE_SWORD = ItemTypes.key(ResourceKey.minecraft("stone_sword")); - public static final DefaultedRegistryReference STONECUTTER = ItemTypes.key(ResourceKey.minecraft("stonecutter")); - public static final DefaultedRegistryReference STRAY_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("stray_spawn_egg")); public static final DefaultedRegistryReference STRIDER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("strider_spawn_egg")); @@ -2426,14 +2426,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference TUFF = ItemTypes.key(ResourceKey.minecraft("tuff")); + public static final DefaultedRegistryReference TUFF_BRICKS = ItemTypes.key(ResourceKey.minecraft("tuff_bricks")); + 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")); @@ -2466,10 +2466,10 @@ public final class ItemTypes { public static final DefaultedRegistryReference WANDERING_TRADER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("wandering_trader_spawn_egg")); - public static final DefaultedRegistryReference WARD_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("ward_armor_trim_smithing_template")); - public static final DefaultedRegistryReference WARDEN_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("warden_spawn_egg")); + public static final DefaultedRegistryReference WARD_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("ward_armor_trim_smithing_template")); + public static final DefaultedRegistryReference WARPED_BUTTON = ItemTypes.key(ResourceKey.minecraft("warped_button")); public static final DefaultedRegistryReference WARPED_DOOR = ItemTypes.key(ResourceKey.minecraft("warped_door")); diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java index 09df9a4190..9a36985991 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java +++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentGroups.java @@ -33,23 +33,18 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class EquipmentGroups { - // @formatter:off - - // SORTFIELDS:ON - - public static final DefaultedRegistryReference HELD = EquipmentGroups.key(ResourceKey.sponge("held")); - - public static final DefaultedRegistryReference WORN = EquipmentGroups.key(ResourceKey.sponge("worn")); - public static final DefaultedRegistryReference ANIMAL_ARMOR = EquipmentGroups.key(ResourceKey.sponge("animal_armor")); - // SORTFIELDS:OFF + public static final DefaultedRegistryReference HAND = EquipmentGroups.key(ResourceKey.sponge("hand")); - // @formatter:on + public static final DefaultedRegistryReference HUMANOID_ARMOR = EquipmentGroups.key(ResourceKey.sponge("humanoid_armor")); private EquipmentGroups() { } diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java index 8de6eecc68..c15efac03b 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java +++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentTypes.java @@ -34,31 +34,25 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * All built-in equipment types. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class EquipmentTypes { - // @formatter:off + public static final DefaultedRegistryReference BODY = EquipmentTypes.key(ResourceKey.sponge("body")); - // SORTFIELDS:ON + public static final DefaultedRegistryReference CHEST = EquipmentTypes.key(ResourceKey.sponge("chest")); public static final DefaultedRegistryReference FEET = EquipmentTypes.key(ResourceKey.sponge("feet")); - public static final DefaultedRegistryReference CHEST = EquipmentTypes.key(ResourceKey.sponge("chest")); - public static final DefaultedRegistryReference HEAD = EquipmentTypes.key(ResourceKey.sponge("head")); public static final DefaultedRegistryReference LEGS = EquipmentTypes.key(ResourceKey.sponge("legs")); - public static final DefaultedRegistryReference MAIN_HAND = EquipmentTypes.key(ResourceKey.sponge("main_hand")); - - public static final DefaultedRegistryReference OFF_HAND = EquipmentTypes.key(ResourceKey.sponge("off_hand")); - - // SORTFIELDS:OFF + public static final DefaultedRegistryReference MAINHAND = EquipmentTypes.key(ResourceKey.sponge("mainhand")); - // @formatter:on + public static final DefaultedRegistryReference OFFHAND = EquipmentTypes.key(ResourceKey.sponge("offhand")); private EquipmentTypes() { } 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 8278db6ab8..a4c51fb3d6 100644 --- a/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java +++ b/src/main/java/org/spongepowered/api/item/potion/PotionTypes.java @@ -66,10 +66,10 @@ public final class PotionTypes { public static final DefaultedRegistryReference LONG_REGENERATION = PotionTypes.key(ResourceKey.minecraft("long_regeneration")); - public static final DefaultedRegistryReference LONG_SLOW_FALLING = PotionTypes.key(ResourceKey.minecraft("long_slow_falling")); - public static final DefaultedRegistryReference LONG_SLOWNESS = PotionTypes.key(ResourceKey.minecraft("long_slowness")); + public static final DefaultedRegistryReference LONG_SLOW_FALLING = PotionTypes.key(ResourceKey.minecraft("long_slow_falling")); + public static final DefaultedRegistryReference LONG_STRENGTH = PotionTypes.key(ResourceKey.minecraft("long_strength")); public static final DefaultedRegistryReference LONG_SWIFTNESS = PotionTypes.key(ResourceKey.minecraft("long_swiftness")); @@ -92,10 +92,10 @@ public final class PotionTypes { public static final DefaultedRegistryReference REGENERATION = PotionTypes.key(ResourceKey.minecraft("regeneration")); - public static final DefaultedRegistryReference SLOW_FALLING = PotionTypes.key(ResourceKey.minecraft("slow_falling")); - public static final DefaultedRegistryReference SLOWNESS = PotionTypes.key(ResourceKey.minecraft("slowness")); + public static final DefaultedRegistryReference SLOW_FALLING = PotionTypes.key(ResourceKey.minecraft("slow_falling")); + public static final DefaultedRegistryReference STRENGTH = PotionTypes.key(ResourceKey.minecraft("strength")); public static final DefaultedRegistryReference STRONG_HARMING = PotionTypes.key(ResourceKey.minecraft("strong_harming")); diff --git a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationTypes.java b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationTypes.java index b90dc06362..ba7a4614a9 100644 --- a/src/main/java/org/spongepowered/api/map/decoration/MapDecorationTypes.java +++ b/src/main/java/org/spongepowered/api/map/decoration/MapDecorationTypes.java @@ -26,7 +26,6 @@ import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; -import org.spongepowered.api.map.MapCanvas; import org.spongepowered.api.registry.DefaultedRegistryReference; import org.spongepowered.api.registry.Registry; import org.spongepowered.api.registry.RegistryKey; @@ -35,68 +34,84 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * A pseudo-enum of {@link MapDecorationType}s that can be used on a - * {@link MapCanvas}. + * */ +@SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class MapDecorationTypes { - // SORTFIELDS:ON + public static final DefaultedRegistryReference BANNER_BLACK = MapDecorationTypes.key(ResourceKey.minecraft("banner_black")); - public static final DefaultedRegistryReference BLUE_MARKER = MapDecorationTypes.key(ResourceKey.sponge("blue_marker")); + public static final DefaultedRegistryReference BANNER_BLUE = MapDecorationTypes.key(ResourceKey.minecraft("banner_blue")); - public static final DefaultedRegistryReference GREEN_MARKER = MapDecorationTypes.key(ResourceKey.sponge("frame")); + public static final DefaultedRegistryReference BANNER_BROWN = MapDecorationTypes.key(ResourceKey.minecraft("banner_brown")); - public static final DefaultedRegistryReference MANSION = MapDecorationTypes.key(ResourceKey.sponge("mansion")); + public static final DefaultedRegistryReference BANNER_CYAN = MapDecorationTypes.key(ResourceKey.minecraft("banner_cyan")); - public static final DefaultedRegistryReference MONUMENT = MapDecorationTypes.key(ResourceKey.sponge("monument")); + public static final DefaultedRegistryReference BANNER_GRAY = MapDecorationTypes.key(ResourceKey.minecraft("banner_gray")); - public static final DefaultedRegistryReference PLAYER_MARKER = MapDecorationTypes.key(ResourceKey.sponge("player")); + public static final DefaultedRegistryReference BANNER_GREEN = MapDecorationTypes.key(ResourceKey.minecraft("banner_green")); - public static final DefaultedRegistryReference PLAYER_OFF_LIMITS = MapDecorationTypes.key(ResourceKey.sponge("player_off_limits")); + public static final DefaultedRegistryReference BANNER_LIGHT_BLUE = MapDecorationTypes.key(ResourceKey.minecraft("banner_light_blue")); - public static final DefaultedRegistryReference PLAYER_OFF_MAP = MapDecorationTypes.key(ResourceKey.sponge("player_off_map")); + public static final DefaultedRegistryReference BANNER_LIGHT_GRAY = MapDecorationTypes.key(ResourceKey.minecraft("banner_light_gray")); - public static final DefaultedRegistryReference RED_MARKER = MapDecorationTypes.key(ResourceKey.sponge("red_marker")); + public static final DefaultedRegistryReference BANNER_LIME = MapDecorationTypes.key(ResourceKey.minecraft("banner_lime")); - public static final DefaultedRegistryReference RED_X = MapDecorationTypes.key(ResourceKey.sponge("red_x")); + public static final DefaultedRegistryReference BANNER_MAGENTA = MapDecorationTypes.key(ResourceKey.minecraft("banner_magenta")); - public static final DefaultedRegistryReference TARGET_X = MapDecorationTypes.key(ResourceKey.sponge("target_x")); + public static final DefaultedRegistryReference BANNER_ORANGE = MapDecorationTypes.key(ResourceKey.minecraft("banner_orange")); - public static final DefaultedRegistryReference TARGET_POINT = MapDecorationTypes.key(ResourceKey.sponge("target_point")); + public static final DefaultedRegistryReference BANNER_PINK = MapDecorationTypes.key(ResourceKey.minecraft("banner_pink")); - public static final DefaultedRegistryReference BANNER_WHITE = MapDecorationTypes.key(ResourceKey.sponge("banner_white")); + public static final DefaultedRegistryReference BANNER_PURPLE = MapDecorationTypes.key(ResourceKey.minecraft("banner_purple")); - public static final DefaultedRegistryReference BANNER_ORANGE = MapDecorationTypes.key(ResourceKey.sponge("banner_orange")); + public static final DefaultedRegistryReference BANNER_RED = MapDecorationTypes.key(ResourceKey.minecraft("banner_red")); - public static final DefaultedRegistryReference BANNER_MAGENTA = MapDecorationTypes.key(ResourceKey.sponge("banner_magenta")); + public static final DefaultedRegistryReference BANNER_WHITE = MapDecorationTypes.key(ResourceKey.minecraft("banner_white")); - public static final DefaultedRegistryReference BANNER_LIGHT_BLUE = MapDecorationTypes.key(ResourceKey.sponge("banner_light_blue")); + public static final DefaultedRegistryReference BANNER_YELLOW = MapDecorationTypes.key(ResourceKey.minecraft("banner_yellow")); - public static final DefaultedRegistryReference BANNER_YELLOW = MapDecorationTypes.key(ResourceKey.sponge("banner_yellow")); + public static final DefaultedRegistryReference BLUE_MARKER = MapDecorationTypes.key(ResourceKey.minecraft("blue_marker")); - public static final DefaultedRegistryReference BANNER_LIME = MapDecorationTypes.key(ResourceKey.sponge("banner_lime")); + public static final DefaultedRegistryReference FRAME = MapDecorationTypes.key(ResourceKey.minecraft("frame")); - public static final DefaultedRegistryReference BANNER_PINK = MapDecorationTypes.key(ResourceKey.sponge("banner_pink")); + public static final DefaultedRegistryReference JUNGLE_TEMPLE = MapDecorationTypes.key(ResourceKey.minecraft("jungle_temple")); - public static final DefaultedRegistryReference BANNER_GRAY = MapDecorationTypes.key(ResourceKey.sponge("banner_gray")); + public static final DefaultedRegistryReference MANSION = MapDecorationTypes.key(ResourceKey.minecraft("mansion")); - public static final DefaultedRegistryReference BANNER_LIGHT_GRAY = MapDecorationTypes.key(ResourceKey.sponge("banner_light_gray")); + public static final DefaultedRegistryReference MONUMENT = MapDecorationTypes.key(ResourceKey.minecraft("monument")); - public static final DefaultedRegistryReference BANNER_CYAN = MapDecorationTypes.key(ResourceKey.sponge("banner_cyan")); + public static final DefaultedRegistryReference PLAYER = MapDecorationTypes.key(ResourceKey.minecraft("player")); - public static final DefaultedRegistryReference BANNER_PURPLE = MapDecorationTypes.key(ResourceKey.sponge("banner_purple")); + public static final DefaultedRegistryReference PLAYER_OFF_LIMITS = MapDecorationTypes.key(ResourceKey.minecraft("player_off_limits")); - public static final DefaultedRegistryReference BANNER_BLUE = MapDecorationTypes.key(ResourceKey.sponge("banner_blue")); + public static final DefaultedRegistryReference PLAYER_OFF_MAP = MapDecorationTypes.key(ResourceKey.minecraft("player_off_map")); - public static final DefaultedRegistryReference BANNER_BROWN = MapDecorationTypes.key(ResourceKey.sponge("banner_brown")); + public static final DefaultedRegistryReference RED_MARKER = MapDecorationTypes.key(ResourceKey.minecraft("red_marker")); - public static final DefaultedRegistryReference BANNER_GREEN = MapDecorationTypes.key(ResourceKey.sponge("banner_green")); + public static final DefaultedRegistryReference RED_X = MapDecorationTypes.key(ResourceKey.minecraft("red_x")); - public static final DefaultedRegistryReference BANNER_RED = MapDecorationTypes.key(ResourceKey.sponge("banner_red")); + public static final DefaultedRegistryReference SWAMP_HUT = MapDecorationTypes.key(ResourceKey.minecraft("swamp_hut")); - public static final DefaultedRegistryReference BANNER_BLACK = MapDecorationTypes.key(ResourceKey.sponge("banner_black")); - // SORTFIELDS:OFF + public static final DefaultedRegistryReference TARGET_POINT = MapDecorationTypes.key(ResourceKey.minecraft("target_point")); + + public static final DefaultedRegistryReference TARGET_X = MapDecorationTypes.key(ResourceKey.minecraft("target_x")); + + public static final DefaultedRegistryReference TRIAL_CHAMBERS = MapDecorationTypes.key(ResourceKey.minecraft("trial_chambers")); + + public static final DefaultedRegistryReference VILLAGE_DESERT = MapDecorationTypes.key(ResourceKey.minecraft("village_desert")); + + public static final DefaultedRegistryReference VILLAGE_PLAINS = MapDecorationTypes.key(ResourceKey.minecraft("village_plains")); + + public static final DefaultedRegistryReference VILLAGE_SAVANNA = MapDecorationTypes.key(ResourceKey.minecraft("village_savanna")); + + public static final DefaultedRegistryReference VILLAGE_SNOWY = MapDecorationTypes.key(ResourceKey.minecraft("village_snowy")); + + public static final DefaultedRegistryReference VILLAGE_TAIGA = MapDecorationTypes.key(ResourceKey.minecraft("village_taiga")); + + private MapDecorationTypes() { + } public static Registry registry() { return Sponge.game().registry(RegistryTypes.MAP_DECORATION_TYPE); diff --git a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java index 3b02affbc0..d88e612b92 100644 --- a/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java +++ b/src/main/java/org/spongepowered/api/map/decoration/orientation/MapDecorationOrientations.java @@ -38,7 +38,7 @@ * The {@link #NORTH} orientation is the upwards orientation on a map. */ @RegistryScopes(scopes = RegistryScope.GAME) -public class MapDecorationOrientations { +public final class MapDecorationOrientations { // SORTFIELDS:ON diff --git a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java index 3dee476c1d..0aa40b7cb8 100644 --- a/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java +++ b/src/main/java/org/spongepowered/api/scoreboard/displayslot/DisplaySlots.java @@ -34,16 +34,12 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * Display slot names which display an objective in a particular place in-game. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class DisplaySlots { - // @formatter:off - - // SORTFIELDS:ON - /** * Displays a player's score for the objective underneath their nametag * in-game, when a player is closer than 10 blocks. @@ -61,41 +57,37 @@ public final class DisplaySlots { */ public static final DefaultedRegistryReference SIDEBAR = DisplaySlots.key(ResourceKey.sponge("sidebar")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_AQUA = DisplaySlots.key(ResourceKey.sponge("sidebar_team_aqua")); - - public static final DefaultedRegistryReference SIDEBAR_TEAM_BLACK = DisplaySlots.key(ResourceKey.sponge("sidebar_team_black")); - - public static final DefaultedRegistryReference SIDEBAR_TEAM_BLUE = DisplaySlots.key(ResourceKey.sponge("sidebar_team_blue")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_AQUA = DisplaySlots.key(ResourceKey.sponge("sidebar.team.aqua")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_AQUA = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_aqua")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_BLACK = DisplaySlots.key(ResourceKey.sponge("sidebar.team.black")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_BLUE = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_blue")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_BLUE = DisplaySlots.key(ResourceKey.sponge("sidebar.team.blue")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_GRAY = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_gray")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_AQUA = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_aqua")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_GREEN = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_green")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_BLUE = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_blue")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_PURPLE = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_purple")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_GRAY = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_gray")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_RED = DisplaySlots.key(ResourceKey.sponge("sidebar_team_dark_red")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_GREEN = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_green")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_GOLD = DisplaySlots.key(ResourceKey.sponge("sidebar_team_gold")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_PURPLE = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_purple")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_GRAY = DisplaySlots.key(ResourceKey.sponge("sidebar_team_gray")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_DARK_RED = DisplaySlots.key(ResourceKey.sponge("sidebar.team.dark_red")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_GREEN = DisplaySlots.key(ResourceKey.sponge("sidebar_team_green")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_GOLD = DisplaySlots.key(ResourceKey.sponge("sidebar.team.gold")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_LIGHT_PURPLE = DisplaySlots.key(ResourceKey.sponge("sidebar_team_light_purple")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_GRAY = DisplaySlots.key(ResourceKey.sponge("sidebar.team.gray")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_RED = DisplaySlots.key(ResourceKey.sponge("sidebar_team_red")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_GREEN = DisplaySlots.key(ResourceKey.sponge("sidebar.team.green")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_WHITE = DisplaySlots.key(ResourceKey.sponge("sidebar_team_white")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_LIGHT_PURPLE = DisplaySlots.key(ResourceKey.sponge("sidebar.team.light_purple")); - public static final DefaultedRegistryReference SIDEBAR_TEAM_YELLOW = DisplaySlots.key(ResourceKey.sponge("sidebar_team_yellow")); + public static final DefaultedRegistryReference SIDEBAR_TEAM_RED = DisplaySlots.key(ResourceKey.sponge("sidebar.team.red")); - // SORTFIELDS:OFF + public static final DefaultedRegistryReference SIDEBAR_TEAM_WHITE = DisplaySlots.key(ResourceKey.sponge("sidebar.team.white")); - // @formatter:on + public static final DefaultedRegistryReference SIDEBAR_TEAM_YELLOW = DisplaySlots.key(ResourceKey.sponge("sidebar.team.yellow")); private DisplaySlots() { } diff --git a/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java b/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java index 0abd509bf4..417704dd9f 100644 --- a/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java +++ b/src/main/java/org/spongepowered/api/statistic/StatisticCategories.java @@ -36,30 +36,29 @@ import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; +/** + * + */ @RegistryScopes(scopes = RegistryScope.GAME) public final class StatisticCategories { - // SORTFIELDS:ON + public static final DefaultedRegistryReference> BROKEN = StatisticCategories.typedKey(ResourceKey.minecraft("broken")); - public static final DefaultedRegistryReference> BLOCKS_BROKEN = StatisticCategories.typedKey(ResourceKey.minecraft("blocks_broken")); + public static final DefaultedRegistryReference> CRAFTED = StatisticCategories.typedKey(ResourceKey.minecraft("crafted")); public static final DefaultedRegistryReference CUSTOM = StatisticCategories.key(ResourceKey.minecraft("custom")); - public static final DefaultedRegistryReference>> ENTITIES_KILLED = StatisticCategories.typedKey(ResourceKey.minecraft("entities_killed")); - - public static final DefaultedRegistryReference> ITEMS_BROKEN = StatisticCategories.typedKey(ResourceKey.minecraft("items_broken")); - - public static final DefaultedRegistryReference> ITEMS_CRAFTED = StatisticCategories.typedKey(ResourceKey.minecraft("items_crafted")); + public static final DefaultedRegistryReference> DROPPED = StatisticCategories.typedKey(ResourceKey.minecraft("dropped")); - public static final DefaultedRegistryReference> ITEMS_DROPPED = StatisticCategories.typedKey(ResourceKey.minecraft("items_dropped")); + public static final DefaultedRegistryReference> KILLED = StatisticCategories.typedKey(ResourceKey.minecraft("killed")); - public static final DefaultedRegistryReference> ITEMS_PICKED_UP = StatisticCategories.typedKey(ResourceKey.minecraft("items_picked_up")); + public static final DefaultedRegistryReference> KILLED_BY = StatisticCategories.typedKey(ResourceKey.minecraft("killed_by")); - public static final DefaultedRegistryReference> ITEMS_USED = StatisticCategories.typedKey(ResourceKey.minecraft("items_used")); + public static final DefaultedRegistryReference> MINED = StatisticCategories.typedKey(ResourceKey.minecraft("mined")); - public static final DefaultedRegistryReference>> KILLED_BY_ENTITIES = StatisticCategories.typedKey(ResourceKey.minecraft("killed_by_entities")); + public static final DefaultedRegistryReference> PICKED_UP = StatisticCategories.typedKey(ResourceKey.minecraft("picked_up")); - // SORTFIELDS:OFF + public static final DefaultedRegistryReference> USED = StatisticCategories.typedKey(ResourceKey.minecraft("used")); private StatisticCategories() { } diff --git a/src/main/java/org/spongepowered/api/statistic/Statistics.java b/src/main/java/org/spongepowered/api/statistic/Statistics.java index fa2012023b..228d0426ab 100644 --- a/src/main/java/org/spongepowered/api/statistic/Statistics.java +++ b/src/main/java/org/spongepowered/api/statistic/Statistics.java @@ -142,14 +142,14 @@ public final class Statistics { public static final DefaultedRegistryReference PIG_ONE_CM = Statistics.key(ResourceKey.minecraft("pig_one_cm")); + public static final DefaultedRegistryReference PLAYER_KILLS = Statistics.key(ResourceKey.minecraft("player_kills")); + public static final DefaultedRegistryReference PLAY_NOTEBLOCK = Statistics.key(ResourceKey.minecraft("play_noteblock")); public static final DefaultedRegistryReference PLAY_RECORD = Statistics.key(ResourceKey.minecraft("play_record")); public static final DefaultedRegistryReference PLAY_TIME = Statistics.key(ResourceKey.minecraft("play_time")); - public static final DefaultedRegistryReference PLAYER_KILLS = Statistics.key(ResourceKey.minecraft("player_kills")); - public static final DefaultedRegistryReference POT_FLOWER = Statistics.key(ResourceKey.minecraft("pot_flower")); public static final DefaultedRegistryReference RAID_TRIGGER = Statistics.key(ResourceKey.minecraft("raid_trigger")); @@ -184,10 +184,10 @@ public final class Statistics { public static final DefaultedRegistryReference USE_CAULDRON = Statistics.key(ResourceKey.minecraft("use_cauldron")); - public static final DefaultedRegistryReference WALK_ON_WATER_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_on_water_one_cm")); - public static final DefaultedRegistryReference WALK_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_one_cm")); + public static final DefaultedRegistryReference WALK_ON_WATER_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_on_water_one_cm")); + public static final DefaultedRegistryReference WALK_UNDER_WATER_ONE_CM = Statistics.key(ResourceKey.minecraft("walk_under_water_one_cm")); private Statistics() { diff --git a/src/main/java/org/spongepowered/api/util/rotation/Rotations.java b/src/main/java/org/spongepowered/api/util/rotation/Rotations.java index 0055ffcdf9..53b6cd26ae 100644 --- a/src/main/java/org/spongepowered/api/util/rotation/Rotations.java +++ b/src/main/java/org/spongepowered/api/util/rotation/Rotations.java @@ -44,7 +44,7 @@ public final class Rotations { public static final DefaultedRegistryReference NONE = Rotations.key(ResourceKey.sponge("none")); public static final DefaultedRegistryReference CLOCKWISE_90 = Rotations.key(ResourceKey.sponge("clockwise_90")); - public static final DefaultedRegistryReference CLOCKWISE_180 = Rotations.key(ResourceKey.sponge("clockwise_180")); + public static final DefaultedRegistryReference CLOCKWISE_180 = Rotations.key(ResourceKey.sponge("180")); public static final DefaultedRegistryReference COUNTERCLOCKWISE_90 = Rotations.key(ResourceKey.sponge("counterclockwise_90")); diff --git a/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java b/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java index 90b424b05c..d3ef36399d 100644 --- a/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java +++ b/src/main/java/org/spongepowered/api/world/difficulty/Difficulties.java @@ -34,16 +34,12 @@ import org.spongepowered.api.registry.RegistryTypes; /** - * A list of difficulties that Minecraft provides in vanilla. + * */ @SuppressWarnings("unused") @RegistryScopes(scopes = RegistryScope.GAME) public final class Difficulties { - // @formatter:off - - // SORTFIELDS:ON - public static final DefaultedRegistryReference EASY = Difficulties.key(ResourceKey.sponge("easy")); public static final DefaultedRegistryReference HARD = Difficulties.key(ResourceKey.sponge("hard")); @@ -52,10 +48,6 @@ public final class Difficulties { public static final DefaultedRegistryReference PEACEFUL = Difficulties.key(ResourceKey.sponge("peaceful")); - // SORTFIELDS:OFF - - // @formatter:on - private Difficulties() { } 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 c1e91fd18c..7e40a7a335 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 @@ -46,6 +46,16 @@ public final class DensityFunctions { public static final DefaultedRegistryReference NETHER_BASE_3D_NOISE = DensityFunctions.key(ResourceKey.minecraft("nether/base_3d_noise")); + public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/depth")); + + public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_FACTOR = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/factor")); + + public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_JAGGEDNESS = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/jaggedness")); + + public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_OFFSET = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/offset")); + + public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/sloped_cheese")); + public static final DefaultedRegistryReference OVERWORLD_BASE_3D_NOISE = DensityFunctions.key(ResourceKey.minecraft("overworld/base_3d_noise")); public static final DefaultedRegistryReference OVERWORLD_CAVES_ENTRANCES = DensityFunctions.key(ResourceKey.minecraft("overworld/caves/entrances")); @@ -70,24 +80,6 @@ public final class DensityFunctions { public static final DefaultedRegistryReference OVERWORLD_JAGGEDNESS = DensityFunctions.key(ResourceKey.minecraft("overworld/jaggedness")); - public static final DefaultedRegistryReference OVERWORLD_OFFSET = DensityFunctions.key(ResourceKey.minecraft("overworld/offset")); - - public static final DefaultedRegistryReference OVERWORLD_RIDGES = DensityFunctions.key(ResourceKey.minecraft("overworld/ridges")); - - public static final DefaultedRegistryReference OVERWORLD_RIDGES_FOLDED = DensityFunctions.key(ResourceKey.minecraft("overworld/ridges_folded")); - - public static final DefaultedRegistryReference OVERWORLD_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("overworld/sloped_cheese")); - - public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/depth")); - - public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_FACTOR = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/factor")); - - public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_JAGGEDNESS = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/jaggedness")); - - public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_OFFSET = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/offset")); - - public static final DefaultedRegistryReference OVERWORLD_AMPLIFIED_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("overworld_amplified/sloped_cheese")); - public static final DefaultedRegistryReference OVERWORLD_LARGE_BIOMES_CONTINENTS = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/continents")); public static final DefaultedRegistryReference OVERWORLD_LARGE_BIOMES_DEPTH = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/depth")); @@ -102,6 +94,14 @@ public final class DensityFunctions { public static final DefaultedRegistryReference OVERWORLD_LARGE_BIOMES_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("overworld_large_biomes/sloped_cheese")); + public static final DefaultedRegistryReference OVERWORLD_OFFSET = DensityFunctions.key(ResourceKey.minecraft("overworld/offset")); + + public static final DefaultedRegistryReference OVERWORLD_RIDGES = DensityFunctions.key(ResourceKey.minecraft("overworld/ridges")); + + public static final DefaultedRegistryReference OVERWORLD_RIDGES_FOLDED = DensityFunctions.key(ResourceKey.minecraft("overworld/ridges_folded")); + + public static final DefaultedRegistryReference OVERWORLD_SLOPED_CHEESE = DensityFunctions.key(ResourceKey.minecraft("overworld/sloped_cheese")); + public static final DefaultedRegistryReference SHIFT_X = DensityFunctions.key(ResourceKey.minecraft("shift_x")); public static final DefaultedRegistryReference SHIFT_Z = DensityFunctions.key(ResourceKey.minecraft("shift_z")); 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 c9062e406b..27d68a3d0f 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 @@ -86,12 +86,12 @@ public final class Noises { public static final DefaultedRegistryReference JAGGED = Noises.key(ResourceKey.minecraft("jagged")); + public static final DefaultedRegistryReference NETHERRACK = Noises.key(ResourceKey.minecraft("netherrack")); + public static final DefaultedRegistryReference NETHER_STATE_SELECTOR = Noises.key(ResourceKey.minecraft("nether_state_selector")); public static final DefaultedRegistryReference NETHER_WART = Noises.key(ResourceKey.minecraft("nether_wart")); - public static final DefaultedRegistryReference NETHERRACK = Noises.key(ResourceKey.minecraft("netherrack")); - public static final DefaultedRegistryReference NOODLE = Noises.key(ResourceKey.minecraft("noodle")); public static final DefaultedRegistryReference NOODLE_RIDGE_A = Noises.key(ResourceKey.minecraft("noodle_ridge_a")); @@ -104,12 +104,12 @@ public final class Noises { public static final DefaultedRegistryReference ORE_GAP = Noises.key(ResourceKey.minecraft("ore_gap")); + public static final DefaultedRegistryReference ORE_VEININESS = Noises.key(ResourceKey.minecraft("ore_veininess")); + public static final DefaultedRegistryReference ORE_VEIN_A = Noises.key(ResourceKey.minecraft("ore_vein_a")); public static final DefaultedRegistryReference ORE_VEIN_B = Noises.key(ResourceKey.minecraft("ore_vein_b")); - public static final DefaultedRegistryReference ORE_VEININESS = Noises.key(ResourceKey.minecraft("ore_veininess")); - public static final DefaultedRegistryReference PACKED_ICE = Noises.key(ResourceKey.minecraft("packed_ice")); public static final DefaultedRegistryReference PATCH = Noises.key(ResourceKey.minecraft("patch")); 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 c2150b8dae..868924aeb8 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 @@ -98,10 +98,10 @@ public final class FeatureTypes { public static final DefaultedRegistryReference HUGE_RED_MUSHROOM = FeatureTypes.key(ResourceKey.minecraft("huge_red_mushroom")); - public static final DefaultedRegistryReference ICE_SPIKE = FeatureTypes.key(ResourceKey.minecraft("ice_spike")); - public static final DefaultedRegistryReference ICEBERG = FeatureTypes.key(ResourceKey.minecraft("iceberg")); + public static final DefaultedRegistryReference ICE_SPIKE = FeatureTypes.key(ResourceKey.minecraft("ice_spike")); + public static final DefaultedRegistryReference KELP = FeatureTypes.key(ResourceKey.minecraft("kelp")); public static final DefaultedRegistryReference LAKE = FeatureTypes.key(ResourceKey.minecraft("lake")); @@ -112,10 +112,10 @@ public final class FeatureTypes { public static final DefaultedRegistryReference MULTIFACE_GROWTH = FeatureTypes.key(ResourceKey.minecraft("multiface_growth")); - public static final DefaultedRegistryReference NETHER_FOREST_VEGETATION = FeatureTypes.key(ResourceKey.minecraft("nether_forest_vegetation")); - public static final DefaultedRegistryReference NETHERRACK_REPLACE_BLOBS = FeatureTypes.key(ResourceKey.minecraft("netherrack_replace_blobs")); + public static final DefaultedRegistryReference NETHER_FOREST_VEGETATION = FeatureTypes.key(ResourceKey.minecraft("nether_forest_vegetation")); + public static final DefaultedRegistryReference NO_BONEMEAL_FLOWER = FeatureTypes.key(ResourceKey.minecraft("no_bonemeal_flower")); public static final DefaultedRegistryReference NO_OP = FeatureTypes.key(ResourceKey.minecraft("no_op")); @@ -138,10 +138,10 @@ public final class FeatureTypes { public static final DefaultedRegistryReference SCULK_PATCH = FeatureTypes.key(ResourceKey.minecraft("sculk_patch")); - public static final DefaultedRegistryReference SEA_PICKLE = FeatureTypes.key(ResourceKey.minecraft("sea_pickle")); - public static final DefaultedRegistryReference SEAGRASS = FeatureTypes.key(ResourceKey.minecraft("seagrass")); + public static final DefaultedRegistryReference SEA_PICKLE = FeatureTypes.key(ResourceKey.minecraft("sea_pickle")); + public static final DefaultedRegistryReference SIMPLE_BLOCK = FeatureTypes.key(ResourceKey.minecraft("simple_block")); public static final DefaultedRegistryReference SIMPLE_RANDOM_SELECTOR = FeatureTypes.key(ResourceKey.minecraft("simple_random_selector")); 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 c36964680f..f3bbaf8ec8 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 @@ -156,22 +156,22 @@ public final class Features { public static final DefaultedRegistryReference FREEZE_TOP_LAYER = Features.key(ResourceKey.minecraft("freeze_top_layer")); - public static final DefaultedRegistryReference GLOW_LICHEN = Features.key(ResourceKey.minecraft("glow_lichen")); - public static final DefaultedRegistryReference GLOWSTONE_EXTRA = Features.key(ResourceKey.minecraft("glowstone_extra")); + public static final DefaultedRegistryReference GLOW_LICHEN = Features.key(ResourceKey.minecraft("glow_lichen")); + public static final DefaultedRegistryReference HUGE_BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("huge_brown_mushroom")); public static final DefaultedRegistryReference HUGE_RED_MUSHROOM = Features.key(ResourceKey.minecraft("huge_red_mushroom")); - public static final DefaultedRegistryReference ICE_PATCH = Features.key(ResourceKey.minecraft("ice_patch")); - - public static final DefaultedRegistryReference ICE_SPIKE = Features.key(ResourceKey.minecraft("ice_spike")); - public static final DefaultedRegistryReference ICEBERG_BLUE = Features.key(ResourceKey.minecraft("iceberg_blue")); public static final DefaultedRegistryReference ICEBERG_PACKED = Features.key(ResourceKey.minecraft("iceberg_packed")); + public static final DefaultedRegistryReference ICE_PATCH = Features.key(ResourceKey.minecraft("ice_patch")); + + public static final DefaultedRegistryReference ICE_SPIKE = Features.key(ResourceKey.minecraft("ice_spike")); + public static final DefaultedRegistryReference JUNGLE_BUSH = Features.key(ResourceKey.minecraft("jungle_bush")); public static final DefaultedRegistryReference JUNGLE_TREE = Features.key(ResourceKey.minecraft("jungle_tree")); @@ -346,8 +346,6 @@ public final class Features { public static final DefaultedRegistryReference SCULK_VEIN = Features.key(ResourceKey.minecraft("sculk_vein")); - public static final DefaultedRegistryReference SEA_PICKLE = Features.key(ResourceKey.minecraft("sea_pickle")); - public static final DefaultedRegistryReference SEAGRASS_MID = Features.key(ResourceKey.minecraft("seagrass_mid")); public static final DefaultedRegistryReference SEAGRASS_SHORT = Features.key(ResourceKey.minecraft("seagrass_short")); @@ -358,6 +356,8 @@ public final class Features { public static final DefaultedRegistryReference SEAGRASS_TALL = Features.key(ResourceKey.minecraft("seagrass_tall")); + public static final DefaultedRegistryReference SEA_PICKLE = Features.key(ResourceKey.minecraft("sea_pickle")); + public static final DefaultedRegistryReference SINGLE_PIECE_OF_GRASS = Features.key(ResourceKey.minecraft("single_piece_of_grass")); public static final DefaultedRegistryReference SMALL_BASALT_COLUMNS = Features.key(ResourceKey.minecraft("small_basalt_columns")); 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 3f9674c78f..4e7ff7baa9 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 @@ -154,22 +154,22 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference FREEZE_TOP_LAYER = PlacedFeatures.key(ResourceKey.minecraft("freeze_top_layer")); - public static final DefaultedRegistryReference GLOW_LICHEN = PlacedFeatures.key(ResourceKey.minecraft("glow_lichen")); - public static final DefaultedRegistryReference GLOWSTONE = PlacedFeatures.key(ResourceKey.minecraft("glowstone")); public static final DefaultedRegistryReference GLOWSTONE_EXTRA = PlacedFeatures.key(ResourceKey.minecraft("glowstone_extra")); - public static final DefaultedRegistryReference GRASS_BONEMEAL = PlacedFeatures.key(ResourceKey.minecraft("grass_bonemeal")); - - public static final DefaultedRegistryReference ICE_PATCH = PlacedFeatures.key(ResourceKey.minecraft("ice_patch")); + public static final DefaultedRegistryReference GLOW_LICHEN = PlacedFeatures.key(ResourceKey.minecraft("glow_lichen")); - public static final DefaultedRegistryReference ICE_SPIKE = PlacedFeatures.key(ResourceKey.minecraft("ice_spike")); + public static final DefaultedRegistryReference GRASS_BONEMEAL = PlacedFeatures.key(ResourceKey.minecraft("grass_bonemeal")); public static final DefaultedRegistryReference ICEBERG_BLUE = PlacedFeatures.key(ResourceKey.minecraft("iceberg_blue")); public static final DefaultedRegistryReference ICEBERG_PACKED = PlacedFeatures.key(ResourceKey.minecraft("iceberg_packed")); + public static final DefaultedRegistryReference ICE_PATCH = PlacedFeatures.key(ResourceKey.minecraft("ice_patch")); + + public static final DefaultedRegistryReference ICE_SPIKE = PlacedFeatures.key(ResourceKey.minecraft("ice_spike")); + public static final DefaultedRegistryReference JUNGLE_BUSH = PlacedFeatures.key(ResourceKey.minecraft("jungle_bush")); public static final DefaultedRegistryReference JUNGLE_TREE = PlacedFeatures.key(ResourceKey.minecraft("jungle_tree")); @@ -398,8 +398,6 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference SCULK_VEIN = PlacedFeatures.key(ResourceKey.minecraft("sculk_vein")); - public static final DefaultedRegistryReference SEA_PICKLE = PlacedFeatures.key(ResourceKey.minecraft("sea_pickle")); - public static final DefaultedRegistryReference SEAGRASS_COLD = PlacedFeatures.key(ResourceKey.minecraft("seagrass_cold")); public static final DefaultedRegistryReference SEAGRASS_DEEP = PlacedFeatures.key(ResourceKey.minecraft("seagrass_deep")); @@ -418,6 +416,8 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference SEAGRASS_WARM = PlacedFeatures.key(ResourceKey.minecraft("seagrass_warm")); + public static final DefaultedRegistryReference SEA_PICKLE = PlacedFeatures.key(ResourceKey.minecraft("sea_pickle")); + public static final DefaultedRegistryReference SMALL_BASALT_COLUMNS = PlacedFeatures.key(ResourceKey.minecraft("small_basalt_columns")); public static final DefaultedRegistryReference SPORE_BLOSSOM = PlacedFeatures.key(ResourceKey.minecraft("spore_blossom")); 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 8e8d7bed6f..f8b2ec1cdc 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 @@ -54,10 +54,10 @@ public final class PlacementModifierTypes { public static final DefaultedRegistryReference FIXED_PLACEMENT = PlacementModifierTypes.key(ResourceKey.minecraft("fixed_placement")); - public static final DefaultedRegistryReference HEIGHT_RANGE = PlacementModifierTypes.key(ResourceKey.minecraft("height_range")); - public static final DefaultedRegistryReference HEIGHTMAP = PlacementModifierTypes.key(ResourceKey.minecraft("heightmap")); + public static final DefaultedRegistryReference HEIGHT_RANGE = PlacementModifierTypes.key(ResourceKey.minecraft("height_range")); + public static final DefaultedRegistryReference IN_SQUARE = PlacementModifierTypes.key(ResourceKey.minecraft("in_square")); public static final DefaultedRegistryReference NOISE_BASED_COUNT = PlacementModifierTypes.key(ResourceKey.minecraft("noise_based_count")); 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 967cdaafe4..0a1b234579 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,12 +40,12 @@ @RegistryScopes(scopes = RegistryScope.ENGINE) public final class JigsawPools { - 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")); public static final DefaultedRegistryReference ANCIENT_CITY_CITY_CENTER_WALLS = JigsawPools.key(ResourceKey.minecraft("ancient_city/city_center/walls")); + public static final DefaultedRegistryReference ANCIENT_CITY_CITY_ENTRANCE = JigsawPools.key(ResourceKey.minecraft("ancient_city/city/entrance")); + public static final DefaultedRegistryReference ANCIENT_CITY_SCULK = JigsawPools.key(ResourceKey.minecraft("ancient_city/sculk")); public static final DefaultedRegistryReference ANCIENT_CITY_STRUCTURES = JigsawPools.key(ResourceKey.minecraft("ancient_city/structures")); @@ -62,10 +62,10 @@ public final class JigsawPools { public static final DefaultedRegistryReference BASTION_BRIDGE_LEGS = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/legs")); - public static final DefaultedRegistryReference BASTION_BRIDGE_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/rampart_plates")); - public static final DefaultedRegistryReference BASTION_BRIDGE_RAMPARTS = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/ramparts")); + public static final DefaultedRegistryReference BASTION_BRIDGE_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/rampart_plates")); + public static final DefaultedRegistryReference BASTION_BRIDGE_STARTING_PIECES = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/starting_pieces")); public static final DefaultedRegistryReference BASTION_BRIDGE_WALLS = JigsawPools.key(ResourceKey.minecraft("bastion/bridge/walls")); @@ -80,10 +80,10 @@ public final class JigsawPools { public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_POSTS = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/posts")); - public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/rampart_plates")); - public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_RAMPARTS = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/ramparts")); + public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/rampart_plates")); + public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_SMALL_STABLES_INNER = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/small_stables/inner")); public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_SMALL_STABLES_OUTER = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/small_stables/outer")); @@ -92,10 +92,10 @@ public final class JigsawPools { public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_STARTING_PIECES = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/starting_pieces")); - public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_WALL_BASES = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/wall_bases")); - public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_WALLS = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/walls")); + public static final DefaultedRegistryReference BASTION_HOGLIN_STABLE_WALL_BASES = JigsawPools.key(ResourceKey.minecraft("bastion/hoglin_stable/wall_bases")); + public static final DefaultedRegistryReference BASTION_MOBS_HOGLIN = JigsawPools.key(ResourceKey.minecraft("bastion/mobs/hoglin")); public static final DefaultedRegistryReference BASTION_MOBS_PIGLIN = JigsawPools.key(ResourceKey.minecraft("bastion/mobs/piglin")); @@ -146,20 +146,20 @@ public final class JigsawPools { public static final DefaultedRegistryReference BASTION_UNITS_CENTER_PIECES = JigsawPools.key(ResourceKey.minecraft("bastion/units/center_pieces")); - public static final DefaultedRegistryReference BASTION_UNITS_EDGE_WALL_UNITS = JigsawPools.key(ResourceKey.minecraft("bastion/units/edge_wall_units")); - public static final DefaultedRegistryReference BASTION_UNITS_EDGES = JigsawPools.key(ResourceKey.minecraft("bastion/units/edges")); + public static final DefaultedRegistryReference BASTION_UNITS_EDGE_WALL_UNITS = JigsawPools.key(ResourceKey.minecraft("bastion/units/edge_wall_units")); + public static final DefaultedRegistryReference BASTION_UNITS_FILLERS_STAGE_0 = JigsawPools.key(ResourceKey.minecraft("bastion/units/fillers/stage_0")); public static final DefaultedRegistryReference BASTION_UNITS_LARGE_RAMPARTS = JigsawPools.key(ResourceKey.minecraft("bastion/units/large_ramparts")); public static final DefaultedRegistryReference BASTION_UNITS_PATHWAYS = JigsawPools.key(ResourceKey.minecraft("bastion/units/pathways")); - public static final DefaultedRegistryReference BASTION_UNITS_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/units/rampart_plates")); - public static final DefaultedRegistryReference BASTION_UNITS_RAMPARTS = JigsawPools.key(ResourceKey.minecraft("bastion/units/ramparts")); + public static final DefaultedRegistryReference BASTION_UNITS_RAMPART_PLATES = JigsawPools.key(ResourceKey.minecraft("bastion/units/rampart_plates")); + public static final DefaultedRegistryReference BASTION_UNITS_STAGES_ROT_STAGE_1 = JigsawPools.key(ResourceKey.minecraft("bastion/units/stages/rot/stage_1")); public static final DefaultedRegistryReference BASTION_UNITS_STAGES_STAGE_0 = JigsawPools.key(ResourceKey.minecraft("bastion/units/stages/stage_0")); @@ -170,18 +170,18 @@ public final class JigsawPools { public static final DefaultedRegistryReference BASTION_UNITS_STAGES_STAGE_3 = JigsawPools.key(ResourceKey.minecraft("bastion/units/stages/stage_3")); - public static final DefaultedRegistryReference BASTION_UNITS_WALL_UNITS = JigsawPools.key(ResourceKey.minecraft("bastion/units/wall_units")); - public static final DefaultedRegistryReference BASTION_UNITS_WALLS_WALL_BASES = JigsawPools.key(ResourceKey.minecraft("bastion/units/walls/wall_bases")); + public static final DefaultedRegistryReference BASTION_UNITS_WALL_UNITS = JigsawPools.key(ResourceKey.minecraft("bastion/units/wall_units")); + public static final DefaultedRegistryReference EMPTY = JigsawPools.key(ResourceKey.minecraft("empty")); public static final DefaultedRegistryReference PILLAGER_OUTPOST_BASE_PLATES = JigsawPools.key(ResourceKey.minecraft("pillager_outpost/base_plates")); - public static final DefaultedRegistryReference PILLAGER_OUTPOST_FEATURE_PLATES = JigsawPools.key(ResourceKey.minecraft("pillager_outpost/feature_plates")); - public static final DefaultedRegistryReference PILLAGER_OUTPOST_FEATURES = JigsawPools.key(ResourceKey.minecraft("pillager_outpost/features")); + public static final DefaultedRegistryReference PILLAGER_OUTPOST_FEATURE_PLATES = JigsawPools.key(ResourceKey.minecraft("pillager_outpost/feature_plates")); + public static final DefaultedRegistryReference PILLAGER_OUTPOST_TOWERS = JigsawPools.key(ResourceKey.minecraft("pillager_outpost/towers")); public static final DefaultedRegistryReference TRAIL_RUINS_BUILDINGS = JigsawPools.key(ResourceKey.minecraft("trail_ruins/buildings")); @@ -200,6 +200,8 @@ public final class JigsawPools { public static final DefaultedRegistryReference TRIAL_CHAMBERS_ATRIUM = JigsawPools.key(ResourceKey.minecraft("trial_chambers/atrium")); + public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHAMBERS_END = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chambers/end")); + public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHAMBER_ADDON = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chamber/addon")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHAMBER_ASSEMBLY = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chamber/assembly")); @@ -214,22 +216,20 @@ public final class JigsawPools { public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHAMBER_SLANTED = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chamber/slanted")); - public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHAMBERS_END = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chambers/end")); - public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHESTS_CONTENTS_SUPPLY = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chests/contents/supply")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_CHESTS_SUPPLY = JigsawPools.key(ResourceKey.minecraft("trial_chambers/chests/supply")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDOR = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridor")); - public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDOR_SLICES = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridor/slices")); - public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDORS_ADDON_LOWER = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridors/addon/lower")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDORS_ADDON_MIDDLE = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridors/addon/middle")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDORS_ADDON_MIDDLE_UPPER = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridors/addon/middle_upper")); + public static final DefaultedRegistryReference TRIAL_CHAMBERS_CORRIDOR_SLICES = JigsawPools.key(ResourceKey.minecraft("trial_chambers/corridor/slices")); + public static final DefaultedRegistryReference TRIAL_CHAMBERS_DECOR = JigsawPools.key(ResourceKey.minecraft("trial_chambers/decor")); public static final DefaultedRegistryReference TRIAL_CHAMBERS_DECOR_CHAMBER = JigsawPools.key(ResourceKey.minecraft("trial_chambers/decor/chamber"));