diff --git a/gradle.properties b/gradle.properties index 04fdf98f22..bf4d9f5bc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.spongepowered -version=14.0.0-SNAPSHOT +version=15.0.0-SNAPSHOT organization=SpongePowered projectUrl=https://www.spongepowered.org projectDescription=A plugin API for Minecraft: Java Edition diff --git a/src/main/java/org/spongepowered/api/block/BlockTypes.java b/src/main/java/org/spongepowered/api/block/BlockTypes.java index d08c7cfec2..60c26f0052 100644 --- a/src/main/java/org/spongepowered/api/block/BlockTypes.java +++ b/src/main/java/org/spongepowered/api/block/BlockTypes.java @@ -336,8 +336,12 @@ public final class BlockTypes { public static final DefaultedRegistryReference BUDDING_AMETHYST = BlockTypes.key(ResourceKey.minecraft("budding_amethyst")); + public static final DefaultedRegistryReference BUSH = BlockTypes.key(ResourceKey.minecraft("bush")); + public static final DefaultedRegistryReference CACTUS = BlockTypes.key(ResourceKey.minecraft("cactus")); + public static final DefaultedRegistryReference CACTUS_FLOWER = BlockTypes.key(ResourceKey.minecraft("cactus_flower")); + public static final DefaultedRegistryReference CAKE = BlockTypes.key(ResourceKey.minecraft("cake")); public static final DefaultedRegistryReference CALCITE = BlockTypes.key(ResourceKey.minecraft("calcite")); @@ -792,6 +796,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference FIRE = BlockTypes.key(ResourceKey.minecraft("fire")); + public static final DefaultedRegistryReference FIREFLY_BUSH = BlockTypes.key(ResourceKey.minecraft("firefly_bush")); + public static final DefaultedRegistryReference FIRE_CORAL = BlockTypes.key(ResourceKey.minecraft("fire_coral")); public static final DefaultedRegistryReference FIRE_CORAL_BLOCK = BlockTypes.key(ResourceKey.minecraft("fire_coral_block")); @@ -1006,6 +1012,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference LAVA_CAULDRON = BlockTypes.key(ResourceKey.minecraft("lava_cauldron")); + public static final DefaultedRegistryReference LEAF_LITTER = BlockTypes.key(ResourceKey.minecraft("leaf_litter")); + public static final DefaultedRegistryReference LECTERN = BlockTypes.key(ResourceKey.minecraft("lectern")); public static final DefaultedRegistryReference LEVER = BlockTypes.key(ResourceKey.minecraft("lever")); @@ -1770,6 +1778,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference SEA_PICKLE = BlockTypes.key(ResourceKey.minecraft("sea_pickle")); + public static final DefaultedRegistryReference SHORT_DRY_GRASS = BlockTypes.key(ResourceKey.minecraft("short_dry_grass")); + public static final DefaultedRegistryReference SHORT_GRASS = BlockTypes.key(ResourceKey.minecraft("short_grass")); public static final DefaultedRegistryReference SHROOMLIGHT = BlockTypes.key(ResourceKey.minecraft("shroomlight")); @@ -1956,6 +1966,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference SWEET_BERRY_BUSH = BlockTypes.key(ResourceKey.minecraft("sweet_berry_bush")); + public static final DefaultedRegistryReference TALL_DRY_GRASS = BlockTypes.key(ResourceKey.minecraft("tall_dry_grass")); + public static final DefaultedRegistryReference TALL_GRASS = BlockTypes.key(ResourceKey.minecraft("tall_grass")); public static final DefaultedRegistryReference TALL_SEAGRASS = BlockTypes.key(ResourceKey.minecraft("tall_seagrass")); @@ -1964,6 +1976,10 @@ public final class BlockTypes { public static final DefaultedRegistryReference TERRACOTTA = BlockTypes.key(ResourceKey.minecraft("terracotta")); + public static final DefaultedRegistryReference TEST_BLOCK = BlockTypes.key(ResourceKey.minecraft("test_block")); + + public static final DefaultedRegistryReference TEST_INSTANCE_BLOCK = BlockTypes.key(ResourceKey.minecraft("test_instance_block")); + public static final DefaultedRegistryReference TINTED_GLASS = BlockTypes.key(ResourceKey.minecraft("tinted_glass")); public static final DefaultedRegistryReference TNT = BlockTypes.key(ResourceKey.minecraft("tnt")); @@ -2192,6 +2208,8 @@ public final class BlockTypes { public static final DefaultedRegistryReference WHITE_WOOL = BlockTypes.key(ResourceKey.minecraft("white_wool")); + public static final DefaultedRegistryReference WILDFLOWERS = BlockTypes.key(ResourceKey.minecraft("wildflowers")); + public static final DefaultedRegistryReference WITHER_ROSE = BlockTypes.key(ResourceKey.minecraft("wither_rose")); public static final DefaultedRegistryReference WITHER_SKELETON_SKULL = BlockTypes.key(ResourceKey.minecraft("wither_skeleton_skull")); 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 073f16c7de..8e4414b22b 100644 --- a/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java +++ b/src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java @@ -124,6 +124,10 @@ public final class BlockEntityTypes { public static final DefaultedRegistryReference STRUCTURE_BLOCK = BlockEntityTypes.key(ResourceKey.minecraft("structure_block")); + public static final DefaultedRegistryReference TEST_BLOCK = BlockEntityTypes.key(ResourceKey.minecraft("test_block")); + + public static final DefaultedRegistryReference TEST_INSTANCE_BLOCK = BlockEntityTypes.key(ResourceKey.minecraft("test_instance_block")); + public static final DefaultedRegistryReference TRAPPED_CHEST = BlockEntityTypes.key(ResourceKey.minecraft("trapped_chest")); public static final DefaultedRegistryReference TRIAL_SPAWNER = BlockEntityTypes.key(ResourceKey.minecraft("trial_spawner")); diff --git a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java index d70dd6e0ca..962179fa4a 100644 --- a/src/main/java/org/spongepowered/api/data/BlockStateKeys.java +++ b/src/main/java/org/spongepowered/api/data/BlockStateKeys.java @@ -30,6 +30,7 @@ import org.spongepowered.api.data.type.BellAttachmentType; import org.spongepowered.api.data.type.ChestAttachmentType; import org.spongepowered.api.data.type.ComparatorMode; +import org.spongepowered.api.data.type.CreakingHeartState; import org.spongepowered.api.data.type.DoorHinge; import org.spongepowered.api.data.type.DripstoneSegment; import org.spongepowered.api.data.type.InstrumentType; @@ -41,6 +42,7 @@ import org.spongepowered.api.data.type.SlabPortion; import org.spongepowered.api.data.type.StairShape; import org.spongepowered.api.data.type.StructureMode; +import org.spongepowered.api.data.type.TestBlockMode; import org.spongepowered.api.data.type.Tilt; import org.spongepowered.api.data.type.TrialSpawnerState; import org.spongepowered.api.data.type.VaultState; @@ -56,8 +58,6 @@ @SuppressWarnings("unused") public final class BlockStateKeys { - public static final Key> ACTIVE = BlockStateKeys.key(ResourceKey.minecraft("property/active"), Boolean.class); - public static final Key> AGE_1 = BlockStateKeys.key(ResourceKey.minecraft("property/age"), Integer.class); public static final Key> AGE_15 = BlockStateKeys.key(ResourceKey.minecraft("property/age"), Integer.class); @@ -118,6 +118,8 @@ public final class BlockStateKeys { public static final Key> CRAFTING = BlockStateKeys.key(ResourceKey.minecraft("property/crafting"), Boolean.class); + public static final Key> CREAKING_HEART_STATE = BlockStateKeys.key(ResourceKey.minecraft("property/creaking_heart_state"), CreakingHeartState.class); + public static final Key> DELAY = BlockStateKeys.key(ResourceKey.minecraft("property/delay"), Integer.class); public static final Key> DISARMED = BlockStateKeys.key(ResourceKey.minecraft("property/disarmed"), Boolean.class); @@ -198,6 +200,8 @@ public final class BlockStateKeys { public static final Key> LOCKED = BlockStateKeys.key(ResourceKey.minecraft("property/locked"), Boolean.class); + public static final Key> MAP = BlockStateKeys.key(ResourceKey.minecraft("property/map"), Boolean.class); + public static final Key> MODE_COMPARATOR = BlockStateKeys.key(ResourceKey.minecraft("property/mode"), ComparatorMode.class); public static final Key> MOISTURE = BlockStateKeys.key(ResourceKey.minecraft("property/moisture"), Integer.class); @@ -242,6 +246,8 @@ public final class BlockStateKeys { public static final Key> SCULK_SENSOR_PHASE = BlockStateKeys.key(ResourceKey.minecraft("property/sculk_sensor_phase"), SculkSensorState.class); + public static final Key> SEGMENT_AMOUNT = BlockStateKeys.key(ResourceKey.minecraft("property/segment_amount"), Integer.class); + public static final Key> SHORT = BlockStateKeys.key(ResourceKey.minecraft("property/short"), Boolean.class); public static final Key> SHRIEKING = BlockStateKeys.key(ResourceKey.minecraft("property/shrieking"), Boolean.class); @@ -266,6 +272,8 @@ public final class BlockStateKeys { public static final Key> STRUCTUREBLOCK_MODE = BlockStateKeys.key(ResourceKey.minecraft("property/mode"), StructureMode.class); + public static final Key> TEST_BLOCK_MODE = BlockStateKeys.key(ResourceKey.minecraft("property/mode"), TestBlockMode.class); + public static final Key> TILT = BlockStateKeys.key(ResourceKey.minecraft("property/tilt"), Tilt.class); public static final Key> TIP = BlockStateKeys.key(ResourceKey.minecraft("property/tip"), Boolean.class); diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java index fde30f367e..1f3533d9b0 100644 --- a/src/main/java/org/spongepowered/api/data/Keys.java +++ b/src/main/java/org/spongepowered/api/data/Keys.java @@ -80,6 +80,7 @@ import org.spongepowered.api.data.type.ParrotType; import org.spongepowered.api.data.type.PhantomPhase; import org.spongepowered.api.data.type.PickupRule; +import org.spongepowered.api.data.type.PigType; import org.spongepowered.api.data.type.PistonType; import org.spongepowered.api.data.type.PortionType; import org.spongepowered.api.data.type.ProfessionType; @@ -100,6 +101,7 @@ import org.spongepowered.api.data.type.VillagerType; import org.spongepowered.api.data.type.WallConnectionState; import org.spongepowered.api.data.type.WireAttachmentType; +import org.spongepowered.api.data.type.WolfSoundVariant; import org.spongepowered.api.data.type.WolfVariant; import org.spongepowered.api.data.value.ListValue; import org.spongepowered.api.data.value.MapValue; @@ -2655,6 +2657,14 @@ public final class Keys { */ public static final Key> PICKUP_RULE = Keys.key(ResourceKey.sponge("pickup_rule"), PickupRule.class); + /** + * The {@link PigType} for a {@link Pig}, which can vary based on + * {@link Biome}. + * + * @see Pig Variant Changes + */ + public static final Key> PIG_TYPE = Keys.key(ResourceKey.sponge("pig_variant"), PigType.class); + /** * Whether a {@link WorldType} is safe for {@link Piglin} to not transform * into {@link ZombifiedPiglin} over time in a {@link ServerWorld world} of that type @@ -3544,6 +3554,13 @@ public final class Keys { */ public static final Key> WOLF_VARIANT = Keys.key(ResourceKey.sponge("wolf_variant"), WolfVariant.class); + /** + * The {@link WolfSoundVariant} of a {@link Wolf}. + * + * @see Wolves wiki + */ + public static final Key> WOLF_SOUND_VARIANT = Keys.key(ResourceKey.sponge("wolf_sound_variant"), WolfSoundVariant.class); + /** * The {@link Sheep} who is being targeted by the {@link SpellTypes#WOLOLO} * spell being casted by an {@link Evoker} diff --git a/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java b/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java index 504e1fabad..bc3feddd4b 100644 --- a/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java +++ b/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java @@ -45,9 +45,7 @@ public class AxolotlVariants { public static final DefaultedRegistryReference WILD = AxolotlVariants.key(ResourceKey.sponge("wild")); - private static DefaultedRegistryReference key(final ResourceKey location) { return RegistryKey.of(RegistryTypes.AXOLOTL_VARIANT, location).asDefaultedReference(Sponge::game); } - } diff --git a/src/main/java/org/spongepowered/api/data/type/CatTypes.java b/src/main/java/org/spongepowered/api/data/type/CatTypes.java index 8b00eab91b..ce521f2437 100644 --- a/src/main/java/org/spongepowered/api/data/type/CatTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/CatTypes.java @@ -37,7 +37,7 @@ * */ @SuppressWarnings("unused") -@RegistryScopes(scopes = RegistryScope.GAME) +@RegistryScopes(scopes = RegistryScope.ENGINE) public final class CatTypes { public static final DefaultedRegistryReference ALL_BLACK = CatTypes.key(ResourceKey.minecraft("all_black")); @@ -66,10 +66,10 @@ private CatTypes() { } public static Registry registry() { - return Sponge.game().registry(RegistryTypes.CAT_TYPE); + return Sponge.server().registry(RegistryTypes.CAT_TYPE); } private static DefaultedRegistryReference key(final ResourceKey location) { - return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asDefaultedReference(Sponge::game); + return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asDefaultedReference(Sponge::server); } } diff --git a/src/main/java/org/spongepowered/api/data/type/ChickenVariant.java b/src/main/java/org/spongepowered/api/data/type/ChickenVariant.java new file mode 100644 index 0000000000..539bc7cbf5 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/ChickenVariant.java @@ -0,0 +1,32 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + +@CatalogedBy(ChickenVariants.class) +public interface ChickenVariant extends DefaultedRegistryValue { +} diff --git a/src/main/java/org/spongepowered/api/data/type/ChickenVariants.java b/src/main/java/org/spongepowered/api/data/type/ChickenVariants.java new file mode 100644 index 0000000000..6dfb850ff4 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/ChickenVariants.java @@ -0,0 +1,56 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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.ENGINE) +public final class ChickenVariants { + + public static final DefaultedRegistryReference COLD = ChickenVariants.key(ResourceKey.minecraft("cold")); + + public static final DefaultedRegistryReference TEMPERATE = ChickenVariants.key(ResourceKey.minecraft("temperate")); + + public static final DefaultedRegistryReference WARM = ChickenVariants.key(ResourceKey.minecraft("warm")); + + private ChickenVariants() { + } + + public static Registry registry() { + return Sponge.server().registry(RegistryTypes.CHICKEN_VARIANT); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asDefaultedReference(Sponge::server); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/CowVariant.java b/src/main/java/org/spongepowered/api/data/type/CowVariant.java new file mode 100644 index 0000000000..4d9d160a36 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/CowVariant.java @@ -0,0 +1,32 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + +@CatalogedBy(CowVariants.class) +public interface CowVariant extends DefaultedRegistryValue { +} diff --git a/src/main/java/org/spongepowered/api/data/type/CowVariants.java b/src/main/java/org/spongepowered/api/data/type/CowVariants.java new file mode 100644 index 0000000000..e5409fcc9f --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/CowVariants.java @@ -0,0 +1,59 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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.ENGINE) +public final class CowVariants { + + public static final DefaultedRegistryReference COLD = CowVariants.key(ResourceKey.minecraft("cold")); + + public static final DefaultedRegistryReference TEMPERATE = CowVariants.key(ResourceKey.minecraft("temperate")); + + public static final DefaultedRegistryReference WARM = CowVariants.key(ResourceKey.minecraft("warm")); + + private CowVariants() { + } + + public static Registry registry() { + return Sponge.server().registry(RegistryTypes.COW_VARIANT); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asDefaultedReference(Sponge::server); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/CreakingHeartState.java b/src/main/java/org/spongepowered/api/data/type/CreakingHeartState.java new file mode 100644 index 0000000000..9fa3be62f7 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/CreakingHeartState.java @@ -0,0 +1,33 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + + +@CatalogedBy(CreakingHeartStates.class) +public interface CreakingHeartState extends DefaultedRegistryValue, Comparable, StringRepresentable { +} diff --git a/src/main/java/org/spongepowered/api/data/type/CreakingHeartStates.java b/src/main/java/org/spongepowered/api/data/type/CreakingHeartStates.java new file mode 100644 index 0000000000..ddd98e510b --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/CreakingHeartStates.java @@ -0,0 +1,58 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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; + +/** + * An enumeration of vanilla {@link CreakingHeartState}s. + */ +@RegistryScopes(scopes = RegistryScope.GAME) +public class CreakingHeartStates { + + public static final DefaultedRegistryReference AWAKE = CreakingHeartStates.key(ResourceKey.sponge("awake")); + + public static final DefaultedRegistryReference DORMANT = CreakingHeartStates.key(ResourceKey.sponge("dormant")); + + public static final DefaultedRegistryReference UPROOTED = CreakingHeartStates.key(ResourceKey.sponge("uprooted")); + + private CreakingHeartStates() { + } + + public static Registry registry() { + return Sponge.game().registry(RegistryTypes.CREAKING_HEART_STATES); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.CREAKING_HEART_STATES, location).asDefaultedReference(Sponge::game); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java index 8d1ba3af23..bea643eb3d 100644 --- a/src/main/java/org/spongepowered/api/data/type/FrogTypes.java +++ b/src/main/java/org/spongepowered/api/data/type/FrogTypes.java @@ -37,7 +37,7 @@ * */ @SuppressWarnings("unused") -@RegistryScopes(scopes = RegistryScope.GAME) +@RegistryScopes(scopes = RegistryScope.ENGINE) public final class FrogTypes { public static final DefaultedRegistryReference COLD = FrogTypes.key(ResourceKey.minecraft("cold")); @@ -50,10 +50,10 @@ private FrogTypes() { } public static Registry registry() { - return Sponge.game().registry(RegistryTypes.FROG_TYPE); + return Sponge.server().registry(RegistryTypes.FROG_TYPE); } private static DefaultedRegistryReference key(final ResourceKey location) { - return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asDefaultedReference(Sponge::game); + return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asDefaultedReference(Sponge::server); } } diff --git a/src/main/java/org/spongepowered/api/data/type/PigType.java b/src/main/java/org/spongepowered/api/data/type/PigType.java new file mode 100644 index 0000000000..121aa46bb9 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/PigType.java @@ -0,0 +1,32 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + +@CatalogedBy(PigTypes.class) +public interface PigType extends DefaultedRegistryValue { +} diff --git a/src/main/java/org/spongepowered/api/data/type/PigTypes.java b/src/main/java/org/spongepowered/api/data/type/PigTypes.java new file mode 100644 index 0000000000..5712660a4a --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/PigTypes.java @@ -0,0 +1,59 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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.ENGINE) +public final class PigTypes { + + public static final DefaultedRegistryReference COLD = PigTypes.key(ResourceKey.minecraft("cold")); + + public static final DefaultedRegistryReference TEMPERATE = PigTypes.key(ResourceKey.minecraft("temperate")); + + public static final DefaultedRegistryReference WARM = PigTypes.key(ResourceKey.minecraft("warm")); + + private PigTypes() { + } + + public static Registry registry() { + return Sponge.server().registry(RegistryTypes.PIG_TYPE); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.PIG_TYPE, location).asDefaultedReference(Sponge::server); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/TestBlockMode.java b/src/main/java/org/spongepowered/api/data/type/TestBlockMode.java new file mode 100644 index 0000000000..e41557d1cc --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/TestBlockMode.java @@ -0,0 +1,33 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + +@CatalogedBy(TestBlockModes.class) +public interface TestBlockMode extends Comparable, DefaultedRegistryValue, StringRepresentable { + +} diff --git a/src/main/java/org/spongepowered/api/data/type/TestBlockModes.java b/src/main/java/org/spongepowered/api/data/type/TestBlockModes.java new file mode 100644 index 0000000000..d40bd14caa --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/TestBlockModes.java @@ -0,0 +1,54 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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.RegistryTypes; + +/** + * + */ +public class TestBlockModes { + + public static final DefaultedRegistryReference ACCEPT = TestBlockModes.key(ResourceKey.sponge("accept")); + + public static final DefaultedRegistryReference FAIL = TestBlockModes.key(ResourceKey.sponge("fail")); + + public static final DefaultedRegistryReference LOG = TestBlockModes.key(ResourceKey.sponge("log")); + + public static final DefaultedRegistryReference START = TestBlockModes.key(ResourceKey.sponge("start")); + + public static Registry registry() { + return Sponge.game().registry(RegistryTypes.TEST_BLOCK_MODE); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.TEST_BLOCK_MODE, location).asDefaultedReference(Sponge::game); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/WolfSoundVariant.java b/src/main/java/org/spongepowered/api/data/type/WolfSoundVariant.java new file mode 100644 index 0000000000..cc71a86094 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/WolfSoundVariant.java @@ -0,0 +1,32 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +import org.spongepowered.api.registry.DefaultedRegistryValue; +import org.spongepowered.api.util.annotation.CatalogedBy; + +@CatalogedBy(WolfSoundVariants.class) +public interface WolfSoundVariant extends DefaultedRegistryValue { +} diff --git a/src/main/java/org/spongepowered/api/data/type/WolfSoundVariants.java b/src/main/java/org/spongepowered/api/data/type/WolfSoundVariants.java new file mode 100644 index 0000000000..22e6ccf331 --- /dev/null +++ b/src/main/java/org/spongepowered/api/data/type/WolfSoundVariants.java @@ -0,0 +1,64 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.data.type; + +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.ENGINE) +public final class WolfSoundVariants { + + public static final DefaultedRegistryReference ANGRY = WolfSoundVariants.key(ResourceKey.minecraft("angry")); + + public static final DefaultedRegistryReference BIG = WolfSoundVariants.key(ResourceKey.minecraft("big")); + + public static final DefaultedRegistryReference CLASSIC = WolfSoundVariants.key(ResourceKey.minecraft("classic")); + + public static final DefaultedRegistryReference CUTE = WolfSoundVariants.key(ResourceKey.minecraft("cute")); + + public static final DefaultedRegistryReference GRUMPY = WolfSoundVariants.key(ResourceKey.minecraft("grumpy")); + + public static final DefaultedRegistryReference PUGLIN = WolfSoundVariants.key(ResourceKey.minecraft("puglin")); + + public static final DefaultedRegistryReference SAD = WolfSoundVariants.key(ResourceKey.minecraft("sad")); + + private WolfSoundVariants() { + } + + public static Registry registry() { + return Sponge.server().registry(RegistryTypes.WOLF_SOUND_VARIANT); + } + + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.WOLF_SOUND_VARIANT, location).asDefaultedReference(Sponge::server); + } +} diff --git a/src/main/java/org/spongepowered/api/data/type/WolfVariants.java b/src/main/java/org/spongepowered/api/data/type/WolfVariants.java index f362a6b189..160028a315 100644 --- a/src/main/java/org/spongepowered/api/data/type/WolfVariants.java +++ b/src/main/java/org/spongepowered/api/data/type/WolfVariants.java @@ -25,47 +25,47 @@ package org.spongepowered.api.data.type; 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.RegistryReference; import org.spongepowered.api.registry.RegistryScope; import org.spongepowered.api.registry.RegistryScopes; import org.spongepowered.api.registry.RegistryTypes; -import org.spongepowered.api.world.server.ServerWorld; /** * */ @SuppressWarnings("unused") -@RegistryScopes(scopes = RegistryScope.WORLD) +@RegistryScopes(scopes = RegistryScope.ENGINE) public final class WolfVariants { - public static final RegistryReference ASHEN = WolfVariants.key(ResourceKey.minecraft("ashen")); + public static final DefaultedRegistryReference ASHEN = WolfVariants.key(ResourceKey.minecraft("ashen")); - public static final RegistryReference BLACK = WolfVariants.key(ResourceKey.minecraft("black")); + public static final DefaultedRegistryReference BLACK = WolfVariants.key(ResourceKey.minecraft("black")); - public static final RegistryReference CHESTNUT = WolfVariants.key(ResourceKey.minecraft("chestnut")); + public static final DefaultedRegistryReference CHESTNUT = WolfVariants.key(ResourceKey.minecraft("chestnut")); - public static final RegistryReference PALE = WolfVariants.key(ResourceKey.minecraft("pale")); + public static final DefaultedRegistryReference PALE = WolfVariants.key(ResourceKey.minecraft("pale")); - public static final RegistryReference RUSTY = WolfVariants.key(ResourceKey.minecraft("rusty")); + public static final DefaultedRegistryReference RUSTY = WolfVariants.key(ResourceKey.minecraft("rusty")); - public static final RegistryReference SNOWY = WolfVariants.key(ResourceKey.minecraft("snowy")); + public static final DefaultedRegistryReference SNOWY = WolfVariants.key(ResourceKey.minecraft("snowy")); - public static final RegistryReference SPOTTED = WolfVariants.key(ResourceKey.minecraft("spotted")); + public static final DefaultedRegistryReference SPOTTED = WolfVariants.key(ResourceKey.minecraft("spotted")); - public static final RegistryReference STRIPED = WolfVariants.key(ResourceKey.minecraft("striped")); + public static final DefaultedRegistryReference STRIPED = WolfVariants.key(ResourceKey.minecraft("striped")); - public static final RegistryReference WOODS = WolfVariants.key(ResourceKey.minecraft("woods")); + public static final DefaultedRegistryReference WOODS = WolfVariants.key(ResourceKey.minecraft("woods")); private WolfVariants() { } - public static Registry registry(final ServerWorld world) { - return world.registry(RegistryTypes.WOLF_VAIRANT); + public static Registry registry() { + return Sponge.server().registry(RegistryTypes.WOLF_VAIRANT); } - private static RegistryReference key(final ResourceKey location) { - return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asReference(); + private static DefaultedRegistryReference key(final ResourceKey location) { + return RegistryKey.of(RegistryTypes.WOLF_VAIRANT, location).asDefaultedReference(Sponge::server); } } diff --git a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java index 676238e087..ee55946899 100644 --- a/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java +++ b/src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java @@ -136,6 +136,8 @@ public final class ParticleTypes { public static final DefaultedRegistryReference FALLING_WATER = ParticleTypes.key(ResourceKey.minecraft("falling_water")); + public static final DefaultedRegistryReference FIREFLY = ParticleTypes.key(ResourceKey.minecraft("firefly")); + public static final DefaultedRegistryReference FIREWORK = ParticleTypes.key(ResourceKey.minecraft("firework")); public static final DefaultedRegistryReference FISHING = ParticleTypes.key(ResourceKey.minecraft("fishing")); @@ -236,6 +238,8 @@ public final class ParticleTypes { public static final DefaultedRegistryReference SWEEP_ATTACK = ParticleTypes.key(ResourceKey.minecraft("sweep_attack")); + public static final DefaultedRegistryReference TINTED_LEAVES = ParticleTypes.key(ResourceKey.minecraft("tinted_leaves")); + public static final DefaultedRegistryReference TOTEM_OF_UNDYING = ParticleTypes.key(ResourceKey.minecraft("totem_of_undying")); public static final DefaultedRegistryReference TRAIL = ParticleTypes.key(ResourceKey.minecraft("trail")); 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 08edce8e02..cc1872a110 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java @@ -284,6 +284,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = SoundTypes.key(ResourceKey.minecraft("block.bubble_column.whirlpool_inside")); + public static final DefaultedRegistryReference BLOCK_CACTUS_FLOWER_BREAK = SoundTypes.key(ResourceKey.minecraft("block.cactus_flower.break")); + + public static final DefaultedRegistryReference BLOCK_CACTUS_FLOWER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.cactus_flower.place")); + public static final DefaultedRegistryReference BLOCK_CAKE_ADD_CANDLE = SoundTypes.key(ResourceKey.minecraft("block.cake.add_candle")); public static final DefaultedRegistryReference BLOCK_CALCITE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.calcite.break")); @@ -526,6 +530,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_CROP_BREAK = SoundTypes.key(ResourceKey.minecraft("block.crop.break")); + public static final DefaultedRegistryReference BLOCK_DEADBUSH_IDLE = SoundTypes.key(ResourceKey.minecraft("block.deadbush.idle")); + public static final DefaultedRegistryReference BLOCK_DECORATED_POT_BREAK = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.break")); public static final DefaultedRegistryReference BLOCK_DECORATED_POT_FALL = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.fall")); @@ -614,6 +620,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_FENCE_GATE_OPEN = SoundTypes.key(ResourceKey.minecraft("block.fence_gate.open")); + public static final DefaultedRegistryReference BLOCK_FIREFLY_BUSH_IDLE = SoundTypes.key(ResourceKey.minecraft("block.firefly_bush.idle")); + public static final DefaultedRegistryReference BLOCK_FIRE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.fire.ambient")); public static final DefaultedRegistryReference BLOCK_FIRE_EXTINGUISH = SoundTypes.key(ResourceKey.minecraft("block.fire.extinguish")); @@ -750,10 +758,20 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_HONEY_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.honey_block.step")); + public static final DefaultedRegistryReference BLOCK_IRON_BREAK = SoundTypes.key(ResourceKey.minecraft("block.iron.break")); + public static final DefaultedRegistryReference BLOCK_IRON_DOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.iron_door.close")); public static final DefaultedRegistryReference BLOCK_IRON_DOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.iron_door.open")); + public static final DefaultedRegistryReference BLOCK_IRON_FALL = SoundTypes.key(ResourceKey.minecraft("block.iron.fall")); + + public static final DefaultedRegistryReference BLOCK_IRON_HIT = SoundTypes.key(ResourceKey.minecraft("block.iron.hit")); + + public static final DefaultedRegistryReference BLOCK_IRON_PLACE = SoundTypes.key(ResourceKey.minecraft("block.iron.place")); + + public static final DefaultedRegistryReference BLOCK_IRON_STEP = SoundTypes.key(ResourceKey.minecraft("block.iron.step")); + public static final DefaultedRegistryReference BLOCK_IRON_TRAPDOOR_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.iron_trapdoor.close")); public static final DefaultedRegistryReference BLOCK_IRON_TRAPDOOR_OPEN = SoundTypes.key(ResourceKey.minecraft("block.iron_trapdoor.open")); @@ -788,6 +806,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_LAVA_POP = SoundTypes.key(ResourceKey.minecraft("block.lava.pop")); + public static final DefaultedRegistryReference BLOCK_LEAF_LITTER_BREAK = SoundTypes.key(ResourceKey.minecraft("block.leaf_litter.break")); + + public static final DefaultedRegistryReference BLOCK_LEAF_LITTER_FALL = SoundTypes.key(ResourceKey.minecraft("block.leaf_litter.fall")); + + public static final DefaultedRegistryReference BLOCK_LEAF_LITTER_HIT = SoundTypes.key(ResourceKey.minecraft("block.leaf_litter.hit")); + + public static final DefaultedRegistryReference BLOCK_LEAF_LITTER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.leaf_litter.place")); + + public static final DefaultedRegistryReference BLOCK_LEAF_LITTER_STEP = SoundTypes.key(ResourceKey.minecraft("block.leaf_litter.step")); + public static final DefaultedRegistryReference BLOCK_LEVER_CLICK = SoundTypes.key(ResourceKey.minecraft("block.lever.click")); public static final DefaultedRegistryReference BLOCK_LILY_PAD_PLACE = SoundTypes.key(ResourceKey.minecraft("block.lily_pad.place")); @@ -1174,10 +1202,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference BLOCK_SAND_HIT = SoundTypes.key(ResourceKey.minecraft("block.sand.hit")); + public static final DefaultedRegistryReference BLOCK_SAND_IDLE = SoundTypes.key(ResourceKey.minecraft("block.sand.idle")); + public static final DefaultedRegistryReference BLOCK_SAND_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sand.place")); public static final DefaultedRegistryReference BLOCK_SAND_STEP = SoundTypes.key(ResourceKey.minecraft("block.sand.step")); + public static final DefaultedRegistryReference BLOCK_SAND_WIND = SoundTypes.key(ResourceKey.minecraft("block.sand.wind")); + public static final DefaultedRegistryReference BLOCK_SCAFFOLDING_BREAK = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.break")); public static final DefaultedRegistryReference BLOCK_SCAFFOLDING_FALL = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.fall")); @@ -2948,16 +2980,86 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_WOLF_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf.ambient")); + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_ANGRY_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_angry.whine")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_BIG_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_big.whine")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_CUTE_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_cute.whine")); + public static final DefaultedRegistryReference ENTITY_WOLF_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf.death")); public static final DefaultedRegistryReference ENTITY_WOLF_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf.growl")); - public static final DefaultedRegistryReference ENTITY_WOLF_HOWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf.howl")); + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_GRUMPY_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_grumpy.whine")); public static final DefaultedRegistryReference ENTITY_WOLF_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf.hurt")); public static final DefaultedRegistryReference ENTITY_WOLF_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf.pant")); + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_PUGLIN_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_puglin.whine")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.ambient")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.death")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_GROWL = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.growl")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_HURT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.hurt")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_PANT = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.pant")); + + public static final DefaultedRegistryReference ENTITY_WOLF_SAD_WHINE = SoundTypes.key(ResourceKey.minecraft("entity.wolf_sad.whine")); + public static final DefaultedRegistryReference ENTITY_WOLF_SHAKE = SoundTypes.key(ResourceKey.minecraft("entity.wolf.shake")); public static final DefaultedRegistryReference ENTITY_WOLF_STEP = SoundTypes.key(ResourceKey.minecraft("entity.wolf.step")); diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java index e96c72ca44..98493c7bd6 100644 --- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java +++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java @@ -320,6 +320,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> LIGHTNING_BOLT = EntityTypes.key(ResourceKey.minecraft("lightning_bolt")); + public static final DefaultedRegistryReference> LINGERING_POTION = EntityTypes.key(ResourceKey.minecraft("lingering_potion")); + public static final DefaultedRegistryReference> LLAMA = EntityTypes.key(ResourceKey.minecraft("llama")); public static final DefaultedRegistryReference> LLAMA_SPIT = EntityTypes.key(ResourceKey.minecraft("llama_spit")); @@ -370,8 +372,6 @@ public final class EntityTypes { public static final DefaultedRegistryReference> POLAR_BEAR = EntityTypes.key(ResourceKey.minecraft("polar_bear")); - public static final DefaultedRegistryReference> POTION = EntityTypes.key(ResourceKey.minecraft("potion")); - public static final DefaultedRegistryReference> PUFFERFISH = EntityTypes.key(ResourceKey.minecraft("pufferfish")); public static final DefaultedRegistryReference> RABBIT = EntityTypes.key(ResourceKey.minecraft("rabbit")); @@ -408,6 +408,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> SPIDER = EntityTypes.key(ResourceKey.minecraft("spider")); + public static final DefaultedRegistryReference> SPLASH_POTION = EntityTypes.key(ResourceKey.minecraft("splash_potion")); + public static final DefaultedRegistryReference> SPRUCE_BOAT = EntityTypes.key(ResourceKey.minecraft("spruce_boat")); public static final DefaultedRegistryReference> SPRUCE_CHEST_BOAT = EntityTypes.key(ResourceKey.minecraft("spruce_chest_boat")); diff --git a/src/main/java/org/spongepowered/api/entity/Saddleable.java b/src/main/java/org/spongepowered/api/entity/Saddleable.java index 4a3dfe1dee..e78dfec086 100644 --- a/src/main/java/org/spongepowered/api/entity/Saddleable.java +++ b/src/main/java/org/spongepowered/api/entity/Saddleable.java @@ -26,10 +26,16 @@ import org.spongepowered.api.data.Keys; import org.spongepowered.api.data.value.Value; +import org.spongepowered.api.tag.EntityTypeTags; +import org.spongepowered.api.tag.Tag; /** * Represents an {@link Entity} which can be saddled. + * + * @deprecated Use {@link EntityType#is(Tag) EntityType.is} {@link EntityTypeTags#CAN_EQUIP_SADDLE} as + * other {@link Entity entities} may be now saddled based on the tag definition */ +@Deprecated(forRemoval = true, since = "15") public interface Saddleable extends Entity { /** diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Pig.java b/src/main/java/org/spongepowered/api/entity/living/animal/Pig.java index 2bb9204d62..6af33b2d0b 100644 --- a/src/main/java/org/spongepowered/api/entity/living/animal/Pig.java +++ b/src/main/java/org/spongepowered/api/entity/living/animal/Pig.java @@ -24,11 +24,24 @@ */ package org.spongepowered.api.entity.living.animal; -import org.spongepowered.api.entity.Saddleable; +import org.spongepowered.api.data.Keys; +import org.spongepowered.api.data.type.PigType; +import org.spongepowered.api.data.value.Value; /** * Represents a Pig. */ -public interface Pig extends Animal, Saddleable { +@SuppressWarnings("removal") +public interface Pig extends Animal, org.spongepowered.api.entity.Saddleable { + + /** + * Gets the variant {@link PigType} of this Pig. + * + * @see Pig Variant Changes + * @return The {@link PigType} of this Pig. + */ + default Value variant() { + return this.requireValue(Keys.PIG_TYPE).asMutable(); + } } diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Strider.java b/src/main/java/org/spongepowered/api/entity/living/animal/Strider.java index 0c2a703bdc..1f6c21eb34 100644 --- a/src/main/java/org/spongepowered/api/entity/living/animal/Strider.java +++ b/src/main/java/org/spongepowered/api/entity/living/animal/Strider.java @@ -24,10 +24,10 @@ */ package org.spongepowered.api.entity.living.animal; -import org.spongepowered.api.entity.Saddleable; - /** * Represents a Strider. */ -public interface Strider extends Animal, Saddleable { +@SuppressWarnings("removal") +public interface Strider extends Animal, org.spongepowered.api.entity.Saddleable { + } diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Wolf.java b/src/main/java/org/spongepowered/api/entity/living/animal/Wolf.java index c35a73fee6..5628dd4eb4 100644 --- a/src/main/java/org/spongepowered/api/entity/living/animal/Wolf.java +++ b/src/main/java/org/spongepowered/api/entity/living/animal/Wolf.java @@ -26,6 +26,7 @@ import org.spongepowered.api.data.Keys; import org.spongepowered.api.data.type.DyeColor; +import org.spongepowered.api.data.type.WolfSoundVariant; import org.spongepowered.api.data.type.WolfVariant; import org.spongepowered.api.data.value.Value; import org.spongepowered.api.entity.Angerable; @@ -43,6 +44,14 @@ default Value.Mutable variant() { return this.requireValue(Keys.WOLF_VARIANT).asMutable(); } + /** + * {@link Keys#WOLF_SOUND_VARIANT} + * @return The wolf's sound variant + */ + default Value.Mutable soundVariant() { + return this.requireValue(Keys.WOLF_SOUND_VARIANT).asMutable(); + } + /** * {@link Keys#DYE_COLOR} * @return The collar color diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/horse/HorseLike.java b/src/main/java/org/spongepowered/api/entity/living/animal/horse/HorseLike.java index fc9e61b41a..46ce2174fb 100644 --- a/src/main/java/org/spongepowered/api/entity/living/animal/horse/HorseLike.java +++ b/src/main/java/org/spongepowered/api/entity/living/animal/horse/HorseLike.java @@ -27,7 +27,6 @@ import org.spongepowered.api.data.Keys; import org.spongepowered.api.data.value.Value; import org.spongepowered.api.entity.Ownable; -import org.spongepowered.api.entity.Saddleable; import org.spongepowered.api.entity.living.animal.Animal; import org.spongepowered.api.item.inventory.Carrier; @@ -35,7 +34,8 @@ /** * An abstract representation of a Horse. */ -public interface HorseLike extends Animal, Ownable, Saddleable, Carrier { +@SuppressWarnings("removal") +public interface HorseLike extends Animal, Ownable, org.spongepowered.api.entity.Saddleable, Carrier { /** * {@link Keys#IS_TAMED} diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java index b51ce30def..8908b8a29b 100644 --- a/src/main/java/org/spongepowered/api/item/ItemTypes.java +++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java @@ -290,6 +290,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference BLUE_DYE = ItemTypes.key(ResourceKey.minecraft("blue_dye")); + public static final DefaultedRegistryReference BLUE_EGG = ItemTypes.key(ResourceKey.minecraft("blue_egg")); + public static final DefaultedRegistryReference BLUE_GLAZED_TERRACOTTA = ItemTypes.key(ResourceKey.minecraft("blue_glazed_terracotta")); public static final DefaultedRegistryReference BLUE_ICE = ItemTypes.key(ResourceKey.minecraft("blue_ice")); @@ -368,6 +370,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference BROWN_DYE = ItemTypes.key(ResourceKey.minecraft("brown_dye")); + public static final DefaultedRegistryReference BROWN_EGG = ItemTypes.key(ResourceKey.minecraft("brown_egg")); + public static final DefaultedRegistryReference BROWN_GLAZED_TERRACOTTA = ItemTypes.key(ResourceKey.minecraft("brown_glazed_terracotta")); public static final DefaultedRegistryReference BROWN_MUSHROOM = ItemTypes.key(ResourceKey.minecraft("brown_mushroom")); @@ -400,8 +404,12 @@ public final class ItemTypes { public static final DefaultedRegistryReference BURN_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("burn_pottery_sherd")); + public static final DefaultedRegistryReference BUSH = ItemTypes.key(ResourceKey.minecraft("bush")); + public static final DefaultedRegistryReference CACTUS = ItemTypes.key(ResourceKey.minecraft("cactus")); + public static final DefaultedRegistryReference CACTUS_FLOWER = ItemTypes.key(ResourceKey.minecraft("cactus_flower")); + public static final DefaultedRegistryReference CAKE = ItemTypes.key(ResourceKey.minecraft("cake")); public static final DefaultedRegistryReference CALCITE = ItemTypes.key(ResourceKey.minecraft("calcite")); @@ -978,6 +986,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference FILLED_MAP = ItemTypes.key(ResourceKey.minecraft("filled_map")); + public static final DefaultedRegistryReference FIREFLY_BUSH = ItemTypes.key(ResourceKey.minecraft("firefly_bush")); + public static final DefaultedRegistryReference FIREWORK_ROCKET = ItemTypes.key(ResourceKey.minecraft("firework_rocket")); public static final DefaultedRegistryReference FIREWORK_STAR = ItemTypes.key(ResourceKey.minecraft("firework_star")); @@ -1328,6 +1338,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference LEAD = ItemTypes.key(ResourceKey.minecraft("lead")); + public static final DefaultedRegistryReference LEAF_LITTER = ItemTypes.key(ResourceKey.minecraft("leaf_litter")); + public static final DefaultedRegistryReference LEATHER = ItemTypes.key(ResourceKey.minecraft("leather")); public static final DefaultedRegistryReference LEATHER_BOOTS = ItemTypes.key(ResourceKey.minecraft("leather_boots")); @@ -2226,6 +2238,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference SHIELD = ItemTypes.key(ResourceKey.minecraft("shield")); + public static final DefaultedRegistryReference SHORT_DRY_GRASS = ItemTypes.key(ResourceKey.minecraft("short_dry_grass")); + public static final DefaultedRegistryReference SHORT_GRASS = ItemTypes.key(ResourceKey.minecraft("short_grass")); public static final DefaultedRegistryReference SHROOMLIGHT = ItemTypes.key(ResourceKey.minecraft("shroomlight")); @@ -2476,12 +2490,18 @@ public final class ItemTypes { public static final DefaultedRegistryReference TADPOLE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("tadpole_spawn_egg")); + public static final DefaultedRegistryReference TALL_DRY_GRASS = ItemTypes.key(ResourceKey.minecraft("tall_dry_grass")); + public static final DefaultedRegistryReference TALL_GRASS = ItemTypes.key(ResourceKey.minecraft("tall_grass")); public static final DefaultedRegistryReference TARGET = ItemTypes.key(ResourceKey.minecraft("target")); public static final DefaultedRegistryReference TERRACOTTA = ItemTypes.key(ResourceKey.minecraft("terracotta")); + public static final DefaultedRegistryReference TEST_BLOCK = ItemTypes.key(ResourceKey.minecraft("test_block")); + + public static final DefaultedRegistryReference TEST_INSTANCE_BLOCK = ItemTypes.key(ResourceKey.minecraft("test_instance_block")); + public static final DefaultedRegistryReference TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("tide_armor_trim_smithing_template")); public static final DefaultedRegistryReference TINTED_GLASS = ItemTypes.key(ResourceKey.minecraft("tinted_glass")); @@ -2738,6 +2758,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference WHITE_WOOL = ItemTypes.key(ResourceKey.minecraft("white_wool")); + public static final DefaultedRegistryReference WILDFLOWERS = ItemTypes.key(ResourceKey.minecraft("wildflowers")); + public static final DefaultedRegistryReference WILD_ARMOR_TRIM_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("wild_armor_trim_smithing_template")); public static final DefaultedRegistryReference WIND_CHARGE = ItemTypes.key(ResourceKey.minecraft("wind_charge")); 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 9a36985991..2cc988bdae 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 @@ -46,6 +46,8 @@ public final class EquipmentGroups { public static final DefaultedRegistryReference HUMANOID_ARMOR = EquipmentGroups.key(ResourceKey.sponge("humanoid_armor")); + public static final DefaultedRegistryReference SADDLE = EquipmentGroups.key(ResourceKey.sponge("saddle")); + 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 c15efac03b..ad0d3f5a46 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 @@ -54,6 +54,8 @@ public final class EquipmentTypes { public static final DefaultedRegistryReference OFFHAND = EquipmentTypes.key(ResourceKey.sponge("offhand")); + public static final DefaultedRegistryReference SADDLE = EquipmentTypes.key(ResourceKey.sponge("saddle")); + private EquipmentTypes() { } diff --git a/src/main/java/org/spongepowered/api/raid/Raid.java b/src/main/java/org/spongepowered/api/raid/Raid.java index 6e82aa196a..db8a24104f 100644 --- a/src/main/java/org/spongepowered/api/raid/Raid.java +++ b/src/main/java/org/spongepowered/api/raid/Raid.java @@ -29,20 +29,12 @@ import org.spongepowered.api.entity.living.Living; import org.spongepowered.api.entity.living.monster.raider.Raider; import org.spongepowered.api.world.difficulty.Difficulties; -import org.spongepowered.api.world.server.ServerWorld; import java.util.List; import java.util.Optional; public interface Raid { - /** - * Gets the {@link ServerWorld} this raid is taking place in. - * - * @return The world - */ - ServerWorld world(); - /** * Gets the {@link BossBar} being displayed to clients of this raid. * diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java index 08ea7298d3..2b4f84c4a8 100644 --- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java +++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java @@ -55,7 +55,10 @@ import org.spongepowered.api.data.type.BodyPart; import org.spongepowered.api.data.type.CatType; import org.spongepowered.api.data.type.ChestAttachmentType; +import org.spongepowered.api.data.type.ChickenVariant; import org.spongepowered.api.data.type.ComparatorMode; +import org.spongepowered.api.data.type.CowVariant; +import org.spongepowered.api.data.type.CreakingHeartState; import org.spongepowered.api.data.type.DoorHinge; import org.spongepowered.api.data.type.DripstoneSegment; import org.spongepowered.api.data.type.DyeColor; @@ -76,6 +79,7 @@ import org.spongepowered.api.data.type.ParrotType; import org.spongepowered.api.data.type.PhantomPhase; import org.spongepowered.api.data.type.PickupRule; +import org.spongepowered.api.data.type.PigType; import org.spongepowered.api.data.type.PistonType; import org.spongepowered.api.data.type.PortionType; import org.spongepowered.api.data.type.ProfessionType; @@ -90,6 +94,7 @@ import org.spongepowered.api.data.type.SpellType; import org.spongepowered.api.data.type.StairShape; import org.spongepowered.api.data.type.StructureMode; +import org.spongepowered.api.data.type.TestBlockMode; import org.spongepowered.api.data.type.Tilt; import org.spongepowered.api.data.type.TrialSpawnerState; import org.spongepowered.api.data.type.TropicalFishShape; @@ -97,6 +102,7 @@ import org.spongepowered.api.data.type.VillagerType; import org.spongepowered.api.data.type.WallConnectionState; import org.spongepowered.api.data.type.WireAttachmentType; +import org.spongepowered.api.data.type.WolfSoundVariant; import org.spongepowered.api.data.type.WolfVariant; import org.spongepowered.api.effect.particle.ParticleOption; import org.spongepowered.api.effect.particle.ParticleType; @@ -325,6 +331,8 @@ public final class RegistryTypes { public static final DefaultedRegistryType CHEST_ATTACHMENT_TYPE = RegistryTypes.spongeKeyInGame("chest_attachment_type"); + public static final DefaultedRegistryType CHICKEN_VARIANT = RegistryTypes.minecraftKeyInGame("chicken_variant"); + public static final DefaultedRegistryType CHUNK_REGENERATE_FLAG = RegistryTypes.spongeKeyInGame("chunk_regenerate_flag"); public static final DefaultedRegistryType> CLICK_TYPE = RegistryTypes.spongeKeyInGame("click_type"); @@ -341,6 +349,10 @@ public final class RegistryTypes { public static final DefaultedRegistryType COMPARATOR_MODE = RegistryTypes.spongeKeyInGame("comparator_mode"); + public static final DefaultedRegistryType COW_VARIANT = RegistryTypes.minecraftKeyInServer("cow_variant"); + + public static final DefaultedRegistryType CREAKING_HEART_STATES = RegistryTypes.spongeKeyInGame("creaking_heart_state"); + public static final DefaultedRegistryType CRITERION = RegistryTypes.spongeKeyInGame("criterion"); public static final DefaultedRegistryType CURRENCY = RegistryTypes.spongeKeyInGame("currency"); @@ -457,6 +469,8 @@ public final class RegistryTypes { public static final DefaultedRegistryType PICKUP_RULE = RegistryTypes.spongeKeyInGame("pickup_rule"); + public static final DefaultedRegistryType PIG_TYPE = RegistryTypes.minecraftKeyInGame("pig_variant"); + public static final DefaultedRegistryType PISTON_TYPE = RegistryTypes.spongeKeyInGame("piston_type"); public static final DefaultedRegistryType PLACEHOLDER_PARSER = RegistryTypes.spongeKeyInGame("placeholder_parser"); @@ -507,6 +521,8 @@ public final class RegistryTypes { public static final DefaultedRegistryType TELEPORT_HELPER_FILTER = RegistryTypes.spongeKeyInGame("teleport_helper_filter"); + public static final DefaultedRegistryType TEST_BLOCK_MODE = RegistryTypes.spongeKeyInGame("test_block_mode"); + public static final DefaultedRegistryType TEXT_ALIGNMENT = RegistryTypes.spongeKeyInGame("text_alignment"); public static final DefaultedRegistryType TRANSACTION_TYPE = RegistryTypes.spongeKeyInGame("transaction_type"); @@ -527,6 +543,8 @@ public final class RegistryTypes { public static final DefaultedRegistryType WOLF_VAIRANT = RegistryTypes.minecraftKeyInServer("wolf_vairant"); + public static final DefaultedRegistryType WOLF_SOUND_VARIANT = RegistryTypes.spongeKeyInGame("wolf_sound_variant"); + public static final DefaultedRegistryType WORLD_ARCHETYPE_TYPE = RegistryTypes.minecraftKeyInServer("dimension"); public static final DefaultedRegistryType WIRE_ATTACHMENT_TYPE = RegistryTypes.spongeKeyInGame("wire_attachment_type"); diff --git a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java index 592d910417..ddf6732ebb 100644 --- a/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java +++ b/src/main/java/org/spongepowered/api/state/BooleanStateProperties.java @@ -33,10 +33,6 @@ public final class BooleanStateProperties { private BooleanStateProperties() { } - public static BooleanStateProperty property_ACTIVE() { - return BooleanStateProperty.of("ACTIVE"); - } - public static BooleanStateProperty property_ATTACHED() { return BooleanStateProperty.of("ATTACHED"); } diff --git a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java index 8cdaa8c716..60b74b0713 100644 --- a/src/main/java/org/spongepowered/api/state/EnumStateProperties.java +++ b/src/main/java/org/spongepowered/api/state/EnumStateProperties.java @@ -29,6 +29,7 @@ import org.spongepowered.api.data.type.BellAttachmentType; import org.spongepowered.api.data.type.ChestAttachmentType; import org.spongepowered.api.data.type.ComparatorMode; +import org.spongepowered.api.data.type.CreakingHeartState; import org.spongepowered.api.data.type.DoorHinge; import org.spongepowered.api.data.type.DripstoneSegment; import org.spongepowered.api.data.type.InstrumentType; @@ -40,6 +41,7 @@ import org.spongepowered.api.data.type.SlabPortion; import org.spongepowered.api.data.type.StairShape; import org.spongepowered.api.data.type.StructureMode; +import org.spongepowered.api.data.type.TestBlockMode; import org.spongepowered.api.data.type.Tilt; import org.spongepowered.api.data.type.TrialSpawnerState; import org.spongepowered.api.data.type.VaultState; @@ -81,6 +83,10 @@ public static EnumStateProperty property_CHEST_TYPE() { return EnumStateProperty.of("CHEST_TYPE"); } + public static EnumStateProperty property_CREAKING_HEART_STATE() { + return EnumStateProperty.of("CREAKING_HEART_STATE"); + } + public static EnumStateProperty property_DOOR_HINGE() { return EnumStateProperty.of("DOOR_HINGE"); } @@ -177,6 +183,10 @@ public static EnumStateProperty property_STRUCTUREBLOCK_MODE() { return EnumStateProperty.of("STRUCTUREBLOCK_MODE"); } + public static EnumStateProperty property_TEST_BLOCK_MODE() { + return EnumStateProperty.of("TEST_BLOCK_MODE"); + } + public static EnumStateProperty property_TILT() { return EnumStateProperty.of("TILT"); } diff --git a/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java b/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java index 850a11ff5b..726a10583c 100644 --- a/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java +++ b/src/main/java/org/spongepowered/api/state/IntegerStateProperties.java @@ -141,6 +141,10 @@ public static IntegerStateProperty property_ROTATION_16() { return IntegerStateProperty.of("ROTATION_16"); } + public static IntegerStateProperty property_SEGMENT_AMOUNT() { + return IntegerStateProperty.of("SEGMENT_AMOUNT"); + } + public static IntegerStateProperty property_STABILITY_DISTANCE() { return IntegerStateProperty.of("STABILITY_DISTANCE"); } diff --git a/src/main/java/org/spongepowered/api/tag/BiomeTags.java b/src/main/java/org/spongepowered/api/tag/BiomeTags.java index c7d7e68f00..4b5ccddbf1 100644 --- a/src/main/java/org/spongepowered/api/tag/BiomeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BiomeTags.java @@ -157,12 +157,16 @@ public final class BiomeTags { public static final Tag SNOW_GOLEM_MELTS = BiomeTags.key(ResourceKey.minecraft("snow_golem_melts")); + public static final Tag SPAWNS_COLD_VARIANT_FARM_ANIMALS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_farm_animals")); + public static final Tag SPAWNS_COLD_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_frogs")); public static final Tag SPAWNS_GOLD_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_gold_rabbits")); public static final Tag SPAWNS_SNOW_FOXES = BiomeTags.key(ResourceKey.minecraft("spawns_snow_foxes")); + public static final Tag SPAWNS_WARM_VARIANT_FARM_ANIMALS = BiomeTags.key(ResourceKey.minecraft("spawns_warm_variant_farm_animals")); + public static final Tag SPAWNS_WARM_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_warm_variant_frogs")); public static final Tag SPAWNS_WHITE_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_white_rabbits")); diff --git a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java index 9651c7b606..e2f0c26bc1 100644 --- a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java @@ -93,6 +93,8 @@ public final class BlockTypeTags { public static final Tag CAMEL_SAND_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("camel_sand_step_sound_blocks")); + public static final Tag CAMELS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("camels_spawnable_on")); + public static final Tag CAMPFIRES = BlockTypeTags.key(ResourceKey.minecraft("campfires")); public static final Tag CANDLE_CAKES = BlockTypeTags.key(ResourceKey.minecraft("candle_cakes")); @@ -137,8 +139,6 @@ public final class BlockTypeTags { public static final Tag DARK_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("dark_oak_logs")); - public static final Tag DEAD_BUSH_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dead_bush_may_place_on")); - public static final Tag DEEPSLATE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("deepslate_ore_replaceables")); public static final Tag DIAMOND_ORES = BlockTypeTags.key(ResourceKey.minecraft("diamond_ores")); @@ -155,6 +155,10 @@ public final class BlockTypeTags { public static final Tag DRIPSTONE_REPLACEABLE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("dripstone_replaceable_blocks")); + public static final Tag DRY_VEGETATION_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dry_vegetation_may_place_on")); + + public static final Tag EDIBLE_FOR_SHEEP = BlockTypeTags.key(ResourceKey.minecraft("edible_for_sheep")); + public static final Tag EMERALD_ORES = BlockTypeTags.key(ResourceKey.minecraft("emerald_ores")); public static final Tag ENCHANTMENT_POWER_PROVIDER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_provider")); @@ -285,6 +289,8 @@ public final class BlockTypeTags { public static final Tag PLANKS = BlockTypeTags.key(ResourceKey.minecraft("planks")); + public static final Tag PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS = BlockTypeTags.key(ResourceKey.minecraft("plays_ambient_desert_block_sounds")); + public static final Tag POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = BlockTypeTags.key(ResourceKey.minecraft("polar_bears_spawnable_on_alternate")); public static final Tag PORTALS = BlockTypeTags.key(ResourceKey.minecraft("portals")); @@ -301,6 +307,8 @@ public final class BlockTypeTags { public static final Tag REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("replaceable")); + public static final Tag REPLACEABLE_BY_MUSHROOMS = BlockTypeTags.key(ResourceKey.minecraft("replaceable_by_mushrooms")); + public static final Tag REPLACEABLE_BY_TREES = BlockTypeTags.key(ResourceKey.minecraft("replaceable_by_trees")); public static final Tag SAND = BlockTypeTags.key(ResourceKey.minecraft("sand")); @@ -357,6 +365,8 @@ public final class BlockTypeTags { public static final Tag SWORD_EFFICIENT = BlockTypeTags.key(ResourceKey.minecraft("sword_efficient")); + public static final Tag SWORD_INSTANTLY_MINES = BlockTypeTags.key(ResourceKey.minecraft("sword_instantly_mines")); + public static final Tag TERRACOTTA = BlockTypeTags.key(ResourceKey.minecraft("terracotta")); public static final Tag TRAIL_RUINS_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("trail_ruins_replaceable")); diff --git a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java index 11667a8654..ee2893a9b2 100644 --- a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java @@ -53,8 +53,12 @@ public final class EntityTypeTags { public static final Tag> CAN_BREATHE_UNDER_WATER = EntityTypeTags.key(ResourceKey.minecraft("can_breathe_under_water")); + public static final Tag> CAN_EQUIP_SADDLE = EntityTypeTags.key(ResourceKey.minecraft("can_equip_saddle")); + public static final Tag> CAN_TURN_IN_BOATS = EntityTypeTags.key(ResourceKey.minecraft("can_turn_in_boats")); + public static final Tag> CAN_WEAR_HORSE_ARMOR = EntityTypeTags.key(ResourceKey.minecraft("can_wear_horse_armor")); + public static final Tag> DEFLECTS_PROJECTILES = EntityTypeTags.key(ResourceKey.minecraft("deflects_projectiles")); public static final Tag> DISMOUNTS_UNDERWATER = EntityTypeTags.key(ResourceKey.minecraft("dismounts_underwater")); diff --git a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java index 4d11bb1546..69148331d2 100644 --- a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java @@ -63,6 +63,8 @@ public final class ItemTypeTags { public static final Tag BOATS = ItemTypeTags.key(ResourceKey.minecraft("boats")); + public static final Tag BOOK_CLONING_TARGET = ItemTypeTags.key(ResourceKey.minecraft("book_cloning_target")); + public static final Tag BOOKSHELF_BOOKS = ItemTypeTags.key(ResourceKey.minecraft("bookshelf_books")); public static final Tag BREAKS_DECORATED_POTS = ItemTypeTags.key(ResourceKey.minecraft("breaks_decorated_pots")); @@ -129,6 +131,8 @@ public final class ItemTypeTags { public static final Tag DYEABLE = ItemTypeTags.key(ResourceKey.minecraft("dyeable")); + public static final Tag EGGS = ItemTypeTags.key(ResourceKey.minecraft("eggs")); + public static final Tag EMERALD_ORES = ItemTypeTags.key(ResourceKey.minecraft("emerald_ores")); public static final Tag ENCHANTABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/armor")); @@ -175,6 +179,8 @@ public final class ItemTypeTags { public static final Tag FISHES = ItemTypeTags.key(ResourceKey.minecraft("fishes")); + public static final Tag FLOWERS = ItemTypeTags.key(ResourceKey.minecraft("flowers")); + public static final Tag FOOT_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("foot_armor")); public static final Tag FOX_FOOD = ItemTypeTags.key(ResourceKey.minecraft("fox_food")); diff --git a/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java b/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java index af63cd3725..a35bb3e07e 100644 --- a/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java +++ b/src/main/java/org/spongepowered/api/world/BlockChangeFlag.java @@ -26,6 +26,7 @@ import org.spongepowered.api.block.BlockTypes; import org.spongepowered.api.block.entity.BlockEntity; +import org.spongepowered.api.block.entity.carrier.chest.Chest; /** * A flag of sorts that determines whether a block change will perform various @@ -104,9 +105,8 @@ public interface BlockChangeFlag { /** * Gets whether this flag is considering that blocks are being moved * in the world, much like how pistons will move blocks. This has some - * effect on {@link org.spongepowered.api.block.entity.BlockEntity} creation - * reaction or drop delays. The behaviors are dependent on the block in - * particular. + * effect on {@link BlockEntity} creation reaction or drop delays. The + * behaviors are dependent on the block in particular. * * @return True if the flag is considering blocks are moving */ @@ -137,7 +137,8 @@ public interface BlockChangeFlag { /** * Gets whatever this block change is going to perform natural * block destruction logic, which can potentially cause other - * side effects like block drops from a {@link BlockEntity}. + * side effects like block drops from a {@link BlockEntity}, + * like a {@link Chest chest} dropping its contents. * The behaviors are dependent on the block in particular. * * @return True if the block change should perform diff --git a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java index d598cf4e2b..53c243e622 100644 --- a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java +++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java @@ -40,6 +40,8 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class GameRules { + public static final DefaultedRegistryReference> ALLOW_FIRE_TICKS_AWAY_FROM_PLAYER = GameRules.key(ResourceKey.sponge("allow_fire_ticks_away_from_player")); + public static final DefaultedRegistryReference> ANNOUNCE_ADVANCEMENTS = GameRules.key(ResourceKey.sponge("announce_advancements")); public static final DefaultedRegistryReference> BLOCK_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("block_explosion_drop_decay")); @@ -140,6 +142,8 @@ public final class GameRules { public static final DefaultedRegistryReference> SPECTATORS_GENERATE_CHUNKS = GameRules.key(ResourceKey.sponge("spectators_generate_chunks")); + public static final DefaultedRegistryReference> TNT_EXPLODES = GameRules.key(ResourceKey.sponge("tnt_explodes")); + public static final DefaultedRegistryReference> TNT_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("tnt_explosion_drop_decay")); public static final DefaultedRegistryReference> UNIVERSAL_ANGER = GameRules.key(ResourceKey.sponge("universal_anger")); 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 868924aeb8..77587f56ed 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 @@ -78,6 +78,8 @@ public final class FeatureTypes { public static final DefaultedRegistryReference END_SPIKE = FeatureTypes.key(ResourceKey.minecraft("end_spike")); + public static final DefaultedRegistryReference FALLEN_TREE = FeatureTypes.key(ResourceKey.minecraft("fallen_tree")); + public static final DefaultedRegistryReference FILL_LAYER = FeatureTypes.key(ResourceKey.minecraft("fill_layer")); public static final DefaultedRegistryReference FLOWER = FeatureTypes.key(ResourceKey.minecraft("flower")); 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 f19c8467d9..6c84509a4e 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 @@ -60,10 +60,14 @@ public final class Features { public static final DefaultedRegistryReference BIRCH_BEES_0002 = Features.key(ResourceKey.minecraft("birch_bees_0002")); + public static final DefaultedRegistryReference BIRCH_BEES_0002_LEAF_LITTER = Features.key(ResourceKey.minecraft("birch_bees_0002_leaf_litter")); + public static final DefaultedRegistryReference BIRCH_BEES_002 = Features.key(ResourceKey.minecraft("birch_bees_002")); public static final DefaultedRegistryReference BIRCH_BEES_005 = Features.key(ResourceKey.minecraft("birch_bees_005")); + public static final DefaultedRegistryReference BIRCH_LEAF_LITTER = Features.key(ResourceKey.minecraft("birch_leaf_litter")); + public static final DefaultedRegistryReference BIRCH_TALL = Features.key(ResourceKey.minecraft("birch_tall")); public static final DefaultedRegistryReference BLACKSTONE_BLOBS = Features.key(ResourceKey.minecraft("blackstone_blobs")); @@ -98,6 +102,8 @@ public final class Features { public static final DefaultedRegistryReference DARK_OAK = Features.key(ResourceKey.minecraft("dark_oak")); + public static final DefaultedRegistryReference DARK_OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("dark_oak_leaf_litter")); + public static final DefaultedRegistryReference DELTA = Features.key(ResourceKey.minecraft("delta")); public static final DefaultedRegistryReference DESERT_WELL = Features.key(ResourceKey.minecraft("desert_well")); @@ -124,16 +130,28 @@ public final class Features { public static final DefaultedRegistryReference END_SPIKE = Features.key(ResourceKey.minecraft("end_spike")); + public static final DefaultedRegistryReference FALLEN_BIRCH_TREE = Features.key(ResourceKey.minecraft("fallen_birch_tree")); + + public static final DefaultedRegistryReference FALLEN_JUNGLE_TREE = Features.key(ResourceKey.minecraft("fallen_jungle_tree")); + + public static final DefaultedRegistryReference FALLEN_OAK_TREE = Features.key(ResourceKey.minecraft("fallen_oak_tree")); + + public static final DefaultedRegistryReference FALLEN_SPRUCE_TREE = Features.key(ResourceKey.minecraft("fallen_spruce_tree")); + + public static final DefaultedRegistryReference FALLEN_SUPER_BIRCH_TREE = Features.key(ResourceKey.minecraft("fallen_super_birch_tree")); + public static final DefaultedRegistryReference FANCY_OAK = Features.key(ResourceKey.minecraft("fancy_oak")); public static final DefaultedRegistryReference FANCY_OAK_BEES = Features.key(ResourceKey.minecraft("fancy_oak_bees")); - public static final DefaultedRegistryReference FANCY_OAK_BEES_0002 = Features.key(ResourceKey.minecraft("fancy_oak_bees_0002")); + public static final DefaultedRegistryReference FANCY_OAK_BEES_0002_LEAF_LITTER = Features.key(ResourceKey.minecraft("fancy_oak_bees_0002_leaf_litter")); public static final DefaultedRegistryReference FANCY_OAK_BEES_002 = Features.key(ResourceKey.minecraft("fancy_oak_bees_002")); public static final DefaultedRegistryReference FANCY_OAK_BEES_005 = Features.key(ResourceKey.minecraft("fancy_oak_bees_005")); + public static final DefaultedRegistryReference FANCY_OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("fancy_oak_leaf_litter")); + public static final DefaultedRegistryReference FLOWER_CHERRY = Features.key(ResourceKey.minecraft("flower_cherry")); public static final DefaultedRegistryReference FLOWER_DEFAULT = Features.key(ResourceKey.minecraft("flower_default")); @@ -220,12 +238,14 @@ public final class Features { public static final DefaultedRegistryReference OAK = Features.key(ResourceKey.minecraft("oak")); - public static final DefaultedRegistryReference OAK_BEES_0002 = Features.key(ResourceKey.minecraft("oak_bees_0002")); + public static final DefaultedRegistryReference OAK_BEES_0002_LEAF_LITTER = Features.key(ResourceKey.minecraft("oak_bees_0002_leaf_litter")); public static final DefaultedRegistryReference OAK_BEES_002 = Features.key(ResourceKey.minecraft("oak_bees_002")); public static final DefaultedRegistryReference OAK_BEES_005 = Features.key(ResourceKey.minecraft("oak_bees_005")); + public static final DefaultedRegistryReference OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("oak_leaf_litter")); + public static final DefaultedRegistryReference ORE_ANCIENT_DEBRIS_LARGE = Features.key(ResourceKey.minecraft("ore_ancient_debris_large")); public static final DefaultedRegistryReference ORE_ANCIENT_DEBRIS_SMALL = Features.key(ResourceKey.minecraft("ore_ancient_debris_small")); @@ -310,20 +330,30 @@ public final class Features { public static final DefaultedRegistryReference PATCH_BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("patch_brown_mushroom")); + public static final DefaultedRegistryReference PATCH_BUSH = Features.key(ResourceKey.minecraft("patch_bush")); + public static final DefaultedRegistryReference PATCH_CACTUS = Features.key(ResourceKey.minecraft("patch_cactus")); public static final DefaultedRegistryReference PATCH_CRIMSON_ROOTS = Features.key(ResourceKey.minecraft("patch_crimson_roots")); public static final DefaultedRegistryReference PATCH_DEAD_BUSH = Features.key(ResourceKey.minecraft("patch_dead_bush")); + public static final DefaultedRegistryReference PATCH_DRY_GRASS = Features.key(ResourceKey.minecraft("patch_dry_grass")); + public static final DefaultedRegistryReference PATCH_FIRE = Features.key(ResourceKey.minecraft("patch_fire")); + public static final DefaultedRegistryReference PATCH_FIREFLY_BUSH = Features.key(ResourceKey.minecraft("patch_firefly_bush")); + public static final DefaultedRegistryReference PATCH_GRASS = Features.key(ResourceKey.minecraft("patch_grass")); public static final DefaultedRegistryReference PATCH_GRASS_JUNGLE = Features.key(ResourceKey.minecraft("patch_grass_jungle")); + public static final DefaultedRegistryReference PATCH_GRASS_MEADOW = Features.key(ResourceKey.minecraft("patch_grass_meadow")); + public static final DefaultedRegistryReference PATCH_LARGE_FERN = Features.key(ResourceKey.minecraft("patch_large_fern")); + public static final DefaultedRegistryReference PATCH_LEAF_LITTER = Features.key(ResourceKey.minecraft("patch_leaf_litter")); + public static final DefaultedRegistryReference PATCH_MELON = Features.key(ResourceKey.minecraft("patch_melon")); public static final DefaultedRegistryReference PATCH_PUMPKIN = Features.key(ResourceKey.minecraft("patch_pumpkin")); @@ -402,7 +432,11 @@ public final class Features { public static final DefaultedRegistryReference TALL_MANGROVE = Features.key(ResourceKey.minecraft("tall_mangrove")); - public static final DefaultedRegistryReference TREES_BIRCH_AND_OAK = Features.key(ResourceKey.minecraft("trees_birch_and_oak")); + public static final DefaultedRegistryReference TREES_BADLANDS = Features.key(ResourceKey.minecraft("trees_badlands")); + + public static final DefaultedRegistryReference TREES_BIRCH = Features.key(ResourceKey.minecraft("trees_birch")); + + public static final DefaultedRegistryReference TREES_BIRCH_AND_OAK_LEAF_LITTER = Features.key(ResourceKey.minecraft("trees_birch_and_oak_leaf_litter")); public static final DefaultedRegistryReference TREES_FLOWER_FOREST = Features.key(ResourceKey.minecraft("trees_flower_forest")); @@ -418,6 +452,8 @@ public final class Features { public static final DefaultedRegistryReference TREES_SAVANNA = Features.key(ResourceKey.minecraft("trees_savanna")); + public static final DefaultedRegistryReference TREES_SNOWY = Features.key(ResourceKey.minecraft("trees_snowy")); + public static final DefaultedRegistryReference TREES_SPARSE_JUNGLE = Features.key(ResourceKey.minecraft("trees_sparse_jungle")); public static final DefaultedRegistryReference TREES_TAIGA = Features.key(ResourceKey.minecraft("trees_taiga")); @@ -448,6 +484,10 @@ public final class Features { public static final DefaultedRegistryReference WEEPING_VINES = Features.key(ResourceKey.minecraft("weeping_vines")); + public static final DefaultedRegistryReference WILDFLOWERS_BIRCH_FOREST = Features.key(ResourceKey.minecraft("wildflowers_birch_forest")); + + public static final DefaultedRegistryReference WILDFLOWERS_MEADOW = Features.key(ResourceKey.minecraft("wildflowers_meadow")); + private Features() { } diff --git a/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java b/src/main/java/org/spongepowered/api/world/generation/feature/PlacedFeatures.java index 5b858086fd..851d45ef75 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 @@ -58,10 +58,14 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference BIRCH_BEES_0002 = PlacedFeatures.key(ResourceKey.minecraft("birch_bees_0002")); + public static final DefaultedRegistryReference BIRCH_BEES_0002_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("birch_bees_0002_leaf_litter")); + public static final DefaultedRegistryReference BIRCH_BEES_002 = PlacedFeatures.key(ResourceKey.minecraft("birch_bees_002")); public static final DefaultedRegistryReference BIRCH_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("birch_checked")); + public static final DefaultedRegistryReference BIRCH_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("birch_leaf_litter")); + public static final DefaultedRegistryReference BIRCH_TALL = PlacedFeatures.key(ResourceKey.minecraft("birch_tall")); public static final DefaultedRegistryReference BLACKSTONE_BLOBS = PlacedFeatures.key(ResourceKey.minecraft("blackstone_blobs")); @@ -96,6 +100,8 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference DARK_OAK_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("dark_oak_checked")); + public static final DefaultedRegistryReference DARK_OAK_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("dark_oak_leaf_litter")); + public static final DefaultedRegistryReference DELTA = PlacedFeatures.key(ResourceKey.minecraft("delta")); public static final DefaultedRegistryReference DESERT_WELL = PlacedFeatures.key(ResourceKey.minecraft("desert_well")); @@ -118,14 +124,26 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference END_SPIKE = PlacedFeatures.key(ResourceKey.minecraft("end_spike")); + public static final DefaultedRegistryReference FALLEN_BIRCH_TREE = PlacedFeatures.key(ResourceKey.minecraft("fallen_birch_tree")); + + public static final DefaultedRegistryReference FALLEN_JUNGLE_TREE = PlacedFeatures.key(ResourceKey.minecraft("fallen_jungle_tree")); + + public static final DefaultedRegistryReference FALLEN_OAK_TREE = PlacedFeatures.key(ResourceKey.minecraft("fallen_oak_tree")); + + public static final DefaultedRegistryReference FALLEN_SPRUCE_TREE = PlacedFeatures.key(ResourceKey.minecraft("fallen_spruce_tree")); + + public static final DefaultedRegistryReference FALLEN_SUPER_BIRCH_TREE = PlacedFeatures.key(ResourceKey.minecraft("fallen_super_birch_tree")); + public static final DefaultedRegistryReference FANCY_OAK_BEES = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_bees")); - public static final DefaultedRegistryReference FANCY_OAK_BEES_0002 = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_bees_0002")); + public static final DefaultedRegistryReference FANCY_OAK_BEES_0002_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_bees_0002_leaf_litter")); public static final DefaultedRegistryReference FANCY_OAK_BEES_002 = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_bees_002")); public static final DefaultedRegistryReference FANCY_OAK_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_checked")); + public static final DefaultedRegistryReference FANCY_OAK_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("fancy_oak_leaf_litter")); + public static final DefaultedRegistryReference FLOWER_CHERRY = PlacedFeatures.key(ResourceKey.minecraft("flower_cherry")); public static final DefaultedRegistryReference FLOWER_DEFAULT = PlacedFeatures.key(ResourceKey.minecraft("flower_default")); @@ -212,12 +230,14 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference OAK = PlacedFeatures.key(ResourceKey.minecraft("oak")); - public static final DefaultedRegistryReference OAK_BEES_0002 = PlacedFeatures.key(ResourceKey.minecraft("oak_bees_0002")); + public static final DefaultedRegistryReference OAK_BEES_0002_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("oak_bees_0002_leaf_litter")); public static final DefaultedRegistryReference OAK_BEES_002 = PlacedFeatures.key(ResourceKey.minecraft("oak_bees_002")); public static final DefaultedRegistryReference OAK_CHECKED = PlacedFeatures.key(ResourceKey.minecraft("oak_checked")); + public static final DefaultedRegistryReference OAK_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("oak_leaf_litter")); + public static final DefaultedRegistryReference ORE_ANCIENT_DEBRIS_LARGE = PlacedFeatures.key(ResourceKey.minecraft("ore_ancient_debris_large")); public static final DefaultedRegistryReference ORE_ANDESITE_LOWER = PlacedFeatures.key(ResourceKey.minecraft("ore_andesite_lower")); @@ -314,6 +334,8 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference PATCH_BERRY_RARE = PlacedFeatures.key(ResourceKey.minecraft("patch_berry_rare")); + public static final DefaultedRegistryReference PATCH_BUSH = PlacedFeatures.key(ResourceKey.minecraft("patch_bush")); + public static final DefaultedRegistryReference PATCH_CACTUS = PlacedFeatures.key(ResourceKey.minecraft("patch_cactus")); public static final DefaultedRegistryReference PATCH_CACTUS_DECORATED = PlacedFeatures.key(ResourceKey.minecraft("patch_cactus_decorated")); @@ -328,14 +350,26 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference PATCH_DEAD_BUSH_BADLANDS = PlacedFeatures.key(ResourceKey.minecraft("patch_dead_bush_badlands")); + public static final DefaultedRegistryReference PATCH_DRY_GRASS_BADLANDS = PlacedFeatures.key(ResourceKey.minecraft("patch_dry_grass_badlands")); + + public static final DefaultedRegistryReference PATCH_DRY_GRASS_DESERT = PlacedFeatures.key(ResourceKey.minecraft("patch_dry_grass_desert")); + public static final DefaultedRegistryReference PATCH_FIRE = PlacedFeatures.key(ResourceKey.minecraft("patch_fire")); + public static final DefaultedRegistryReference PATCH_FIREFLY_BUSH_NEAR_WATER = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_near_water")); + + public static final DefaultedRegistryReference PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_near_water_swamp")); + + public static final DefaultedRegistryReference PATCH_FIREFLY_BUSH_SWAMP = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_swamp")); + public static final DefaultedRegistryReference PATCH_GRASS_BADLANDS = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_badlands")); public static final DefaultedRegistryReference PATCH_GRASS_FOREST = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_forest")); public static final DefaultedRegistryReference PATCH_GRASS_JUNGLE = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_jungle")); + public static final DefaultedRegistryReference PATCH_GRASS_MEADOW = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_meadow")); + public static final DefaultedRegistryReference PATCH_GRASS_NORMAL = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_normal")); public static final DefaultedRegistryReference PATCH_GRASS_PLAIN = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_plain")); @@ -348,6 +382,8 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference PATCH_LARGE_FERN = PlacedFeatures.key(ResourceKey.minecraft("patch_large_fern")); + public static final DefaultedRegistryReference PATCH_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("patch_leaf_litter")); + public static final DefaultedRegistryReference PATCH_MELON = PlacedFeatures.key(ResourceKey.minecraft("patch_melon")); public static final DefaultedRegistryReference PATCH_MELON_SPARSE = PlacedFeatures.key(ResourceKey.minecraft("patch_melon_sparse")); @@ -462,7 +498,7 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference TREES_BIRCH = PlacedFeatures.key(ResourceKey.minecraft("trees_birch")); - public static final DefaultedRegistryReference TREES_BIRCH_AND_OAK = PlacedFeatures.key(ResourceKey.minecraft("trees_birch_and_oak")); + public static final DefaultedRegistryReference TREES_BIRCH_AND_OAK_LEAF_LITTER = PlacedFeatures.key(ResourceKey.minecraft("trees_birch_and_oak_leaf_litter")); public static final DefaultedRegistryReference TREES_CHERRY = PlacedFeatures.key(ResourceKey.minecraft("trees_cherry")); @@ -516,6 +552,10 @@ public final class PlacedFeatures { public static final DefaultedRegistryReference WEEPING_VINES = PlacedFeatures.key(ResourceKey.minecraft("weeping_vines")); + public static final DefaultedRegistryReference WILDFLOWERS_BIRCH_FOREST = PlacedFeatures.key(ResourceKey.minecraft("wildflowers_birch_forest")); + + public static final DefaultedRegistryReference WILDFLOWERS_MEADOW = PlacedFeatures.key(ResourceKey.minecraft("wildflowers_meadow")); + private PlacedFeatures() { }