More redstone components

.gitignore

@@ -232,3 +232,4 @@ creativeitems.json
 recipes.json
 data/
 data/*
+/src/main/resources/rebel.xml

src/main/java/cn/nukkit/Nukkit.java

@@ -39,7 +39,7 @@ public class Nukkit {
 
     public final static Properties GIT_INFO = getGitInfo();
     public final static String VERSION = getVersion();
-    public final static String API_VERSION = "1.0.9";
+    public final static String API_VERSION = "1.0.10";
     public final static String CODENAME = "";
     @Deprecated
     public final static String MINECRAFT_VERSION = ProtocolInfo.MINECRAFT_VERSION;

src/main/java/cn/nukkit/Player.java

@@ -3195,7 +3195,7 @@ public void onCompletion(Server server) {
                                     } else if (target instanceof Player) {
                                         if ((((Player) target).getGamemode() & 0x01) > 0) {
                                             break;
-                                        } else if (!this.server.getPropertyBoolean("pvp")) {
+                                        } else if (!this.server.getPropertyBoolean("pvp") || this.server.getDifficulty() == 0) {
                                             break;
                                         }
                                     }

src/main/java/cn/nukkit/Server.java

@@ -4,6 +4,7 @@
 import cn.nukkit.blockentity.*;
 import cn.nukkit.command.*;
 import cn.nukkit.console.NukkitConsole;
+import cn.nukkit.dispenser.DispenseBehaviorRegister;
 import cn.nukkit.entity.Attribute;
 import cn.nukkit.entity.Entity;
 import cn.nukkit.entity.EntityHuman;
@@ -156,6 +157,8 @@ public class Server {
 
     private boolean autoSave = true;
 
+    private boolean redstoneEnabled = true;
+
     private RCON rcon;
 
     private EntityMetadataStore entityMetadata;
@@ -387,6 +390,7 @@ public Level remove(Object key) {
         this.autoTickRateLimit = this.getConfig("level-settings.auto-tick-rate-limit", 20);
         this.alwaysTickPlayers = this.getConfig("level-settings.always-tick-players", false);
         this.baseTickRate = this.getConfig("level-settings.base-tick-rate", 1);
+        this.redstoneEnabled = this.getConfig("level-settings.tick-redstone", true);
 
         this.scheduler = new ServerScheduler();
 
@@ -453,6 +457,7 @@ public Level remove(Object key) {
         Effect.init();
         Potion.init();
         Attribute.init();
+        DispenseBehaviorRegister.init();
         GlobalBlockPalette.getOrCreateRuntimeId(0, 0); //Force it to load
 
         // Convert legacy data before plugins get the chance to mess with it.
@@ -742,8 +747,11 @@ public boolean dispatchCommand(CommandSender sender, String commandLine) throws
         if (!this.isPrimaryThread()) {
             getLogger().warning("Command Dispatched Async: " + commandLine);
             getLogger().warning("Please notify author of plugin causing this execution to fix this bug!", new Throwable());
-            // TODO: We should sync the command to the main thread too!
+
+            this.scheduler.scheduleTask(null, () -> dispatchCommand(sender, commandLine));
+            return true;
         }
+
         if (sender == null) {
             throw new ServerException("CommandSender is not valid");
         }
@@ -2023,6 +2031,14 @@ public boolean isLanguageForced() {
         return forceLanguage;
     }
 
+    public boolean isRedstoneEnabled() {
+        return redstoneEnabled;
+    }
+
+    public void setRedstoneEnabled(boolean redstoneEnabled) {
+        this.redstoneEnabled = redstoneEnabled;
+    }
+
     public Network getNetwork() {
         return network;
     }
@@ -2333,6 +2349,9 @@ private void registerBlockEntities() {
         BlockEntity.registerBlockEntity(BlockEntity.SHULKER_BOX, BlockEntityShulkerBox.class);
         BlockEntity.registerBlockEntity(BlockEntity.BANNER, BlockEntityBanner.class);
         BlockEntity.registerBlockEntity(BlockEntity.MUSIC, BlockEntityMusic.class);
+        BlockEntity.registerBlockEntity(BlockEntity.DISPENSER, BlockEntityDispenser.class);
+        BlockEntity.registerBlockEntity(BlockEntity.DROPPER, BlockEntityDropper.class);
+        BlockEntity.registerBlockEntity(BlockEntity.MOVING_BLOCK, BlockEntityMovingBlock.class);
     }
 
     public boolean isNetherAllowed() {

src/main/java/cn/nukkit/block/Block.java

@@ -179,7 +179,7 @@ public static void init() {
             list[DRAGON_EGG] = BlockDragonEgg.class; //122
             list[REDSTONE_LAMP] = BlockRedstoneLamp.class; //123
             list[LIT_REDSTONE_LAMP] = BlockRedstoneLampLit.class; //124
-            //TODO: list[DROPPER] = BlockDropper.class; //125
+            list[DROPPER] = BlockDropper.class; //125
             list[ACTIVATOR_RAIL] = BlockRailActivator.class; //126
             list[COCOA] = BlockCocoa.class; //127
             list[SANDSTONE_STAIRS] = BlockStairsSandstone.class; //128
@@ -296,8 +296,7 @@ public static void init() {
             list[GLOWING_OBSIDIAN] = BlockObsidianGlowing.class; //246
             //list[NETHER_REACTOR] = BlockNetherReactor.class; //247 Should not be removed
 
-            //TODO: list[PISTON_EXTENSION] = BlockPistonExtension.class; //250
-
+            list[MOVING_BLOCK] = BlockMoving.class; //250
             list[OBSERVER] = BlockObserver.class; //251
 
             for (int id = 0; id < 256; id++) {
@@ -488,6 +487,18 @@ public boolean canBePushed() {
         return true;
     }
 
+    public boolean canBePulled() {
+        return true;
+    }
+
+    public boolean breaksWhenMoved() {
+        return false;
+    }
+
+    public boolean sticksToPiston() {
+        return true;
+    }
+
     public boolean hasComparatorInputOverride() {
         return false;
     }
@@ -691,6 +702,10 @@ public Block getSide(BlockFace face) {
     }
 
     public Block getSide(BlockFace face, int step) {
+        if (step == 0) {
+            return this;
+        }
+
         if (this.isValid()) {
             if (step == 1) {
                 return this.getLevel().getBlock((int) x + face.getXOffset(), (int) y + face.getYOffset(), (int) z + face.getZOffset());

src/main/java/cn/nukkit/block/BlockBanner.java

@@ -133,4 +133,9 @@ public Item toItem() {
     public BlockFace getBlockFace() {
         return BlockFace.fromHorizontalIndex(this.getDamage() & 0x7);
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
 }

src/main/java/cn/nukkit/block/BlockBeacon.java

@@ -94,4 +94,9 @@ public boolean place(Item item, Block block, Block target, BlockFace face, doubl
     public boolean canBePushed() {
         return false;
     }
+
+    @Override
+    public boolean canBePulled() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockBed.java

@@ -197,4 +197,14 @@ public DyeColor getDyeColor() {
     public BlockFace getBlockFace() {
         return BlockFace.fromHorizontalIndex(this.getDamage() & 0x7);
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockBedrock.java

@@ -41,6 +41,11 @@ public boolean canBePushed() {
         return false;
     }
 
+    @Override
+    public boolean canBePulled() {
+        return false;
+    }
+
     @Override
     public boolean canHarvestWithHand() {
         return false;

src/main/java/cn/nukkit/block/BlockBedrockInvisible.java

@@ -47,6 +47,11 @@ public boolean canBePushed() {
         return false;
     }
 
+    @Override
+    public boolean canBePulled() {
+        return false;
+    }
+
     @Override
     public Item toItem() {
         return new ItemBlock(new BlockAir());

src/main/java/cn/nukkit/block/BlockButton.java

@@ -54,15 +54,20 @@ public boolean onActivate(Item item, Player player) {
             return false;
         }
 
-        this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 0, 15));
+        this.level.scheduleUpdate(this, 30);
+
+        if (this.level.getServer().isRedstoneEnabled()) {
+            this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 0, 15));
+
+            Vector3 pos = getLocation();
+
+            level.updateAroundRedstone(pos, null);
+            level.updateAroundRedstone(pos.getSide(getFacing().getOpposite()), null);
+        }
+
         this.setDamage(this.getDamage() ^ 0x08);
         this.level.setBlock(this, this, true, false);
         this.level.addSound(this.add(0.5, 0.5, 0.5), Sound.RANDOM_CLICK);
-        this.level.scheduleUpdate(this, 30);
-        Vector3 pos = getLocation();
-
-        level.updateAroundRedstone(pos, null);
-        level.updateAroundRedstone(pos.getSide(getFacing().getOpposite()), null);
         return true;
     }
 
@@ -75,15 +80,17 @@ public int onUpdate(int type) {
             }
         } else if (type == Level.BLOCK_UPDATE_SCHEDULED) {
             if (this.isActivated()) {
-                this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 15, 0));
-
                 this.setDamage(this.getDamage() ^ 0x08);
                 this.level.setBlock(this, this, true, false);
                 this.level.addSound(this.add(0.5, 0.5, 0.5), Sound.RANDOM_CLICK);
 
-                Vector3 pos = getLocation();
-                level.updateAroundRedstone(pos, null);
-                level.updateAroundRedstone(pos.getSide(getFacing().getOpposite()), null);
+                if (!this.level.getServer().isRedstoneEnabled()) {
+                    this.level.getServer().getPluginManager().callEvent(new BlockRedstoneEvent(this, 15, 0));
+
+                    Vector3 pos = getLocation();
+                    level.updateAroundRedstone(pos, null);
+                    level.updateAroundRedstone(pos.getSide(getFacing().getOpposite()), null);
+                }
             }
 
             return Level.BLOCK_UPDATE_SCHEDULED;

src/main/java/cn/nukkit/block/BlockCactus.java

@@ -152,11 +152,21 @@ public String getName() {
     public BlockColor getColor() {
         return BlockColor.FOLIAGE_BLOCK_COLOR;
     }
-    
+
     @Override
     public Item[] getDrops(Item item) {
         return new Item[]{
-            Item.get(Item.CACTUS, 0, 1)
+                Item.get(Item.CACTUS, 0, 1)
         };
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockCake.java

@@ -136,4 +136,14 @@ public int getComparatorInputOverride() {
     public boolean hasComparatorInputOverride() {
         return true;
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockChorusFlower.java

@@ -37,4 +37,14 @@ public int getToolType() {
     public Item[] getDrops(Item item) {
         return new Item[0];
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockChorusPlant.java

@@ -37,4 +37,14 @@ public int getToolType() {
     public Item[] getDrops(Item item) {
         return new Item[0];
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }

src/main/java/cn/nukkit/block/BlockCocoa.java

@@ -244,4 +244,14 @@ public Item[] getDrops(Item item) {
     public BlockFace getBlockFace() {
         return BlockFace.fromHorizontalIndex(this.getDamage() & 0x07);
     }
+
+    @Override
+    public boolean breaksWhenMoved() {
+        return true;
+    }
+
+    @Override
+    public boolean sticksToPiston() {
+        return false;
+    }
 }