> admins = telnet.getConfig().getAdmins();
// For every admin
for (String name : admins.keySet())
@@ -337,7 +331,7 @@ public final class ClientSession extends Thread
input = AUTH_INPUT_FILTER.matcher(input).replaceAll("").trim();
- if (TelnetConfig.getInstance().getConfigEntries().getPassword().equals(input))
+ if (telnet.getConfig().getPassword().equals(input))
{
return true;
}
@@ -366,7 +360,7 @@ public final class ClientSession extends Thread
TelnetLogger.info(clientAddress + " logged in as \"" + username + "\".");
// Start feeding data to the client.
- TelnetLogAppender.getInstance().addSession(this);
+ telnet.getPlugin().appender.addSession(this);
// Process commands
while (syncIsConnected())
@@ -379,6 +373,7 @@ public final class ClientSession extends Thread
}
catch (IOException ex)
{
+ TelnetLogger.severe(ex);
break;
}
@@ -421,6 +416,7 @@ public final class ClientSession extends Thread
{
writeLine("Shutting down the server...");
TelnetLogger.warning(username + ": Shutting down the server...");
+ Bukkit.shutdown();
System.exit(0);
}
else if ("telnet.log".equalsIgnoreCase(command))
@@ -449,7 +445,7 @@ public final class ClientSession extends Thread
}
else if ("telnet.exit".equalsIgnoreCase(command))
{
- writeLine("Goodbye.");
+ writeLine("Goodbye. <3");
syncTerminateSession();
}
else if ("telnet.enhanced".equalsIgnoreCase(command))
@@ -458,7 +454,7 @@ public final class ClientSession extends Thread
writeLine((enhancedMode ? "A" : "Dea") + "ctivated enhanced mode.");
if (enhancedMode)
{
- PlayerEventListener.triggerPlayerListUpdates();
+ telnet.getPlugin().listener.triggerPlayerListUpdates();
}
}
else
diff --git a/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java b/src/main/java/me/totalfreedom/bukkittelnet/session/FilterMode.java
similarity index 60%
rename from src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
rename to src/main/java/me/totalfreedom/bukkittelnet/session/FilterMode.java
index aaa55fc..0649504 100644
--- a/src/me/StevenLawson/BukkitTelnet/session/FilterMode.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/session/FilterMode.java
@@ -1,7 +1,8 @@
-package me.StevenLawson.BukkitTelnet.session;
+package me.totalfreedom.bukkittelnet.session;
public enum FilterMode
{
+
FULL,
NONCHAT_ONLY,
CHAT_ONLY;
diff --git a/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java b/src/main/java/me/totalfreedom/bukkittelnet/session/SessionCommandSender.java
similarity index 71%
rename from src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
rename to src/main/java/me/totalfreedom/bukkittelnet/session/SessionCommandSender.java
index d63f625..c61814e 100644
--- a/src/me/StevenLawson/BukkitTelnet/session/SessionCommandSender.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/session/SessionCommandSender.java
@@ -1,16 +1,19 @@
-package me.StevenLawson.BukkitTelnet.session;
+package me.totalfreedom.bukkittelnet.session;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.conversations.Conversation;
+import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
-public class SessionCommandSender implements CommandSender
+public class SessionCommandSender implements ConsoleCommandSender
{
+
private final ClientSession session;
public SessionCommandSender(ClientSession session)
@@ -21,13 +24,7 @@ public class SessionCommandSender implements CommandSender
@Override
public void sendMessage(String message)
{
- session.printRawLine(message);
- }
-
- @Override
- public String getName()
- {
- return this.session.getUserName();
+ session.writeRawLine(message);
}
@Override
@@ -39,6 +36,12 @@ public class SessionCommandSender implements CommandSender
}
}
+ @Override
+ public String getName()
+ {
+ return this.session.getUserName();
+ }
+
@Override
public Server getServer()
{
@@ -119,4 +122,38 @@ public class SessionCommandSender implements CommandSender
public void setOp(boolean value)
{
}
+
+ @Override
+ public boolean isConversing()
+ {
+ return false;
+ }
+
+ @Override
+ public void acceptConversationInput(String string)
+ {
+ }
+
+ @Override
+ public boolean beginConversation(Conversation c)
+ {
+ return false;
+ }
+
+ @Override
+ public void abandonConversation(Conversation c)
+ {
+ }
+
+ @Override
+ public void abandonConversation(Conversation c, ConversationAbandonedEvent cae)
+ {
+ }
+
+ @Override
+ public void sendRawMessage(String string)
+ {
+ session.writeRawLine(string);
+ }
+
}
diff --git a/src/net/pravian/bukkitlib/FileUtils.java b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/FileUtils.java
similarity index 97%
rename from src/net/pravian/bukkitlib/FileUtils.java
rename to src/main/java/me/totalfreedom/bukkittelnet/thirdparty/FileUtils.java
index e5c43dc..a384017 100644
--- a/src/net/pravian/bukkitlib/FileUtils.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/FileUtils.java
@@ -1,4 +1,4 @@
-package net.pravian.bukkitlib;
+package me.totalfreedom.bukkittelnet.thirdparty;
import java.io.File;
import java.io.FileInputStream;
@@ -19,6 +19,7 @@ import org.bukkit.plugin.Plugin;
*/
public class FileUtils
{
+
/**
* Downloads a file from the specified URIL and saves it at the specified location.
*
@@ -121,7 +122,8 @@ public class FileUtils
/**
* Delete a specified folder and all contents quietly.
*
- * Warning: This method will delete files, only folders!
+ *
+ * Warning: This method will delete files, only folders!
*
* @param file The folder to delete.
* @return true if the delete was successful.
diff --git a/src/net/pravian/bukkitlib/YamlConfig.java b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java
similarity index 94%
rename from src/net/pravian/bukkitlib/YamlConfig.java
rename to src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java
index a1aa343..c9d1196 100644
--- a/src/net/pravian/bukkitlib/YamlConfig.java
+++ b/src/main/java/me/totalfreedom/bukkittelnet/thirdparty/YamlConfig.java
@@ -1,4 +1,4 @@
-package net.pravian.bukkitlib;
+package me.totalfreedom.bukkittelnet.thirdparty;
import java.io.File;
import java.io.IOException;
@@ -13,6 +13,7 @@ import org.bukkit.plugin.Plugin;
*/
public class YamlConfig extends YamlConfiguration
{
+
private final Plugin PLUGIN;
private final File CONFIG_FILE;
private final boolean COPY_DEFAULTS;
@@ -20,7 +21,8 @@ public class YamlConfig extends YamlConfiguration
/**
* Creates a new YamlConfig instance.
*
- * Example:
+ *
+ * Example:
*
* YamlConfig config = new YamlConfig(this, "config.yml", true);
* config.load();
@@ -38,7 +40,8 @@ public class YamlConfig extends YamlConfiguration
/**
* Creates a new YamlConfig instance.
*
- * Example:
+ *
+ * Example:
*
* YamlConfig config = new YamlConfig(this, new File(plugin.getDataFolder() + "/players", "DarthSalamon.yml"), false);
* config.load();
@@ -76,7 +79,8 @@ public class YamlConfig extends YamlConfiguration
/**
* Loads the configuration from the predefined file.
*
- * Optionally, if loadDefaults has been set to true, the file will be copied over from the default inside the jar-file of the owning plugin.
+ *
+ * Optionally, if loadDefaults has been set to true, the file will be copied over from the default inside the jar-file of the owning plugin.
*
* @see #YamlConfig(Plugin, String, boolean)
*/
@@ -126,6 +130,7 @@ public class YamlConfig extends YamlConfiguration
/**
* Returns the default configuration as been stored in the jar-file of the owning plugin.
+ *
* @return The default configuration.
*/
public YamlConfiguration getDefaultConfig()
diff --git a/src/config.yml b/src/main/resources/config.yml
similarity index 89%
rename from src/config.yml
rename to src/main/resources/config.yml
index b491616..81ccde1 100644
--- a/src/config.yml
+++ b/src/main/resources/config.yml
@@ -13,7 +13,7 @@ password: 'walrus'
admins:
madgeek1450:
- 74.131.135.3
- darthsalamon:
- - 94.209.214.179
+ prozza:
+ - 176.56.237.227
markbyron:
- 71.47.67.103
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
new file mode 100644
index 0000000..e73663f
--- /dev/null
+++ b/src/main/resources/plugin.yml
@@ -0,0 +1,5 @@
+name: BukkitTelnet
+main: me.totalfreedom.bukkittelnet.BukkitTelnet
+version: 4.3
+description: Telnet console access plugin.
+authors: [bekvon, Madgeek1450, Prozza]
diff --git a/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java b/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
deleted file mode 100644
index 51c9a1b..0000000
--- a/src/me/StevenLawson/BukkitTelnet/BukkitTelnet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package me.StevenLawson.BukkitTelnet;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Logger;
-import org.bukkit.Server;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class BukkitTelnet extends JavaPlugin
-{
- public static BukkitTelnet plugin;
- public static Server server;
-
- @Override
- public void onLoad()
- {
- plugin = this;
- server = plugin.getServer();
-
- TelnetLogger.setPluginLogger(plugin.getLogger());
- TelnetLogger.setServerLogger(server.getLogger());
- }
-
- @Override
- public void onEnable()
- {
- TelnetConfig.getInstance().loadConfig();
-
- ((Logger) LogManager.getRootLogger()).addAppender(TelnetLogAppender.getInstance());
-
- TelnetServer.getInstance().startServer();
-
- TelnetLogger.info(plugin.getName() + " v" + plugin.getDescription().getVersion() + " enabled");
-
- this.getServer().getPluginManager().registerEvents(new PlayerEventListener(), plugin);
- }
-
- @Override
- public void onDisable()
- {
- TelnetServer.getInstance().stopServer();
-
- TelnetLogger.info(plugin.getName() + " disabled.");
- }
-}
diff --git a/src/me/StevenLawson/BukkitTelnet/api/TelnetEvent.java b/src/me/StevenLawson/BukkitTelnet/api/TelnetEvent.java
deleted file mode 100644
index 643181a..0000000
--- a/src/me/StevenLawson/BukkitTelnet/api/TelnetEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package me.StevenLawson.BukkitTelnet.api;
-
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.server.ServerEvent;
-
-public abstract class TelnetEvent extends ServerEvent
-{
- private static final HandlerList handlers = new HandlerList();
-
- @Override
- public HandlerList getHandlers()
- {
- return handlers;
- }
-
- public static HandlerList getHandlerList()
- {
- return handlers;
- }
-}
diff --git a/src/plugin.yml b/src/plugin.yml
deleted file mode 100644
index dbbcc4c..0000000
--- a/src/plugin.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: BukkitTelnet
-main: me.StevenLawson.BukkitTelnet.BukkitTelnet
-version: 4.2
-description: Telnet console access plugin.
-authors: [bekvon, Madgeek1450, DarthSalamon]
diff --git a/supressions.xml b/supressions.xml
new file mode 100644
index 0000000..5fdfc91
--- /dev/null
+++ b/supressions.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+