Skip to content

Commit

Permalink
feat!: update content api to 25w05a
Browse files Browse the repository at this point in the history
Breaking Changes
- Raids no longer have a ServerWorld link

Additions
- Mainly new type entries and tag entries are updated
  • Loading branch information
gabizou committed Feb 1, 2025
1 parent 0b462f5 commit 68f73ba
Show file tree
Hide file tree
Showing 12 changed files with 130 additions and 9 deletions.
4 changes: 4 additions & 0 deletions src/main/java/org/spongepowered/api/block/BlockTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@ public final class BlockTypes {

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

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

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

public static final DefaultedRegistryReference<BlockType> CAKE = BlockTypes.key(ResourceKey.minecraft("cake"));
Expand Down Expand Up @@ -792,6 +794,8 @@ public final class BlockTypes {

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

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

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

public static final DefaultedRegistryReference<BlockType> FIRE_CORAL_BLOCK = BlockTypes.key(ResourceKey.minecraft("fire_coral_block"));
Expand Down
32 changes: 32 additions & 0 deletions src/main/java/org/spongepowered/api/data/type/CowVariant.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* 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.data.type;

import org.spongepowered.api.registry.DefaultedRegistryValue;
import org.spongepowered.api.util.annotation.CatalogedBy;

@CatalogedBy(CowVariants.class)
public interface CowVariant extends DefaultedRegistryValue {
}
59 changes: 59 additions & 0 deletions src/main/java/org/spongepowered/api/data/type/CowVariants.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* 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.data.type;

import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
import org.spongepowered.api.registry.Registry;
import org.spongepowered.api.registry.RegistryKey;
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;

/**
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
*/
@SuppressWarnings("unused")
@RegistryScopes(scopes = RegistryScope.ENGINE)
public final class CowVariants {

public static final DefaultedRegistryReference<CowVariant> COLD = CowVariants.key(ResourceKey.minecraft("cold"));

public static final DefaultedRegistryReference<CowVariant> TEMPERATE = CowVariants.key(ResourceKey.minecraft("temperate"));

public static final DefaultedRegistryReference<CowVariant> WARM = CowVariants.key(ResourceKey.minecraft("warm"));

private CowVariants() {
}

public static Registry<CowVariant> registry() {
return Sponge.server().registry(RegistryTypes.COW_VARIANT);
}

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

public static final DefaultedRegistryReference<ParticleType> FALLING_WATER = ParticleTypes.key(ResourceKey.minecraft("falling_water"));

public static final DefaultedRegistryReference<ParticleType> FIREFLY = ParticleTypes.key(ResourceKey.minecraft("firefly"));

public static final DefaultedRegistryReference<ParticleType> FIREWORK = ParticleTypes.key(ResourceKey.minecraft("firework"));

public static final DefaultedRegistryReference<ParticleType> FISHING = ParticleTypes.key(ResourceKey.minecraft("fishing"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,8 @@ public final class SoundTypes {

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

public static final DefaultedRegistryReference<SoundType> BLOCK_DEADBUSH_IDLE = SoundTypes.key(ResourceKey.minecraft("block.deadbush.idle"));

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

public static final DefaultedRegistryReference<SoundType> BLOCK_DECORATED_POT_FALL = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.fall"));
Expand Down Expand Up @@ -1194,10 +1196,14 @@ public final class SoundTypes {

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

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

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

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
4 changes: 4 additions & 0 deletions src/main/java/org/spongepowered/api/item/ItemTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,8 @@ public final class ItemTypes {

public static final DefaultedRegistryReference<ItemType> BURN_POTTERY_SHERD = ItemTypes.key(ResourceKey.minecraft("burn_pottery_sherd"));

public static final DefaultedRegistryReference<ItemType> BUSH = ItemTypes.key(ResourceKey.minecraft("bush"));

public static final DefaultedRegistryReference<ItemType> CACTUS = ItemTypes.key(ResourceKey.minecraft("cactus"));

public static final DefaultedRegistryReference<ItemType> CAKE = ItemTypes.key(ResourceKey.minecraft("cake"));
Expand Down Expand Up @@ -978,6 +980,8 @@ public final class ItemTypes {

public static final DefaultedRegistryReference<ItemType> FILLED_MAP = ItemTypes.key(ResourceKey.minecraft("filled_map"));

public static final DefaultedRegistryReference<ItemType> FIREFLY_BUSH = ItemTypes.key(ResourceKey.minecraft("firefly_bush"));

public static final DefaultedRegistryReference<ItemType> FIREWORK_ROCKET = ItemTypes.key(ResourceKey.minecraft("firework_rocket"));

public static final DefaultedRegistryReference<ItemType> FIREWORK_STAR = ItemTypes.key(ResourceKey.minecraft("firework_star"));
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/org/spongepowered/api/raid/Raid.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@

public interface Raid {

/**
* Gets the {@link ServerWorld} this raid is taking place in.
*
* @return The world
*/
ServerWorld world();

/**
* Gets the {@link BossBar} being displayed to clients of this raid.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.spongepowered.api.data.type.CatType;
import org.spongepowered.api.data.type.ChestAttachmentType;
import org.spongepowered.api.data.type.ComparatorMode;
import org.spongepowered.api.data.type.CowVariant;
import org.spongepowered.api.data.type.CreakingHeartState;
import org.spongepowered.api.data.type.DoorHinge;
import org.spongepowered.api.data.type.DripstoneSegment;
Expand Down Expand Up @@ -336,6 +337,8 @@ public final class RegistryTypes {

public static final DefaultedRegistryType<ComparatorMode> COMPARATOR_MODE = RegistryTypes.spongeKeyInGame("comparator_mode");

public static final DefaultedRegistryType<CowVariant> COW_VARIANT = RegistryTypes.minecraftKeyInServer("cow_variant");

public static final DefaultedRegistryType<CreakingHeartState> CREAKING_HEART_STATES = RegistryTypes.spongeKeyInGame("creaking_heart_state");

public static final DefaultedRegistryType<Criterion> CRITERION = RegistryTypes.spongeKeyInGame("criterion");
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/spongepowered/api/tag/BlockTypeTags.java
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@ public final class BlockTypeTags {

public static final Tag<BlockType> PLANKS = BlockTypeTags.key(ResourceKey.minecraft("planks"));

public static final Tag<BlockType> PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS = BlockTypeTags.key(ResourceKey.minecraft("plays_ambient_desert_block_sounds"));

public static final Tag<BlockType> POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = BlockTypeTags.key(ResourceKey.minecraft("polar_bears_spawnable_on_alternate"));

public static final Tag<BlockType> PORTALS = BlockTypeTags.key(ResourceKey.minecraft("portals"));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/spongepowered/api/tag/DamageTypeTags.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ public final class DamageTypeTags {

public static final Tag<DamageType> BYPASSES_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_armor"));

public static final Tag<DamageType> BYPASSES_BLOCKING = DamageTypeTags.key(ResourceKey.minecraft("bypasses_blocking"));

public static final Tag<DamageType> BYPASSES_EFFECTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_effects"));

public static final Tag<DamageType> BYPASSES_ENCHANTMENTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_enchantments"));
Expand All @@ -63,6 +61,8 @@ public final class DamageTypeTags {

public static final Tag<DamageType> BYPASSES_RESISTANCE = DamageTypeTags.key(ResourceKey.minecraft("bypasses_resistance"));

public static final Tag<DamageType> BYPASSES_SHIELD = DamageTypeTags.key(ResourceKey.minecraft("bypasses_shield"));

public static final Tag<DamageType> BYPASSES_WOLF_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_wolf_armor"));

public static final Tag<DamageType> CAN_BREAK_ARMOR_STAND = DamageTypeTags.key(ResourceKey.minecraft("can_break_armor_stand"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ public final class Features {

public static final DefaultedRegistryReference<Feature> PATCH_BROWN_MUSHROOM = Features.key(ResourceKey.minecraft("patch_brown_mushroom"));

public static final DefaultedRegistryReference<Feature> PATCH_BUSH = Features.key(ResourceKey.minecraft("patch_bush"));

public static final DefaultedRegistryReference<Feature> PATCH_CACTUS = Features.key(ResourceKey.minecraft("patch_cactus"));

public static final DefaultedRegistryReference<Feature> PATCH_CRIMSON_ROOTS = Features.key(ResourceKey.minecraft("patch_crimson_roots"));
Expand All @@ -328,6 +330,12 @@ public final class Features {

public static final DefaultedRegistryReference<Feature> PATCH_FIRE = Features.key(ResourceKey.minecraft("patch_fire"));

public static final DefaultedRegistryReference<Feature> PATCH_FIREFLY_BUSH = Features.key(ResourceKey.minecraft("patch_firefly_bush"));

public static final DefaultedRegistryReference<Feature> PATCH_FIREFLY_BUSH_NEAR_WATER = Features.key(ResourceKey.minecraft("patch_firefly_bush_near_water"));

public static final DefaultedRegistryReference<Feature> PATCH_FIREFLY_BUSH_SPARSE = Features.key(ResourceKey.minecraft("patch_firefly_bush_sparse"));

public static final DefaultedRegistryReference<Feature> PATCH_GRASS = Features.key(ResourceKey.minecraft("patch_grass"));

public static final DefaultedRegistryReference<Feature> PATCH_GRASS_JUNGLE = Features.key(ResourceKey.minecraft("patch_grass_jungle"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,8 @@ public final class PlacedFeatures {

public static final DefaultedRegistryReference<PlacedFeature> PATCH_BERRY_RARE = PlacedFeatures.key(ResourceKey.minecraft("patch_berry_rare"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_BUSH = PlacedFeatures.key(ResourceKey.minecraft("patch_bush"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_CACTUS = PlacedFeatures.key(ResourceKey.minecraft("patch_cactus"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_CACTUS_DECORATED = PlacedFeatures.key(ResourceKey.minecraft("patch_cactus_decorated"));
Expand All @@ -340,6 +342,12 @@ public final class PlacedFeatures {

public static final DefaultedRegistryReference<PlacedFeature> PATCH_FIRE = PlacedFeatures.key(ResourceKey.minecraft("patch_fire"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_FIREFLY_BUSH_NEAR_WATER = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_near_water"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_FIREFLY_BUSH_NEAR_WATER_SWAMP = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_near_water_swamp"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_FIREFLY_BUSH_SWAMP = PlacedFeatures.key(ResourceKey.minecraft("patch_firefly_bush_swamp"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_GRASS_BADLANDS = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_badlands"));

public static final DefaultedRegistryReference<PlacedFeature> PATCH_GRASS_FOREST = PlacedFeatures.key(ResourceKey.minecraft("patch_grass_forest"));
Expand Down

0 comments on commit 68f73ba

Please sign in to comment.