PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated bungee version + removed dependency to Apache commons lang

Browse Source
This commit is contained in:
Marc Baloup 2021-07-04 20:06:28 +02:00
parent 807b7ce4ed
commit 3158fa73c5
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
5 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/pom.xml
View File

@ -15,24 +15,12 @@
<name>PandaLib-Core</name> <name>PandaLib-Core</name>
<dependencies> <dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>fr.pandacube.bungeecord</groupId> <groupId>fr.pandacube.bungeecord</groupId>
<artifactId>bungeecord-chat</artifactId> <artifactId>bungeecord-chat</artifactId>
<version>${bungeecord.version}</version> <version>${bungeecord.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- <dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
<version>1.2</version>
<scope>compile</scope>
</dependency> -->
<dependency> <dependency>
<groupId>io.github.classgraph</groupId> <groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId> <artifactId>classgraph</artifactId>

10
Core/src/main/java/fr/pandacube/lib/core/db/SQLElement.java
View File

@ -17,8 +17,8 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.UUID; 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.Gson;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -368,13 +368,13 @@ public abstract class SQLElement<E extends SQLElement<E>> {
@Override @Override
public String toString() { public String toString() {
ToStringBuilder b = new ToStringBuilder(this); ToStringHelper b = MoreObjects.toStringHelper(this);
for (SQLField<E, ?> f : fields.values()) for (SQLField<E, ?> f : fields.values())
try { try {
b.append(f.getName(), get(f)); b.add(f.getName(), get(f));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
b.append(f.getName(), "(Undefined)"); b.add(f.getName(), "(Undefined)");
} }
return b.toString(); return b.toString();

9
Core/src/main/java/fr/pandacube/lib/core/net/PServer.java
View File

@ -12,7 +12,7 @@ import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; 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; import fr.pandacube.lib.core.util.Log;
@ -156,9 +156,10 @@ public class PServer extends Thread implements Closeable {
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this) return MoreObjects.toStringHelper(this)
.append("thread", getName()) .add("thread", getName())
.append("socket", socket).toString(); .add("socket", socket)
.toString();
} }
} }

10
Core/src/main/java/fr/pandacube/lib/core/net/PSocket.java
View File

@ -15,8 +15,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean; 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 com.google.common.base.Objects;
import fr.pandacube.lib.core.util.Log; import fr.pandacube.lib.core.util.Log;
@ -346,9 +345,10 @@ public class PSocket extends Thread implements Closeable {
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this) return MoreObjects.toStringHelper(this)
.append("thread", getName()) .add("thread", getName())
.append("socket", socket.getRemoteSocketAddress()).toString(); .add("socket", socket.getRemoteSocketAddress())
.toString();
} }
} }

2
pom.xml
View File

@ -41,7 +41,7 @@
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <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> <paper.version>1.16.5-R0.1</paper.version>
<mc.version>1.16.5</mc.version> <mc.version>1.16.5</mc.version>
</properties> </properties>