diff --git a/.clangformat b/.clangformat
deleted file mode 100644
index dbbd5f6..0000000
--- a/.clangformat
+++ /dev/null
@@ -1,68 +0,0 @@
----
-#BasedOnStyle: WebKit
-TabWidth: '4'
-IndentWidth: '4'
-UseTab: 'Always'
-AlignOperands: 'true'
-AlignAfterOpenBracket: 'Align'
-AlignConsecutiveAssignments: 'true'
-AlignConsecutiveDeclarations: 'true'
-AlignEscapedNewlines: 'Left'
-AlignTrailingComments: 'true'
-AllowAllParametersOfDeclarationOnNextLine: 'true'
-AllowShortBlocksOnASingleLine: 'false'
-AllowShortCaseLabelsOnASingleLine: 'false'
-AllowShortFunctionsOnASingleLine: 'All'
-AllowShortIfStatementsOnASingleLine: 'false'
-AllowShortLoopsOnASingleLine: 'false'
-AlwaysBreakAfterReturnType: 'None'
-AlwaysBreakTemplateDeclarations: 'true'
-AlwaysBreakBeforeMultilineStrings: 'false'
-BinPackArguments: 'false'
-BinPackParameters: 'false'
-BreakBeforeBraces: 'Custom'
-BraceWrapping:
- AfterEnum: 'true'
- AfterClass: 'true'
- AfterControlStatement: 'true'
- AfterStruct: 'true'
- AfterFunction: 'true'
- AfterNamespace: 'true'
- AfterUnion: 'true'
- AfterExternBlock: 'true'
- BeforeCatch: 'true'
- BeforeElse: 'true'
- SplitEmptyRecord: 'false'
- SplitEmptyNamespace: 'false'
- SplitEmptyFunction: 'false'
-BreakBeforeBinaryOperators: 'true'
-BreakBeforeTernaryOperators: 'false'
-BreakConstructorInitializersBeforeComma: 'false'
-BreakBeforeInheritanceComma: 'false'
-BreakStringLiterals: 'true'
-ColumnLimit: '140'
-CompactNamespaces: 'false'
-Cpp11BracedListStyle: 'true'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
-DerivePointerAlignment: 'false'
-IndentCaseLabels: 'true'
-IndentPPDirectives: 'AfterHash'
-KeepEmptyLinesAtTheStartOfBlocks: 'true'
-Language: 'Java'
-NamespaceIndentation: 'All'
-PointerAlignment: 'Right'
-ReflowComments: 'true'
-SortIncludes: 'true'
-SortUsingDeclarations: 'true'
-SpaceAfterCStyleCast: 'false'
-SpaceAfterTemplateKeyword: 'false'
-SpaceBeforeAssignmentOperators: 'true'
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: 'false'
-SpacesInAngles: 'false'
-SpacesInCStyleCastParentheses: 'false'
-SpacesInContainerLiterals: 'false'
-SpacesInParentheses: 'false'
-SpacesInSquareBrackets: 'false'
-Standard: 'Auto'
-...
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bf559af..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-sudo: false
-dist: trusty
-language: java
-jdk:
- - oraclejdk8
diff --git a/Minecraft-SSHD-Bukkit/pom.xml b/Minecraft-SSHD-Bukkit/pom.xml
new file mode 100644
index 0000000..952d93b
--- /dev/null
+++ b/Minecraft-SSHD-Bukkit/pom.xml
@@ -0,0 +1,84 @@
+
+
+ 4.0.0
+
+ com.ryanmichela
+ sshd
+ 2.0.0
+
+
+ Minecraft-SSHD-Bukkit
+
+
+ 17
+ 17
+ UTF-8
+
+
+
+
+
+ org.spigotmc
+ spigot-api
+ 1.19.4-R0.1-SNAPSHOT
+
+
+
+
+
+
+
+ clean package
+
+
+
+ .
+ true
+ ${basedir}/src/main/resources
+
+ plugin.yml
+ config.yml
+ motd.txt
+
+
+
+
+
+
+ maven-assembly-plugin
+ 3.1.1
+
+
+ package
+
+ single
+
+
+
+
+ ${project.name}-${project.version}
+ false
+
+ jar-with-dependencies
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.7.0
+
+
+ 1.8
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/ryanmichela/sshd/BCrypt.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/BCrypt.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/BCrypt.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/BCrypt.java
diff --git a/src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java
diff --git a/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java
diff --git a/src/main/java/com/ryanmichela/sshd/ConsoleCommandFactory.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandFactory.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ConsoleCommandFactory.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleCommandFactory.java
diff --git a/src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
diff --git a/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
diff --git a/src/main/java/com/ryanmichela/sshd/Cryptography.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/Cryptography.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/Cryptography.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/Cryptography.java
diff --git a/src/main/java/com/ryanmichela/sshd/FlushyOutputStream.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/FlushyOutputStream.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/FlushyOutputStream.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/FlushyOutputStream.java
diff --git a/src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java
diff --git a/src/main/java/com/ryanmichela/sshd/MkpasswdCommand.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/MkpasswdCommand.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/MkpasswdCommand.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/MkpasswdCommand.java
diff --git a/src/main/java/com/ryanmichela/sshd/PermissionUtil.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/PermissionUtil.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/PermissionUtil.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/PermissionUtil.java
diff --git a/src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
similarity index 98%
rename from src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
index 20323dc..da0e9ec 100644
--- a/src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
@@ -1,6 +1,5 @@
package com.ryanmichela.sshd;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
diff --git a/src/main/java/com/ryanmichela/sshd/ReflectionUtil.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ReflectionUtil.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/ReflectionUtil.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/ReflectionUtil.java
diff --git a/src/main/java/com/ryanmichela/sshd/SshTerminal.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshTerminal.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/SshTerminal.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshTerminal.java
diff --git a/src/main/java/com/ryanmichela/sshd/SshdPlugin.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
similarity index 96%
rename from src/main/java/com/ryanmichela/sshd/SshdPlugin.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
index 79b816d..c1758dd 100644
--- a/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/SshdPlugin.java
@@ -2,17 +2,14 @@ package com.ryanmichela.sshd;
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;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
-import org.apache.sshd.server.subsystem.sftp.SimpleAccessControlSftpEventListener;
+import org.apache.sshd.sftp.server.SftpSubsystemFactory;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.plugin.java.JavaPlugin;
-import com.ryanmichela.sshd.ConsoleShellFactory;
-import com.ryanmichela.sshd.MkpasswdCommand;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -96,7 +93,7 @@ public class SshdPlugin extends JavaPlugin
{
// Handle access control for SFTP.
SftpSubsystemFactory.Builder builder = new SftpSubsystemFactory.Builder();
- builder.addSftpEventListener(new SimpleAccessControlSftpEventListener()
+ builder.addSftpEventListener(new SimpleAccessControlSftpEventListener()
{
protected boolean isAccessAllowed(ServerSession session, String remote, Path localpath)
{
diff --git a/src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
similarity index 91%
rename from src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
index c79ccd0..d2d3cc0 100644
--- a/src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
@@ -76,6 +76,17 @@ public class StreamHandlerAppender implements Appender
{
}
+ @Override
+ public State getState() {
+ // Todo: i am not sure what is this
+ return null;
+ }
+
+ @Override
+ public void initialize() {
+ // Todo: i am not sure what is this
+ }
+
@Override
public void start()
{
diff --git a/src/main/java/com/ryanmichela/sshd/Waitable.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/Waitable.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/Waitable.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/Waitable.java
diff --git a/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
similarity index 94%
rename from src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
index 9befe10..38ca4e5 100644
--- a/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
+++ b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java
@@ -2,7 +2,6 @@ package com.ryanmichela.sshd.implementations;
import com.ryanmichela.sshd.SshdPlugin;
import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
@@ -21,6 +20,7 @@ import com.ryanmichela.sshd.ConsoleLogFormatter;
import java.io.IOException;
import java.util.Arrays;
import java.util.Set;
+import java.util.UUID;
import java.util.logging.Level;
public class SSHDCommandSender implements ConsoleCommandSender, CommandSender
@@ -61,11 +61,26 @@ public class SSHDCommandSender implements ConsoleCommandSender, CommandSender
}
}
+ @Override
+ public void sendRawMessage(UUID uuid, String s) {
+ sendRawMessage(s);
+ }
+
public void sendMessage(String[] messages)
{
Arrays.asList(messages).forEach(this::sendMessage);
}
+ @Override
+ public void sendMessage(UUID uuid, String s) {
+ sendMessage(s);
+ }
+
+ @Override
+ public void sendMessage(UUID uuid, String... strings) {
+ sendMessage(strings);
+ }
+
public String getName()
{
return "SSHD Console";
diff --git a/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java b/Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java
similarity index 100%
rename from src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java
rename to Minecraft-SSHD-Bukkit/src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java
diff --git a/src/main/java/org/slf4j/impl/PluginSlf4jFactory.java b/Minecraft-SSHD-Bukkit/src/main/java/org/slf4j/impl/PluginSlf4jFactory.java
similarity index 100%
rename from src/main/java/org/slf4j/impl/PluginSlf4jFactory.java
rename to Minecraft-SSHD-Bukkit/src/main/java/org/slf4j/impl/PluginSlf4jFactory.java
diff --git a/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/Minecraft-SSHD-Bukkit/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
similarity index 100%
rename from src/main/java/org/slf4j/impl/StaticLoggerBinder.java
rename to Minecraft-SSHD-Bukkit/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
diff --git a/src/main/resources/config.yml b/Minecraft-SSHD-Bukkit/src/main/resources/config.yml
similarity index 100%
rename from src/main/resources/config.yml
rename to Minecraft-SSHD-Bukkit/src/main/resources/config.yml
diff --git a/src/main/resources/motd.txt b/Minecraft-SSHD-Bukkit/src/main/resources/motd.txt
similarity index 100%
rename from src/main/resources/motd.txt
rename to Minecraft-SSHD-Bukkit/src/main/resources/motd.txt
diff --git a/src/main/resources/plugin.yml b/Minecraft-SSHD-Bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from src/main/resources/plugin.yml
rename to Minecraft-SSHD-Bukkit/src/main/resources/plugin.yml
diff --git a/README.md b/README.md
index 04a776b..ef5425e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
Minecraft-SSHD
===========
-[![Build Status](https://travis-ci.org/Justasic/Minecraft-SSHD.svg?branch=master)](https://travis-ci.org/Justasic/Minecraft-SSHD)
-[![Release](https://img.shields.io/github/release/Justasic/Minecraft-SSHD.svg?label=Release&maxAge=60)](https://github.com/Justasic/Minecraft-SSHD/releases/latest)
[![GitHub license](https://img.shields.io/github/license/Justasic/Minecraft-SSHD)](https://github.com/Justasic/Minecraft-SSHD/blob/master/LICENSE)
diff --git a/pom.xml b/pom.xml
index c62be7a..69ec413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,11 @@
com.ryanmichela
sshd
Minecraft-SSHD: The SSH daemon for Minecraft servers.
+
+ Minecraft-SSHD-Bukkit
+
2.0.0
- https://github.com/Justasic/Minecraft-SSHD/
+ https://git.limework.net/Limework/Minecraft-SSHD/
1.8
@@ -33,36 +36,29 @@
-
- org.spigotmc
- spigot-api
- 1.15.2-R0.1-SNAPSHOT
-
-
org.apache.sshd
sshd-core
- 2.4.0
+ 2.9.0
compile
jar
-
org.apache.sshd
sshd-mina
- 2.4.0
+ 2.9.0
org.apache.sshd
sshd-contrib
- 2.4.0
+ 2.9.0
org.apache.sshd
sshd-common
- 2.4.0
+ 2.9.0
compile
jar
@@ -70,7 +66,7 @@
org.apache.sshd
sshd-sftp
- 2.4.0
+ 2.9.0
@@ -82,100 +78,48 @@
org.apache.mina
mina-core
- 2.1.3
+ 2.2.1
org.slf4j
slf4j-api
- 1.7.28
+ 2.0.5
org.slf4j
slf4j-jdk14
- 1.7.28
+ 2.0.5
jline
jline
- 2.12.1
+ 2.14.6
org.apache.logging.log4j
log4j-core
- 2.0
+ 2.20.0
provided
org.apache.logging.log4j
log4j-api
- 2.1
+ 2.20.0
provided
commons-codec
commons-codec
- 1.10
+ 1.15
provided
-
-
- clean package
-
-
-
- .
- true
- ${basedir}/src/main/resources
-
- plugin.yml
- config.yml
- motd.txt
-
-
-
-
-
-
- maven-assembly-plugin
- 3.1.1
-
-
- package
-
- single
-
-
-
-
- ${project.name}-${project.version}
- false
-
- jar-with-dependencies
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.7.0
-
-
- 1.8
- true
-
-
-
-
-
- jar
+ pom