30 Commits

Author SHA1 Message Date
ade359b92d Update junit5 monorepo to v5.11.3 2024-10-21 15:01:22 +00:00
Lee
acd87f9741 Merge pull request 'Update dependency org.springframework:spring-web to v6.1.13' (#16) from renovate/spring-core into master
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 31s
Reviewed-on: #16
2024-09-25 23:50:32 +00:00
Lee
7a482a2b7f Merge pull request 'Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.4' (#17) from renovate/org.apache.httpcomponents.client5-httpclient5-5.x into master
Some checks are pending
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Waiting to run
Reviewed-on: #17
2024-09-25 23:50:22 +00:00
Lee
9ce3f867d4 Merge pull request 'Update junit5 monorepo to v5.11.1' (#15) from renovate/junit5-monorepo into master
Some checks are pending
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Waiting to run
Reviewed-on: #15
2024-09-25 23:50:10 +00:00
5af9d1099e Update junit5 monorepo to v5.11.1 2024-09-25 08:01:23 +00:00
abac8f6b57 Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.4 2024-09-19 17:01:44 +00:00
94b9df0ec8 Update dependency org.springframework:spring-web to v6.1.13 2024-09-12 12:01:29 +00:00
Lee
44a216c928 Merge pull request 'Update dependency org.springframework:spring-web to v6.1.11' (#14) from renovate/spring-core into master
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 27s
Reviewed-on: #14
2024-07-30 20:55:48 +00:00
3eec5d30a6 Update dependency org.springframework:spring-web to v6.1.11 2024-07-11 09:00:56 +00:00
fe2e19f953 oopsie
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 18s
2024-07-06 05:08:55 +01:00
190c41ba90 Merge remote-tracking branch 'origin/master'
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 20s
2024-07-06 05:02:11 +01:00
3c7ba27953 fix? 2024-07-06 05:02:05 +01:00
Lee
24770bf2a9 Merge pull request 'Update dependency org.springframework:spring-web to v6.1.10' (#8) from renovate/spring-core into master
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 1m53s
Reviewed-on: #8
2024-07-06 03:39:14 +00:00
Lee
50573fed45 Merge pull request 'Update s4u/setup-maven-action action to v1.14.0' (#9) from renovate/s4u-setup-maven-action-1.x into master
Some checks failed
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Has been cancelled
Reviewed-on: #9
2024-07-06 03:39:07 +00:00
Lee
805c09d31d Merge pull request 'Update dependency com.google.code.gson:gson to v2.11.0' (#10) from renovate/com.google.code.gson-gson-2.x into master
Some checks failed
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Has been cancelled
Reviewed-on: #10
2024-07-06 03:39:00 +00:00
Lee
04d8e66e3b Merge pull request 'Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0' (#11) from renovate/org.apache.maven.plugins-maven-shade-plugin-3.x into master
Some checks failed
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Has been cancelled
Reviewed-on: #11
2024-07-06 03:38:54 +00:00
Lee
cf143e10a3 Merge pull request 'Update junit5 monorepo to v5.10.3' (#12) from renovate/junit5-monorepo into master
Some checks failed
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Has been cancelled
Reviewed-on: #12
2024-07-06 03:38:38 +00:00
Lee
4628c8f23b Merge pull request 'Update dependency org.projectlombok:lombok to v1.18.34' (#13) from renovate/org.projectlombok-lombok-1.x into master
Some checks failed
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Has been cancelled
Reviewed-on: #13
2024-07-06 03:38:32 +00:00
0ae5b94124 Update s4u/setup-maven-action action to v1.14.0 2024-06-29 08:00:55 +00:00
3a696ebd1e Update dependency org.projectlombok:lombok to v1.18.34 2024-06-28 01:00:55 +00:00
bfe20bc87c Update junit5 monorepo to v5.10.3 2024-06-27 15:00:49 +00:00
5f4722e079 Update dependency org.springframework:spring-web to v6.1.10 2024-06-19 17:00:53 +00:00
1c19098c87 Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0 2024-05-31 09:01:47 +00:00
de71477c98 Update dependency com.google.code.gson:gson to v2.11.0 2024-05-19 20:01:43 +00:00
Lee
0abef68e86 Merge pull request 'Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.3' (#7) from renovate/org.apache.maven.plugins-maven-shade-plugin-3.x into master
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 48s
Reviewed-on: #7
2024-04-23 20:01:50 +00:00
6f34a25d65 Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.3 2024-04-23 20:00:57 +00:00
10ff006eb4 add preview to the motd class
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 27s
2024-04-22 20:22:24 +01:00
24b0a767be Merge remote-tracking branch 'origin/master'
All checks were successful
Publish package to my Maven Repository / docker (ubuntu-latest, 2.44.0, 17, 3.8.5) (push) Successful in 23s
2024-04-21 23:37:48 +01:00
21c93f45b8 bump ver 2024-04-21 23:34:40 +01:00
579aa64094 add location to the server 2024-04-21 23:29:25 +01:00
3 changed files with 53 additions and 12 deletions

View File

@ -23,7 +23,7 @@ jobs:
# Setup Java and Maven # Setup Java and Maven
- name: Set up JDK and Maven - name: Set up JDK and Maven
uses: s4u/setup-maven-action@v1.12.0 uses: s4u/setup-maven-action@v1.14.0
with: with:
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
distribution: "zulu" distribution: "zulu"

16
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>xyz.mcutils</groupId> <groupId>xyz.mcutils</groupId>
<artifactId>mcutils-java-library</artifactId> <artifactId>mcutils-java-library</artifactId>
<version>1.2.0</version> <version>1.2.4</version>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
@ -28,7 +28,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.5.2</version> <version>3.6.0</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -46,13 +46,13 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.32</version> <version>1.18.34</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.10.1</version> <version>2.11.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -60,13 +60,13 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
<version>6.1.6</version> <version>6.1.13</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents.client5</groupId> <groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId> <artifactId>httpclient5</artifactId>
<version>5.3.1</version> <version>5.4</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -74,13 +74,13 @@
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>5.10.2</version> <version>5.11.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>5.10.2</version> <version>5.11.3</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -39,8 +39,13 @@ public class MinecraftServer {
*/ */
private Players players; private Players players;
@AllArgsConstructor @Getter /**
private static class MOTD { * The location of the server.
*/
private GeoLocation location;
@Getter
public static class MOTD {
/** /**
* The raw motd lines * The raw motd lines
@ -56,13 +61,18 @@ public class MinecraftServer {
* The html motd lines * The html motd lines
*/ */
private String[] html; private String[] html;
/**
* The server list MOTD preview.
*/
private String preview;
} }
/** /**
* Player count data for a server. * Player count data for a server.
*/ */
@Getter @Getter
private static class Players { public static class Players {
/** /**
* The online players on this server. * The online players on this server.
*/ */
@ -94,4 +104,35 @@ public class MinecraftServer {
private String name; private String name;
} }
} }
/**
* The location of the server.
*/
@Getter
public static class GeoLocation {
/**
* The country of the server.
*/
private String country;
/**
* The region of the server.
*/
private String region;
/**
* The city of the server.
*/
private String city;
/**
* The latitude of the server.
*/
private double latitude;
/**
* The longitude of the server.
*/
private double longitude;
}
} }