Limework fork is born!

.clangformat

@@ -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'
-...

.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-dist: trusty
-language: java
-jdk:
-  - oraclejdk8

Minecraft-SSHD-Bukkit/pom.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ryanmichela</groupId>
+        <artifactId>sshd</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <artifactId>Minecraft-SSHD-Bukkit</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+
+    <!-- Build -->
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                    <include>config.yml</include>
+                    <include>motd.txt</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <finalName>${project.name}-${project.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+
+            <!-- Compile plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>

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;

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)
 				{

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() 
     {

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";

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)
 
 <img align="left" width="140" height="140" src="docs/ssh_logo.png?raw=true" hspace="5" vspace="5" alt="diskover"><br/>

pom.xml

@@ -7,8 +7,11 @@
     <groupId>com.ryanmichela</groupId>
     <artifactId>sshd</artifactId>
     <description>Minecraft-SSHD: The SSH daemon for Minecraft servers.</description>
+    <modules>
+        <module>Minecraft-SSHD-Bukkit</module>
+    </modules>
     <version>2.0.0</version>
-    <url>https://github.com/Justasic/Minecraft-SSHD/</url>
+    <url>https://git.limework.net/Limework/Minecraft-SSHD/</url>
 
     <properties>
         <java.version>1.8</java.version>
@@ -33,36 +36,29 @@
 
     <!-- Dependencies -->
     <dependencies>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.15.2-R0.1-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
             <scope>compile</scope>
             <type>jar</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-mina</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-contrib</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-common</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
             <scope>compile</scope>
             <type>jar</type>
         </dependency>
@@ -70,7 +66,7 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>
-            <version>2.4.0</version>
+            <version>2.9.0</version>
         </dependency>
 
         <dependency>
@@ -82,100 +78,48 @@
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
-            <version>2.1.3</version>
+            <version>2.2.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.28</version>
+            <version>2.0.5</version>
         </dependency>
         
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.28</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>
             <groupId>jline</groupId>
             <artifactId>jline</artifactId>
-            <version>2.12.1</version>
+            <version>2.14.6</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.0</version>
+            <version>2.20.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.1</version>
+            <version>2.20.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
+            <version>1.15</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <!-- Build -->
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                    <include>config.yml</include>
-                    <include>motd.txt</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <finalName>${project.name}-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-            </plugin>
-            
-            <!-- Compile plugin -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
 </project>