Updated bungee version + removed dependency to Apache commons lang
This commit is contained in:
parent
807b7ce4ed
commit
3158fa73c5
12
Core/pom.xml
12
Core/pom.xml
@ -15,24 +15,12 @@
|
||||
<name>PandaLib-Core</name>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-lang</groupId>
|
||||
<artifactId>commons-lang</artifactId>
|
||||
<version>2.6</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>fr.pandacube.bungeecord</groupId>
|
||||
<artifactId>bungeecord-chat</artifactId>
|
||||
<version>${bungeecord.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<!-- <dependency>
|
||||
<groupId>org.javatuples</groupId>
|
||||
<artifactId>javatuples</artifactId>
|
||||
<version>1.2</version>
|
||||
<scope>compile</scope>
|
||||
</dependency> -->
|
||||
<dependency>
|
||||
<groupId>io.github.classgraph</groupId>
|
||||
<artifactId>classgraph</artifactId>
|
||||
|
@ -17,8 +17,8 @@ import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import org.apache.commons.lang.builder.ToStringBuilder;
|
||||
|
||||
import com.google.common.base.MoreObjects;
|
||||
import com.google.common.base.MoreObjects.ToStringHelper;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
@ -368,13 +368,13 @@ public abstract class SQLElement<E extends SQLElement<E>> {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
ToStringBuilder b = new ToStringBuilder(this);
|
||||
ToStringHelper b = MoreObjects.toStringHelper(this);
|
||||
|
||||
for (SQLField<E, ?> f : fields.values())
|
||||
try {
|
||||
b.append(f.getName(), get(f));
|
||||
b.add(f.getName(), get(f));
|
||||
} catch (IllegalArgumentException e) {
|
||||
b.append(f.getName(), "(Undefined)");
|
||||
b.add(f.getName(), "(Undefined)");
|
||||
}
|
||||
|
||||
return b.toString();
|
||||
|
@ -12,7 +12,7 @@ import java.util.List;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.apache.commons.lang.builder.ToStringBuilder;
|
||||
import com.google.common.base.MoreObjects;
|
||||
|
||||
import fr.pandacube.lib.core.util.Log;
|
||||
|
||||
@ -156,9 +156,10 @@ public class PServer extends Thread implements Closeable {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this)
|
||||
.append("thread", getName())
|
||||
.append("socket", socket).toString();
|
||||
return MoreObjects.toStringHelper(this)
|
||||
.add("thread", getName())
|
||||
.add("socket", socket)
|
||||
.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -15,8 +15,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.apache.commons.lang.builder.ToStringBuilder;
|
||||
|
||||
import com.google.common.base.MoreObjects;
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
import fr.pandacube.lib.core.util.Log;
|
||||
@ -346,9 +345,10 @@ public class PSocket extends Thread implements Closeable {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this)
|
||||
.append("thread", getName())
|
||||
.append("socket", socket.getRemoteSocketAddress()).toString();
|
||||
return MoreObjects.toStringHelper(this)
|
||||
.add("thread", getName())
|
||||
.add("socket", socket.getRemoteSocketAddress())
|
||||
.toString();
|
||||
}
|
||||
|
||||
}
|
||||
|
2
pom.xml
2
pom.xml
@ -41,7 +41,7 @@
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<bungeecord.version>1.16-R0.4-SNAPSHOT</bungeecord.version>
|
||||
<bungeecord.version>1.17-R0.1-SNAPSHOT</bungeecord.version>
|
||||
<paper.version>1.16.5-R0.1</paper.version>
|
||||
<mc.version>1.16.5</mc.version>
|
||||
</properties>
|
||||
|
Loading…
Reference in New Issue
Block a user