Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.spongepowered
version=15.0.0-SNAPSHOT
version=16.0.0-SNAPSHOT
organization=SpongePowered
projectUrl=https://www.spongepowered.org
projectDescription=A plugin API for Minecraft: Java Edition
Expand Down
3 changes: 3 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -928,6 +928,9 @@
<artifact name="adventure-bom-4.21.0.module">
<sha256 value="ea8520de222b95a774896d5ba89b456ca1d0b3bf9165b3ecc8ec2f2d766128f3" origin="Generated by Gradle"/>
</artifact>
<artifact name="adventure-bom-4.21.0.pom">
<sha256 value="7e9b8fc45d74c863276f2e36c346b34edf91d94246c46823471bf8c358657a74" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="net.kyori" name="adventure-key" version="4.16.0">
<artifact name="adventure-key-4.16.0-javadoc.jar">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ public final class Triggers {

public static final DefaultedRegistryReference<Trigger<?>> PLAYER_KILLED_ENTITY = Triggers.key(ResourceKey.minecraft("player_killed_entity"));

public static final DefaultedRegistryReference<Trigger<?>> PLAYER_SHEARED_EQUIPMENT = Triggers.key(ResourceKey.minecraft("player_sheared_equipment"));

public static final DefaultedRegistryReference<Trigger<?>> RECIPE_CRAFTED = Triggers.key(ResourceKey.minecraft("recipe_crafted"));

public static final DefaultedRegistryReference<Trigger<?>> RECIPE_UNLOCKED = Triggers.key(ResourceKey.minecraft("recipe_unlocked"));
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/spongepowered/api/block/BlockTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,8 @@ public final class BlockTypes {

public static final DefaultedRegistryReference<BlockType> DRAGON_WALL_HEAD = BlockTypes.key(ResourceKey.minecraft("dragon_wall_head"));

public static final DefaultedRegistryReference<BlockType> DRIED_GHAST = BlockTypes.key(ResourceKey.minecraft("dried_ghast"));

public static final DefaultedRegistryReference<BlockType> DRIED_KELP_BLOCK = BlockTypes.key(ResourceKey.minecraft("dried_kelp_block"));

public static final DefaultedRegistryReference<BlockType> DRIPSTONE_BLOCK = BlockTypes.key(ResourceKey.minecraft("dripstone_block"));
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/spongepowered/api/data/BlockStateKeys.java
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ public final class BlockStateKeys {

public static final Key<Value<Boolean>> DRAG = BlockStateKeys.key(ResourceKey.minecraft("property/drag"), Boolean.class);

public static final Key<Value<Integer>> DRIED_GHAST_HYDRATION_LEVELS = BlockStateKeys.key(ResourceKey.minecraft("property/hydration"), Integer.class);

public static final Key<Value<DripstoneSegment>> DRIPSTONE_THICKNESS = BlockStateKeys.key(ResourceKey.minecraft("property/thickness"), DripstoneSegment.class);

public static final Key<Value<Integer>> DUSTED = BlockStateKeys.key(ResourceKey.minecraft("property/dusted"), Integer.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ public static Registry<CatType> registry() {
}

private static DefaultedRegistryReference<CatType> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.CAT_TYPE, location).asScopedReference();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ public static Registry<ChickenVariant> registry() {
}

private static DefaultedRegistryReference<ChickenVariant> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asScopedReference();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ public static Registry<CowVariant> registry() {
}

private static DefaultedRegistryReference<CowVariant> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asScopedReference();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ public static Registry<FrogType> registry() {
}

private static DefaultedRegistryReference<FrogType> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.FROG_TYPE, location).asScopedReference();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ public static Registry<PigType> registry() {
}

private static DefaultedRegistryReference<PigType> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.PIG_TYPE, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.PIG_TYPE, location).asScopedReference();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ public static Registry<WolfSoundVariant> registry() {
}

private static DefaultedRegistryReference<WolfSoundVariant> key(final ResourceKey location) {
return RegistryKey.of(RegistryTypes.WOLF_SOUND_VARIANT, location).asDefaultedReference(Sponge::server);
return RegistryKey.of(RegistryTypes.WOLF_SOUND_VARIANT, location).asScopedReference();
}
}
66 changes: 58 additions & 8 deletions src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,22 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> BLOCK_DISPENSER_LAUNCH = SoundTypes.key(ResourceKey.minecraft("block.dispenser.launch"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.ambient"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_AMBIENT_WATER = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.ambient_water"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_BREAK = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.break"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_FALL = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.fall"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_PLACE = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.place"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_PLACE_IN_WATER = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.place_in_water"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_STEP = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.step"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIED_GHAST_TRANSITION = SoundTypes.key(ResourceKey.minecraft("block.dried_ghast.transition"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_BREAK = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.break"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_FALL = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.fall"));
Expand All @@ -594,6 +610,8 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> BLOCK_DRIPSTONE_BLOCK_STEP = SoundTypes.key(ResourceKey.minecraft("block.dripstone_block.step"));

public static final DefaultedRegistryReference<SoundType> BLOCK_DRY_GRASS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.dry_grass.ambient"));

public static final DefaultedRegistryReference<SoundType> BLOCK_ENCHANTMENT_TABLE_USE = SoundTypes.key(ResourceKey.minecraft("block.enchantment_table.use"));

public static final DefaultedRegistryReference<SoundType> BLOCK_ENDER_CHEST_CLOSE = SoundTypes.key(ResourceKey.minecraft("block.ender_chest.close"));
Expand Down Expand Up @@ -1208,8 +1226,6 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_STEP = SoundTypes.key(ResourceKey.minecraft("block.sand.step"));

public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_WIND = SoundTypes.key(ResourceKey.minecraft("block.sand.wind"));

public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_BREAK = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.break"));

public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_FALL = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.fall"));
Expand Down Expand Up @@ -2080,6 +2096,14 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ENTITY_GENERIC_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.generic.swim"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.ambient"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.death"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_HURT = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.hurt"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHASTLING_SPAWN = SoundTypes.key(ResourceKey.minecraft("entity.ghastling.spawn"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ghast.ambient"));

public static final DefaultedRegistryReference<SoundType> ENTITY_GHAST_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ghast.death"));
Expand Down Expand Up @@ -2162,6 +2186,22 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ENTITY_GUARDIAN_HURT_LAND = SoundTypes.key(ResourceKey.minecraft("entity.guardian.hurt_land"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.ambient"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.death"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_EQUIP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.equip"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.harness_goggles_down"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.harness_goggles_up"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_HURT = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.hurt"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_RIDING = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.riding"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HAPPY_GHAST_UNEQUIP = SoundTypes.key(ResourceKey.minecraft("entity.happy_ghast.unequip"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HOGLIN_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.hoglin.ambient"));

public static final DefaultedRegistryReference<SoundType> ENTITY_HOGLIN_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.hoglin.angry"));
Expand Down Expand Up @@ -2266,10 +2306,6 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ENTITY_ITEM_PICKUP = SoundTypes.key(ResourceKey.minecraft("entity.item.pickup"));

public static final DefaultedRegistryReference<SoundType> ENTITY_LEASH_KNOT_BREAK = SoundTypes.key(ResourceKey.minecraft("entity.leash_knot.break"));

public static final DefaultedRegistryReference<SoundType> ENTITY_LEASH_KNOT_PLACE = SoundTypes.key(ResourceKey.minecraft("entity.leash_knot.place"));

public static final DefaultedRegistryReference<SoundType> ENTITY_LIGHTNING_BOLT_IMPACT = SoundTypes.key(ResourceKey.minecraft("entity.lightning_bolt.impact"));

public static final DefaultedRegistryReference<SoundType> ENTITY_LIGHTNING_BOLT_THUNDER = SoundTypes.key(ResourceKey.minecraft("entity.lightning_bolt.thunder"));
Expand Down Expand Up @@ -2570,8 +2606,6 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ENTITY_POLAR_BEAR_WARNING = SoundTypes.key(ResourceKey.minecraft("entity.polar_bear.warning"));

public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.ambient"));

public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_BLOW_OUT = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.blow_out"));

public static final DefaultedRegistryReference<SoundType> ENTITY_PUFFER_FISH_BLOW_UP = SoundTypes.key(ResourceKey.minecraft("entity.puffer_fish.blow_up"));
Expand Down Expand Up @@ -3268,8 +3302,18 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ITEM_HONEY_BOTTLE_DRINK = SoundTypes.key(ResourceKey.minecraft("item.honey_bottle.drink"));

public static final DefaultedRegistryReference<SoundType> ITEM_HORSE_ARMOR_UNEQUIP = SoundTypes.key(ResourceKey.minecraft("item.horse_armor.unequip"));

public static final DefaultedRegistryReference<SoundType> ITEM_INK_SAC_USE = SoundTypes.key(ResourceKey.minecraft("item.ink_sac.use"));

public static final DefaultedRegistryReference<SoundType> ITEM_LEAD_BREAK = SoundTypes.key(ResourceKey.minecraft("item.lead.break"));

public static final DefaultedRegistryReference<SoundType> ITEM_LEAD_TIED = SoundTypes.key(ResourceKey.minecraft("item.lead.tied"));

public static final DefaultedRegistryReference<SoundType> ITEM_LEAD_UNTIED = SoundTypes.key(ResourceKey.minecraft("item.lead.untied"));

public static final DefaultedRegistryReference<SoundType> ITEM_LLAMA_CARPET_UNEQUIP = SoundTypes.key(ResourceKey.minecraft("item.llama_carpet.unequip"));

public static final DefaultedRegistryReference<SoundType> ITEM_LODESTONE_COMPASS_LOCK = SoundTypes.key(ResourceKey.minecraft("item.lodestone_compass.lock"));

public static final DefaultedRegistryReference<SoundType> ITEM_MACE_SMASH_AIR = SoundTypes.key(ResourceKey.minecraft("item.mace.smash_air"));
Expand All @@ -3282,6 +3326,10 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> ITEM_OMINOUS_BOTTLE_DISPOSE = SoundTypes.key(ResourceKey.minecraft("item.ominous_bottle.dispose"));

public static final DefaultedRegistryReference<SoundType> ITEM_SADDLE_UNEQUIP = SoundTypes.key(ResourceKey.minecraft("item.saddle.unequip"));

public static final DefaultedRegistryReference<SoundType> ITEM_SHEARS_SNIP = SoundTypes.key(ResourceKey.minecraft("item.shears.snip"));

public static final DefaultedRegistryReference<SoundType> ITEM_SHIELD_BLOCK = SoundTypes.key(ResourceKey.minecraft("item.shield.block"));

public static final DefaultedRegistryReference<SoundType> ITEM_SHIELD_BREAK = SoundTypes.key(ResourceKey.minecraft("item.shield.break"));
Expand Down Expand Up @@ -3356,6 +3404,8 @@ public final class SoundTypes {

public static final DefaultedRegistryReference<SoundType> MUSIC_DISC_STRAD = SoundTypes.key(ResourceKey.minecraft("music_disc.strad"));

public static final DefaultedRegistryReference<SoundType> MUSIC_DISC_TEARS = SoundTypes.key(ResourceKey.minecraft("music_disc.tears"));

public static final DefaultedRegistryReference<SoundType> MUSIC_DISC_WAIT = SoundTypes.key(ResourceKey.minecraft("music_disc.wait"));

public static final DefaultedRegistryReference<SoundType> MUSIC_DISC_WARD = SoundTypes.key(ResourceKey.minecraft("music_disc.ward"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public final class MusicDiscs {

public static final DefaultedRegistryReference<MusicDisc> STRAD = MusicDiscs.key(ResourceKey.minecraft("strad"));

public static final DefaultedRegistryReference<MusicDisc> TEARS = MusicDiscs.key(ResourceKey.minecraft("tears"));

public static final DefaultedRegistryReference<MusicDisc> THIRTEEN = MusicDiscs.key(ResourceKey.minecraft("13"));

public static final DefaultedRegistryReference<MusicDisc> WAIT = MusicDiscs.key(ResourceKey.minecraft("wait"));
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/spongepowered/api/entity/EntityTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.spongepowered.api.entity.living.animal.Chicken;
import org.spongepowered.api.entity.living.animal.Fox;
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.Ocelot;
import org.spongepowered.api.entity.living.animal.Panda;
Expand Down Expand Up @@ -290,6 +291,8 @@ public final class EntityTypes {

public static final DefaultedRegistryReference<EntityType<Guardian>> GUARDIAN = EntityTypes.key(ResourceKey.minecraft("guardian"));

public static final DefaultedRegistryReference<EntityType<HappyGhast>> HAPPY_GHAST = EntityTypes.key(ResourceKey.minecraft("happy_ghast"));

public static final DefaultedRegistryReference<EntityType<Hoglin>> HOGLIN = EntityTypes.key(ResourceKey.minecraft("hoglin"));

public static final DefaultedRegistryReference<EntityType<HopperMinecart>> HOPPER_MINECART = EntityTypes.key(ResourceKey.minecraft("hopper_minecart"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public final class AttributeTypes {

public static final DefaultedRegistryReference<RangedAttributeType> BURNING_TIME = AttributeTypes.key(ResourceKey.minecraft("burning_time"));

public static final DefaultedRegistryReference<RangedAttributeType> CAMERA_DISTANCE = AttributeTypes.key(ResourceKey.minecraft("camera_distance"));

public static final DefaultedRegistryReference<RangedAttributeType> ENTITY_INTERACTION_RANGE = AttributeTypes.key(ResourceKey.minecraft("entity_interaction_range"));

public static final DefaultedRegistryReference<RangedAttributeType> EXPLOSION_KNOCKBACK_RESISTANCE = AttributeTypes.key(ResourceKey.minecraft("explosion_knockback_resistance"));
Expand Down Expand Up @@ -104,6 +106,10 @@ public final class AttributeTypes {

public static final DefaultedRegistryReference<RangedAttributeType> WATER_MOVEMENT_EFFICIENCY = AttributeTypes.key(ResourceKey.minecraft("water_movement_efficiency"));

public static final DefaultedRegistryReference<RangedAttributeType> WAYPOINT_RECEIVE_RANGE = AttributeTypes.key(ResourceKey.minecraft("waypoint_receive_range"));

public static final DefaultedRegistryReference<RangedAttributeType> WAYPOINT_TRANSMIT_RANGE = AttributeTypes.key(ResourceKey.minecraft("waypoint_transmit_range"));

private AttributeTypes() {
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
*
* Copyright (c) SpongePowered <https://www.spongepowered.org>
* 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.util.annotation.Experimental;

/**
* A Happy Ghast that is passive and normally does not attack players.
*
* @see <a href="https://minecraft.wiki/w/Happy_Ghast">Minecraft Wiki</a>
*/
@Experimental("summer_drop")
public interface HappyGhast extends Animal {
}
Loading