From c10abbe228a163362a110147b495119c1ca540cf Mon Sep 17 00:00:00 2001 From: Fangoboyo <77935781+Fangoboyo@users.noreply.github.com> Date: Sun, 26 Jun 2022 14:50:40 -0700 Subject: [PATCH] removed scheduler as it was a bad idea --- .../java/tech/nully/BossBarAPI/BossBar.java | 30 +++++++----------- .../nully/BossBarAPI/FakeWitherCommand.java | 3 +- .../Runnables/DragonDeleteRunnable.java | 16 ---------- .../Runnables/DragonRespawnRunnable.java | 17 ---------- .../nully/BossBarAPI/SpawnFakeWither.java | 4 +-- target/BossBarAPI-0.0.1-shaded.jar | Bin 20026 -> 18403 bytes .../compile/default-compile/createdFiles.lst | 2 -- 7 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 src/main/java/tech/nully/BossBarAPI/Runnables/DragonDeleteRunnable.java delete mode 100644 src/main/java/tech/nully/BossBarAPI/Runnables/DragonRespawnRunnable.java diff --git a/src/main/java/tech/nully/BossBarAPI/BossBar.java b/src/main/java/tech/nully/BossBarAPI/BossBar.java index 3580f6e..02691ae 100644 --- a/src/main/java/tech/nully/BossBarAPI/BossBar.java +++ b/src/main/java/tech/nully/BossBarAPI/BossBar.java @@ -1,14 +1,8 @@ package tech.nully.BossBarAPI; import com.comphenix.protocol.ProtocolLibrary; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitScheduler; -import tech.nully.BossBarAPI.Runnables.DragonDeleteRunnable; -import tech.nully.BossBarAPI.Runnables.DragonRespawnRunnable; - -import static tech.nully.BossBarAPI.SpawnFakeWither.TICKS_PER_SECOND; public class BossBar { private int bossHealth = 200; @@ -21,7 +15,6 @@ public class BossBar { public BossBar(Player p) { this.p = p; } - private DragonRespawnRunnable respawnRunnable; public int getHealth() { return bossHealth; @@ -30,7 +23,9 @@ public class BossBar { public void setHealth(int bossHealth) { this.bossHealth = bossHealth; if (dragon != null) { - dragon.setHealth(bossHealth); + if (dragon.created) { + dragon.setHealth(bossHealth); + } } } @@ -41,32 +36,29 @@ public class BossBar { public void setText(String text) { this.text = text; if (dragon != null) { - dragon.setCustomName(text); + if (dragon.created) { + dragon.setCustomName(text); + } } } public void display() { if (dragon != null) { - dragon.destroy(); + if (dragon.created) { + dragon.destroy(); + } } dragon = new SpawnFakeWither.FakeWither( new Location(p.getWorld(), p.getLocation().getX(), -15, p.getLocation().getZ()), ProtocolLibrary.getProtocolManager()); dragon.setCustomName(text); dragon.setVisible(false); dragon.create(); - - respawnRunnable = new DragonRespawnRunnable(this); - - Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.getInstance(), new DragonDeleteRunnable(dragon), 1); - Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(Main.getInstance(), respawnRunnable, TICKS_PER_SECOND*4, TICKS_PER_SECOND*4); } public void delete() { if (dragon != null) { - dragon.destroy(); - - if (respawnRunnable != null) { - respawnRunnable.cancel(); + if (dragon.created) { + dragon.destroy(); } } } diff --git a/src/main/java/tech/nully/BossBarAPI/FakeWitherCommand.java b/src/main/java/tech/nully/BossBarAPI/FakeWitherCommand.java index 8676fa5..c51398a 100644 --- a/src/main/java/tech/nully/BossBarAPI/FakeWitherCommand.java +++ b/src/main/java/tech/nully/BossBarAPI/FakeWitherCommand.java @@ -1,8 +1,6 @@ package tech.nully.BossBarAPI; -import com.comphenix.protocol.ProtocolLibrary; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -21,6 +19,7 @@ public class FakeWitherCommand implements CommandExecutor { Player player = (Player) sender; BossBar bar = new BossBar(player); bar.setText("Countdown"); + bar.display(); // Count down diff --git a/src/main/java/tech/nully/BossBarAPI/Runnables/DragonDeleteRunnable.java b/src/main/java/tech/nully/BossBarAPI/Runnables/DragonDeleteRunnable.java deleted file mode 100644 index 3ae4c7f..0000000 --- a/src/main/java/tech/nully/BossBarAPI/Runnables/DragonDeleteRunnable.java +++ /dev/null @@ -1,16 +0,0 @@ -package tech.nully.BossBarAPI.Runnables; - -import org.bukkit.scheduler.BukkitRunnable; -import tech.nully.BossBarAPI.SpawnFakeWither; - -public class DragonDeleteRunnable extends BukkitRunnable { - - private SpawnFakeWither.FakeWither dragon; - public DragonDeleteRunnable(SpawnFakeWither.FakeWither dragon) { - this.dragon = dragon; - } - @Override - public void run() { - dragon.destroy(); - } -} diff --git a/src/main/java/tech/nully/BossBarAPI/Runnables/DragonRespawnRunnable.java b/src/main/java/tech/nully/BossBarAPI/Runnables/DragonRespawnRunnable.java deleted file mode 100644 index a4581a5..0000000 --- a/src/main/java/tech/nully/BossBarAPI/Runnables/DragonRespawnRunnable.java +++ /dev/null @@ -1,17 +0,0 @@ -package tech.nully.BossBarAPI.Runnables; - -import org.bukkit.scheduler.BukkitRunnable; -import tech.nully.BossBarAPI.BossBar; -import tech.nully.BossBarAPI.SpawnFakeWither; - -public class DragonRespawnRunnable extends BukkitRunnable { - - private BossBar bar; - public DragonRespawnRunnable(BossBar bar) { - this.bar = bar; - } - @Override - public void run() { - bar.display(); - } -} diff --git a/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java b/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java index 72f042e..25f6d62 100644 --- a/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java +++ b/src/main/java/tech/nully/BossBarAPI/SpawnFakeWither.java @@ -45,8 +45,8 @@ public class SpawnFakeWither extends JavaPlugin { public Location location; public ProtocolManager manager; - public FakeWither(Location location, ProtocolManager manager) { - this.location = location; + public FakeWither(Player p, ProtocolManager manager) { + this.location = new Location(p.getWorld(), p.getLocation().getX(), -5, p.getLocation().getZ()); this.manager = manager; } diff --git a/target/BossBarAPI-0.0.1-shaded.jar b/target/BossBarAPI-0.0.1-shaded.jar index ebe853a92d99f696a2bcd064f72754fee87a053f..5befbe710d3ec951f80a02a885f41da4e2435623 100644 GIT binary patch delta 3214 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 UEo$@>Y#=s}%TLGOpz$vJ51{=W1poj5 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index de55258..7f03386 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,3 @@ -tech\nully\BossBarAPI\Runnables\DragonRespawnRunnable.class -tech\nully\BossBarAPI\Runnables\DragonDeleteRunnable.class tech\nully\BossBarAPI\FakeWitherCommand$1.class tech\nully\BossBarAPI\BossBar.class tech\nully\BossBarAPI\FakeWitherCommand.class