Skip to content

Commit c9ca712

Browse files
gabizougabizou
committed
feat!: add content for 25w06a
Additions: - New blocks - New ChickenVariant Breaking Change: - Vanilla tag name DEAD_BUSH_MAY_PLACE_ON to DRY_VEGETATION_MAY_PLACE_ON
1 parent f78b07f commit c9ca712

File tree

11 files changed

+127
-2
lines changed

11 files changed

+127
-2
lines changed

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

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

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

343+
public static final DefaultedRegistryReference<BlockType> CACTUS_FLOWER = BlockTypes.key(ResourceKey.minecraft("cactus_flower"));
344+
343345
public static final DefaultedRegistryReference<BlockType> CAKE = BlockTypes.key(ResourceKey.minecraft("cake"));
344346

345347
public static final DefaultedRegistryReference<BlockType> CALCITE = BlockTypes.key(ResourceKey.minecraft("calcite"));
@@ -1776,6 +1778,8 @@ public final class BlockTypes {
17761778

17771779
public static final DefaultedRegistryReference<BlockType> SEA_PICKLE = BlockTypes.key(ResourceKey.minecraft("sea_pickle"));
17781780

1781+
public static final DefaultedRegistryReference<BlockType> SHORT_DRY_GRASS = BlockTypes.key(ResourceKey.minecraft("short_dry_grass"));
1782+
17791783
public static final DefaultedRegistryReference<BlockType> SHORT_GRASS = BlockTypes.key(ResourceKey.minecraft("short_grass"));
17801784

17811785
public static final DefaultedRegistryReference<BlockType> SHROOMLIGHT = BlockTypes.key(ResourceKey.minecraft("shroomlight"));
@@ -1962,6 +1966,8 @@ public final class BlockTypes {
19621966

19631967
public static final DefaultedRegistryReference<BlockType> SWEET_BERRY_BUSH = BlockTypes.key(ResourceKey.minecraft("sweet_berry_bush"));
19641968

1969+
public static final DefaultedRegistryReference<BlockType> TALL_DRY_GRASS = BlockTypes.key(ResourceKey.minecraft("tall_dry_grass"));
1970+
19651971
public static final DefaultedRegistryReference<BlockType> TALL_GRASS = BlockTypes.key(ResourceKey.minecraft("tall_grass"));
19661972

19671973
public static final DefaultedRegistryReference<BlockType> TALL_SEAGRASS = BlockTypes.key(ResourceKey.minecraft("tall_seagrass"));

‎src/main/java/org/spongepowered/api/data/type/ChickenVariant.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(ChickenVariants.class)
31+
public interface ChickenVariant extends DefaultedRegistryValue {
32+
}

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
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+
@SuppressWarnings("unused")
37+
@RegistryScopes(scopes = RegistryScope.ENGINE)
38+
public final class ChickenVariants {
39+
40+
public static final DefaultedRegistryReference<ChickenVariant> COLD = ChickenVariants.key(ResourceKey.minecraft("cold"));
41+
42+
public static final DefaultedRegistryReference<ChickenVariant> TEMPERATE = ChickenVariants.key(ResourceKey.minecraft("temperate"));
43+
44+
public static final DefaultedRegistryReference<ChickenVariant> WARM = ChickenVariants.key(ResourceKey.minecraft("warm"));
45+
46+
private ChickenVariants() {
47+
}
48+
49+
public static Registry<ChickenVariant> registry() {
50+
return Sponge.server().registry(RegistryTypes.CHICKEN_VARIANT);
51+
}
52+
53+
private static DefaultedRegistryReference<ChickenVariant> key(final ResourceKey location) {
54+
return RegistryKey.of(RegistryTypes.CHICKEN_VARIANT, location).asDefaultedReference(Sponge::server);
55+
}
56+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,10 @@ public final class SoundTypes {
284284

285285
public static final DefaultedRegistryReference<SoundType> BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = SoundTypes.key(ResourceKey.minecraft("block.bubble_column.whirlpool_inside"));
286286

287+
public static final DefaultedRegistryReference<SoundType> BLOCK_CACTUS_FLOWER_BREAK = SoundTypes.key(ResourceKey.minecraft("block.cactus_flower.break"));
288+
289+
public static final DefaultedRegistryReference<SoundType> BLOCK_CACTUS_FLOWER_PLACE = SoundTypes.key(ResourceKey.minecraft("block.cactus_flower.place"));
290+
287291
public static final DefaultedRegistryReference<SoundType> BLOCK_CAKE_ADD_CANDLE = SoundTypes.key(ResourceKey.minecraft("block.cake.add_candle"));
288292

289293
public static final DefaultedRegistryReference<SoundType> BLOCK_CALCITE_BREAK = SoundTypes.key(ResourceKey.minecraft("block.calcite.break"));
@@ -616,6 +620,8 @@ public final class SoundTypes {
616620

617621
public static final DefaultedRegistryReference<SoundType> BLOCK_FENCE_GATE_OPEN = SoundTypes.key(ResourceKey.minecraft("block.fence_gate.open"));
618622

623+
public static final DefaultedRegistryReference<SoundType> BLOCK_FIREFLY_BUSH_IDLE = SoundTypes.key(ResourceKey.minecraft("block.firefly_bush.idle"));
624+
619625
public static final DefaultedRegistryReference<SoundType> BLOCK_FIRE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("block.fire.ambient"));
620626

621627
public static final DefaultedRegistryReference<SoundType> BLOCK_FIRE_EXTINGUISH = SoundTypes.key(ResourceKey.minecraft("block.fire.extinguish"));

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ public final class ItemTypes {
290290

291291
public static final DefaultedRegistryReference<ItemType> BLUE_DYE = ItemTypes.key(ResourceKey.minecraft("blue_dye"));
292292

293+
public static final DefaultedRegistryReference<ItemType> BLUE_EGG = ItemTypes.key(ResourceKey.minecraft("blue_egg"));
294+
293295
public static final DefaultedRegistryReference<ItemType> BLUE_GLAZED_TERRACOTTA = ItemTypes.key(ResourceKey.minecraft("blue_glazed_terracotta"));
294296

295297
public static final DefaultedRegistryReference<ItemType> BLUE_ICE = ItemTypes.key(ResourceKey.minecraft("blue_ice"));
@@ -368,6 +370,8 @@ public final class ItemTypes {
368370

369371
public static final DefaultedRegistryReference<ItemType> BROWN_DYE = ItemTypes.key(ResourceKey.minecraft("brown_dye"));
370372

373+
public static final DefaultedRegistryReference<ItemType> BROWN_EGG = ItemTypes.key(ResourceKey.minecraft("brown_egg"));
374+
371375
public static final DefaultedRegistryReference<ItemType> BROWN_GLAZED_TERRACOTTA = ItemTypes.key(ResourceKey.minecraft("brown_glazed_terracotta"));
372376

373377
public static final DefaultedRegistryReference<ItemType> BROWN_MUSHROOM = ItemTypes.key(ResourceKey.minecraft("brown_mushroom"));
@@ -404,6 +408,8 @@ public final class ItemTypes {
404408

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

411+
public static final DefaultedRegistryReference<ItemType> CACTUS_FLOWER = ItemTypes.key(ResourceKey.minecraft("cactus_flower"));
412+
407413
public static final DefaultedRegistryReference<ItemType> CAKE = ItemTypes.key(ResourceKey.minecraft("cake"));
408414

409415
public static final DefaultedRegistryReference<ItemType> CALCITE = ItemTypes.key(ResourceKey.minecraft("calcite"));
@@ -2232,6 +2238,8 @@ public final class ItemTypes {
22322238

22332239
public static final DefaultedRegistryReference<ItemType> SHIELD = ItemTypes.key(ResourceKey.minecraft("shield"));
22342240

2241+
public static final DefaultedRegistryReference<ItemType> SHORT_DRY_GRASS = ItemTypes.key(ResourceKey.minecraft("short_dry_grass"));
2242+
22352243
public static final DefaultedRegistryReference<ItemType> SHORT_GRASS = ItemTypes.key(ResourceKey.minecraft("short_grass"));
22362244

22372245
public static final DefaultedRegistryReference<ItemType> SHROOMLIGHT = ItemTypes.key(ResourceKey.minecraft("shroomlight"));
@@ -2482,6 +2490,8 @@ public final class ItemTypes {
24822490

24832491
public static final DefaultedRegistryReference<ItemType> TADPOLE_SPAWN_EGG = ItemTypes.key(ResourceKey.minecraft("tadpole_spawn_egg"));
24842492

2493+
public static final DefaultedRegistryReference<ItemType> TALL_DRY_GRASS = ItemTypes.key(ResourceKey.minecraft("tall_dry_grass"));
2494+
24852495
public static final DefaultedRegistryReference<ItemType> TALL_GRASS = ItemTypes.key(ResourceKey.minecraft("tall_grass"));
24862496

24872497
public static final DefaultedRegistryReference<ItemType> TARGET = ItemTypes.key(ResourceKey.minecraft("target"));

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import org.spongepowered.api.data.type.BodyPart;
5454
import org.spongepowered.api.data.type.CatType;
5555
import org.spongepowered.api.data.type.ChestAttachmentType;
56+
import org.spongepowered.api.data.type.ChickenVariant;
5657
import org.spongepowered.api.data.type.ComparatorMode;
5758
import org.spongepowered.api.data.type.CowVariant;
5859
import org.spongepowered.api.data.type.CreakingHeartState;
@@ -321,6 +322,8 @@ public final class RegistryTypes {
321322

322323
public static final DefaultedRegistryType<ChestAttachmentType> CHEST_ATTACHMENT_TYPE = RegistryTypes.spongeKeyInGame("chest_attachment_type");
323324

325+
public static final DefaultedRegistryType<ChickenVariant> CHICKEN_VARIANT = RegistryTypes.minecraftKeyInGame("chicken_variant");
326+
324327
public static final DefaultedRegistryType<ChunkRegenerateFlag> CHUNK_REGENERATE_FLAG = RegistryTypes.spongeKeyInGame("chunk_regenerate_flag");
325328

326329
public static final DefaultedRegistryType<ClickType<?>> CLICK_TYPE = RegistryTypes.spongeKeyInGame("click_type");

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@ public final class BlockTypeTags {
137137

138138
public static final Tag<BlockType> DARK_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("dark_oak_logs"));
139139

140-
public static final Tag<BlockType> DEAD_BUSH_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dead_bush_may_place_on"));
141-
142140
public static final Tag<BlockType> DEEPSLATE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("deepslate_ore_replaceables"));
143141

144142
public static final Tag<BlockType> DIAMOND_ORES = BlockTypeTags.key(ResourceKey.minecraft("diamond_ores"));
@@ -155,6 +153,10 @@ public final class BlockTypeTags {
155153

156154
public static final Tag<BlockType> DRIPSTONE_REPLACEABLE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("dripstone_replaceable_blocks"));
157155

156+
public static final Tag<BlockType> DRY_VEGETATION_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dry_vegetation_may_place_on"));
157+
158+
public static final Tag<BlockType> EDIBLE_FOR_SHEEP = BlockTypeTags.key(ResourceKey.minecraft("edible_for_sheep"));
159+
158160
public static final Tag<BlockType> EMERALD_ORES = BlockTypeTags.key(ResourceKey.minecraft("emerald_ores"));
159161

160162
public static final Tag<BlockType> ENCHANTMENT_POWER_PROVIDER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_provider"));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ public final class ItemTypeTags {
131131

132132
public static final Tag<ItemType> DYEABLE = ItemTypeTags.key(ResourceKey.minecraft("dyeable"));
133133

134+
public static final Tag<ItemType> EGGS = ItemTypeTags.key(ResourceKey.minecraft("eggs"));
135+
134136
public static final Tag<ItemType> EMERALD_ORES = ItemTypeTags.key(ResourceKey.minecraft("emerald_ores"));
135137

136138
public static final Tag<ItemType> ENCHANTABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/armor"));

‎src/main/java/org/spongepowered/api/world/gamerule/GameRules.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
@RegistryScopes(scopes = RegistryScope.GAME)
4141
public final class GameRules {
4242

43+
public static final DefaultedRegistryReference<GameRule<Boolean>> ALLOW_FIRE_TICKS_AWAY_FROM_PLAYER = GameRules.key(ResourceKey.sponge("allow_fire_ticks_away_from_player"));
44+
4345
public static final DefaultedRegistryReference<GameRule<Boolean>> ANNOUNCE_ADVANCEMENTS = GameRules.key(ResourceKey.sponge("announce_advancements"));
4446

4547
public static final DefaultedRegistryReference<GameRule<Boolean>> BLOCK_EXPLOSION_DROP_DECAY = GameRules.key(ResourceKey.sponge("block_explosion_drop_decay"));

‎src/main/java/org/spongepowered/api/world/generation/feature/Features.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ public final class Features {
328328

329329
public static final DefaultedRegistryReference<Feature> PATCH_DEAD_BUSH = Features.key(ResourceKey.minecraft("patch_dead_bush"));
330330

331+
public static final DefaultedRegistryReference<Feature> PATCH_DRY_GRASS = Features.key(ResourceKey.minecraft("patch_dry_grass"));
332+
331333
public static final DefaultedRegistryReference<Feature> PATCH_FIRE = Features.key(ResourceKey.minecraft("patch_fire"));
332334

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

0 commit comments

Comments
 (0)