Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-26 19:18:12 +01:00
Code Issues Projects Releases Wiki Activity

WIP block entity

Browse Source
This commit is contained in:
Felix Cravic 2020-04-24 00:17:40 +02:00
parent 6da352f192
commit 5d7f538ab7
3 changed files with 73 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/themode/minestom/instance/Chunk.java
View File

@ -4,6 +4,7 @@ import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.Viewable; import fr.themode.minestom.Viewable;
import fr.themode.minestom.data.Data; import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player; import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.instance.block.BlockManager; import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.instance.block.CustomBlock; import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.instance.block.UpdateConsumer; import fr.themode.minestom.instance.block.UpdateConsumer;
@ -239,8 +240,8 @@ public class Chunk implements Viewable {
} }
private boolean isBlockEntity(short blockId) { private boolean isBlockEntity(short blockId) {
// TODO complete Block block = Block.fromId(blockId);
return blockId == 2033; return block.isBlockEntity();
} }
public Set<Integer> getBlockEntities() { public Set<Integer> getBlockEntities() {

70
src/main/java/fr/themode/minestom/instance/block/Block.java
View File

@ -1265,6 +1265,76 @@ public enum Block {
} }
} }
public boolean isBlockEntity() {
switch (this) {
case SPAWNER:
case COMMAND_BLOCK:
case BEACON:
case CREEPER_HEAD:
case CREEPER_WALL_HEAD:
case DRAGON_HEAD:
case DRAGON_WALL_HEAD:
case PLAYER_HEAD:
case PLAYER_WALL_HEAD:
case ZOMBIE_HEAD:
case ZOMBIE_WALL_HEAD:
case CONDUIT:
case BLACK_BANNER:
case BLACK_WALL_BANNER:
case BLUE_BANNER:
case BLUE_WALL_BANNER:
case BROWN_BANNER:
case BROWN_WALL_BANNER:
case CYAN_BANNER:
case PURPLE_BANNER:
case GREEN_BANNER:
case RED_BANNER:
case WHITE_WALL_BANNER:
case ORANGE_WALL_BANNER:
case MAGENTA_WALL_BANNER:
case LIGHT_BLUE_WALL_BANNER:
case YELLOW_WALL_BANNER:
case LIME_WALL_BANNER:
case PINK_WALL_BANNER:
case GRAY_WALL_BANNER:
case LIGHT_GRAY_WALL_BANNER:
case CYAN_WALL_BANNER:
case PURPLE_WALL_BANNER:
case GREEN_WALL_BANNER:
case RED_WALL_BANNER:
case STRUCTURE_BLOCK:
case END_GATEWAY:
case OAK_SIGN:
case SPRUCE_SIGN:
case BIRCH_SIGN:
case ACACIA_SIGN:
case JUNGLE_SIGN:
case DARK_OAK_SIGN:
case BLACK_BED:
case WHITE_BED:
case ORANGE_BED:
case MAGENTA_BED:
case LIGHT_BLUE_BED:
case YELLOW_BED:
case LIME_BED:
case PINK_BED:
case GRAY_BED:
case LIGHT_GRAY_BED:
case CYAN_BED:
case PURPLE_BED:
case BLUE_BED:
case BROWN_BED:
case GREEN_BED:
case RED_BED:
case JIGSAW:
case CAMPFIRE:
case BEEHIVE:
return true;
default:
return false;
}
}
public List<BlockAlternative> getBlockAlternatives() { public List<BlockAlternative> getBlockAlternatives() {
return Collections.unmodifiableList(blockAlternatives); return Collections.unmodifiableList(blockAlternatives);
} }

1
src/main/java/fr/themode/minestom/listener/BlockPlacementListener.java
View File

@ -89,7 +89,6 @@ public class BlockPlacementListener {
player.callEvent(PlayerBlockPlaceEvent.class, playerBlockPlaceEvent); player.callEvent(PlayerBlockPlaceEvent.class, playerBlockPlaceEvent);
if (!playerBlockPlaceEvent.isCancelled() && canPlace) { if (!playerBlockPlaceEvent.isCancelled() && canPlace) {
instance.setBlock(blockPosition, material.getBlock()); instance.setBlock(blockPosition, material.getBlock());
//instance.setCustomBlock(blockPosition, "updatable");
if (playerBlockPlaceEvent.doesConsumeBlock()) { if (playerBlockPlaceEvent.doesConsumeBlock()) {
StackingRule stackingRule = usedItem.getStackingRule(); StackingRule stackingRule = usedItem.getStackingRule();