Skip to content

Commit 387a1cb

Browse files
replydevreplydev
authored
Merge pull request #5 from replydev/fixes
Hotfixes
2 parents f1dcf4a + ce4e31e commit 387a1cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+191
-260
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ To run it in GUI mode just double click it.
88

99
To run it in CLI mode use a terminal:
1010

11-
`java -Dfile.encoding=UTF-8 -jar qubo.jar -range 164.132.200.* -ports 25565-25577 -th 500 -ti 1000`
11+
`java -Dfile.encoding=UTF-8 -jar me.replydev.qubo.jar -range 164.132.200.* -ports 25565-25577 -th 500 -ti 1000`
1212

1313
## Building
1414
To build the software clone this repository with Intellij IDEA

‎pom.xml‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<properties>
8-
<maven.compiler.source>1.8</maven.compiler.source>
98
<maven.compiler.target>1.8</maven.compiler.target>
9+
<maven.compiler.source>1.8</maven.compiler.source>
10+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1012
</properties>
1113

1214
<groupId>me.reply.qubo</groupId>
1315
<artifactId>quboscanner</artifactId>
14-
<version>0.3.6</version>
16+
<version>0.3.7</version>
1517

1618
<dependencies>
1719
<dependency>
@@ -22,12 +24,12 @@
2224
<dependency>
2325
<groupId>net.java.dev.jna</groupId>
2426
<artifactId>jna-platform</artifactId>
25-
<version>5.5.0</version>
27+
<version>5.6.0</version>
2628
</dependency>
2729
<dependency>
2830
<groupId>com.formdev</groupId>
2931
<artifactId>flatlaf</artifactId>
30-
<version>0.27</version>
32+
<version>0.45</version>
3133
</dependency>
3234
<dependency>
3335
<groupId>com.intellij</groupId>
@@ -42,54 +44,39 @@
4244
<dependency>
4345
<groupId>com.github.seancfoley</groupId>
4446
<artifactId>ipaddress</artifactId>
45-
<version>5.2.1</version>
47+
<version>5.3.3</version>
4648
</dependency>
4749
<dependency>
4850
<groupId>org.apache.httpcomponents</groupId>
4951
<artifactId>httpclient</artifactId>
50-
<version>4.5.11</version>
52+
<version>4.5.13</version>
5153
</dependency>
5254
</dependencies>
5355
<build>
5456
<plugins>
55-
5657
<plugin>
5758
<groupId>org.apache.maven.plugins</groupId>
58-
<artifactId>maven-assembly-plugin</artifactId>
59-
<version>2.4.1</version>
60-
<configuration>
61-
<!-- get all project dependencies -->
62-
<descriptorRefs>
63-
<descriptorRef>jar-with-dependencies</descriptorRef>
64-
</descriptorRefs>
65-
<!-- MainClass in mainfest make a executable jar -->
66-
<archive>
67-
<manifest>
68-
<mainClass>qubo.Main</mainClass>
69-
</manifest>
70-
</archive>
71-
72-
</configuration>
59+
<artifactId>maven-dependency-plugin</artifactId>
60+
<version>3.0.1</version>
7361
<executions>
7462
<execution>
75-
<id>make-assembly</id>
76-
<!-- bind to the packaging phase -->
63+
<id>copy-dependencies</id>
7764
<phase>package</phase>
78-
<goals>
79-
<goal>single</goal>
80-
</goals>
65+
<goals><goal>copy-dependencies</goal></goals>
8166
</execution>
8267
</executions>
8368
</plugin>
8469
<plugin>
85-
<groupId>org.apache.maven.plugins</groupId>
86-
<artifactId>maven-jar-plugin</artifactId>
70+
<artifactId>maven-assembly-plugin</artifactId>
8771
<configuration>
8872
<archive>
8973
<manifest>
90-
<mainClass>qubo.Main</mainClass>
74+
<mainClass>me.replydev.qubo.Main</mainClass>
9175
</manifest>
9276
</archive>
77+
<descriptorRefs>
78+
<descriptorRef>jar-with-dependencies</descriptorRef>
79+
</descriptorRefs>
9380
</configuration>
9481
</plugin>
9582
</plugins>

src/main/java/mcping/MCPing.java renamed to src/main/java/me/replydev/mcping/MCPing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package mcping;
1+
package me.replydev.mcping;
22

33
import java.io.IOException;
44
import java.net.InetSocketAddress;
55
import com.google.gson.Gson;
6-
import mcping.data.*;
6+
import me.replydev.mcping.data.*;
77

88
public class MCPing
99
{

src/main/java/mcping/PingOptions.java renamed to src/main/java/me/replydev/mcping/PingOptions.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mcping;
1+
package me.replydev.mcping;
22

33
public class PingOptions {
44

@@ -22,11 +22,6 @@ public PingOptions setTimeout(int timeout) {
2222
return this;
2323
}
2424

25-
/*public PingOptions setCharset(String charset) {
26-
this.charset = charset;
27-
return this;
28-
}*/
29-
3025
String getHostname() {
3126
return this.hostname;
3227
}
@@ -39,8 +34,4 @@ public int getTimeout() {
3934
return this.timeout;
4035
}
4136

42-
/*public String getCharset() {
43-
return this.charset;
44-
}*/
45-
4637
}

src/main/java/mcping/Pinger.java renamed to src/main/java/me/replydev/mcping/Pinger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package mcping;
1+
package me.replydev.mcping;
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.Closeable;

src/main/java/mcping/data/ExtraResponse.java renamed to src/main/java/me/replydev/mcping/data/ExtraResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package mcping.data;
1+
package me.replydev.mcping.data;
22

33
import com.google.gson.annotations.SerializedName;
4-
import mcping.rawData.ExtraDescription;
4+
import me.replydev.mcping.rawData.ExtraDescription;
55

66
public class ExtraResponse extends MCResponse {
77

src/main/java/mcping/data/FinalResponse.java renamed to src/main/java/me/replydev/mcping/data/FinalResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package mcping.data;
1+
package me.replydev.mcping.data;
22

3-
import mcping.rawData.Players;
4-
import mcping.rawData.Version;
3+
import me.replydev.mcping.rawData.Players;
4+
import me.replydev.mcping.rawData.Version;
55

66
public class FinalResponse extends MCResponse {
77

src/main/java/mcping/data/ForgeResponse.java renamed to src/main/java/me/replydev/mcping/data/ForgeResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package mcping.data;
1+
package me.replydev.mcping.data;
22

33
import com.google.gson.annotations.SerializedName;
4-
import mcping.rawData.*;
4+
import me.replydev.mcping.rawData.*;
55

66
public class ForgeResponse {
77

src/main/java/mcping/data/ForgeResponseOld.java renamed to src/main/java/me/replydev/mcping/data/ForgeResponseOld.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package mcping.data;
1+
package me.replydev.mcping.data;
22

33
import com.google.gson.annotations.SerializedName;
4-
import mcping.rawData.*;
4+
import me.replydev.mcping.rawData.*;
55

66
public class ForgeResponseOld {
77

src/main/java/mcping/data/ForgeResponseTranslate.java renamed to src/main/java/me/replydev/mcping/data/ForgeResponseTranslate.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package mcping.data;
1+
package me.replydev.mcping.data;
22

33
import com.google.gson.annotations.SerializedName;
4-
import mcping.rawData.ForgeDescriptionTranslate;
5-
import mcping.rawData.ForgeModInfo;
6-
import mcping.rawData.Players;
7-
import mcping.rawData.Version;
4+
import me.replydev.mcping.rawData.ForgeDescriptionTranslate;
5+
import me.replydev.mcping.rawData.ForgeModInfo;
6+
import me.replydev.mcping.rawData.Players;
7+
import me.replydev.mcping.rawData.Version;
88

99
public class ForgeResponseTranslate {
1010

0 commit comments

Comments
 (0)