Skip to content

Commit 7f4b70e

Browse files
committed
chore: update api data types for 1.21.2 content
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2 parents 2a43df0 + 196f5d5 commit 7f4b70e

File tree

31 files changed

+673
-50
lines changed

31 files changed

+673
-50
lines changed

src/main/java/org/spongepowered/api/advancement/criteria/trigger/Triggers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public final class Triggers {
9494

9595
public static final DefaultedRegistryReference<Trigger<?>> ITEM_USED_ON_BLOCK = Triggers.key(ResourceKey.minecraft("item_used_on_block"));
9696

97-
public static final DefaultedRegistryReference<Trigger<?>> KILLED_BY_CROSSBOW = Triggers.key(ResourceKey.minecraft("killed_by_crossbow"));
97+
public static final DefaultedRegistryReference<Trigger<?>> KILLED_BY_ARROW = Triggers.key(ResourceKey.minecraft("killed_by_arrow"));
9898

9999
public static final DefaultedRegistryReference<Trigger<?>> KILL_MOB_NEAR_SCULK_CATALYST = Triggers.key(ResourceKey.minecraft("kill_mob_near_sculk_catalyst"));
100100

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525
package org.spongepowered.api.block;
2626

27+
import org.jetbrains.annotations.ApiStatus;
2728
import org.spongepowered.api.ResourceKey;
2829
import org.spongepowered.api.Sponge;
2930
import org.spongepowered.api.registry.DefaultedRegistryReference;
@@ -32,6 +33,7 @@
3233
import org.spongepowered.api.registry.RegistryScope;
3334
import org.spongepowered.api.registry.RegistryScopes;
3435
import org.spongepowered.api.registry.RegistryTypes;
36+
import org.spongepowered.api.util.annotation.Experimental;
3537

3638
/**
3739
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
@@ -496,6 +498,10 @@ public final class BlockTypes {
496498

497499
public static final DefaultedRegistryReference<BlockType> CRAFTING_TABLE = BlockTypes.key(ResourceKey.minecraft("crafting_table"));
498500

501+
@Experimental("winter_drop")
502+
@ApiStatus.Experimental
503+
public static final DefaultedRegistryReference<BlockType> CREAKING_HEART = BlockTypes.key(ResourceKey.minecraft("creaking_heart"));
504+
499505
public static final DefaultedRegistryReference<BlockType> CREEPER_HEAD = BlockTypes.key(ResourceKey.minecraft("creeper_head"));
500506

501507
public static final DefaultedRegistryReference<BlockType> CREEPER_WALL_HEAD = BlockTypes.key(ResourceKey.minecraft("creeper_wall_head"));
@@ -1336,6 +1342,86 @@ public final class BlockTypes {
13361342

13371343
public static final DefaultedRegistryReference<BlockType> PACKED_MUD = BlockTypes.key(ResourceKey.minecraft("packed_mud"));
13381344

1345+
@Experimental("winter_drop")
1346+
@ApiStatus.Experimental
1347+
public static final DefaultedRegistryReference<BlockType> PALE_HANGING_MOSS = BlockTypes.key(ResourceKey.minecraft("pale_hanging_moss"));
1348+
1349+
@Experimental("winter_drop")
1350+
@ApiStatus.Experimental
1351+
public static final DefaultedRegistryReference<BlockType> PALE_MOSS_BLOCK = BlockTypes.key(ResourceKey.minecraft("pale_moss_block"));
1352+
1353+
@Experimental("winter_drop")
1354+
@ApiStatus.Experimental
1355+
public static final DefaultedRegistryReference<BlockType> PALE_MOSS_CARPET = BlockTypes.key(ResourceKey.minecraft("pale_moss_carpet"));
1356+
1357+
@Experimental("winter_drop")
1358+
@ApiStatus.Experimental
1359+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_BUTTON = BlockTypes.key(ResourceKey.minecraft("pale_oak_button"));
1360+
1361+
@Experimental("winter_drop")
1362+
@ApiStatus.Experimental
1363+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_DOOR = BlockTypes.key(ResourceKey.minecraft("pale_oak_door"));
1364+
1365+
@Experimental("winter_drop")
1366+
@ApiStatus.Experimental
1367+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_FENCE = BlockTypes.key(ResourceKey.minecraft("pale_oak_fence"));
1368+
1369+
@Experimental("winter_drop")
1370+
@ApiStatus.Experimental
1371+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_FENCE_GATE = BlockTypes.key(ResourceKey.minecraft("pale_oak_fence_gate"));
1372+
1373+
@Experimental("winter_drop")
1374+
@ApiStatus.Experimental
1375+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_hanging_sign"));
1376+
1377+
@Experimental("winter_drop")
1378+
@ApiStatus.Experimental
1379+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_LEAVES = BlockTypes.key(ResourceKey.minecraft("pale_oak_leaves"));
1380+
1381+
@Experimental("winter_drop")
1382+
@ApiStatus.Experimental
1383+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_LOG = BlockTypes.key(ResourceKey.minecraft("pale_oak_log"));
1384+
1385+
@Experimental("winter_drop")
1386+
@ApiStatus.Experimental
1387+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_PLANKS = BlockTypes.key(ResourceKey.minecraft("pale_oak_planks"));
1388+
1389+
@Experimental("winter_drop")
1390+
@ApiStatus.Experimental
1391+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("pale_oak_pressure_plate"));
1392+
1393+
@Experimental("winter_drop")
1394+
@ApiStatus.Experimental
1395+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SAPLING = BlockTypes.key(ResourceKey.minecraft("pale_oak_sapling"));
1396+
1397+
@Experimental("winter_drop")
1398+
@ApiStatus.Experimental
1399+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_sign"));
1400+
1401+
@Experimental("winter_drop")
1402+
@ApiStatus.Experimental
1403+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SLAB = BlockTypes.key(ResourceKey.minecraft("pale_oak_slab"));
1404+
1405+
@Experimental("winter_drop")
1406+
@ApiStatus.Experimental
1407+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_STAIRS = BlockTypes.key(ResourceKey.minecraft("pale_oak_stairs"));
1408+
1409+
@Experimental("winter_drop")
1410+
@ApiStatus.Experimental
1411+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("pale_oak_trapdoor"));
1412+
1413+
@Experimental("winter_drop")
1414+
@ApiStatus.Experimental
1415+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WALL_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_wall_hanging_sign"));
1416+
1417+
@Experimental("winter_drop")
1418+
@ApiStatus.Experimental
1419+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WALL_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_wall_sign"));
1420+
1421+
@Experimental("winter_drop")
1422+
@ApiStatus.Experimental
1423+
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WOOD = BlockTypes.key(ResourceKey.minecraft("pale_oak_wood"));
1424+
13391425
public static final DefaultedRegistryReference<BlockType> PEARLESCENT_FROGLIGHT = BlockTypes.key(ResourceKey.minecraft("pearlescent_froglight"));
13401426

13411427
public static final DefaultedRegistryReference<BlockType> PEONY = BlockTypes.key(ResourceKey.minecraft("peony"));
@@ -1502,6 +1588,10 @@ public final class BlockTypes {
15021588

15031589
public static final DefaultedRegistryReference<BlockType> POTTED_OXEYE_DAISY = BlockTypes.key(ResourceKey.minecraft("potted_oxeye_daisy"));
15041590

1591+
@Experimental("winter_drop")
1592+
@ApiStatus.Experimental
1593+
public static final DefaultedRegistryReference<BlockType> POTTED_PALE_OAK_SAPLING = BlockTypes.key(ResourceKey.minecraft("potted_pale_oak_sapling"));
1594+
15051595
public static final DefaultedRegistryReference<BlockType> POTTED_PINK_TULIP = BlockTypes.key(ResourceKey.minecraft("potted_pink_tulip"));
15061596

15071597
public static final DefaultedRegistryReference<BlockType> POTTED_POPPY = BlockTypes.key(ResourceKey.minecraft("potted_poppy"));
@@ -1864,6 +1954,14 @@ public final class BlockTypes {
18641954

18651955
public static final DefaultedRegistryReference<BlockType> STRIPPED_OAK_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_oak_wood"));
18661956

1957+
@Experimental("winter_drop")
1958+
@ApiStatus.Experimental
1959+
public static final DefaultedRegistryReference<BlockType> STRIPPED_PALE_OAK_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_pale_oak_log"));
1960+
1961+
@Experimental("winter_drop")
1962+
@ApiStatus.Experimental
1963+
public static final DefaultedRegistryReference<BlockType> STRIPPED_PALE_OAK_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_pale_oak_wood"));
1964+
18671965
public static final DefaultedRegistryReference<BlockType> STRIPPED_SPRUCE_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_spruce_log"));
18681966

18691967
public static final DefaultedRegistryReference<BlockType> STRIPPED_SPRUCE_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_spruce_wood"));

src/main/java/org/spongepowered/api/block/entity/BlockEntityTypes.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ public final class BlockEntityTypes {
7474

7575
public static final DefaultedRegistryReference<BlockEntityType> CRAFTER = BlockEntityTypes.key(ResourceKey.minecraft("crafter"));
7676

77+
public static final DefaultedRegistryReference<BlockEntityType> CREAKING_HEART = BlockEntityTypes.key(ResourceKey.minecraft("creaking_heart"));
78+
7779
public static final DefaultedRegistryReference<BlockEntityType> DAYLIGHT_DETECTOR = BlockEntityTypes.key(ResourceKey.minecraft("daylight_detector"));
7880

7981
public static final DefaultedRegistryReference<BlockEntityType> DECORATED_POT = BlockEntityTypes.key(ResourceKey.minecraft("decorated_pot"));
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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.block.entity;
26+
27+
import org.jetbrains.annotations.ApiStatus;
28+
import org.spongepowered.api.util.annotation.Experimental;
29+
30+
/**
31+
* Represents a CreakingHeart block entity.
32+
*
33+
* @see <a href="https://minecraft.wiki/Creaking_Heart">Creaking Heart</a>
34+
*/
35+
@Experimental("winter_drop")
36+
@ApiStatus.Experimental
37+
public interface CreakingHeart extends BlockEntity {
38+
39+
}

src/main/java/org/spongepowered/api/data/BlockStateKeys.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.spongepowered.api.data.type.BellAttachmentType;
3131
import org.spongepowered.api.data.type.ChestAttachmentType;
3232
import org.spongepowered.api.data.type.ComparatorMode;
33+
import org.spongepowered.api.data.type.CreakingHeart;
3334
import org.spongepowered.api.data.type.DoorHinge;
3435
import org.spongepowered.api.data.type.DripstoneSegment;
3536
import org.spongepowered.api.data.type.InstrumentType;
@@ -116,6 +117,8 @@ public final class BlockStateKeys {
116117

117118
public static final Key<Value<Boolean>> CRAFTING = BlockStateKeys.key(ResourceKey.minecraft("property/crafting"), Boolean.class);
118119

120+
public static final Key<Value<CreakingHeart>> CREAKING = BlockStateKeys.key(ResourceKey.minecraft("property/creaking"), CreakingHeart.class);
121+
119122
public static final Key<Value<Integer>> DELAY = BlockStateKeys.key(ResourceKey.minecraft("property/delay"), Integer.class);
120123

121124
public static final Key<Value<Boolean>> DISARMED = BlockStateKeys.key(ResourceKey.minecraft("property/disarmed"), Boolean.class);
@@ -264,6 +267,8 @@ public final class BlockStateKeys {
264267

265268
public static final Key<Value<Tilt>> TILT = BlockStateKeys.key(ResourceKey.minecraft("property/tilt"), Tilt.class);
266269

270+
public static final Key<Value<Boolean>> TIP = BlockStateKeys.key(ResourceKey.minecraft("property/tip"), Boolean.class);
271+
267272
public static final Key<Value<TrialSpawnerState>> TRIAL_SPAWNER_STATE = BlockStateKeys.key(ResourceKey.minecraft("property/trial_spawner_state"), TrialSpawnerState.class);
268273

269274
public static final Key<Value<Boolean>> TRIGGERED = BlockStateKeys.key(ResourceKey.minecraft("property/triggered"), Boolean.class);
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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.registry.RegistryScope;
29+
import org.spongepowered.api.registry.RegistryScopes;
30+
import org.spongepowered.api.util.annotation.CatalogedBy;
31+
32+
@RegistryScopes(scopes = RegistryScope.GAME)
33+
@CatalogedBy(CreakingHearts.class)
34+
public interface CreakingHeart extends Comparable<CreakingHeart>, StringRepresentable, DefaultedRegistryValue {
35+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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.RegistryKey;
31+
import org.spongepowered.api.registry.RegistryTypes;
32+
33+
public final class CreakingHearts {
34+
35+
public static final DefaultedRegistryReference<CreakingHeart> ACTIVE = CreakingHearts.key(ResourceKey.sponge("active"));
36+
37+
public static final DefaultedRegistryReference<CreakingHeart> DISABLED = CreakingHearts.key(ResourceKey.sponge("disabled"));
38+
39+
public static final DefaultedRegistryReference<CreakingHeart> DORMANT = CreakingHearts.key(ResourceKey.sponge("dormant"));
40+
41+
private static DefaultedRegistryReference<CreakingHeart> key(final ResourceKey location) {
42+
return RegistryKey.of(RegistryTypes.CREAKING_HEART, location).asDefaultedReference(Sponge::game);
43+
}
44+
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public final class ParticleTypes {
4646

4747
public static final DefaultedRegistryReference<ParticleType> BLOCK = ParticleTypes.key(ResourceKey.minecraft("block"));
4848

49+
public static final DefaultedRegistryReference<ParticleType> BLOCK_CRUMBLE = ParticleTypes.key(ResourceKey.minecraft("block_crumble"));
50+
4951
public static final DefaultedRegistryReference<ParticleType> BLOCK_MARKER = ParticleTypes.key(ResourceKey.minecraft("block_marker"));
5052

5153
public static final DefaultedRegistryReference<ParticleType> BUBBLE = ParticleTypes.key(ResourceKey.minecraft("bubble"));
@@ -234,6 +236,8 @@ public final class ParticleTypes {
234236

235237
public static final DefaultedRegistryReference<ParticleType> TOTEM_OF_UNDYING = ParticleTypes.key(ResourceKey.minecraft("totem_of_undying"));
236238

239+
public static final DefaultedRegistryReference<ParticleType> TRAIL = ParticleTypes.key(ResourceKey.minecraft("trail"));
240+
237241
public static final DefaultedRegistryReference<ParticleType> TRIAL_OMEN = ParticleTypes.key(ResourceKey.minecraft("trial_omen"));
238242

239243
public static final DefaultedRegistryReference<ParticleType> TRIAL_SPAWNER_DETECTION = ParticleTypes.key(ResourceKey.minecraft("trial_spawner_detection"));

0 commit comments

Comments
 (0)