Skip to content

Commit bc4157b

Browse files
FaithcaioFaithcaio
committed
Merge branch 'snapshot/1.19.4' into api-10
2 parents 9a1b567 + 5bed024 commit bc4157b

38 files changed

+912
-963
lines changed

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,40 @@ public final class BlockTypes {
367367

368368
public static final DefaultedRegistryReference<BlockType> CHAIN_COMMAND_BLOCK = BlockTypes.key(ResourceKey.minecraft("chain_command_block"));
369369

370+
public static final DefaultedRegistryReference<BlockType> CHERRY_BUTTON = BlockTypes.key(ResourceKey.minecraft("cherry_button"));
371+
372+
public static final DefaultedRegistryReference<BlockType> CHERRY_DOOR = BlockTypes.key(ResourceKey.minecraft("cherry_door"));
373+
374+
public static final DefaultedRegistryReference<BlockType> CHERRY_FENCE = BlockTypes.key(ResourceKey.minecraft("cherry_fence"));
375+
376+
public static final DefaultedRegistryReference<BlockType> CHERRY_FENCE_GATE = BlockTypes.key(ResourceKey.minecraft("cherry_fence_gate"));
377+
378+
public static final DefaultedRegistryReference<BlockType> CHERRY_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("cherry_hanging_sign"));
379+
380+
public static final DefaultedRegistryReference<BlockType> CHERRY_LEAVES = BlockTypes.key(ResourceKey.minecraft("cherry_leaves"));
381+
382+
public static final DefaultedRegistryReference<BlockType> CHERRY_LOG = BlockTypes.key(ResourceKey.minecraft("cherry_log"));
383+
384+
public static final DefaultedRegistryReference<BlockType> CHERRY_PLANKS = BlockTypes.key(ResourceKey.minecraft("cherry_planks"));
385+
386+
public static final DefaultedRegistryReference<BlockType> CHERRY_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("cherry_pressure_plate"));
387+
388+
public static final DefaultedRegistryReference<BlockType> CHERRY_SAPLING = BlockTypes.key(ResourceKey.minecraft("cherry_sapling"));
389+
390+
public static final DefaultedRegistryReference<BlockType> CHERRY_SIGN = BlockTypes.key(ResourceKey.minecraft("cherry_sign"));
391+
392+
public static final DefaultedRegistryReference<BlockType> CHERRY_SLAB = BlockTypes.key(ResourceKey.minecraft("cherry_slab"));
393+
394+
public static final DefaultedRegistryReference<BlockType> CHERRY_STAIRS = BlockTypes.key(ResourceKey.minecraft("cherry_stairs"));
395+
396+
public static final DefaultedRegistryReference<BlockType> CHERRY_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("cherry_trapdoor"));
397+
398+
public static final DefaultedRegistryReference<BlockType> CHERRY_WALL_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("cherry_wall_hanging_sign"));
399+
400+
public static final DefaultedRegistryReference<BlockType> CHERRY_WALL_SIGN = BlockTypes.key(ResourceKey.minecraft("cherry_wall_sign"));
401+
402+
public static final DefaultedRegistryReference<BlockType> CHERRY_WOOD = BlockTypes.key(ResourceKey.minecraft("cherry_wood"));
403+
370404
public static final DefaultedRegistryReference<BlockType> CHEST = BlockTypes.key(ResourceKey.minecraft("chest"));
371405

372406
public static final DefaultedRegistryReference<BlockType> CHIPPED_ANVIL = BlockTypes.key(ResourceKey.minecraft("chipped_anvil"));
@@ -617,6 +651,8 @@ public final class BlockTypes {
617651

618652
public static final DefaultedRegistryReference<BlockType> DEAD_TUBE_CORAL_WALL_FAN = BlockTypes.key(ResourceKey.minecraft("dead_tube_coral_wall_fan"));
619653

654+
public static final DefaultedRegistryReference<BlockType> DECORATED_POT = BlockTypes.key(ResourceKey.minecraft("decorated_pot"));
655+
620656
public static final DefaultedRegistryReference<BlockType> DEEPSLATE = BlockTypes.key(ResourceKey.minecraft("deepslate"));
621657

622658
public static final DefaultedRegistryReference<BlockType> DEEPSLATE_BRICK_SLAB = BlockTypes.key(ResourceKey.minecraft("deepslate_brick_slab"));
@@ -1289,6 +1325,8 @@ public final class BlockTypes {
12891325

12901326
public static final DefaultedRegistryReference<BlockType> PINK_GLAZED_TERRACOTTA = BlockTypes.key(ResourceKey.minecraft("pink_glazed_terracotta"));
12911327

1328+
public static final DefaultedRegistryReference<BlockType> PINK_PETALS = BlockTypes.key(ResourceKey.minecraft("pink_petals"));
1329+
12921330
public static final DefaultedRegistryReference<BlockType> PINK_SHULKER_BOX = BlockTypes.key(ResourceKey.minecraft("pink_shulker_box"));
12931331

12941332
public static final DefaultedRegistryReference<BlockType> PINK_STAINED_GLASS = BlockTypes.key(ResourceKey.minecraft("pink_stained_glass"));
@@ -1385,6 +1423,8 @@ public final class BlockTypes {
13851423

13861424
public static final DefaultedRegistryReference<BlockType> POTTED_CACTUS = BlockTypes.key(ResourceKey.minecraft("potted_cactus"));
13871425

1426+
public static final DefaultedRegistryReference<BlockType> POTTED_CHERRY_SAPLING = BlockTypes.key(ResourceKey.minecraft("potted_cherry_sapling"));
1427+
13881428
public static final DefaultedRegistryReference<BlockType> POTTED_CORNFLOWER = BlockTypes.key(ResourceKey.minecraft("potted_cornflower"));
13891429

13901430
public static final DefaultedRegistryReference<BlockType> POTTED_CRIMSON_FUNGUS = BlockTypes.key(ResourceKey.minecraft("potted_crimson_fungus"));
@@ -1423,6 +1463,8 @@ public final class BlockTypes {
14231463

14241464
public static final DefaultedRegistryReference<BlockType> POTTED_SPRUCE_SAPLING = BlockTypes.key(ResourceKey.minecraft("potted_spruce_sapling"));
14251465

1466+
public static final DefaultedRegistryReference<BlockType> POTTED_TORCHFLOWER = BlockTypes.key(ResourceKey.minecraft("potted_torchflower"));
1467+
14261468
public static final DefaultedRegistryReference<BlockType> POTTED_WARPED_FUNGUS = BlockTypes.key(ResourceKey.minecraft("potted_warped_fungus"));
14271469

14281470
public static final DefaultedRegistryReference<BlockType> POTTED_WARPED_ROOTS = BlockTypes.key(ResourceKey.minecraft("potted_warped_roots"));
@@ -1745,6 +1787,10 @@ public final class BlockTypes {
17451787

17461788
public static final DefaultedRegistryReference<BlockType> STRIPPED_BIRCH_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_birch_wood"));
17471789

1790+
public static final DefaultedRegistryReference<BlockType> STRIPPED_CHERRY_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_cherry_log"));
1791+
1792+
public static final DefaultedRegistryReference<BlockType> STRIPPED_CHERRY_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_cherry_wood"));
1793+
17481794
public static final DefaultedRegistryReference<BlockType> STRIPPED_CRIMSON_HYPHAE = BlockTypes.key(ResourceKey.minecraft("stripped_crimson_hyphae"));
17491795

17501796
public static final DefaultedRegistryReference<BlockType> STRIPPED_CRIMSON_STEM = BlockTypes.key(ResourceKey.minecraft("stripped_crimson_stem"));
@@ -1781,6 +1827,8 @@ public final class BlockTypes {
17811827

17821828
public static final DefaultedRegistryReference<BlockType> SUNFLOWER = BlockTypes.key(ResourceKey.minecraft("sunflower"));
17831829

1830+
public static final DefaultedRegistryReference<BlockType> SUSPICIOUS_SAND = BlockTypes.key(ResourceKey.minecraft("suspicious_sand"));
1831+
17841832
public static final DefaultedRegistryReference<BlockType> SWEET_BERRY_BUSH = BlockTypes.key(ResourceKey.minecraft("sweet_berry_bush"));
17851833

17861834
public static final DefaultedRegistryReference<BlockType> TALL_GRASS = BlockTypes.key(ResourceKey.minecraft("tall_grass"));
@@ -1797,6 +1845,10 @@ public final class BlockTypes {
17971845

17981846
public static final DefaultedRegistryReference<BlockType> TORCH = BlockTypes.key(ResourceKey.minecraft("torch"));
17991847

1848+
public static final DefaultedRegistryReference<BlockType> TORCHFLOWER = BlockTypes.key(ResourceKey.minecraft("torchflower"));
1849+
1850+
public static final DefaultedRegistryReference<BlockType> TORCHFLOWER_CROP = BlockTypes.key(ResourceKey.minecraft("torchflower_crop"));
1851+
18001852
public static final DefaultedRegistryReference<BlockType> TRAPPED_CHEST = BlockTypes.key(ResourceKey.minecraft("trapped_chest"));
18011853

18021854
public static final DefaultedRegistryReference<BlockType> TRIPWIRE = BlockTypes.key(ResourceKey.minecraft("tripwire"));

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public final class BlockEntityTypes {
7171

7272
public static final DefaultedRegistryReference<BlockEntityType> DAYLIGHT_DETECTOR = BlockEntityTypes.key(ResourceKey.minecraft("daylight_detector"));
7373

74+
public static final DefaultedRegistryReference<BlockEntityType> DECORATED_POT = BlockEntityTypes.key(ResourceKey.minecraft("decorated_pot"));
75+
7476
public static final DefaultedRegistryReference<BlockEntityType> DISPENSER = BlockEntityTypes.key(ResourceKey.minecraft("dispenser"));
7577

7678
public static final DefaultedRegistryReference<BlockEntityType> DROPPER = BlockEntityTypes.key(ResourceKey.minecraft("dropper"));
@@ -115,6 +117,8 @@ public final class BlockEntityTypes {
115117

116118
public static final DefaultedRegistryReference<BlockEntityType> STRUCTURE_BLOCK = BlockEntityTypes.key(ResourceKey.minecraft("structure_block"));
117119

120+
public static final DefaultedRegistryReference<BlockEntityType> SUSPICIOUS_SAND = BlockEntityTypes.key(ResourceKey.minecraft("suspicious_sand"));
121+
118122
public static final DefaultedRegistryReference<BlockEntityType> TRAPPED_CHEST = BlockEntityTypes.key(ResourceKey.minecraft("trapped_chest"));
119123

120124
// @formatter:on

‎src/main/java/org/spongepowered/api/data/Keys.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2459,10 +2459,15 @@ public final class Keys {
24592459
public static final Key<Value<Integer>> POWER = Keys.key(ResourceKey.sponge("power"), Integer.class);
24602460

24612461
/**
2462-
* The {@link Precipitation} type of a {@link Biome}. Readonly.
2462+
* The default {@link Precipitation} type of a {@link Biome}. Readonly.
24632463
*/
24642464
public static final Key<Value<Precipitation>> PRECIPITATION = Keys.key(ResourceKey.sponge("precipitation"), Precipitation.class);
24652465

2466+
/**
2467+
* Whether a {@link Biome} has {@link Precipitation}. Readonly.
2468+
*/
2469+
public static final Key<Value<Boolean>> HAS_PRECIPITATION = Keys.key(ResourceKey.sponge("has_precipitation"), Boolean.class);
2470+
24662471
/**
24672472
* The previous {@link GameMode} of a {@link ServerPlayer}. Readonly.
24682473
*/

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public final class BoatTypes {
4848

4949
public static final DefaultedRegistryReference<BoatType> BIRCH = BoatTypes.key(ResourceKey.sponge("birch"));
5050

51+
public static final DefaultedRegistryReference<BoatType> CHERRY = BoatTypes.key(ResourceKey.sponge("cherry"));
52+
5153
public static final DefaultedRegistryReference<BoatType> DARK_OAK = BoatTypes.key(ResourceKey.sponge("dark_oak"));
5254

5355
public static final DefaultedRegistryReference<BoatType> JUNGLE = BoatTypes.key(ResourceKey.sponge("jungle"));

‎src/main/java/org/spongepowered/api/datapack/DataPackType.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import org.spongepowered.api.advancement.AdvancementTemplate;
2828
import org.spongepowered.api.adventure.ChatTypeTemplate;
29+
import org.spongepowered.api.event.cause.entity.damage.DamageTypeTemplate;
2930
import org.spongepowered.api.item.recipe.RecipeRegistration;
3031
import org.spongepowered.api.registry.RegistryType;
3132
import org.spongepowered.api.tag.TagTemplate;
@@ -96,5 +97,7 @@ interface Factory {
9697
DataPackType<JigsawPoolTemplate> jigsawPool();
9798

9899
DataPackType<ChatTypeTemplate> chatType();
100+
101+
DataPackType<DamageTypeTemplate> damageType();
99102
}
100103
}

‎src/main/java/org/spongepowered/api/datapack/DataPackTypes.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.spongepowered.api.adventure.ChatTypeTemplate;
3030
import org.spongepowered.api.block.BlockType;
3131
import org.spongepowered.api.entity.EntityType;
32+
import org.spongepowered.api.event.cause.entity.damage.DamageType;
33+
import org.spongepowered.api.event.cause.entity.damage.DamageTypeTemplate;
3234
import org.spongepowered.api.fluid.FluidType;
3335
import org.spongepowered.api.item.ItemType;
3436
import org.spongepowered.api.item.recipe.RecipeRegistration;
@@ -99,6 +101,9 @@ public final class DataPackTypes {
99101

100102
public static final DataPackType<ChatTypeTemplate> CHAT_TYPE = Sponge.game().factoryProvider().provide(DataPackType.Factory.class).chatType();
101103

104+
public static final DataPackType<DamageTypeTemplate> DAMAGE_TYPE = Sponge.game().factoryProvider().provide(DataPackType.Factory.class).damageType();
105+
public static final DataPackType<TagTemplate<DamageType>> DAMAGE_TYPE_TAG = Sponge.game().factoryProvider().provide(DataPackType.Factory.class).tag(RegistryTypes.DAMAGE_TYPE);
106+
102107
// SORTFIELDS:OFF
103108

104109
// TODO `worldgen/world_preset`? WorldGenerationConfig? with mapping of LevelStems

‎src/main/java/org/spongepowered/api/datapack/DataPacks.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import org.spongepowered.api.adventure.ChatTypeTemplate;
2929
import org.spongepowered.api.block.BlockType;
3030
import org.spongepowered.api.entity.EntityType;
31+
import org.spongepowered.api.event.cause.entity.damage.DamageType;
32+
import org.spongepowered.api.event.cause.entity.damage.DamageTypeTemplate;
3133
import org.spongepowered.api.fluid.FluidType;
3234
import org.spongepowered.api.item.ItemType;
3335
import org.spongepowered.api.item.recipe.RecipeRegistration;
@@ -95,6 +97,9 @@ public final class DataPacks {
9597
public static final DataPack<JigsawPoolTemplate> JIGSAW_POOL = DataPackTypes.JIGSAW_POOL.pack("plugin_worldgen", "Sponge plugin provided jigsaw pools");
9698
public static final DataPack<ChatTypeTemplate> CHAT_TYPE = DataPackTypes.CHAT_TYPE.pack("plugin_chat_types", "Sponge plugin provided chat types");
9799

100+
public static final DataPack<DamageTypeTemplate> DAMAGE_TYPE = DataPackTypes.DAMAGE_TYPE.pack("plugin_damage_types", "Sponge plugin provided damage types");
101+
public static final DataPack<TagTemplate<DamageType>> DAMAGE_TYPE_TAG = DataPackTypes.DAMAGE_TYPE_TAG.pack("plugin_damage_types", "Sponge plugin provided damage type tags");
102+
98103
// SORTFIELDS:ON
99104

100105
private DataPacks() {

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

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

7878
public static final DefaultedRegistryReference<ParticleType> DRAGON_BREATH = ParticleTypes.key(ResourceKey.minecraft("dragon_breath"));
7979

80+
public static final DefaultedRegistryReference<ParticleType> DRIPPING_CHERRY_LEAVES = ParticleTypes.key(ResourceKey.minecraft("dripping_cherry_leaves"));
81+
8082
public static final DefaultedRegistryReference<ParticleType> DRIPPING_DRIPSTONE_LAVA = ParticleTypes.key(ResourceKey.minecraft("dripping_dripstone_lava"));
8183

8284
public static final DefaultedRegistryReference<ParticleType> DRIPPING_DRIPSTONE_WATER = ParticleTypes.key(ResourceKey.minecraft("dripping_dripstone_water"));
@@ -111,6 +113,8 @@ public final class ParticleTypes {
111113

112114
public static final DefaultedRegistryReference<ParticleType> EXPLOSION_EMITTER = ParticleTypes.key(ResourceKey.minecraft("explosion_emitter"));
113115

116+
public static final DefaultedRegistryReference<ParticleType> FALLING_CHERRY_LEAVES = ParticleTypes.key(ResourceKey.minecraft("falling_cherry_leaves"));
117+
114118
public static final DefaultedRegistryReference<ParticleType> FALLING_DRIPSTONE_LAVA = ParticleTypes.key(ResourceKey.minecraft("falling_dripstone_lava"));
115119

116120
public static final DefaultedRegistryReference<ParticleType> FALLING_DRIPSTONE_WATER = ParticleTypes.key(ResourceKey.minecraft("falling_dripstone_water"));
@@ -153,6 +157,8 @@ public final class ParticleTypes {
153157

154158
public static final DefaultedRegistryReference<ParticleType> ITEM_SNOWBALL = ParticleTypes.key(ResourceKey.minecraft("item_snowball"));
155159

160+
public static final DefaultedRegistryReference<ParticleType> LANDING_CHERRY_LEAVES = ParticleTypes.key(ResourceKey.minecraft("landing_cherry_leaves"));
161+
156162
public static final DefaultedRegistryReference<ParticleType> LANDING_HONEY = ParticleTypes.key(ResourceKey.minecraft("landing_honey"));
157163

158164
public static final DefaultedRegistryReference<ParticleType> LANDING_LAVA = ParticleTypes.key(ResourceKey.minecraft("landing_lava"));

0 commit comments

Comments
 (0)