forked from Minecraft/QoL
Merge branch 'master' of git.etztech.xyz:Etzelia/QoL
commit
179b86f2b4
9
pom.xml
9
pom.xml
|
@ -68,6 +68,11 @@
|
||||||
<artifactId>Essentials</artifactId>
|
<artifactId>Essentials</artifactId>
|
||||||
<version>2.14-SNAPSHOT</version>
|
<version>2.14-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>us.dynmap</groupId>
|
||||||
|
<artifactId>dynmap-api</artifactId>
|
||||||
|
<version>1.9.4</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-lang</groupId>
|
<groupId>commons-lang</groupId>
|
||||||
<artifactId>commons-lang</artifactId>
|
<artifactId>commons-lang</artifactId>
|
||||||
|
@ -90,6 +95,10 @@
|
||||||
<id>etztech-repo</id>
|
<id>etztech-repo</id>
|
||||||
<url>http://repo.etztech.xyz</url>
|
<url>http://repo.etztech.xyz</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>dynmap-repo</id>
|
||||||
|
<url>http://repo.mikeprimm.com/</url>
|
||||||
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>ess-repo</id>
|
<id>ess-repo</id>
|
||||||
<url>http://repo.ess3.net/content/groups/essentials</url>
|
<url>http://repo.ess3.net/content/groups/essentials</url>
|
||||||
|
|
|
@ -11,6 +11,7 @@ import xyz.etztech.qol.commands.*;
|
||||||
import xyz.etztech.qol.listeners.*;
|
import xyz.etztech.qol.listeners.*;
|
||||||
import xyz.etztech.qol.other.LinkCommand;
|
import xyz.etztech.qol.other.LinkCommand;
|
||||||
import xyz.etztech.qol.other.TPSRunnable;
|
import xyz.etztech.qol.other.TPSRunnable;
|
||||||
|
import org.dynmap.DynmapAPI;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -21,6 +22,7 @@ public class QoL extends JavaPlugin {
|
||||||
|
|
||||||
private static QoL instance;
|
private static QoL instance;
|
||||||
private static IEssentials essentials = null;
|
private static IEssentials essentials = null;
|
||||||
|
private static DynmapAPI dynmap = null;
|
||||||
|
|
||||||
public static FileConfiguration config;
|
public static FileConfiguration config;
|
||||||
private Logger log = Logger.getLogger( "Minecraft" );
|
private Logger log = Logger.getLogger( "Minecraft" );
|
||||||
|
@ -44,6 +46,12 @@ public class QoL extends JavaPlugin {
|
||||||
essentials = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials");
|
essentials = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Dynmap hook
|
||||||
|
if (Bukkit.getPluginManager().isPluginEnabled("dynmap")) {
|
||||||
|
log("Hooked into Dynmap.");
|
||||||
|
dynmap = (DynmapAPI) Bukkit.getPluginManager().getPlugin("dynmap");
|
||||||
|
}
|
||||||
|
|
||||||
if( isEnabled() ) {
|
if( isEnabled() ) {
|
||||||
|
|
||||||
// Add listeners
|
// Add listeners
|
||||||
|
@ -243,9 +251,9 @@ public class QoL extends JavaPlugin {
|
||||||
return links;
|
return links;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IEssentials getEssentials() {
|
public static IEssentials getEssentials() { return essentials; }
|
||||||
return essentials;
|
|
||||||
}
|
public static DynmapAPI getDynmap() { return dynmap; }
|
||||||
|
|
||||||
|
|
||||||
private void runTask(final String command) {
|
private void runTask(final String command) {
|
||||||
|
|
|
@ -13,6 +13,7 @@ import xyz.etztech.core.CoreUtils;
|
||||||
import xyz.etztech.core.web.CoreWeb;
|
import xyz.etztech.core.web.CoreWeb;
|
||||||
import xyz.etztech.qol.QoL;
|
import xyz.etztech.qol.QoL;
|
||||||
import xyz.etztech.qol.other.LinkCommand;
|
import xyz.etztech.qol.other.LinkCommand;
|
||||||
|
import org.dynmap.DynmapAPI;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -20,25 +21,43 @@ import java.util.UUID;
|
||||||
|
|
||||||
public class CommandPreprocessListener implements Listener {
|
public class CommandPreprocessListener implements Listener {
|
||||||
|
|
||||||
|
|
||||||
QoL plugin;
|
QoL plugin;
|
||||||
private Map<UUID, String> confirmTpMap = new HashMap<>();
|
private Map<UUID, String> confirmTpMap = new HashMap<>();
|
||||||
|
private Map<UUID, Boolean> dynmapVisibleStatusMap = new HashMap<>();
|
||||||
|
|
||||||
public CommandPreprocessListener(QoL plugin) {
|
public CommandPreprocessListener(QoL plugin) {
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
||||||
|
|
||||||
String command = event.getMessage();
|
String command = event.getMessage();
|
||||||
String base = command.split(" ")[0].substring(1).toLowerCase(); // Strip the slash
|
String base = command.split(" ")[0].substring(1).toLowerCase(); // Strip the slash
|
||||||
Player sender = event.getPlayer();
|
Player sender = event.getPlayer();
|
||||||
|
DynmapAPI dynmap = plugin.getDynmap();
|
||||||
|
|
||||||
|
// Spec dynmap hide
|
||||||
|
if (base.equals("spec") && sender.hasPermission("SafeSpectate.spectate") && dynmap != null) {
|
||||||
|
boolean visibleStatus;
|
||||||
|
if (sender.getGameMode() != GameMode.SPECTATOR){
|
||||||
|
dynmapVisibleStatusMap.put(sender.getUniqueId(), dynmap.getPlayerVisbility(sender.getName()));
|
||||||
|
visibleStatus = false;
|
||||||
|
}
|
||||||
|
else if (dynmapVisibleStatusMap.containsKey(sender.getUniqueId())){
|
||||||
|
visibleStatus = dynmapVisibleStatusMap.remove(sender.getUniqueId());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
visibleStatus = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
dynmap.setPlayerVisiblity(sender.getDisplayName(), visibleStatus);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spec TP confirmation
|
||||||
if (sender.hasPermission("qol.tpconfirm")) {
|
if (sender.hasPermission("qol.tpconfirm")) {
|
||||||
//check if the command is a tp command
|
//check if the command is a tp command
|
||||||
if (noSlash(base).equals("tp") || noSlash(base).startsWith("tele") || noSlash(command).startsWith("lagg tpchunk")) {
|
if (noSlash(base).equals("tp") || noSlash(base).toLowerCase().startsWith("tele") || noSlash(command).toLowerCase().startsWith("lagg tpchunk")) {
|
||||||
//If the user is in the confirm tp map, remove them and let the command run
|
//If the user is in the confirm tp map, remove them and let the command run
|
||||||
if (command.equals(confirmTpMap.get(sender.getUniqueId()))) {
|
if (command.equals(confirmTpMap.get(sender.getUniqueId()))) {
|
||||||
confirmTpMap.remove(sender.getUniqueId());
|
confirmTpMap.remove(sender.getUniqueId());
|
||||||
|
|
Loading…
Reference in New Issue