Fix liquid traits

CloudburstMC · Jun 7, 2021 · 65c7c8a · 65c7c8a
1 parent c6b9cf0
commit 65c7c8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/api/src/main/java/org/cloudburstmc/api/block/BlockTraits.java b/api/src/main/java/org/cloudburstmc/api/block/BlockTraits.java
@@ -45,7 +45,6 @@ public class BlockTraits {
  public static final IntegerBlockTrait FLUID_LEVEL = IntegerBlockTrait.from("fluid_level", 8);
  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 LIQUID_DEPTH = IntegerBlockTrait.from("liquid_depth", 16);
  public static final IntegerBlockTrait GROWTH = IntegerBlockTrait.from("growth", 8);
  public static final IntegerBlockTrait HEIGHT = IntegerBlockTrait.from("height", 8);
  public static final IntegerBlockTrait HONEY_LEVEL = IntegerBlockTrait.from("honey_level", 6);

diff --git a/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java b/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java
@@ -14,10 +14,10 @@ public class BlockTypes {
  public static final BlockType PLANKS = BlockType.of(Identifiers.PLANKS, BlockTraits.TREE_SPECIES);
  public static final BlockType SAPLING = BlockType.of(Identifiers.SAPLING, BlockTraits.TREE_SPECIES_OVERWORLD, BlockTraits.HAS_AGE);
  public static final BlockType BEDROCK = BlockType.of(Identifiers.BEDROCK, BlockTraits.HAS_INFINIBURN);
- public static final BlockType FLOWING_WATER = BlockType.of(Identifiers.FLOWING_WATER, BlockTraits.LIQUID_DEPTH);
- public static final BlockType WATER = BlockType.of(Identifiers.WATER, BlockTraits.LIQUID_DEPTH);
- public static final BlockType FLOWING_LAVA = BlockType.of(Identifiers.FLOWING_LAVA, BlockTraits.LIQUID_DEPTH);
- public static final BlockType LAVA = BlockType.of(Identifiers.LAVA, BlockTraits.LIQUID_DEPTH);
+ public static final BlockType FLOWING_WATER = BlockType.of(Identifiers.FLOWING_WATER, BlockTraits.IS_FLOWING, BlockTraits.FLUID_LEVEL);
+ public static final BlockType WATER = BlockType.of(Identifiers.WATER, BlockTraits.IS_FLOWING, BlockTraits.FLUID_LEVEL);
+ public static final BlockType FLOWING_LAVA = BlockType.of(Identifiers.FLOWING_LAVA, BlockTraits.IS_FLOWING, BlockTraits.FLUID_LEVEL);
+ public static final BlockType LAVA = BlockType.of(Identifiers.LAVA, BlockTraits.IS_FLOWING, BlockTraits.FLUID_LEVEL);
  public static final BlockType SAND = BlockType.of(Identifiers.SAND, BlockTraits.SAND_TYPE);
  public static final BlockType GRAVEL = BlockType.of(Identifiers.GRAVEL);
  public static final BlockType GOLD_ORE = BlockType.of(Identifiers.GOLD_ORE);