From 6682f6a50ded512311bb3c773687eeb2e32c04fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bedn=C3=A1=C5=99?= Date: Wed, 15 Jun 2022 21:53:15 +0900 Subject: [PATCH] Fix compilation --- .../org/cloudburstmc/api/block/BlockBehaviors.java | 2 +- .../org/cloudburstmc/api/block/BlockStates.java | 1 - .../org/cloudburstmc/api/block/BlockTypes.java | 1 - .../api/block/behavior/GenericBlockBehavior.java | 14 ++++++++++++++ .../java/org/cloudburstmc/api/item/ItemTypes.java | 11 +++-------- .../cloudburstmc/api/util/data/TreeSpecies.java | 1 - 6 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 api/src/main/java/org/cloudburstmc/api/block/behavior/GenericBlockBehavior.java diff --git a/api/src/main/java/org/cloudburstmc/api/block/BlockBehaviors.java b/api/src/main/java/org/cloudburstmc/api/block/BlockBehaviors.java index ae0e5f307..aafbeaf72 100644 --- a/api/src/main/java/org/cloudburstmc/api/block/BlockBehaviors.java +++ b/api/src/main/java/org/cloudburstmc/api/block/BlockBehaviors.java @@ -50,7 +50,7 @@ private BlockBehaviors() { // public static final BehaviorKey, BasicBlockBehavior.Executor> GET_STRIPPED_BLOCK = DataKey.behavior(Identifier.fromString("get_stripped_block"), BasicBlockBehavior.class, BasicBlockBehavior.Executor.class); - public static final BehaviorKey>, Optional>> GET_BLOCK_ENTITY = DataKey.behavior(Identifier.fromString("get_block_entity"), Optional.class, Optional.class); + public static final BehaviorKey>>, GenericBlockBehavior.Executor>>> GET_BLOCK_ENTITY = DataKey.behavior(Identifier.fromString("get_block_entity"), GenericBlockBehavior.class, GenericBlockBehavior.Executor.class); public static final BehaviorKey MAY_PICK = DataKey.behavior(Identifier.fromString("may_pick"), BooleanBlockBehavior.class, BooleanBlockBehavior.Executor.class); diff --git a/api/src/main/java/org/cloudburstmc/api/block/BlockStates.java b/api/src/main/java/org/cloudburstmc/api/block/BlockStates.java index 4a831ffb6..ef96ba4bb 100644 --- a/api/src/main/java/org/cloudburstmc/api/block/BlockStates.java +++ b/api/src/main/java/org/cloudburstmc/api/block/BlockStates.java @@ -287,7 +287,6 @@ public class BlockStates { public static final BlockState WOODEN_STAIRS = BlockTypes.WOODEN_STAIRS.getDefaultState(); public static final BlockState WOODEN_TRAPDOOR = BlockTypes.WOODEN_TRAPDOOR.getDefaultState(); 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_ROOTS = BlockTypes.MANGROVE_ROOTS.getDefaultState(); public static final BlockState MUDDY_MANGROVE_ROOTS = BlockTypes.MUDDY_MANGROVE_ROOTS.getDefaultState(); diff --git a/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java b/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java index 26c2c7c03..4c0f4eb09 100644 --- a/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java +++ b/api/src/main/java/org/cloudburstmc/api/block/BlockTypes.java @@ -337,7 +337,6 @@ public class BlockTypes { 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.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); diff --git a/api/src/main/java/org/cloudburstmc/api/block/behavior/GenericBlockBehavior.java b/api/src/main/java/org/cloudburstmc/api/block/behavior/GenericBlockBehavior.java new file mode 100644 index 000000000..ab07a07d5 --- /dev/null +++ b/api/src/main/java/org/cloudburstmc/api/block/behavior/GenericBlockBehavior.java @@ -0,0 +1,14 @@ +package org.cloudburstmc.api.block.behavior; + +import org.cloudburstmc.api.block.Block; +import org.cloudburstmc.api.util.behavior.Behavior; + +public interface GenericBlockBehavior { + + void execute(Behavior> behavior, Block block); + + @FunctionalInterface + interface Executor { + void execute(Block block); + } +} diff --git a/api/src/main/java/org/cloudburstmc/api/item/ItemTypes.java b/api/src/main/java/org/cloudburstmc/api/item/ItemTypes.java index 89dec36ee..eaf396e3a 100644 --- a/api/src/main/java/org/cloudburstmc/api/item/ItemTypes.java +++ b/api/src/main/java/org/cloudburstmc/api/item/ItemTypes.java @@ -2,11 +2,6 @@ import lombok.experimental.UtilityClass; import org.cloudburstmc.api.util.Identifiers; -import org.cloudburstmc.api.util.data.DyeColor; -import org.cloudburstmc.api.util.data.TreeSpecies; - -import java.util.IdentityHashMap; -import java.util.Map; @UtilityClass public class ItemTypes { @@ -257,7 +252,7 @@ public class ItemTypes { public static final ItemType LAPIS_LAZULI = ItemType.of(ItemIds.LAPIS_LAZULI); - public static final ItemType DISC_FRAGMENT_5 = IntItem.builder().id(ItemIds.DISC_FRAGMENT_5).build(); - public static final ItemType RECOVERY_COMPASS = IntItem.builder().id(ItemIds.RECOVERY_COMPASS).build(); - public static final ItemType ECHO_CHARD = IntItem.builder().id(ItemIds.ECHO_CHARD).build(); + public static final ItemType DISC_FRAGMENT_5 = ItemType.of(ItemIds.DISC_FRAGMENT_5); + public static final ItemType RECOVERY_COMPASS = ItemType.of(ItemIds.RECOVERY_COMPASS); + public static final ItemType ECHO_CHARD = ItemType.of(ItemIds.ECHO_CHARD); } diff --git a/api/src/main/java/org/cloudburstmc/api/util/data/TreeSpecies.java b/api/src/main/java/org/cloudburstmc/api/util/data/TreeSpecies.java index aee27b507..2a686a7fd 100644 --- a/api/src/main/java/org/cloudburstmc/api/util/data/TreeSpecies.java +++ b/api/src/main/java/org/cloudburstmc/api/util/data/TreeSpecies.java @@ -9,6 +9,5 @@ public enum TreeSpecies { DARK_OAK, CRIMSON, WARPED, - MANGROVE, }