Skip to content

Commit 700c16b

Browse files
gabizougabizou
committed
feat!: update content api to 25w05a
Breaking Changes - Raids no longer have a ServerWorld link Additions - Mainly new type entries and tag entries are updated
1 parent 0b462f5 commit 700c16b

File tree

12 files changed

+130
-10
lines changed

12 files changed

+130
-10
lines changed

‎src/main/java/org/spongepowered/api/block/BlockTypes.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ public final class BlockTypes {
336336

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

339+
public static final DefaultedRegistryReference<BlockType> BUSH = BlockTypes.key(ResourceKey.minecraft("bush"));
340+
339341
public static final DefaultedRegistryReference<BlockType> CACTUS = BlockTypes.key(ResourceKey.minecraft("cactus"));
340342

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

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

797+
public static final DefaultedRegistryReference<BlockType> FIREFLY_BUSH = BlockTypes.key(ResourceKey.minecraft("firefly_bush"));
798+
795799
public static final DefaultedRegistryReference<BlockType> FIRE_CORAL = BlockTypes.key(ResourceKey.minecraft("fire_coral"));
796800

797801
public static final DefaultedRegistryReference<BlockType> FIRE_CORAL_BLOCK = BlockTypes.key(ResourceKey.minecraft("fire_coral_block"));

‎src/main/java/org/spongepowered/api/data/type/CowVariant.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.api.data.type;
26+
27+
import org.spongepowered.api.registry.DefaultedRegistryValue;
28+
import org.spongepowered.api.util.annotation.CatalogedBy;
29+
30+
@CatalogedBy(CowVariants.class)
31+
public interface CowVariant extends DefaultedRegistryValue {
32+
}

‎src/main/java/org/spongepowered/api/data/type/CowVariants.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* This file is part of SpongeAPI, licensed under the MIT License (MIT).
3+
*
4+
* Copyright (c) SpongePowered <https://www.spongepowered.org>
5+
* Copyright (c) contributors
6+
*
7+
* Permission is hereby granted, free of charge, to any person obtaining a copy
8+
* of this software and associated documentation files (the "Software"), to deal
9+
* in the Software without restriction, including without limitation the rights
10+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
* copies of the Software, and to permit persons to whom the Software is
12+
* furnished to do so, subject to the following conditions:
13+
*
14+
* The above copyright notice and this permission notice shall be included in
15+
* all copies or substantial portions of the Software.
16+
*
17+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
* THE SOFTWARE.
24+
*/
25+
package org.spongepowered.api.data.type;
26+
27+
import org.spongepowered.api.ResourceKey;
28+
import org.spongepowered.api.Sponge;
29+
import org.spongepowered.api.registry.DefaultedRegistryReference;
30+
import org.spongepowered.api.registry.Registry;
31+
import org.spongepowered.api.registry.RegistryKey;
32+
import org.spongepowered.api.registry.RegistryScope;
33+
import org.spongepowered.api.registry.RegistryScopes;
34+
import org.spongepowered.api.registry.RegistryTypes;
35+
36+
/**
37+
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
38+
*/
39+
@SuppressWarnings("unused")
40+
@RegistryScopes(scopes = RegistryScope.ENGINE)
41+
public final class CowVariants {
42+
43+
public static final DefaultedRegistryReference<CowVariant> COLD = CowVariants.key(ResourceKey.minecraft("cold"));
44+
45+
public static final DefaultedRegistryReference<CowVariant> TEMPERATE = CowVariants.key(ResourceKey.minecraft("temperate"));
46+
47+
public static final DefaultedRegistryReference<CowVariant> WARM = CowVariants.key(ResourceKey.minecraft("warm"));
48+
49+
private CowVariants() {
50+
}
51+
52+
public static Registry<CowVariant> registry() {
53+
return Sponge.server().registry(RegistryTypes.COW_VARIANT);
54+
}
55+
56+
private static DefaultedRegistryReference<CowVariant> key(final ResourceKey location) {
57+
return RegistryKey.of(RegistryTypes.COW_VARIANT, location).asDefaultedReference(Sponge::server);
58+
}
59+
}

‎src/main/java/org/spongepowered/api/effect/particle/ParticleTypes.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ public final class ParticleTypes {
136136

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

139+
public static final DefaultedRegistryReference<ParticleType> FIREFLY = ParticleTypes.key(ResourceKey.minecraft("firefly"));
140+
139141
public static final DefaultedRegistryReference<ParticleType> FIREWORK = ParticleTypes.key(ResourceKey.minecraft("firework"));
140142

141143
public static final DefaultedRegistryReference<ParticleType> FISHING = ParticleTypes.key(ResourceKey.minecraft("fishing"));

‎src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ public final class SoundTypes {
526526

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

529+
public static final DefaultedRegistryReference<SoundType> BLOCK_DEADBUSH_IDLE = SoundTypes.key(ResourceKey.minecraft("block.deadbush.idle"));
530+
529531
public static final DefaultedRegistryReference<SoundType> BLOCK_DECORATED_POT_BREAK = SoundTypes.key(ResourceKey.minecraft("block.decorated_pot.break"));
530532

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

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

1199+
public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_IDLE = SoundTypes.key(ResourceKey.minecraft("block.sand.idle"));
1200+
11971201
public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_PLACE = SoundTypes.key(ResourceKey.minecraft("block.sand.place"));
11981202

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

1205+
public static final DefaultedRegistryReference<SoundType> BLOCK_SAND_WIND = SoundTypes.key(ResourceKey.minecraft("block.sand.wind"));
1206+
12011207
public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_BREAK = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.break"));
12021208

12031209
public static final DefaultedRegistryReference<SoundType> BLOCK_SCAFFOLDING_FALL = SoundTypes.key(ResourceKey.minecraft("block.scaffolding.fall"));

‎src/main/java/org/spongepowered/api/item/ItemTypes.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,8 @@ public final class ItemTypes {
400400

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

403+
public static final DefaultedRegistryReference<ItemType> BUSH = ItemTypes.key(ResourceKey.minecraft("bush"));
404+
403405
public static final DefaultedRegistryReference<ItemType> CACTUS = ItemTypes.key(ResourceKey.minecraft("cactus"));
404406

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

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

983+
public static final DefaultedRegistryReference<ItemType> FIREFLY_BUSH = ItemTypes.key(ResourceKey.minecraft("firefly_bush"));
984+
981985
public static final DefaultedRegistryReference<ItemType> FIREWORK_ROCKET = ItemTypes.key(ResourceKey.minecraft("firework_rocket"));
982986

983987
public static final DefaultedRegistryReference<ItemType> FIREWORK_STAR = ItemTypes.key(ResourceKey.minecraft("firework_star"));

‎src/main/java/org/spongepowered/api/raid/Raid.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,12 @@
2929
import org.spongepowered.api.entity.living.Living;
3030
import org.spongepowered.api.entity.living.monster.raider.Raider;
3131
import org.spongepowered.api.world.difficulty.Difficulties;
32-
import org.spongepowered.api.world.server.ServerWorld;
3332

3433
import java.util.List;
3534
import java.util.Optional;
3635

3736
public interface Raid {
3837

39-
/**
40-
* Gets the {@link ServerWorld} this raid is taking place in.
41-
*
42-
* @return The world
43-
*/
44-
ServerWorld world();
45-
4638
/**
4739
* Gets the {@link BossBar} being displayed to clients of this raid.
4840
*

‎src/main/java/org/spongepowered/api/registry/RegistryTypes.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import org.spongepowered.api.data.type.CatType;
5555
import org.spongepowered.api.data.type.ChestAttachmentType;
5656
import org.spongepowered.api.data.type.ComparatorMode;
57+
import org.spongepowered.api.data.type.CowVariant;
5758
import org.spongepowered.api.data.type.CreakingHeartState;
5859
import org.spongepowered.api.data.type.DoorHinge;
5960
import org.spongepowered.api.data.type.DripstoneSegment;
@@ -336,6 +337,8 @@ public final class RegistryTypes {
336337

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

340+
public static final DefaultedRegistryType<CowVariant> COW_VARIANT = RegistryTypes.minecraftKeyInServer("cow_variant");
341+
339342
public static final DefaultedRegistryType<CreakingHeartState> CREAKING_HEART_STATES = RegistryTypes.spongeKeyInGame("creaking_heart_state");
340343

341344
public static final DefaultedRegistryType<Criterion> CRITERION = RegistryTypes.spongeKeyInGame("criterion");

‎src/main/java/org/spongepowered/api/tag/BlockTypeTags.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ public final class BlockTypeTags {
285285

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

288+
public static final Tag<BlockType> PLAYS_AMBIENT_DESERT_BLOCK_SOUNDS = BlockTypeTags.key(ResourceKey.minecraft("plays_ambient_desert_block_sounds"));
289+
288290
public static final Tag<BlockType> POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = BlockTypeTags.key(ResourceKey.minecraft("polar_bears_spawnable_on_alternate"));
289291

290292
public static final Tag<BlockType> PORTALS = BlockTypeTags.key(ResourceKey.minecraft("portals"));

‎src/main/java/org/spongepowered/api/tag/DamageTypeTags.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ public final class DamageTypeTags {
5353

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

56-
public static final Tag<DamageType> BYPASSES_BLOCKING = DamageTypeTags.key(ResourceKey.minecraft("bypasses_blocking"));
57-
5856
public static final Tag<DamageType> BYPASSES_EFFECTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_effects"));
5957

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

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

64+
public static final Tag<DamageType> BYPASSES_SHIELD = DamageTypeTags.key(ResourceKey.minecraft("bypasses_shield"));
65+
6666
public static final Tag<DamageType> BYPASSES_WOLF_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_wolf_armor"));
6767

6868
public static final Tag<DamageType> CAN_BREAK_ARMOR_STAND = DamageTypeTags.key(ResourceKey.minecraft("can_break_armor_stand"));

0 commit comments

Comments
 (0)