Limework
/
Minecraft-SSHD
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Builds and runs.

This commit is contained in:
toxuin 2017-11-13 17:32:30 +03:00 committed by Haarolean
parent f034cef465
commit 396351771c
7 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pom.xml
View File

@ -35,6 +35,7 @@
<type>jar</type>
<systemPath>${basedir}/bukkit-build/bukkit.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
@ -42,16 +43,52 @@
<scope>compile</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.0.16</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.25</version>
</dependency>
</dependencies>
<!-- Build -->
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
<!-- Shade plugin -->
<!--<plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.5</version>
<version>1.7</version>
<executions>
<execution>
<phase>package</phase>
@ -73,7 +110,8 @@
</filters>
<minimizeJar>true</minimizeJar>
</configuration>
</plugin>-->
</plugin> -->
<!-- Compile plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

7
src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java
View File

@ -15,6 +15,9 @@ import java.io.OutputStream;
import java.util.logging.StreamHandler;
public class ConsoleShellFactory implements Factory<Command> {
public Command get() {
return this.create();
}
public Command create() {
return new ConsoleShell();
@ -92,7 +95,7 @@ public class ConsoleShellFactory implements Factory<Command> {
String command;
try {
printPreamble(consoleReader);
while(true) {
while (true) {
command = consoleReader.readLine("\r>", null);
if (command != null) {
if (command.equals("exit")) {
@ -109,7 +112,7 @@ public class ConsoleShellFactory implements Factory<Command> {
}
}
private void printPreamble(ConsoleReader consoleReader) throws IOException{
private void printPreamble(ConsoleReader consoleReader) throws IOException {
consoleReader.println(" _____ _____ _ _ _____");
consoleReader.println(" / ____/ ____| | | | __ \\");
consoleReader.println("| (___| (___ | |__| | | | |");

1
src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java
View File

@ -3,6 +3,7 @@ package com.ryanmichela.sshd;
import org.apache.sshd.common.SshException;
import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
import java.io.IOException;
import java.io.OutputStream;
import java.util.logging.*;

2
src/main/java/com/ryanmichela/sshd/PemDecoder.java
View File

@ -22,7 +22,7 @@ public class PemDecoder extends java.io.BufferedReader {
}
public PublicKey getPemBytes() throws Exception {
StringBuffer b64 = new StringBuffer();
StringBuilder b64 = new StringBuilder();
String line = readLine();
if (!line.matches(BEGIN)) {

4
src/main/java/com/ryanmichela/sshd/ReflectionUtil.java
View File

@ -28,9 +28,7 @@ public class ReflectionUtil {
modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
f.set(o, newValue);
} catch (NoSuchFieldException ex) {
System.out.println("*** " + c.getName() + ":" + ex);
} catch (IllegalAccessException ex) {
} catch (NoSuchFieldException | IllegalAccessException ex) {
System.out.println("*** " + c.getName() + ":" + ex);
}
}

6
src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
View File

@ -71,12 +71,12 @@ public class StreamHandlerAppender implements Appender {
@Override
public State getState() {
return null; // TODO: Generated method stub
return State.INITIALIZED;
}
@Override
public void initialize() {
// TODO: Generated method stub
}
@Override
@ -96,6 +96,6 @@ public class StreamHandlerAppender implements Appender {
@Override
public boolean isStopped() {
return false; // TODO: Generated method stub
return false;
}
}

7
src/main/java/org/slf4j/impl/PluginSlf4jFactory.java
View File

@ -22,24 +22,19 @@ public class PluginSlf4jFactory implements ILoggerFactory {
private String name;
private boolean isEnabled(Level level) {
if (SshdPlugin.instance != null) {
return SshdPlugin.instance.getLogger().isLoggable(level);
}
return false;
return SshdPlugin.instance != null && SshdPlugin.instance.getLogger().isLoggable(level);
}
private void log(Level level, String s, Object[] objects) {
if (SshdPlugin.instance != null && isEnabled(level)) {
FormattingTuple ft = MessageFormatter.arrayFormat(s, objects);
SshdPlugin.instance.getLogger().log(level, ft.getMessage(), ft.getThrowable());
SshdPlugin.instance.getLogger().log(level, s, Thread.currentThread().getStackTrace());
}
}
private void log(Level level, String s, Throwable throwable) {
if (SshdPlugin.instance != null && isEnabled(level)) {
SshdPlugin.instance.getLogger().log(level, s, throwable);
SshdPlugin.instance.getLogger().log(level, s, Thread.currentThread().getStackTrace());
}
}