diff --git a/Minecraft-SSHD-Bukkit/pom.xml b/Minecraft-SSHD-Bukkit/pom.xml
index 952d93b..bdfb1b8 100644
--- a/Minecraft-SSHD-Bukkit/pom.xml
+++ b/Minecraft-SSHD-Bukkit/pom.xml
@@ -6,7 +6,7 @@
com.ryanmichela
sshd
- 2.0.0
+ 2.1.0
Minecraft-SSHD-Bukkit
@@ -17,6 +17,14 @@
UTF-8
+
+
+
+ GPL2
+ http://www.gnu.org/licenses/gpl-2.0.html
+
+
+
@@ -24,7 +32,6 @@
spigot-api
1.19.4-R0.1-SNAPSHOT
-
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
index c1758dd..b3d8da6 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
@@ -1,5 +1,6 @@
package com.ryanmichela.sshd;
+import com.ryanmichela.sshd.jline.ConsoleShellFactory;
import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
import org.apache.sshd.common.session.helpers.AbstractSession;
import org.apache.sshd.contrib.server.subsystem.sftp.SimpleAccessControlSftpEventListener;
@@ -19,9 +20,7 @@ import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
-import java.util.Map;
import java.util.logging.Level;
-import java.util.stream.Stream;
/**
* Copyright 2013 Ryan Michela
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDCommandSender.java
similarity index 97%
rename from Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDCommandSender.java
index 38ca4e5..c68a39e 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDCommandSender.java
@@ -1,4 +1,4 @@
-package com.ryanmichela.sshd.implementations;
+package com.ryanmichela.sshd.implementations.commandsenders;
import com.ryanmichela.sshd.SshdPlugin;
import org.bukkit.Bukkit;
@@ -14,7 +14,7 @@ import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
-import com.ryanmichela.sshd.ConsoleShellFactory;
+import com.ryanmichela.sshd.jline.ConsoleShellFactory;
import com.ryanmichela.sshd.ConsoleLogFormatter;
import java.io.IOException;
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDConversationTracker.java
similarity index 97%
rename from Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDConversationTracker.java
index 9dd39af..4bbb3b7 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/commandsenders/SSHDConversationTracker.java
@@ -1,4 +1,4 @@
-package com.ryanmichela.sshd.implementations;
+package com.ryanmichela.sshd.implementations.commandsenders;
import org.bukkit.Bukkit;
import org.bukkit.conversations.Conversation;
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleCommandCompleter.java
similarity index 90%
rename from Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleCommandCompleter.java
index 0d74b18..ed6b0ee 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleCommandCompleter.java
@@ -1,9 +1,12 @@
-package com.ryanmichela.sshd;
+package com.ryanmichela.sshd.jline;
/**
* Copyright 2013 Ryan Michela
*/
+import com.ryanmichela.sshd.ReflectionUtil;
+import com.ryanmichela.sshd.SshdPlugin;
+import com.ryanmichela.sshd.Waitable;
import jline.console.completer.Completer;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap;
@@ -16,7 +19,7 @@ public class ConsoleCommandCompleter implements Completer
{
public int complete(final String buffer, final int cursor, final List candidates)
{
- Waitable> waitable = new Waitable>()
+ Waitable> waitable = new Waitable>()
{
@Override
protected List evaluate()
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleShellFactory.java
similarity index 92%
rename from Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleShellFactory.java
index 35a2ebc..a283260 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/ConsoleShellFactory.java
@@ -1,18 +1,10 @@
-package com.ryanmichela.sshd;
+package com.ryanmichela.sshd.jline;
-import com.ryanmichela.sshd.ConsoleCommandCompleter;
-import com.ryanmichela.sshd.ConsoleLogFormatter;
-import com.ryanmichela.sshd.PermissionUtil;
-import com.ryanmichela.sshd.FlushyOutputStream;
-import com.ryanmichela.sshd.FlushyStreamHandler;
-import com.ryanmichela.sshd.SshTerminal;
-import com.ryanmichela.sshd.SshdPlugin;
-import com.ryanmichela.sshd.StreamHandlerAppender;
-import com.ryanmichela.sshd.implementations.SSHDCommandSender;
+import com.ryanmichela.sshd.*;
+import com.ryanmichela.sshd.implementations.commandsenders.SSHDCommandSender;
import jline.console.ConsoleReader;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;
-import org.apache.sshd.common.Factory;
import org.apache.sshd.server.shell.ShellFactory;
import org.apache.sshd.server.command.Command;
import org.apache.sshd.server.channel.ChannelSession;
@@ -29,7 +21,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.StringTokenizer;
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.StreamHandler;
diff --git a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshTerminal.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/SshTerminal.java
similarity index 81%
rename from Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshTerminal.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/SshTerminal.java
index a9b765d..30e7d16 100644
--- a/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshTerminal.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/jline/SshTerminal.java
@@ -1,4 +1,4 @@
-package com.ryanmichela.sshd;
+package com.ryanmichela.sshd.jline;
import jline.TerminalSupport;
@@ -7,7 +7,7 @@ import jline.TerminalSupport;
*/
public class SshTerminal extends TerminalSupport
{
- protected SshTerminal()
+ public SshTerminal()
{
super(true);
}
diff --git a/pom.xml b/pom.xml
index 69ec413..7e16b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
Minecraft-SSHD-Bukkit
- 2.0.0
+ 2.1.0
https://git.limework.net/Limework/Minecraft-SSHD/
@@ -29,8 +29,8 @@
- GPL2
- http://www.gnu.org/licenses/gpl-2.0.html
+ Apache-2.0
+ https://www.apache.org/licenses/LICENSE-2.0