Skip to content

Commit

Permalink
Add all new block states except stripped_mangrove_wood
Browse files Browse the repository at this point in the history
  • Loading branch information
@Creeperface01
Creeperface01 committed Jun 15, 2022
1 parent ec5129f commit 2243630
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 15 deletions.
17 changes: 8 additions & 9 deletions src/main/java/org/cloudburstmc/api/block/BlockIds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@ public final class BlockIds {
public static final Identifier DISPENSER = Identifier.fromString("dispenser");
public static final Identifier DOUBLE_CUT_COPPER_SLAB = Identifier.fromString("double_cut_copper_slab");
public static final Identifier DOUBLE_PLANT = Identifier.fromString("double_plant");
public static final Identifier DOUBLE_STONE_SLAB = Identifier.fromString("double_stone_slab");
public static final Identifier DOUBLE_STONE_SLAB2 = Identifier.fromString("double_stone_slab2");
public static final Identifier DOUBLE_STONE_SLAB3 = Identifier.fromString("double_stone_slab3");
public static final Identifier DOUBLE_STONE_SLAB4 = Identifier.fromString("double_stone_slab4");
public static final Identifier DOUBLE_STONE_SLAB = Identifier.fromString("double_stone_block_slab");
public static final Identifier DOUBLE_STONE_SLAB2 = Identifier.fromString("double_stone_block_slab2");
public static final Identifier DOUBLE_STONE_SLAB3 = Identifier.fromString("double_stone_block_slab3");
public static final Identifier DOUBLE_STONE_SLAB4 = Identifier.fromString("double_stone_block_slab4");
public static final Identifier DOUBLE_WOODEN_SLAB = Identifier.fromString("double_wooden_slab");
public static final Identifier DRAGON_EGG = Identifier.fromString("dragon_egg");
public static final Identifier DRIED_KELP_BLOCK = Identifier.fromString("dried_kelp_block");
Expand Down Expand Up @@ -460,7 +460,6 @@ public final class BlockIds {

public static final Identifier MANGROVE_PRESSURE_PLATE = Identifier.fromString("mangrove_pressure_plate");
public static final Identifier MANGROVE_PROPAGULE = Identifier.fromString("mangrove_propagule");
public static final Identifier MANGROVE_PROPAGULE_HANGING = Identifier.fromString("mangrove_propagule_hanging");

public static final Identifier MANGROVE_ROOTS = Identifier.fromString("mangrove_roots");

Expand Down Expand Up @@ -660,10 +659,10 @@ public final class BlockIds {
public static final Identifier STONE_BRICK_STAIRS = Identifier.fromString("stone_brick_stairs");
public static final Identifier STONE_BUTTON = Identifier.fromString("stone_button");
public static final Identifier STONE_PRESSURE_PLATE = Identifier.fromString("stone_pressure_plate");
public static final Identifier STONE_SLAB = Identifier.fromString("stone_slab");
public static final Identifier STONE_SLAB2 = Identifier.fromString("stone_slab2");
public static final Identifier STONE_SLAB3 = Identifier.fromString("stone_slab3");
public static final Identifier STONE_SLAB4 = Identifier.fromString("stone_slab4");
public static final Identifier STONE_SLAB = Identifier.fromString("stone_block_slab");
public static final Identifier STONE_SLAB2 = Identifier.fromString("stone_block_slab2");
public static final Identifier STONE_SLAB3 = Identifier.fromString("stone_block_slab3");
public static final Identifier STONE_SLAB4 = Identifier.fromString("stone_block_slab4");
public static final Identifier STONE_STAIRS = Identifier.fromString("stone_stairs");
public static final Identifier STRIPPED_ACACIA_LOG = Identifier.fromString("stripped_acacia_log");
public static final Identifier STRIPPED_BIRCH_LOG = Identifier.fromString("stripped_birch_log");
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/cloudburstmc/api/block/BlockStates.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@ public class BlockStates {
public static final BlockState WOOL = BlockTypes.WOOL.getDefaultState();
public static final BlockState MANGROVE_LEAVES = BlockTypes.MANGROVE_LEAVES.getDefaultState();
public static final BlockState MANGROVE_PROPAGULE = BlockTypes.MANGROVE_PROPAGULE.getDefaultState();
public static final BlockState MANGROVE_PROPAGULE_HANGING = BlockTypes.MANGROVE_PROPAGULE_HANGING.getDefaultState();
public static final BlockState MANGROVE_ROOTS = BlockTypes.MANGROVE_ROOTS.getDefaultState();
public static final BlockState MUDDY_MANGROVE_ROOTS = BlockTypes.MUDDY_MANGROVE_ROOTS.getDefaultState();
public static final BlockState MUD = BlockTypes.MUD.getDefaultState();
public static final BlockState MUD_BRICK_DOUBLE_SLAB = BlockTypes.MUD_BRICK_DOUBLE_SLAB.getDefaultState();
public static final BlockState MUD_BRICK_SLAB = BlockTypes.MUD_BRICK_SLAB.getDefaultState();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/cloudburstmc/api/block/BlockTraits.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class BlockTraits {
public static final EnumBlockTrait<FluidType> FLUID_TYPE = EnumBlockTrait.of("fluid_type", FluidType.class);
public static final IntegerBlockTrait FILL_LEVEL = IntegerBlockTrait.from("fill_level", 7);
public static final IntegerBlockTrait GROWTH = IntegerBlockTrait.from("growth", 8);
public static final IntegerBlockTrait PROPAGULE_STAGE = IntegerBlockTrait.from("propagule_stage", 5);
public static final IntegerBlockTrait HEIGHT = IntegerBlockTrait.from("height", 8);
public static final IntegerBlockTrait HONEY_LEVEL = IntegerBlockTrait.from("honey_level", 6);
public static final IntegerBlockTrait HUGE_MUSHROOM_BITS = IntegerBlockTrait.from("huge_mushroom_bits", 16);
Expand Down Expand Up @@ -90,7 +91,7 @@ public class BlockTraits {
public static final EnumBlockTrait<StructureVoidType> STRUCTURE_VOID_TYPE = EnumBlockTrait.of("structure_void_type", StructureVoidType.class);
public static final EnumBlockTrait<TallGrassType> TALL_GRASS_TYPE = EnumBlockTrait.of("tall_grass_type", TallGrassType.class);
public static final EnumBlockTrait<TreeSpecies> TREE_SPECIES = EnumBlockTrait.of("tree_species", TreeSpecies.class, TreeSpecies.OAK);
public static final EnumBlockTrait<TreeSpecies> TREE_SPECIES_OVERWORLD = EnumBlockTrait.of("tree_species", TreeSpecies.class, TreeSpecies.OAK, TreeSpecies.SPRUCE, TreeSpecies.BIRCH, TreeSpecies.JUNGLE, TreeSpecies.ACACIA, TreeSpecies.DARK_OAK);
public static final EnumBlockTrait<TreeSpecies> TREE_SPECIES_OVERWORLD = EnumBlockTrait.of("tree_species", TreeSpecies.class, TreeSpecies.OAK, TreeSpecies.SPRUCE, TreeSpecies.BIRCH, TreeSpecies.JUNGLE, TreeSpecies.ACACIA, TreeSpecies.DARK_OAK, TreeSpecies.MANGROVE);
public static final EnumBlockTrait<TreeSpecies> TREE_SPECIES_NETHER = EnumBlockTrait.of("tree_species", TreeSpecies.class, TreeSpecies.CRIMSON, TreeSpecies.WARPED);
public static final EnumBlockTrait<TurtleEggCount> TURTLE_EGG_COUNT = EnumBlockTrait.of("turtle_egg_count", TurtleEggCount.class);
public static final IntegerBlockTrait TWISTING_VINES_AGE = IntegerBlockTrait.from("twisting_vines_age", 26);
Expand All @@ -117,6 +118,7 @@ public class BlockTraits {
public static final EnumBlockTrait<LeverDirection> LEVER_DIRECTION = EnumBlockTrait.of("lever_direction", LeverDirection.class);

public static final BooleanBlockTrait IS_ACTIVE = BooleanBlockTrait.of("is_active", "active");
public static final BooleanBlockTrait CAN_SUMMON = BooleanBlockTrait.of("can_summon");
public static final BooleanBlockTrait IS_ALLOWED_UNDERWATER = BooleanBlockTrait.of("is_allowed_underwater", "allow_underwater_bit");
public static final BooleanBlockTrait IS_ATTACHED = BooleanBlockTrait.of("is_attached", "attached_bit");
public static final BooleanBlockTrait IS_BLOOMING = BooleanBlockTrait.of("is_blooming", "bloom");
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/org/cloudburstmc/api/block/BlockTypes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,16 @@ public class BlockTypes {
public static final BlockType SCULK = BlockType.of(BlockIds.SCULK);
public static final BlockType SCULK_VEIN = BlockType.of(BlockIds.SCULK_VEIN, BlockTraits.MULTI_FACE_DIRECTION);
public static final BlockType SCULK_CATALYST = BlockType.of(BlockIds.SCULK_CATALYST, BlockTraits.IS_BLOOMING);
public static final BlockType SCULK_SHRIEKER = BlockType.of(BlockIds.SCULK_SHRIEKER, BlockTraits.IS_ACTIVE);
public static final BlockType SCULK_SHRIEKER = BlockType.of(BlockIds.SCULK_SHRIEKER, BlockTraits.IS_ACTIVE, BlockTraits.CAN_SUMMON);
public static final BlockType CLIENT_REQUEST_PLACEHOLDER_BLOCK = BlockType.of(BlockIds.CLIENT_REQUEST_PLACEHOLDER_BLOCK);
public static final BlockType FROG_SPAWN = BlockType.of(BlockIds.FROG_SPAWN);
public static final BlockType PEARLESCENT_FROGLIGHT = BlockType.of(BlockIds.PEARLESCENT_FROGLIGHT, BlockTraits.AXIS);
public static final BlockType VERDANT_FROGLIGHT = BlockType.of(BlockIds.VERDANT_FROGLIGHT, BlockTraits.AXIS);
public static final BlockType OCHRE_FROGLIGHT = BlockType.of(BlockIds.OCHRE_FROGLIGHT, BlockTraits.AXIS);
public static final BlockType MANGROVE_LEAVES = BlockType.of(BlockIds.MANGROVE_LEAVES, BlockTraits.IS_PERSISTENT, BlockTraits.HAS_UPDATE);
public static final BlockType MANGROVE_PROPAGULE = BlockType.of(BlockIds.MANGROVE_PROPAGULE, BlockTraits.FACING_DIRECTION, BlockTraits.GROWTH);
public static final BlockType MANGROVE_PROPAGULE_HANGING = BlockType.of(BlockIds.MANGROVE_PROPAGULE_HANGING, BlockTraits.FACING_DIRECTION, BlockTraits.GROWTH);
public static final BlockType MANGROVE_PROPAGULE = BlockType.of(BlockIds.MANGROVE_PROPAGULE, BlockTraits.IS_HANGING, BlockTraits.PROPAGULE_STAGE);
public static final BlockType MANGROVE_ROOTS = BlockType.of(BlockIds.MANGROVE_ROOTS);
public static final BlockType MUDDY_MANGROVE_ROOTS = BlockType.of(BlockIds.MUDDY_MANGROVE_ROOTS);
public static final BlockType MUD = BlockType.of(BlockIds.MUD);
public static final BlockType MUD_BRICK_DOUBLE_SLAB = BlockType.of(BlockIds.MUD_BRICK_DOUBLE_SLAB, BlockTraits.IS_TOP_SLOT);
public static final BlockType MUD_BRICK_SLAB = BlockType.of(BlockIds.MUD_BRICK_SLAB, BlockTraits.IS_TOP_SLOT);
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/org/cloudburstmc/api/item/ItemIds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,4 +394,12 @@ public final class ItemIds {
public static final Identifier RAW_IRON = Identifier.fromString("minecraft:raw_iron");
public static final Identifier COPPER_INGOT = Identifier.fromString("minecraft:copper_ingot");
public static final Identifier SPYGLASS = Identifier.fromString("minecraft:spyglass");

public static final Identifier MANGROVE_BOAT = Identifier.fromString("minecraft:mangrove_boat");

public static final Identifier MANGROVE_CHEST_BOAT = Identifier.fromString("minecraft:mangrove_chest_boat");

public static final Identifier MANGROVE_DOOR = Identifier.fromString("minecraft:mangrove_door");

public static final Identifier MANGROVE_SIGN = Identifier.fromString("minecraft:mangrove_sign");
}
4 changes: 3 additions & 1 deletion src/main/java/org/cloudburstmc/api/util/data/TreeSpecies.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ public enum TreeSpecies {
ACACIA,
DARK_OAK,
CRIMSON,
WARPED
WARPED,

MANGROVE,
}

0 comments on commit 2243630

Please sign in to comment.