diff --git a/gradle.properties b/gradle.properties index 8efe0fa31c..3a648afca7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=org.spongepowered -version=17.0.0-SNAPSHOT +version=18.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/advancement/criteria/trigger/Triggers.java b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java index 893202b41f..d2fba1e749 100644 --- a/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java +++ b/src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java @@ -130,6 +130,8 @@ public final class Triggers { public static final DefaultedRegistryReference> SLIDE_DOWN_BLOCK = Triggers.key(ResourceKey.minecraft("slide_down_block")); + public static final DefaultedRegistryReference> SPEAR_MOBS = Triggers.key(ResourceKey.minecraft("spear_mobs")); + public static final DefaultedRegistryReference> STARTED_RIDING = Triggers.key(ResourceKey.minecraft("started_riding")); public static final DefaultedRegistryReference> SUMMONED_ENTITY = Triggers.key(ResourceKey.minecraft("summoned_entity")); diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java index f61e0aab4a..f712ef6e9b 100644 --- a/src/main/java/org/spongepowered/api/data/Keys.java +++ b/src/main/java/org/spongepowered/api/data/Keys.java @@ -410,7 +410,7 @@ public final class Keys { * fade over time and the entity will become peaceful again once its anger * reaches its minimum.

*/ - public static final Key> ANGER_LEVEL = Keys.key(ResourceKey.sponge("anger_level"), Integer.class); + public static final Key> ANGER_LEVEL = Keys.key(ResourceKey.sponge("anger_level"), Long.class); /** * The set of {@link PotionEffect}s applied on use of an {@link ItemStack}. diff --git a/src/main/java/org/spongepowered/api/data/type/ItemActionType.java b/src/main/java/org/spongepowered/api/data/type/ItemActionType.java index 16d0bfcae8..a0c5d4c8dc 100644 --- a/src/main/java/org/spongepowered/api/data/type/ItemActionType.java +++ b/src/main/java/org/spongepowered/api/data/type/ItemActionType.java @@ -31,5 +31,5 @@ * Represents a possible type of {@link ItemAction}. */ @CatalogedBy(ItemActionTypes.class) -public interface ItemActionType extends DefaultedRegistryValue { +public interface ItemActionType extends DefaultedRegistryValue { } diff --git a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java index 23c84a4daa..765c2fcee1 100644 --- a/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java +++ b/src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java @@ -46,6 +46,8 @@ public final class PotionEffectTypes { public static final DefaultedRegistryReference BLINDNESS = PotionEffectTypes.key(ResourceKey.minecraft("blindness")); + public static final DefaultedRegistryReference BREATH_OF_THE_NAUTILUS = PotionEffectTypes.key(ResourceKey.minecraft("breath_of_the_nautilus")); + public static final DefaultedRegistryReference CONDUIT_POWER = PotionEffectTypes.key(ResourceKey.minecraft("conduit_power")); public static final DefaultedRegistryReference DARKNESS = PotionEffectTypes.key(ResourceKey.minecraft("darkness")); 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 6c694bac1e..3651345422 100644 --- a/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java +++ b/src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java @@ -1756,6 +1756,22 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_AXOLOTL_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.axolotl.swim")); + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.ambient")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_AMBIENT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.ambient_land")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.death")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_DEATH_LAND = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.death_land")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.eat")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.hurt")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.hurt_land")); + + public static final DefaultedRegistryReference ENTITY_BABY_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.swim")); + public static final DefaultedRegistryReference ENTITY_BAT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.bat.ambient")); public static final DefaultedRegistryReference ENTITY_BAT_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.bat.death")); @@ -1840,6 +1856,28 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_CAMEL_HURT = SoundTypes.key(ResourceKey.minecraft("entity.camel.hurt")); + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.ambient")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_DASH = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.dash")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_DASH_READY = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.dash_ready")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.death")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_EAT = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.eat")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_HURT = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.hurt")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_SADDLE = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.saddle")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_SIT = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.sit")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_STAND = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.stand")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_STEP = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.step")); + + public static final DefaultedRegistryReference ENTITY_CAMEL_HUSK_STEP_SAND = SoundTypes.key(ResourceKey.minecraft("entity.camel_husk.step_sand")); + public static final DefaultedRegistryReference ENTITY_CAMEL_SADDLE = SoundTypes.key(ResourceKey.minecraft("entity.camel.saddle")); public static final DefaultedRegistryReference ENTITY_CAMEL_SIT = SoundTypes.key(ResourceKey.minecraft("entity.camel.sit")); @@ -2456,6 +2494,32 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_MULE_JUMP = SoundTypes.key(ResourceKey.minecraft("entity.mule.jump")); + public static final DefaultedRegistryReference ENTITY_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.ambient")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_AMBIENT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.ambient_land")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DASH = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DASH_LAND = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash_land")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DASH_READY = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash_ready")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DASH_READY_LAND = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash_ready_land")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.death")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_DEATH_LAND = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.death_land")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.eat")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.hurt")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.hurt_land")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_RIDING = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.riding")); + + public static final DefaultedRegistryReference ENTITY_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.swim")); + public static final DefaultedRegistryReference ENTITY_OCELOT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ocelot.ambient")); public static final DefaultedRegistryReference ENTITY_OCELOT_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ocelot.death")); @@ -2488,6 +2552,14 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PANDA_WORRIED_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.panda.worried_ambient")); + public static final DefaultedRegistryReference ENTITY_PARCHED_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.parched.ambient")); + + public static final DefaultedRegistryReference ENTITY_PARCHED_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.parched.death")); + + public static final DefaultedRegistryReference ENTITY_PARCHED_HURT = SoundTypes.key(ResourceKey.minecraft("entity.parched.hurt")); + + public static final DefaultedRegistryReference ENTITY_PARCHED_STEP = SoundTypes.key(ResourceKey.minecraft("entity.parched.step")); + public static final DefaultedRegistryReference ENTITY_PARROT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.parrot.ambient")); public static final DefaultedRegistryReference ENTITY_PARROT_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.parrot.death")); @@ -2504,6 +2576,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_BREEZE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.breeze")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_CAMEL_HUSK = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.camel_husk")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_CREAKING = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.creaking")); public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_CREEPER = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.creeper")); @@ -2530,6 +2604,8 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_MAGMA_CUBE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.magma_cube")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_PARCHED = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.parched")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_PHANTOM = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.phantom")); public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_PIGLIN = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.piglin")); @@ -2568,6 +2644,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ZOMBIE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.zombie")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ZOMBIE_HORSE = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.zombie_horse")); + + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ZOMBIE_NAUTILUS = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.zombie_nautilus")); + public static final DefaultedRegistryReference ENTITY_PARROT_IMITATE_ZOMBIE_VILLAGER = SoundTypes.key(ResourceKey.minecraft("entity.parrot.imitate.zombie_villager")); public static final DefaultedRegistryReference ENTITY_PARROT_STEP = SoundTypes.key(ResourceKey.minecraft("entity.parrot.step")); @@ -3210,14 +3290,42 @@ public final class SoundTypes { public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.ambient")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.angry")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.death")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_EAT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.eat")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_HORSE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.hurt")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.hurt")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_INFECT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.infect")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.ambient")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_AMBIENT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.ambient_land")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DASH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DASH_LAND = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash_land")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DASH_READY = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash_ready")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DASH_READY_LAND = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash_ready_land")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.death")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_DEATH_LAND = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.death_land")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.eat")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.hurt")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.hurt_land")); + + public static final DefaultedRegistryReference ENTITY_ZOMBIE_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.swim")); + public static final DefaultedRegistryReference ENTITY_ZOMBIE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.zombie.step")); public static final DefaultedRegistryReference ENTITY_ZOMBIE_VILLAGER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_villager.ambient")); @@ -3266,12 +3374,16 @@ public final class SoundTypes { public static final DefaultedRegistryReference ITEM_ARMOR_EQUIP_LEATHER = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_leather")); + public static final DefaultedRegistryReference ITEM_ARMOR_EQUIP_NAUTILUS = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_nautilus")); + public static final DefaultedRegistryReference ITEM_ARMOR_EQUIP_NETHERITE = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_netherite")); public static final DefaultedRegistryReference ITEM_ARMOR_EQUIP_TURTLE = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_turtle")); public static final DefaultedRegistryReference ITEM_ARMOR_EQUIP_WOLF = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_wolf")); + public static final DefaultedRegistryReference ITEM_ARMOR_UNEQUIP_NAUTILUS = SoundTypes.key(ResourceKey.minecraft("item.armor.unequip_nautilus")); + public static final DefaultedRegistryReference ITEM_ARMOR_UNEQUIP_WOLF = SoundTypes.key(ResourceKey.minecraft("item.armor.unequip_wolf")); public static final DefaultedRegistryReference ITEM_AXE_SCRAPE = SoundTypes.key(ResourceKey.minecraft("item.axe.scrape")); @@ -3406,6 +3518,10 @@ public final class SoundTypes { public static final DefaultedRegistryReference ITEM_MACE_SMASH_GROUND_HEAVY = SoundTypes.key(ResourceKey.minecraft("item.mace.smash_ground_heavy")); + public static final DefaultedRegistryReference ITEM_NAUTILUS_SADDLE_EQUIP = SoundTypes.key(ResourceKey.minecraft("item.nautilus_saddle_equip")); + + public static final DefaultedRegistryReference ITEM_NAUTILUS_SADDLE_UNDERWATER_EQUIP = SoundTypes.key(ResourceKey.minecraft("item.nautilus_saddle_underwater_equip")); + public static final DefaultedRegistryReference ITEM_NETHER_WART_PLANT = SoundTypes.key(ResourceKey.minecraft("item.nether_wart.plant")); public static final DefaultedRegistryReference ITEM_OMINOUS_BOTTLE_DISPOSE = SoundTypes.key(ResourceKey.minecraft("item.ominous_bottle.dispose")); @@ -3420,6 +3536,24 @@ public final class SoundTypes { public static final DefaultedRegistryReference ITEM_SHOVEL_FLATTEN = SoundTypes.key(ResourceKey.minecraft("item.shovel.flatten")); + public static final DefaultedRegistryReference ITEM_SPEAR_ATTACK = SoundTypes.key(ResourceKey.minecraft("item.spear.attack")); + + public static final DefaultedRegistryReference ITEM_SPEAR_HIT = SoundTypes.key(ResourceKey.minecraft("item.spear.hit")); + + public static final DefaultedRegistryReference ITEM_SPEAR_LUNGE_1 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_1")); + + public static final DefaultedRegistryReference ITEM_SPEAR_LUNGE_2 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_2")); + + public static final DefaultedRegistryReference ITEM_SPEAR_LUNGE_3 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_3")); + + public static final DefaultedRegistryReference ITEM_SPEAR_USE = SoundTypes.key(ResourceKey.minecraft("item.spear.use")); + + public static final DefaultedRegistryReference ITEM_SPEAR_WOOD_ATTACK = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.attack")); + + public static final DefaultedRegistryReference ITEM_SPEAR_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.hit")); + + public static final DefaultedRegistryReference ITEM_SPEAR_WOOD_USE = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.use")); + public static final DefaultedRegistryReference ITEM_SPYGLASS_STOP_USING = SoundTypes.key(ResourceKey.minecraft("item.spyglass.stop_using")); public static final DefaultedRegistryReference ITEM_SPYGLASS_USE = SoundTypes.key(ResourceKey.minecraft("item.spyglass.use")); diff --git a/src/main/java/org/spongepowered/api/entity/Angerable.java b/src/main/java/org/spongepowered/api/entity/Angerable.java index a6f9d97528..e8f4015343 100644 --- a/src/main/java/org/spongepowered/api/entity/Angerable.java +++ b/src/main/java/org/spongepowered/api/entity/Angerable.java @@ -43,7 +43,7 @@ default Value.Mutable angry() { * * @return The anger level, decays over time */ - default Value.Mutable angerLevel() { + default Value.Mutable angerLevel() { return this.requireValue(Keys.ANGER_LEVEL).asMutable(); } } diff --git a/src/main/java/org/spongepowered/api/entity/EntityTypes.java b/src/main/java/org/spongepowered/api/entity/EntityTypes.java index 6c629b4776..e1ee0e952f 100644 --- a/src/main/java/org/spongepowered/api/entity/EntityTypes.java +++ b/src/main/java/org/spongepowered/api/entity/EntityTypes.java @@ -48,6 +48,7 @@ import org.spongepowered.api.entity.living.animal.Goat; import org.spongepowered.api.entity.living.animal.HappyGhast; import org.spongepowered.api.entity.living.animal.Hoglin; +import org.spongepowered.api.entity.living.animal.Nautilus; import org.spongepowered.api.entity.living.animal.Ocelot; import org.spongepowered.api.entity.living.animal.Panda; import org.spongepowered.api.entity.living.animal.Parrot; @@ -59,11 +60,13 @@ import org.spongepowered.api.entity.living.animal.Strider; import org.spongepowered.api.entity.living.animal.Turtle; import org.spongepowered.api.entity.living.animal.Wolf; +import org.spongepowered.api.entity.living.animal.ZombieNautilus; +import org.spongepowered.api.entity.living.animal.camel.Camel; +import org.spongepowered.api.entity.living.animal.camel.CamelHusk; import org.spongepowered.api.entity.living.animal.cow.Cow; import org.spongepowered.api.entity.living.animal.cow.Mooshroom; import org.spongepowered.api.entity.living.animal.frog.Frog; import org.spongepowered.api.entity.living.animal.frog.Tadpole; -import org.spongepowered.api.entity.living.animal.horse.Camel; import org.spongepowered.api.entity.living.animal.horse.Donkey; import org.spongepowered.api.entity.living.animal.horse.Horse; import org.spongepowered.api.entity.living.animal.horse.Mule; @@ -108,6 +111,7 @@ import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Evoker; import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Illusioner; import org.spongepowered.api.entity.living.monster.skeleton.Bogged; +import org.spongepowered.api.entity.living.monster.skeleton.Parched; import org.spongepowered.api.entity.living.monster.skeleton.Skeleton; import org.spongepowered.api.entity.living.monster.skeleton.Stray; import org.spongepowered.api.entity.living.monster.skeleton.WitherSkeleton; @@ -208,6 +212,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> CAMEL = EntityTypes.key(ResourceKey.minecraft("camel")); + public static final DefaultedRegistryReference> CAMEL_HUSK = EntityTypes.key(ResourceKey.minecraft("camel_husk")); + public static final DefaultedRegistryReference> CAT = EntityTypes.key(ResourceKey.minecraft("cat")); public static final DefaultedRegistryReference> CAVE_SPIDER = EntityTypes.key(ResourceKey.minecraft("cave_spider")); @@ -348,6 +354,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> MULE = EntityTypes.key(ResourceKey.minecraft("mule")); + public static final DefaultedRegistryReference> NAUTILUS = EntityTypes.key(ResourceKey.minecraft("nautilus")); + public static final DefaultedRegistryReference> OAK_BOAT = EntityTypes.key(ResourceKey.minecraft("oak_boat")); public static final DefaultedRegistryReference> OAK_CHEST_BOAT = EntityTypes.key(ResourceKey.minecraft("oak_chest_boat")); @@ -364,6 +372,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> PANDA = EntityTypes.key(ResourceKey.minecraft("panda")); + public static final DefaultedRegistryReference> PARCHED = EntityTypes.key(ResourceKey.minecraft("parched")); + public static final DefaultedRegistryReference> PARROT = EntityTypes.key(ResourceKey.minecraft("parrot")); public static final DefaultedRegistryReference> PHANTOM = EntityTypes.key(ResourceKey.minecraft("phantom")); @@ -472,6 +482,8 @@ public final class EntityTypes { public static final DefaultedRegistryReference> ZOMBIE_HORSE = EntityTypes.key(ResourceKey.minecraft("zombie_horse")); + public static final DefaultedRegistryReference> ZOMBIE_NAUTILUS = EntityTypes.key(ResourceKey.minecraft("zombie_nautilus")); + public static final DefaultedRegistryReference> ZOMBIE_VILLAGER = EntityTypes.key(ResourceKey.minecraft("zombie_villager")); public static final DefaultedRegistryReference> ZOMBIFIED_PIGLIN = EntityTypes.key(ResourceKey.minecraft("zombified_piglin")); diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Nautilus.java b/src/main/java/org/spongepowered/api/entity/living/animal/Nautilus.java new file mode 100644 index 0000000000..1a7274c7bd --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/animal/Nautilus.java @@ -0,0 +1,33 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.entity.living.animal; + +/** + * A friendly {@link NautilusLike} entity. + *

+ * See Minecraft Wiki + */ +public interface Nautilus extends NautilusLike { +} diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/NautilusLike.java b/src/main/java/org/spongepowered/api/entity/living/animal/NautilusLike.java new file mode 100644 index 0000000000..bb098c6160 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/animal/NautilusLike.java @@ -0,0 +1,35 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.entity.living.animal; + +import org.spongepowered.api.item.inventory.Carrier; + +/** + * Represents a Nautilus-like entity, all of which can be mounted. + *

+ * See Minecraft Wiki + */ +public interface NautilusLike extends TameableAnimal, Carrier { +} diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/ZombieNautilus.java b/src/main/java/org/spongepowered/api/entity/living/animal/ZombieNautilus.java new file mode 100644 index 0000000000..a37d6f2413 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/animal/ZombieNautilus.java @@ -0,0 +1,34 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.entity.living.animal; + +/** + * Represents a Zombie Nautilus. + *

+ * See Minecraft Wiki + */ +public interface ZombieNautilus extends NautilusLike { + +} diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/horse/Camel.java b/src/main/java/org/spongepowered/api/entity/living/animal/camel/Camel.java similarity index 91% rename from src/main/java/org/spongepowered/api/entity/living/animal/horse/Camel.java rename to src/main/java/org/spongepowered/api/entity/living/animal/camel/Camel.java index 790614b12f..14fc4dc2ed 100644 --- a/src/main/java/org/spongepowered/api/entity/living/animal/horse/Camel.java +++ b/src/main/java/org/spongepowered/api/entity/living/animal/camel/Camel.java @@ -22,9 +22,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.spongepowered.api.entity.living.animal.horse; +package org.spongepowered.api.entity.living.animal.camel; import org.spongepowered.api.entity.living.animal.Sittable; +import org.spongepowered.api.entity.living.animal.horse.HorseLike; /** * Represents a Camel. diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/camel/CamelHusk.java b/src/main/java/org/spongepowered/api/entity/living/animal/camel/CamelHusk.java new file mode 100644 index 0000000000..7db4628271 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/animal/camel/CamelHusk.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.entity.living.animal.camel; + +/** + * Represents a Camel Husk. + * @see Minecraft Wiki + */ +public interface CamelHusk extends Camel { +} diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/Parched.java b/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/Parched.java new file mode 100644 index 0000000000..5765f7e773 --- /dev/null +++ b/src/main/java/org/spongepowered/api/entity/living/monster/skeleton/Parched.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.entity.living.monster.skeleton; + +/** + * Represents a Parched Skeleton. + * See Minecraft Wiki + */ +public interface Parched extends SkeletonLike { +} diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java index f22ac3dfa4..b2bf79e759 100644 --- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java +++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java @@ -114,6 +114,8 @@ public final class DamageTypes { public static final DefaultedRegistryReference SONIC_BOOM = DamageTypes.key(ResourceKey.minecraft("sonic_boom")); + public static final DefaultedRegistryReference SPEAR = DamageTypes.key(ResourceKey.minecraft("spear")); + public static final DefaultedRegistryReference SPIT = DamageTypes.key(ResourceKey.minecraft("spit")); public static final DefaultedRegistryReference STALAGMITE = DamageTypes.key(ResourceKey.minecraft("stalagmite")); diff --git a/src/main/java/org/spongepowered/api/item/ItemTypes.java b/src/main/java/org/spongepowered/api/item/ItemTypes.java index 621aa7c678..2905a2702a 100644 --- a/src/main/java/org/spongepowered/api/item/ItemTypes.java +++ b/src/main/java/org/spongepowered/api/item/ItemTypes.java @@ -428,6 +428,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference CALIBRATED_SCULK_SENSOR = ItemTypes.key(ResourceKey.minecraft("calibrated_sculk_sensor")); + public static final DefaultedRegistryReference CAMEL_HUSK_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("camel_husk_spawn_egg")); + public static final DefaultedRegistryReference CAMEL_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("camel_spawn_egg")); public static final DefaultedRegistryReference CAMPFIRE = ItemTypes.key(ResourceKey.minecraft("campfire")); @@ -644,6 +646,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference COPPER_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("copper_leggings")); + public static final DefaultedRegistryReference COPPER_NAUTILUS_ARMOR = ItemTypes.key(ResourceKey.minecraft("copper_nautilus_armor")); + public static final DefaultedRegistryReference COPPER_NUGGET = ItemTypes.key(ResourceKey.minecraft("copper_nugget")); public static final DefaultedRegistryReference COPPER_ORE = ItemTypes.key(ResourceKey.minecraft("copper_ore")); @@ -652,6 +656,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference COPPER_SHOVEL = ItemTypes.key(ResourceKey.minecraft("copper_shovel")); + public static final DefaultedRegistryReference COPPER_SPEAR = ItemTypes.key(ResourceKey.minecraft("copper_spear")); + public static final DefaultedRegistryReference COPPER_SWORD = ItemTypes.key(ResourceKey.minecraft("copper_sword")); public static final DefaultedRegistryReference COPPER_TORCH = ItemTypes.key(ResourceKey.minecraft("copper_torch")); @@ -908,12 +914,16 @@ public final class ItemTypes { public static final DefaultedRegistryReference DIAMOND_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("diamond_leggings")); + public static final DefaultedRegistryReference DIAMOND_NAUTILUS_ARMOR = ItemTypes.key(ResourceKey.minecraft("diamond_nautilus_armor")); + public static final DefaultedRegistryReference DIAMOND_ORE = ItemTypes.key(ResourceKey.minecraft("diamond_ore")); public static final DefaultedRegistryReference DIAMOND_PICKAXE = ItemTypes.key(ResourceKey.minecraft("diamond_pickaxe")); public static final DefaultedRegistryReference DIAMOND_SHOVEL = ItemTypes.key(ResourceKey.minecraft("diamond_shovel")); + public static final DefaultedRegistryReference DIAMOND_SPEAR = ItemTypes.key(ResourceKey.minecraft("diamond_spear")); + public static final DefaultedRegistryReference DIAMOND_SWORD = ItemTypes.key(ResourceKey.minecraft("diamond_sword")); public static final DefaultedRegistryReference DIORITE = ItemTypes.key(ResourceKey.minecraft("diorite")); @@ -1154,10 +1164,14 @@ public final class ItemTypes { public static final DefaultedRegistryReference GOLDEN_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("golden_leggings")); + public static final DefaultedRegistryReference GOLDEN_NAUTILUS_ARMOR = ItemTypes.key(ResourceKey.minecraft("golden_nautilus_armor")); + public static final DefaultedRegistryReference GOLDEN_PICKAXE = ItemTypes.key(ResourceKey.minecraft("golden_pickaxe")); public static final DefaultedRegistryReference GOLDEN_SHOVEL = ItemTypes.key(ResourceKey.minecraft("golden_shovel")); + public static final DefaultedRegistryReference GOLDEN_SPEAR = ItemTypes.key(ResourceKey.minecraft("golden_spear")); + public static final DefaultedRegistryReference GOLDEN_SWORD = ItemTypes.key(ResourceKey.minecraft("golden_sword")); public static final DefaultedRegistryReference GOLD_BLOCK = ItemTypes.key(ResourceKey.minecraft("gold_block")); @@ -1338,6 +1352,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference IRON_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("iron_leggings")); + public static final DefaultedRegistryReference IRON_NAUTILUS_ARMOR = ItemTypes.key(ResourceKey.minecraft("iron_nautilus_armor")); + public static final DefaultedRegistryReference IRON_NUGGET = ItemTypes.key(ResourceKey.minecraft("iron_nugget")); public static final DefaultedRegistryReference IRON_ORE = ItemTypes.key(ResourceKey.minecraft("iron_ore")); @@ -1346,6 +1362,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference IRON_SHOVEL = ItemTypes.key(ResourceKey.minecraft("iron_shovel")); + public static final DefaultedRegistryReference IRON_SPEAR = ItemTypes.key(ResourceKey.minecraft("iron_spear")); + public static final DefaultedRegistryReference IRON_SWORD = ItemTypes.key(ResourceKey.minecraft("iron_sword")); public static final DefaultedRegistryReference IRON_TRAPDOOR = ItemTypes.key(ResourceKey.minecraft("iron_trapdoor")); @@ -1730,6 +1748,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference NAUTILUS_SHELL = ItemTypes.key(ResourceKey.minecraft("nautilus_shell")); + public static final DefaultedRegistryReference NAUTILUS_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("nautilus_spawn_egg")); + public static final DefaultedRegistryReference NETHERITE_AXE = ItemTypes.key(ResourceKey.minecraft("netherite_axe")); public static final DefaultedRegistryReference NETHERITE_BLOCK = ItemTypes.key(ResourceKey.minecraft("netherite_block")); @@ -1742,16 +1762,22 @@ public final class ItemTypes { public static final DefaultedRegistryReference NETHERITE_HOE = ItemTypes.key(ResourceKey.minecraft("netherite_hoe")); + public static final DefaultedRegistryReference NETHERITE_HORSE_ARMOR = ItemTypes.key(ResourceKey.minecraft("netherite_horse_armor")); + public static final DefaultedRegistryReference NETHERITE_INGOT = ItemTypes.key(ResourceKey.minecraft("netherite_ingot")); public static final DefaultedRegistryReference NETHERITE_LEGGINGS = ItemTypes.key(ResourceKey.minecraft("netherite_leggings")); + public static final DefaultedRegistryReference NETHERITE_NAUTILUS_ARMOR = ItemTypes.key(ResourceKey.minecraft("netherite_nautilus_armor")); + public static final DefaultedRegistryReference NETHERITE_PICKAXE = ItemTypes.key(ResourceKey.minecraft("netherite_pickaxe")); public static final DefaultedRegistryReference NETHERITE_SCRAP = ItemTypes.key(ResourceKey.minecraft("netherite_scrap")); public static final DefaultedRegistryReference NETHERITE_SHOVEL = ItemTypes.key(ResourceKey.minecraft("netherite_shovel")); + public static final DefaultedRegistryReference NETHERITE_SPEAR = ItemTypes.key(ResourceKey.minecraft("netherite_spear")); + public static final DefaultedRegistryReference NETHERITE_SWORD = ItemTypes.key(ResourceKey.minecraft("netherite_sword")); public static final DefaultedRegistryReference NETHERITE_UPGRADE_SMITHING_TEMPLATE = ItemTypes.key(ResourceKey.minecraft("netherite_upgrade_smithing_template")); @@ -1950,6 +1976,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference PAPER = ItemTypes.key(ResourceKey.minecraft("paper")); + public static final DefaultedRegistryReference PARCHED_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("parched_spawn_egg")); + public static final DefaultedRegistryReference PARROT_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("parrot_spawn_egg")); public static final DefaultedRegistryReference PEARLESCENT_FROGLIGHT = ItemTypes.key(ResourceKey.minecraft("pearlescent_froglight")); @@ -2530,6 +2558,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference STONE_SLAB = ItemTypes.key(ResourceKey.minecraft("stone_slab")); + public static final DefaultedRegistryReference STONE_SPEAR = ItemTypes.key(ResourceKey.minecraft("stone_spear")); + public static final DefaultedRegistryReference STONE_STAIRS = ItemTypes.key(ResourceKey.minecraft("stone_stairs")); public static final DefaultedRegistryReference STONE_SWORD = ItemTypes.key(ResourceKey.minecraft("stone_sword")); @@ -2968,6 +2998,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference WOODEN_SHOVEL = ItemTypes.key(ResourceKey.minecraft("wooden_shovel")); + public static final DefaultedRegistryReference WOODEN_SPEAR = ItemTypes.key(ResourceKey.minecraft("wooden_spear")); + public static final DefaultedRegistryReference WOODEN_SWORD = ItemTypes.key(ResourceKey.minecraft("wooden_sword")); public static final DefaultedRegistryReference WRITABLE_BOOK = ItemTypes.key(ResourceKey.minecraft("writable_book")); @@ -3010,6 +3042,8 @@ public final class ItemTypes { public static final DefaultedRegistryReference ZOMBIE_HORSE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombie_horse_spawn_egg")); + public static final DefaultedRegistryReference ZOMBIE_NAUTILUS_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombie_nautilus_spawn_egg")); + public static final DefaultedRegistryReference ZOMBIE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombie_spawn_egg")); public static final DefaultedRegistryReference ZOMBIE_VILLAGER_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("zombie_villager_spawn_egg")); diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java index e561ee8941..9243434f48 100644 --- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java +++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentTypes.java @@ -164,6 +164,14 @@ public final class EnchantmentTypes { */ public static final DefaultedRegistryReference LUCK_OF_THE_SEA = EnchantmentTypes.key(ResourceKey.minecraft("luck_of_the_sea")); + /** + * Lunge is an enchantment applied to spears that causes jab attacks to propel the wielder forward horizontally at the cost of draining durability. + * + *

In vanilla, the maximum level is 3.

+ * See Lunge on the Minecraft Wiki. + */ + public static final DefaultedRegistryReference LUNGE = EnchantmentTypes.key(ResourceKey.minecraft("lunge")); + /** * Increases rate of fish biting your hook while fishing. * diff --git a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentConditions.java b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentConditions.java index 090b8326c1..5c4737fec9 100644 --- a/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentConditions.java +++ b/src/main/java/org/spongepowered/api/item/inventory/equipment/EquipmentConditions.java @@ -56,6 +56,8 @@ public final class EquipmentConditions { public static final DefaultedRegistryReference OFFHAND = EquipmentConditions.key(ResourceKey.sponge("offhand")); + public static final DefaultedRegistryReference SADDLE = EquipmentConditions.key(ResourceKey.sponge("saddle")); + private EquipmentConditions() { } diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java index cff6876bc4..b50e35caa9 100644 --- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java +++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java @@ -407,7 +407,7 @@ public final class RegistryTypes { public static final DefaultedRegistryType GAME_MODE = RegistryTypes.spongeKeyInGame("game_mode"); - public static final DefaultedRegistryType> GAME_RULE = RegistryTypes.spongeKeyInGame("game_rule"); + public static final DefaultedRegistryType> GAME_RULE = RegistryTypes.minecraftKeyInGame("game_rule"); public static final DefaultedRegistryType GOAL_EXECUTOR_TYPE = RegistryTypes.spongeKeyInGame("goal_executor_type"); diff --git a/src/main/java/org/spongepowered/api/statistic/Statistics.java b/src/main/java/org/spongepowered/api/statistic/Statistics.java index 003d4f8d24..f42995170a 100644 --- a/src/main/java/org/spongepowered/api/statistic/Statistics.java +++ b/src/main/java/org/spongepowered/api/statistic/Statistics.java @@ -134,6 +134,8 @@ public final class Statistics { public static final DefaultedRegistryReference MOB_KILLS = Statistics.key(ResourceKey.minecraft("mob_kills")); + public static final DefaultedRegistryReference NAUTILUS_ONE_CM = Statistics.key(ResourceKey.minecraft("nautilus_one_cm")); + public static final DefaultedRegistryReference OPEN_BARREL = Statistics.key(ResourceKey.minecraft("open_barrel")); public static final DefaultedRegistryReference OPEN_CHEST = Statistics.key(ResourceKey.minecraft("open_chest")); diff --git a/src/main/java/org/spongepowered/api/tag/BiomeTags.java b/src/main/java/org/spongepowered/api/tag/BiomeTags.java index a5dddfd223..1f0a833ba9 100644 --- a/src/main/java/org/spongepowered/api/tag/BiomeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BiomeTags.java @@ -41,8 +41,6 @@ public final class BiomeTags { public static final DefaultedTag ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = BiomeTags.key(ResourceKey.minecraft("allows_tropical_fish_spawns_at_any_height")); - public static final DefaultedTag HAS_CLOSER_WATER_FOG = BiomeTags.key(ResourceKey.minecraft("has_closer_water_fog")); - public static final DefaultedTag HAS_STRUCTURE_ANCIENT_CITY = BiomeTags.key(ResourceKey.minecraft("has_structure/ancient_city")); public static final DefaultedTag HAS_STRUCTURE_BASTION_REMNANT = BiomeTags.key(ResourceKey.minecraft("has_structure/bastion_remnant")); @@ -111,8 +109,6 @@ public final class BiomeTags { public static final DefaultedTag HAS_STRUCTURE_WOODLAND_MANSION = BiomeTags.key(ResourceKey.minecraft("has_structure/woodland_mansion")); - public static final DefaultedTag INCREASED_FIRE_BURNOUT = BiomeTags.key(ResourceKey.minecraft("increased_fire_burnout")); - public static final DefaultedTag IS_BADLANDS = BiomeTags.key(ResourceKey.minecraft("is_badlands")); public static final DefaultedTag IS_BEACH = BiomeTags.key(ResourceKey.minecraft("is_beach")); @@ -145,8 +141,6 @@ public final class BiomeTags { public static final DefaultedTag MORE_FREQUENT_DROWNED_SPAWNS = BiomeTags.key(ResourceKey.minecraft("more_frequent_drowned_spawns")); - public static final DefaultedTag PLAYS_UNDERWATER_MUSIC = BiomeTags.key(ResourceKey.minecraft("plays_underwater_music")); - public static final DefaultedTag POLAR_BEARS_SPAWN_ON_ALTERNATE_BLOCKS = BiomeTags.key(ResourceKey.minecraft("polar_bears_spawn_on_alternate_blocks")); public static final DefaultedTag PRODUCES_CORALS_FROM_BONEMEAL = BiomeTags.key(ResourceKey.minecraft("produces_corals_from_bonemeal")); @@ -155,12 +149,12 @@ public final class BiomeTags { public static final DefaultedTag REQUIRED_OCEAN_MONUMENT_SURROUNDING = BiomeTags.key(ResourceKey.minecraft("required_ocean_monument_surrounding")); - public static final DefaultedTag SNOW_GOLEM_MELTS = BiomeTags.key(ResourceKey.minecraft("snow_golem_melts")); - public static final DefaultedTag SPAWNS_COLD_VARIANT_FARM_ANIMALS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_farm_animals")); public static final DefaultedTag SPAWNS_COLD_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_frogs")); + public static final DefaultedTag SPAWNS_CORAL_VARIANT_ZOMBIE_NAUTILUS = BiomeTags.key(ResourceKey.minecraft("spawns_coral_variant_zombie_nautilus")); + public static final DefaultedTag SPAWNS_GOLD_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_gold_rabbits")); public static final DefaultedTag SPAWNS_SNOW_FOXES = BiomeTags.key(ResourceKey.minecraft("spawns_snow_foxes")); @@ -175,8 +169,6 @@ public final class BiomeTags { public static final DefaultedTag WATER_ON_MAP_OUTLINES = BiomeTags.key(ResourceKey.minecraft("water_on_map_outlines")); - public static final DefaultedTag WITHOUT_PATROL_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_patrol_spawns")); - public static final DefaultedTag WITHOUT_WANDERING_TRADER_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_wandering_trader_spawns")); public static final DefaultedTag WITHOUT_ZOMBIE_SIEGES = BiomeTags.key(ResourceKey.minecraft("without_zombie_sieges")); diff --git a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java index 68e6ff49c9..56f226c41d 100644 --- a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java @@ -99,6 +99,8 @@ public final class BlockTypeTags { public static final DefaultedTag CAMPFIRES = BlockTypeTags.key(ResourceKey.minecraft("campfires")); + public static final DefaultedTag CAN_GLIDE_THROUGH = BlockTypeTags.key(ResourceKey.minecraft("can_glide_through")); + public static final DefaultedTag CANDLE_CAKES = BlockTypeTags.key(ResourceKey.minecraft("candle_cakes")); public static final DefaultedTag CANDLES = BlockTypeTags.key(ResourceKey.minecraft("candles")); diff --git a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java index d34ade57cb..3e8fc51dbd 100644 --- a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java @@ -53,16 +53,22 @@ public final class EntityTypeTags { public static final DefaultedTag> BOAT = EntityTypeTags.key(ResourceKey.minecraft("boat")); + public static final DefaultedTag> BURN_IN_DAYLIGHT = EntityTypeTags.key(ResourceKey.minecraft("burn_in_daylight")); + public static final DefaultedTag> CAN_BREATHE_UNDER_WATER = EntityTypeTags.key(ResourceKey.minecraft("can_breathe_under_water")); public static final DefaultedTag> CAN_EQUIP_HARNESS = EntityTypeTags.key(ResourceKey.minecraft("can_equip_harness")); public static final DefaultedTag> CAN_EQUIP_SADDLE = EntityTypeTags.key(ResourceKey.minecraft("can_equip_saddle")); + public static final DefaultedTag> CAN_FLOAT_WHILE_RIDDEN = EntityTypeTags.key(ResourceKey.minecraft("can_float_while_ridden")); + public static final DefaultedTag> CAN_TURN_IN_BOATS = EntityTypeTags.key(ResourceKey.minecraft("can_turn_in_boats")); public static final DefaultedTag> CAN_WEAR_HORSE_ARMOR = EntityTypeTags.key(ResourceKey.minecraft("can_wear_horse_armor")); + public static final DefaultedTag> CAN_WEAR_NAUTILUS_ARMOR = EntityTypeTags.key(ResourceKey.minecraft("can_wear_nautilus_armor")); + public static final DefaultedTag> CANDIDATE_FOR_IRON_GOLEM_GIFT = EntityTypeTags.key(ResourceKey.minecraft("candidate_for_iron_golem_gift")); public static final DefaultedTag> CANNOT_BE_PUSHED_ONTO_BOATS = EntityTypeTags.key(ResourceKey.minecraft("cannot_be_pushed_onto_boats")); @@ -95,6 +101,8 @@ public final class EntityTypeTags { public static final DefaultedTag> INVERTED_HEALING_AND_HARM = EntityTypeTags.key(ResourceKey.minecraft("inverted_healing_and_harm")); + public static final DefaultedTag> NAUTILUS_HOSTILES = EntityTypeTags.key(ResourceKey.minecraft("nautilus_hostiles")); + public static final DefaultedTag> NO_ANGER_FROM_WIND_CHARGE = EntityTypeTags.key(ResourceKey.minecraft("no_anger_from_wind_charge")); public static final DefaultedTag> NON_CONTROLLING_RIDER = EntityTypeTags.key(ResourceKey.minecraft("non_controlling_rider")); diff --git a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java index a8ee29f4af..e0ab36c8eb 100644 --- a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java @@ -79,6 +79,8 @@ public final class ItemTypeTags { public static final DefaultedTag CAMEL_FOOD = ItemTypeTags.key(ResourceKey.minecraft("camel_food")); + public static final DefaultedTag CAMEL_HUSK_FOOD = ItemTypeTags.key(ResourceKey.minecraft("camel_husk_food")); + public static final DefaultedTag CANDLES = ItemTypeTags.key(ResourceKey.minecraft("candles")); public static final DefaultedTag CAT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("cat_food")); @@ -169,15 +171,19 @@ public final class ItemTypeTags { public static final DefaultedTag ENCHANTABLE_LEG_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/leg_armor")); + public static final DefaultedTag ENCHANTABLE_LUNGE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/lunge")); + public static final DefaultedTag ENCHANTABLE_MACE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mace")); + public static final DefaultedTag ENCHANTABLE_MELEE_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/melee_weapon")); + public static final DefaultedTag ENCHANTABLE_MINING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining")); public static final DefaultedTag ENCHANTABLE_MINING_LOOT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining_loot")); public static final DefaultedTag ENCHANTABLE_SHARP_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sharp_weapon")); - public static final DefaultedTag ENCHANTABLE_SWORD = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sword")); + public static final DefaultedTag ENCHANTABLE_SWEEPING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sweeping")); public static final DefaultedTag ENCHANTABLE_TRIDENT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/trident")); @@ -263,6 +269,12 @@ public final class ItemTypeTags { public static final DefaultedTag MEAT = ItemTypeTags.key(ResourceKey.minecraft("meat")); + public static final DefaultedTag NAUTILUS_BUCKET_FOOD = ItemTypeTags.key(ResourceKey.minecraft("nautilus_bucket_food")); + + public static final DefaultedTag NAUTILUS_FOOD = ItemTypeTags.key(ResourceKey.minecraft("nautilus_food")); + + public static final DefaultedTag NAUTILUS_TAMING_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("nautilus_taming_items")); + public static final DefaultedTag NETHERITE_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("netherite_tool_materials")); public static final DefaultedTag NON_FLAMMABLE_WOOD = ItemTypeTags.key(ResourceKey.minecraft("non_flammable_wood")); @@ -353,6 +365,8 @@ public final class ItemTypeTags { public static final DefaultedTag SOUL_FIRE_BASE_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("soul_fire_base_blocks")); + public static final DefaultedTag SPEARS = ItemTypeTags.key(ResourceKey.minecraft("spears")); + public static final DefaultedTag SPRUCE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("spruce_logs")); public static final DefaultedTag STAIRS = ItemTypeTags.key(ResourceKey.minecraft("stairs")); @@ -417,6 +431,8 @@ public final class ItemTypeTags { public static final DefaultedTag WOOL_CARPETS = ItemTypeTags.key(ResourceKey.minecraft("wool_carpets")); + public static final DefaultedTag ZOMBIE_HORSE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("zombie_horse_food")); + private ItemTypeTags() { } diff --git a/src/main/java/org/spongepowered/api/world/biome/Biome.java b/src/main/java/org/spongepowered/api/world/biome/Biome.java index 18323b9dee..6178b61114 100644 --- a/src/main/java/org/spongepowered/api/world/biome/Biome.java +++ b/src/main/java/org/spongepowered/api/world/biome/Biome.java @@ -37,7 +37,6 @@ import org.spongepowered.api.entity.living.golem.SnowGolem; import org.spongepowered.api.registry.DefaultedRegistryValue; import org.spongepowered.api.tag.Taggable; -import org.spongepowered.api.util.Builder; import org.spongepowered.api.util.Color; import org.spongepowered.api.util.CopyableBuilder; import org.spongepowered.api.util.annotation.CatalogedBy; 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 37e5e8bc3e..7a973822eb 100644 --- a/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java +++ b/src/main/java/org/spongepowered/api/world/gamerule/GameRules.java @@ -40,125 +40,123 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class GameRules { - public static final DefaultedRegistryReference> ALLOW_ENTERING_NETHER_USING_PORTALS = GameRules.key(ResourceKey.sponge("allow_entering_nether_using_portals")); + public static final DefaultedRegistryReference> ADVANCE_TIME = GameRules.key(ResourceKey.minecraft("advance_time")); - public static final DefaultedRegistryReference> ALLOW_FIRE_TICKS_AWAY_FROM_PLAYER = GameRules.key(ResourceKey.sponge("allow_fire_ticks_away_from_player")); + public static final DefaultedRegistryReference> ADVANCE_WEATHER = GameRules.key(ResourceKey.minecraft("advance_weather")); - public static final DefaultedRegistryReference> ANNOUNCE_ADVANCEMENTS = GameRules.key(ResourceKey.sponge("announce_advancements")); + public static final DefaultedRegistryReference> ALLOW_ENTERING_NETHER_USING_PORTALS = GameRules.key(ResourceKey.minecraft("allow_entering_nether_using_portals")); - public static final DefaultedRegistryReference> BLOCK_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("block_explosion_drop_decay")); + public static final DefaultedRegistryReference> BLOCK_DROPS = GameRules.key(ResourceKey.minecraft("block_drops")); - public static final DefaultedRegistryReference> COMMAND_BLOCKS_ENABLED = GameRules.key(ResourceKey.sponge("command_blocks_enabled")); + public static final DefaultedRegistryReference> BLOCK_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.minecraft("block_explosion_drop_decay")); - public static final DefaultedRegistryReference> COMMAND_BLOCK_OUTPUT = GameRules.key(ResourceKey.sponge("command_block_output")); + public static final DefaultedRegistryReference> COMMAND_BLOCKS_WORK = GameRules.key(ResourceKey.minecraft("command_blocks_work")); - public static final DefaultedRegistryReference> COMMAND_MODIFICATION_BLOCK_LIMIT = GameRules.key(ResourceKey.sponge("command_modification_block_limit")); + public static final DefaultedRegistryReference> COMMAND_BLOCK_OUTPUT = GameRules.key(ResourceKey.minecraft("command_block_output")); - public static final DefaultedRegistryReference> DISABLE_ELYTRA_MOVEMENT_CHECK = GameRules.key(ResourceKey.sponge("disable_elytra_movement_check")); + public static final DefaultedRegistryReference> DROWNING_DAMAGE = GameRules.key(ResourceKey.minecraft("drowning_damage")); - public static final DefaultedRegistryReference> DISABLE_PLAYER_MOVEMENT_CHECK = GameRules.key(ResourceKey.sponge("disable_player_movement_check")); + public static final DefaultedRegistryReference> ELYTRA_MOVEMENT_CHECK = GameRules.key(ResourceKey.minecraft("elytra_movement_check")); - public static final DefaultedRegistryReference> DISABLE_RAIDS = GameRules.key(ResourceKey.sponge("disable_raids")); + public static final DefaultedRegistryReference> ENDER_PEARLS_VANISH_ON_DEATH = GameRules.key(ResourceKey.minecraft("ender_pearls_vanish_on_death")); - public static final DefaultedRegistryReference> DO_DAYLIGHT_CYCLE = GameRules.key(ResourceKey.sponge("do_daylight_cycle")); + public static final DefaultedRegistryReference> ENTITY_DROPS = GameRules.key(ResourceKey.minecraft("entity_drops")); - public static final DefaultedRegistryReference> DO_ENTITY_DROPS = GameRules.key(ResourceKey.sponge("do_entity_drops")); + public static final DefaultedRegistryReference> FALL_DAMAGE = GameRules.key(ResourceKey.minecraft("fall_damage")); - public static final DefaultedRegistryReference> DO_FIRE_TICK = GameRules.key(ResourceKey.sponge("do_fire_tick")); + public static final DefaultedRegistryReference> FIRE_DAMAGE = GameRules.key(ResourceKey.minecraft("fire_damage")); - public static final DefaultedRegistryReference> DO_IMMEDIATE_RESPAWN = GameRules.key(ResourceKey.sponge("do_immediate_respawn")); + public static final DefaultedRegistryReference> FIRE_SPREAD_RADIUS_AROUND_PLAYER = GameRules.key(ResourceKey.minecraft("fire_spread_radius_around_player")); - public static final DefaultedRegistryReference> DO_INSOMNIA = GameRules.key(ResourceKey.sponge("do_insomnia")); + public static final DefaultedRegistryReference> FORGIVE_DEAD_PLAYERS = GameRules.key(ResourceKey.minecraft("forgive_dead_players")); - public static final DefaultedRegistryReference> DO_LIMITED_CRAFTING = GameRules.key(ResourceKey.sponge("do_limited_crafting")); + public static final DefaultedRegistryReference> FREEZE_DAMAGE = GameRules.key(ResourceKey.minecraft("freeze_damage")); - public static final DefaultedRegistryReference> DO_MOB_LOOT = GameRules.key(ResourceKey.sponge("do_mob_loot")); + public static final DefaultedRegistryReference> GLOBAL_SOUND_EVENTS = GameRules.key(ResourceKey.minecraft("global_sound_events")); - public static final DefaultedRegistryReference> DO_MOB_SPAWNING = GameRules.key(ResourceKey.sponge("do_mob_spawning")); + public static final DefaultedRegistryReference> IMMEDIATE_RESPAWN = GameRules.key(ResourceKey.minecraft("immediate_respawn")); - public static final DefaultedRegistryReference> DO_PATROL_SPAWNING = GameRules.key(ResourceKey.sponge("do_patrol_spawning")); + public static final DefaultedRegistryReference> KEEP_INVENTORY = GameRules.key(ResourceKey.minecraft("keep_inventory")); - public static final DefaultedRegistryReference> DO_TILE_DROPS = GameRules.key(ResourceKey.sponge("do_tile_drops")); + public static final DefaultedRegistryReference> LAVA_SOURCE_CONVERSION = GameRules.key(ResourceKey.minecraft("lava_source_conversion")); - public static final DefaultedRegistryReference> DO_TRADER_SPAWNING = GameRules.key(ResourceKey.sponge("do_trader_spawning")); + public static final DefaultedRegistryReference> LIMITED_CRAFTING = GameRules.key(ResourceKey.minecraft("limited_crafting")); - public static final DefaultedRegistryReference> DO_VINES_SPREAD = GameRules.key(ResourceKey.sponge("do_vines_spread")); + public static final DefaultedRegistryReference> LOCATOR_BAR = GameRules.key(ResourceKey.minecraft("locator_bar")); - public static final DefaultedRegistryReference> DO_WARDEN_SPAWNING = GameRules.key(ResourceKey.sponge("do_warden_spawning")); + public static final DefaultedRegistryReference> LOG_ADMIN_COMMANDS = GameRules.key(ResourceKey.minecraft("log_admin_commands")); - public static final DefaultedRegistryReference> DO_WEATHER_CYCLE = GameRules.key(ResourceKey.sponge("do_weather_cycle")); + public static final DefaultedRegistryReference> MAX_BLOCK_MODIFICATIONS = GameRules.key(ResourceKey.minecraft("max_block_modifications")); - public static final DefaultedRegistryReference> DROWNING_DAMAGE = GameRules.key(ResourceKey.sponge("drowning_damage")); + public static final DefaultedRegistryReference> MAX_COMMAND_FORKS = GameRules.key(ResourceKey.minecraft("max_command_forks")); - public static final DefaultedRegistryReference> ENDER_PEARLS_VANISH_ON_DEATH = GameRules.key(ResourceKey.sponge("ender_pearls_vanish_on_death")); + public static final DefaultedRegistryReference> MAX_COMMAND_SEQUENCE_LENGTH = GameRules.key(ResourceKey.minecraft("max_command_sequence_length")); - public static final DefaultedRegistryReference> FALL_DAMAGE = GameRules.key(ResourceKey.sponge("fall_damage")); + public static final DefaultedRegistryReference> MAX_ENTITY_CRAMMING = GameRules.key(ResourceKey.minecraft("max_entity_cramming")); - public static final DefaultedRegistryReference> FIRE_DAMAGE = GameRules.key(ResourceKey.sponge("fire_damage")); + public static final DefaultedRegistryReference> MAX_MINECART_SPEED = GameRules.key(ResourceKey.minecraft("max_minecart_speed")); - public static final DefaultedRegistryReference> FORGIVE_DEAD_PLAYERS = GameRules.key(ResourceKey.sponge("forgive_dead_players")); + public static final DefaultedRegistryReference> MAX_SNOW_ACCUMULATION_HEIGHT = GameRules.key(ResourceKey.minecraft("max_snow_accumulation_height")); - public static final DefaultedRegistryReference> FREEZE_DAMAGE = GameRules.key(ResourceKey.sponge("freeze_damage")); + public static final DefaultedRegistryReference> MOB_DROPS = GameRules.key(ResourceKey.minecraft("mob_drops")); - public static final DefaultedRegistryReference> GLOBAL_SOUND_EVENTS = GameRules.key(ResourceKey.sponge("global_sound_events")); + public static final DefaultedRegistryReference> MOB_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.minecraft("mob_explosion_drop_decay")); - public static final DefaultedRegistryReference> KEEP_INVENTORY = GameRules.key(ResourceKey.sponge("keep_inventory")); + public static final DefaultedRegistryReference> MOB_GRIEFING = GameRules.key(ResourceKey.minecraft("mob_griefing")); - public static final DefaultedRegistryReference> LAVA_SOURCE_CONVERSION = GameRules.key(ResourceKey.sponge("lava_source_conversion")); + public static final DefaultedRegistryReference> NATURAL_HEALTH_REGENERATION = GameRules.key(ResourceKey.minecraft("natural_health_regeneration")); - public static final DefaultedRegistryReference> LOCATOR_BAR = GameRules.key(ResourceKey.sponge("locator_bar")); + public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_CREATIVE_DELAY = GameRules.key(ResourceKey.minecraft("players_nether_portal_creative_delay")); - public static final DefaultedRegistryReference> LOG_ADMIN_COMMANDS = GameRules.key(ResourceKey.sponge("log_admin_commands")); + public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_DEFAULT_DELAY = GameRules.key(ResourceKey.minecraft("players_nether_portal_default_delay")); - public static final DefaultedRegistryReference> MAX_COMMAND_CHAIN_LENGTH = GameRules.key(ResourceKey.sponge("max_command_chain_length")); + public static final DefaultedRegistryReference> PLAYERS_SLEEPING_PERCENTAGE = GameRules.key(ResourceKey.minecraft("players_sleeping_percentage")); - public static final DefaultedRegistryReference> MAX_COMMAND_FORK_COUNT = GameRules.key(ResourceKey.sponge("max_command_fork_count")); + public static final DefaultedRegistryReference> PLAYER_MOVEMENT_CHECK = GameRules.key(ResourceKey.minecraft("player_movement_check")); - public static final DefaultedRegistryReference> MAX_ENTITY_CRAMMING = GameRules.key(ResourceKey.sponge("max_entity_cramming")); + public static final DefaultedRegistryReference> PROJECTILES_CAN_BREAK_BLOCKS = GameRules.key(ResourceKey.minecraft("projectiles_can_break_blocks")); - public static final DefaultedRegistryReference> MINECART_MAX_SPEED = GameRules.key(ResourceKey.sponge("minecart_max_speed")); + public static final DefaultedRegistryReference> PVP = GameRules.key(ResourceKey.minecraft("pvp")); - public static final DefaultedRegistryReference> MOB_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("mob_explosion_drop_decay")); + public static final DefaultedRegistryReference> RAIDS = GameRules.key(ResourceKey.minecraft("raids")); - public static final DefaultedRegistryReference> MOB_GRIEFING = GameRules.key(ResourceKey.sponge("mob_griefing")); + public static final DefaultedRegistryReference> RANDOM_TICK_SPEED = GameRules.key(ResourceKey.minecraft("random_tick_speed")); - public static final DefaultedRegistryReference> NATURAL_REGENERATION = GameRules.key(ResourceKey.sponge("natural_regeneration")); + public static final DefaultedRegistryReference> REDUCED_DEBUG_INFO = GameRules.key(ResourceKey.minecraft("reduced_debug_info")); - public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_CREATIVE_DELAY = GameRules.key(ResourceKey.sponge("players_nether_portal_creative_delay")); + public static final DefaultedRegistryReference> RESPAWN_RADIUS = GameRules.key(ResourceKey.minecraft("respawn_radius")); - public static final DefaultedRegistryReference> PLAYERS_NETHER_PORTAL_DEFAULT_DELAY = GameRules.key(ResourceKey.sponge("players_nether_portal_default_delay")); + public static final DefaultedRegistryReference> SEND_COMMAND_FEEDBACK = GameRules.key(ResourceKey.minecraft("send_command_feedback")); - public static final DefaultedRegistryReference> PLAYERS_SLEEPING_PERCENTAGE = GameRules.key(ResourceKey.sponge("players_sleeping_percentage")); + public static final DefaultedRegistryReference> SHOW_ADVANCEMENT_MESSAGES = GameRules.key(ResourceKey.minecraft("show_advancement_messages")); - public static final DefaultedRegistryReference> PROJECTILES_CAN_BREAK_BLOCKS = GameRules.key(ResourceKey.sponge("projectiles_can_break_blocks")); + public static final DefaultedRegistryReference> SHOW_DEATH_MESSAGES = GameRules.key(ResourceKey.minecraft("show_death_messages")); - public static final DefaultedRegistryReference> PVP = GameRules.key(ResourceKey.sponge("pvp")); + public static final DefaultedRegistryReference> SPAWNER_BLOCKS_WORK = GameRules.key(ResourceKey.minecraft("spawner_blocks_work")); - public static final DefaultedRegistryReference> RANDOM_TICK_SPEED = GameRules.key(ResourceKey.sponge("random_tick_speed")); + public static final DefaultedRegistryReference> SPAWN_MOBS = GameRules.key(ResourceKey.minecraft("spawn_mobs")); - public static final DefaultedRegistryReference> REDUCED_DEBUG_INFO = GameRules.key(ResourceKey.sponge("reduced_debug_info")); + public static final DefaultedRegistryReference> SPAWN_MONSTERS = GameRules.key(ResourceKey.minecraft("spawn_monsters")); - public static final DefaultedRegistryReference> SEND_COMMAND_FEEDBACK = GameRules.key(ResourceKey.sponge("send_command_feedback")); + public static final DefaultedRegistryReference> SPAWN_PATROLS = GameRules.key(ResourceKey.minecraft("spawn_patrols")); - public static final DefaultedRegistryReference> SHOW_DEATH_MESSAGES = GameRules.key(ResourceKey.sponge("show_death_messages")); + public static final DefaultedRegistryReference> SPAWN_PHANTOMS = GameRules.key(ResourceKey.minecraft("spawn_phantoms")); - public static final DefaultedRegistryReference> SNOW_ACCUMULATION_HEIGHT = GameRules.key(ResourceKey.sponge("snow_accumulation_height")); + public static final DefaultedRegistryReference> SPAWN_WANDERING_TRADERS = GameRules.key(ResourceKey.minecraft("spawn_wandering_traders")); - public static final DefaultedRegistryReference> SPAWNER_BLOCKS_ENABLED = GameRules.key(ResourceKey.sponge("spawner_blocks_enabled")); + public static final DefaultedRegistryReference> SPAWN_WARDENS = GameRules.key(ResourceKey.minecraft("spawn_wardens")); - public static final DefaultedRegistryReference> SPAWN_MONSTERS = GameRules.key(ResourceKey.sponge("spawn_monsters")); + public static final DefaultedRegistryReference> SPECTATORS_GENERATE_CHUNKS = GameRules.key(ResourceKey.minecraft("spectators_generate_chunks")); - public static final DefaultedRegistryReference> SPAWN_RADIUS = GameRules.key(ResourceKey.sponge("spawn_radius")); + public static final DefaultedRegistryReference> SPREAD_VINES = GameRules.key(ResourceKey.minecraft("spread_vines")); - public static final DefaultedRegistryReference> SPECTATORS_GENERATE_CHUNKS = GameRules.key(ResourceKey.sponge("spectators_generate_chunks")); + public static final DefaultedRegistryReference> TNT_EXPLODES = GameRules.key(ResourceKey.minecraft("tnt_explodes")); - public static final DefaultedRegistryReference> TNT_EXPLODES = GameRules.key(ResourceKey.sponge("tnt_explodes")); + public static final DefaultedRegistryReference> TNT_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.minecraft("tnt_explosion_drop_decay")); - 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.minecraft("universal_anger")); - public static final DefaultedRegistryReference> UNIVERSAL_ANGER = GameRules.key(ResourceKey.sponge("universal_anger")); - - public static final DefaultedRegistryReference> WATER_SOURCE_CONVERSION = GameRules.key(ResourceKey.sponge("water_source_conversion")); + public static final DefaultedRegistryReference> WATER_SOURCE_CONVERSION = GameRules.key(ResourceKey.minecraft("water_source_conversion")); private GameRules() { }