From 91c1059386dabcb4eb00b049d25805b454b362c1 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 27 Apr 2019 19:20:33 -0400 Subject: [PATCH] Removed Arconix Support --- pom.xml | 5 --- .../ultimatestacker/UltimateStacker.java | 11 ----- .../hologram/HologramArconix.java | 40 ------------------ .../command/commands/CommandSettings.class | Bin 1854 -> 1854 bytes 4 files changed, 56 deletions(-) delete mode 100644 src/main/java/com/songoda/ultimatestacker/hologram/HologramArconix.java diff --git a/pom.xml b/pom.xml index a140b24..d7e4cd6 100644 --- a/pom.xml +++ b/pom.xml @@ -73,11 +73,6 @@ songodaupdater 1 - - com.songoda - arconix - 2.0.0 - net.milkbowl vault diff --git a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java index 31b97e7..5426aa5 100644 --- a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java +++ b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java @@ -5,7 +5,6 @@ import com.songoda.ultimatestacker.entity.EntityStack; import com.songoda.ultimatestacker.entity.EntityStackManager; import com.songoda.ultimatestacker.events.*; import com.songoda.ultimatestacker.hologram.Hologram; -import com.songoda.ultimatestacker.hologram.HologramArconix; import com.songoda.ultimatestacker.hologram.HologramHolographicDisplays; import com.songoda.ultimatestacker.spawner.SpawnerStack; import com.songoda.ultimatestacker.spawner.SpawnerStackManager; @@ -24,16 +23,7 @@ import org.bukkit.command.ConsoleCommandSender; import org.bukkit.entity.EntityType; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; public class UltimateStacker extends JavaPlugin { @@ -205,7 +195,6 @@ public class UltimateStacker extends JavaPlugin { if (getConfig().getBoolean("Spawners.Holograms Enabled")) { if (pluginManager.isPluginEnabled("HolographicDisplays")) hologram = new HologramHolographicDisplays(this); - else if (pluginManager.isPluginEnabled("Arconix")) hologram = new HologramArconix(this); } Bukkit.getScheduler().runTaskTimerAsynchronously(this, this::saveToFile, 6000, 6000); diff --git a/src/main/java/com/songoda/ultimatestacker/hologram/HologramArconix.java b/src/main/java/com/songoda/ultimatestacker/hologram/HologramArconix.java deleted file mode 100644 index 0b27195..0000000 --- a/src/main/java/com/songoda/ultimatestacker/hologram/HologramArconix.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.songoda.ultimatestacker.hologram; - -import com.songoda.arconix.api.hologram.HologramObject; -import com.songoda.arconix.plugin.Arconix; -import com.songoda.ultimatestacker.UltimateStacker; -import org.bukkit.Location; - -public class HologramArconix extends Hologram { - - private com.songoda.arconix.api.packets.Hologram hologramManager; - - public HologramArconix(UltimateStacker instance) { - super(instance); - this.hologramManager = Arconix.pl().getApi().packetLibrary.getHologramManager(); - } - - @Override - public void add(Location location, String line) { - fixLocation(location); - HologramObject hologram = new HologramObject(null, location, line); - hologramManager.addHologram(hologram); - } - - @Override - public void remove(Location location) { - fixLocation(location); - hologramManager.removeHologram(location, 1); - } - - @Override - public void update(Location location, String line) { - fixLocation(location); - HologramObject hologram = new HologramObject(null, location, line); - hologramManager.addHologram(hologram); - } - - private void fixLocation(Location location) { - location.add(0.5, 1, 0.5); - } -} diff --git a/target/classes/com/songoda/ultimatestacker/command/commands/CommandSettings.class b/target/classes/com/songoda/ultimatestacker/command/commands/CommandSettings.class index 6f70aa547d6c6178f4a182240fe79f7e5ed1cace..be18bd1c7af8026814809d4382359ce6b54b56c7 100644 GIT binary patch delta 20 ccmdnTw~uebHzvm5$={hG7=t$lFu!9409POf!~g&Q delta 20 ccmdnTw~uebHzvm7$={hG7>hRtFu!9409jxN1ONa4