Merge pull request #358 from Baterka/develop

Bug fixes & CustomBlock type for mob spawning
BentoBoxWorld · Nov 24, 2023 · ee4f519 · ee4f519
2 parents 5288546 + 111f2dc
commit ee4f519
Show file tree

Hide file tree

Showing 27 changed files with 337 additions and 163 deletions.
diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlock.java b/src/main/java/world/bentobox/aoneblock/AOneBlock.java
@@ -172,6 +172,7 @@ public void onReload() {
 		blockListener.saveCache();
 		if (loadSettings()) {
 			log("Reloaded AOneBlock settings");
+			loadData();
 		}
 	}
 

diff --git a/src/main/java/world/bentobox/aoneblock/dataobjects/OneBlockIslands.java b/src/main/java/world/bentobox/aoneblock/dataobjects/OneBlockIslands.java
@@ -10,6 +10,7 @@
 import com.google.gson.annotations.Expose;
 
 import world.bentobox.aoneblock.oneblocks.OneBlockObject;
+import world.bentobox.aoneblock.oneblocks.customblock.MobCustomBlock;
 import world.bentobox.bentobox.database.objects.DataObject;
 import world.bentobox.bentobox.database.objects.Table;
 
@@ -43,6 +44,12 @@ public class OneBlockIslands implements DataObject {
     @Expose
     private String hologram = "";
 
+    /**
+     * Timestamp of last phase change
+     */
+    @Expose
+    private long lastPhaseChangeTime = 0;
+
     private Queue<OneBlockObject> queue = new LinkedList<>();
 
     /**
@@ -135,7 +142,16 @@ public Queue<OneBlockObject> getQueue() {
      * @return list of upcoming mobs
      */
     public List<EntityType> getNearestMob(int i) {
-        return getQueue().stream().limit(i).filter(OneBlockObject::isEntity).map(OneBlockObject::getEntityType).toList();
+        return getQueue().stream().limit(i).filter(obo ->
+                // Include OneBlockObjects that are Entity, or custom block of type MobCustomBlock
+                obo.isEntity() || (obo.isCustomBlock() && obo.getCustomBlock() instanceof MobCustomBlock)
+        ).map(obo -> {
+            if (obo.isCustomBlock() && obo.getCustomBlock() instanceof MobCustomBlock) {
+                return ((MobCustomBlock) obo.getCustomBlock()).getMob();
+            }
+
+            return obo.getEntityType();
+        }).toList();
     }
 
     /**
@@ -186,5 +202,17 @@ public void setLifetime(long lifetime) {
         this.lifetime = lifetime;
     }
 
+    /**
+     * @return Timestamp of last phase change
+     */
+    public long getLastPhaseChangeTime() {
+        return this.lastPhaseChangeTime;
+    }
 
+    /**
+     * @param lastPhaseChangeTime Timestamp of last phase change
+     */
+    public void setLastPhaseChangeTime(long lastPhaseChangeTime) {
+        this.lastPhaseChangeTime = lastPhaseChangeTime;
+    }
 }
diff --git a/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java b/src/main/java/world/bentobox/aoneblock/listeners/BlockListener.java
@@ -287,15 +287,17 @@ private void process(@NonNull Cancellable e, @NonNull Island i, @Nullable Player
             saveIsland(i);
         }
         // Check if requirements met
-        if (check.phaseRequirementsFail(player, i, phase, world)) {
+        if (check.phaseRequirementsFail(player, i, is, phase, world)) {
             e.setCancelled(true);
             return;
         }
         if (newPhase) {
             is.clearQueue();
+            is.setLastPhaseChangeTime(System.currentTimeMillis());
         }
         // Get the block number in this phase
-        int blockNumber = is.getBlockNumber() - phase.getBlockNumberValue() + (int) is.getQueue().stream().filter(OneBlockObject::isMaterial).count();
+        int materialBlocksInQueue = (int) is.getQueue().stream().filter(obo -> obo.isMaterial() || obo.isCustomBlock()).count();
+        int blockNumber = is.getBlockNumber() - (phase.getBlockNumberValue() - 1) + materialBlocksInQueue;
         // Get the block that is being broken
         Block block = Objects.requireNonNull(i.getCenter()).toVector().toLocation(world).getBlock();
         // Fill a 5 block queue
@@ -406,7 +408,7 @@ else if (player.getLocation().getBlock().equals(block.getRelative(BlockFace.UP))
 
     private void spawnBlock(@NonNull OneBlockObject nextBlock, @NonNull Block block) {
         if (nextBlock.isCustomBlock()) {
-            nextBlock.getCustomBlock().setBlock(block);
+            nextBlock.getCustomBlock().execute(addon, block);
         } else if (nextBlock.isItemsAdderBlock()) {
             //Get Custom Block from ItemsAdder and place it
             CustomBlock cBlock = CustomBlock.getInstance(nextBlock.getItemsAdderBlock());

diff --git a/src/main/java/world/bentobox/aoneblock/listeners/CheckPhase.java b/src/main/java/world/bentobox/aoneblock/listeners/CheckPhase.java
@@ -52,7 +52,7 @@ public CheckPhase(AOneBlock addon, BlockListener blockListener) {
      * @param world  - world
      * @return true if the player cannot proceed to the next phase.
      */
-    protected boolean phaseRequirementsFail(@Nullable Player player, @NonNull Island i, OneBlockPhase phase, @NonNull World world) {
+    protected boolean phaseRequirementsFail(@Nullable Player player, @NonNull Island i, @NonNull OneBlockIslands is, OneBlockPhase phase, @NonNull World world) {
         if (phase.getRequirements().isEmpty()) {
             return false;
         }
@@ -88,6 +88,14 @@ protected boolean phaseRequirementsFail(@Nullable Player player, @NonNull Island
                 }
                 yield false;
             }
+            case COOLDOWN -> {
+                long remainingTime = r.getCooldown() - (System.currentTimeMillis() - is.getLastPhaseChangeTime()) / 1000;
+                if(remainingTime > 0){
+                    User.getInstance(player).sendMessage("aoneblock.phase.cooldown", TextVariables.NUMBER, String.valueOf(remainingTime));
+                    yield true;
+                }
+                yield false;
+            }
             };
             if (b) blocked = true;
         }

diff --git a/src/main/java/world/bentobox/aoneblock/listeners/MakeSpace.java b/src/main/java/world/bentobox/aoneblock/listeners/MakeSpace.java
@@ -52,7 +52,7 @@ public MakeSpace(AOneBlock addon) {
      * @param entity Entity that is spawned.
      * @param spawnLocation Location where entity is spawned.
      */
-    void makeSpace(@NonNull Entity entity, @NonNull Location spawnLocation)
+    public void makeSpace(@NonNull Entity entity, @NonNull Location spawnLocation)
     {
         World world = entity.getWorld();
         List<Block> airBlocks = new ArrayList<>();

diff --git a/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlockCustomBlock.java b/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlockCustomBlock.java
@@ -1,17 +1,18 @@
 package world.bentobox.aoneblock.oneblocks;
 
 import org.bukkit.block.Block;
+import world.bentobox.aoneblock.AOneBlock;
 
 /**
- * Represents a custom block
+ * Represents a custom block with custom executable
  *
  * @author HSGamer
  */
 public interface OneBlockCustomBlock {
     /**
-     * Set the block
+     * Executes the custom logic
      *
      * @param block the block
      */
-    void setBlock(Block block);
+    void execute(AOneBlock addon, Block block);
 }
diff --git a/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlockCustomBlockCreator.java b/src/main/java/world/bentobox/aoneblock/oneblocks/OneBlockCustomBlockCreator.java
@@ -1,6 +1,7 @@
 package world.bentobox.aoneblock.oneblocks;
 
 import world.bentobox.aoneblock.oneblocks.customblock.BlockDataCustomBlock;
+import world.bentobox.aoneblock.oneblocks.customblock.MobCustomBlock;
 
 import java.util.*;
 import java.util.function.Function;
@@ -16,6 +17,7 @@ public final class OneBlockCustomBlockCreator {
 
     static {
         register("block-data", BlockDataCustomBlock::fromMap);
+        register("mob", MobCustomBlock::fromMap);
         register("short", map -> {
             String type = Objects.toString(map.get("data"), null);
             if (type == null) {