Skip to content

Commit

Permalink
chore: generate new api additions
Browse files Browse the repository at this point in the history
Namely some small subtle changes:
- FeatureFlag.WINTER_DROP is gone
- CreakingHeart changed to a boolean state

!breaking: Removed CreakingHeart as it's no longer applicable
  • Loading branch information
gabizou committed Nov 14, 2024
1 parent 3e5a2ce commit 15e9b4d
Show file tree
Hide file tree
Showing 17 changed files with 118 additions and 204 deletions.
72 changes: 22 additions & 50 deletions src/main/java/org/spongepowered/api/block/BlockTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
*/
package org.spongepowered.api.block;

import org.jetbrains.annotations.ApiStatus;
import org.spongepowered.api.ResourceKey;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.registry.DefaultedRegistryReference;
Expand All @@ -33,7 +32,6 @@
import org.spongepowered.api.registry.RegistryScope;
import org.spongepowered.api.registry.RegistryScopes;
import org.spongepowered.api.registry.RegistryTypes;
import org.spongepowered.api.util.annotation.Experimental;

/**
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
Expand Down Expand Up @@ -422,6 +420,8 @@ public final class BlockTypes {

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

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

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

public static final DefaultedRegistryReference<BlockType> CHISELED_STONE_BRICKS = BlockTypes.key(ResourceKey.minecraft("chiseled_stone_bricks"));
Expand All @@ -436,6 +436,8 @@ public final class BlockTypes {

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

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

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

public static final DefaultedRegistryReference<BlockType> COAL_ORE = BlockTypes.key(ResourceKey.minecraft("coal_ore"));
Expand Down Expand Up @@ -498,8 +500,6 @@ public final class BlockTypes {

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

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> CREAKING_HEART = BlockTypes.key(ResourceKey.minecraft("creaking_heart"));

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

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

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

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

public static final DefaultedRegistryReference<BlockType> ORANGE_BED = BlockTypes.key(ResourceKey.minecraft("orange_bed"));
Expand Down Expand Up @@ -1342,84 +1344,44 @@ public final class BlockTypes {

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

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_HANGING_MOSS = BlockTypes.key(ResourceKey.minecraft("pale_hanging_moss"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_MOSS_BLOCK = BlockTypes.key(ResourceKey.minecraft("pale_moss_block"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_MOSS_CARPET = BlockTypes.key(ResourceKey.minecraft("pale_moss_carpet"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_BUTTON = BlockTypes.key(ResourceKey.minecraft("pale_oak_button"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_DOOR = BlockTypes.key(ResourceKey.minecraft("pale_oak_door"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_FENCE = BlockTypes.key(ResourceKey.minecraft("pale_oak_fence"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_FENCE_GATE = BlockTypes.key(ResourceKey.minecraft("pale_oak_fence_gate"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_hanging_sign"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_LEAVES = BlockTypes.key(ResourceKey.minecraft("pale_oak_leaves"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_LOG = BlockTypes.key(ResourceKey.minecraft("pale_oak_log"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_PLANKS = BlockTypes.key(ResourceKey.minecraft("pale_oak_planks"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_PRESSURE_PLATE = BlockTypes.key(ResourceKey.minecraft("pale_oak_pressure_plate"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SAPLING = BlockTypes.key(ResourceKey.minecraft("pale_oak_sapling"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_sign"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_SLAB = BlockTypes.key(ResourceKey.minecraft("pale_oak_slab"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_STAIRS = BlockTypes.key(ResourceKey.minecraft("pale_oak_stairs"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_TRAPDOOR = BlockTypes.key(ResourceKey.minecraft("pale_oak_trapdoor"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WALL_HANGING_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_wall_hanging_sign"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WALL_SIGN = BlockTypes.key(ResourceKey.minecraft("pale_oak_wall_sign"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> PALE_OAK_WOOD = BlockTypes.key(ResourceKey.minecraft("pale_oak_wood"));

public static final DefaultedRegistryReference<BlockType> PEARLESCENT_FROGLIGHT = BlockTypes.key(ResourceKey.minecraft("pearlescent_froglight"));
Expand Down Expand Up @@ -1560,6 +1522,8 @@ public final class BlockTypes {

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

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

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

public static final DefaultedRegistryReference<BlockType> POTTED_CRIMSON_FUNGUS = BlockTypes.key(ResourceKey.minecraft("potted_crimson_fungus"));
Expand All @@ -1584,12 +1548,12 @@ public final class BlockTypes {

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

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

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

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

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> POTTED_PALE_OAK_SAPLING = BlockTypes.key(ResourceKey.minecraft("potted_pale_oak_sapling"));

public static final DefaultedRegistryReference<BlockType> POTTED_PINK_TULIP = BlockTypes.key(ResourceKey.minecraft("potted_pink_tulip"));
Expand Down Expand Up @@ -1760,6 +1724,18 @@ public final class BlockTypes {

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

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

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

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

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

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

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

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

public static final DefaultedRegistryReference<BlockType> ROOTED_DIRT = BlockTypes.key(ResourceKey.minecraft("rooted_dirt"));
Expand Down Expand Up @@ -1954,12 +1930,8 @@ public final class BlockTypes {

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

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> STRIPPED_PALE_OAK_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_pale_oak_log"));

@Experimental("winter_drop")
@ApiStatus.Experimental
public static final DefaultedRegistryReference<BlockType> STRIPPED_PALE_OAK_WOOD = BlockTypes.key(ResourceKey.minecraft("stripped_pale_oak_wood"));

public static final DefaultedRegistryReference<BlockType> STRIPPED_SPRUCE_LOG = BlockTypes.key(ResourceKey.minecraft("stripped_spruce_log"));
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/spongepowered/api/data/BlockStateKeys.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.spongepowered.api.data.type.BellAttachmentType;
import org.spongepowered.api.data.type.ChestAttachmentType;
import org.spongepowered.api.data.type.ComparatorMode;
import org.spongepowered.api.data.type.CreakingHeart;
import org.spongepowered.api.data.type.DoorHinge;
import org.spongepowered.api.data.type.DripstoneSegment;
import org.spongepowered.api.data.type.InstrumentType;
Expand All @@ -57,6 +56,8 @@
@SuppressWarnings("unused")
public final class BlockStateKeys {

public static final Key<Value<Boolean>> ACTIVE = BlockStateKeys.key(ResourceKey.minecraft("property/active"), Boolean.class);

public static final Key<Value<Integer>> AGE_1 = BlockStateKeys.key(ResourceKey.minecraft("property/age"), Integer.class);

public static final Key<Value<Integer>> AGE_15 = BlockStateKeys.key(ResourceKey.minecraft("property/age"), Integer.class);
Expand Down Expand Up @@ -117,8 +118,6 @@ public final class BlockStateKeys {

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

public static final Key<Value<CreakingHeart>> CREAKING = BlockStateKeys.key(ResourceKey.minecraft("property/creaking"), CreakingHeart.class);

public static final Key<Value<Integer>> DELAY = BlockStateKeys.key(ResourceKey.minecraft("property/delay"), Integer.class);

public static final Key<Value<Boolean>> DISARMED = BlockStateKeys.key(ResourceKey.minecraft("property/disarmed"), Boolean.class);
Expand Down Expand Up @@ -203,6 +202,8 @@ public final class BlockStateKeys {

public static final Key<Value<Integer>> MOISTURE = BlockStateKeys.key(ResourceKey.minecraft("property/moisture"), Integer.class);

public static final Key<Value<Boolean>> NATURAL = BlockStateKeys.key(ResourceKey.minecraft("property/natural"), Boolean.class);

public static final Key<Value<Boolean>> NORTH = BlockStateKeys.key(ResourceKey.minecraft("property/north"), Boolean.class);

public static final Key<Value<WireAttachmentType>> NORTH_REDSTONE = BlockStateKeys.key(ResourceKey.minecraft("property/north"), WireAttachmentType.class);
Expand Down
35 changes: 0 additions & 35 deletions src/main/java/org/spongepowered/api/data/type/CreakingHeart.java

This file was deleted.

44 changes: 0 additions & 44 deletions src/main/java/org/spongepowered/api/data/type/CreakingHearts.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ public final class ParticleTypes {

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

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

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

public static final DefaultedRegistryReference<ParticleType> PORTAL = ParticleTypes.key(ResourceKey.minecraft("portal"));
Expand Down
Loading

0 comments on commit 15e9b4d

Please sign in to comment.