Skip to content

Commit f7f1de6

Browse files
LadyCailinLadyCailin
committed
Update to Java 17, MC 1.18, and bump version to 2.0
The primary change in this commit is to re-do the parts of the plugin that interacted with the org.ajave ebean dependency. This has now been replaced with the successor project io.ebeans. No major changes otherwise, beside the fact that initial installation requires manual work. This can be improved later perhaps, but this feature was removed from the underlying library, and the intent of this release is to do minimal changes. Due to this, however, the version has been bumped to 2.0 as this is a somewhat "breaking" change. On first run, the necessary SQL is printed to the logs, which must be run manually.
1 parent 7b32279 commit f7f1de6

9 files changed

Lines changed: 1323 additions & 1343 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@
3030
*.ipr
3131
*.iws
3232
.idea/
33+
34+
nb-configuration.xml

‎pom.xml‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>nu.nerd</groupId>
55
<artifactId>ModReq</artifactId>
6-
<version>1.8</version>
6+
<version>2.0</version>
77
<packaging>jar</packaging>
88
<name>ModReq</name>
99
<description>Moderator Request Sytem</description>
@@ -22,30 +22,31 @@
2222
<id>spigot-repo</id>
2323
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
2424
</repository>
25-
<repository>
26-
<id>znode-releases</id>
27-
<name>znode-releases</name>
28-
<url>http://repo.zno.de/artifactory/libs-release-local</url>
29-
</repository>
3025
</repositories>
3126

3227
<dependencies>
3328
<dependency>
34-
<groupId>org.bukkit</groupId>
35-
<artifactId>bukkit</artifactId>
36-
<version>1.12-R0.1-SNAPSHOT</version>
29+
<groupId>org.spigotmc</groupId>
30+
<artifactId>spigot-api</artifactId>
31+
<version>1.18.1-R0.1-SNAPSHOT</version>
3732
<type>jar</type>
3833
<scope>compile</scope>
3934
</dependency>
35+
<!--
36+
Must build locally from https://github.com/NerdNu/bukkit-migration-tools
37+
Originally prebuilds could be found at http://repo.zno.de/artifactory/libs-snapshot-local
38+
but modern versions of maven refuse to download over http, and the site doesn't support
39+
https.
40+
-->
4041
<dependency>
4142
<groupId>org.gestern</groupId>
4243
<artifactId>bukkit-migration-tools</artifactId>
43-
<version>0.1</version>
44+
<version>0.2</version>
4445
</dependency>
4546
<dependency>
4647
<groupId>nu.nerd</groupId>
4748
<artifactId>BukkitEbean</artifactId>
48-
<version>1.0.0</version>
49+
<version>1.0.1</version>
4950
</dependency>
5051
</dependencies>
5152

@@ -78,22 +79,13 @@
7879
<finalName>ModReq</finalName>
7980
</configuration>
8081
</plugin>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>2.0.2</version>
85-
<configuration>
86-
<source>1.5</source>
87-
<target>1.5</target>
88-
</configuration>
89-
</plugin>
9082
</plugins>
9183
</pluginManagement>
9284
<plugins>
9385
<plugin>
9486
<groupId>org.apache.maven.plugins</groupId>
9587
<artifactId>maven-shade-plugin</artifactId>
96-
<version>2.2</version>
88+
<version>3.3.0-SNAPSHOT</version>
9789
<executions>
9890
<execution>
9991
<phase>package</phase>
@@ -120,6 +112,35 @@
120112
</execution>
121113
</executions>
122114
</plugin>
115+
<plugin>
116+
<groupId>io.repaint.maven</groupId>
117+
<artifactId>tiles-maven-plugin</artifactId>
118+
<version>2.19</version>
119+
<extensions>true</extensions>
120+
<configuration>
121+
<tiles>
122+
<!-- other tiles ... -->
123+
<tile>io.ebean.tile:enhancement:12.12.1</tile>
124+
</tiles>
125+
</configuration>
126+
</plugin>
127+
128+
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-compiler-plugin</artifactId>
132+
<version>3.8.1</version>
133+
<configuration>
134+
<release>17</release>
135+
<annotationProcessorPaths>
136+
<path>
137+
<groupId>io.ebean</groupId>
138+
<artifactId>querybean-generator</artifactId>
139+
<version>12.12.1</version>
140+
</path>
141+
</annotationProcessorPaths>
142+
</configuration>
143+
</plugin>
123144
</plugins>
124145
</build>
125146
</project>

‎src/nu/nerd/modreq/Configuration.java‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -2,107 +2,107 @@
22
* To change this template, choose Tools | Templates
33
* and open the template in the editor.
44
*/
5-
65
package nu.nerd.modreq;
76

87
public class Configuration {
9-
private ModReq plugin;
108

11-
public String GENERAL__PAGE_ERROR;
12-
public String GENERAL__SEARCH_ERROR;
13-
public String GENERAL__REQUEST_NUMBER;
14-
public String GENERAL__REQUEST_FILED;
15-
public String GENERAL__MAX_REQUESTS;
16-
public String GENERAL__REQUEST_ERROR;
17-
public String GENERAL__NO_REQUESTS;
18-
public String GENERAL__CLOSE_ERROR;
19-
public String GENERAL__COMPLETED;
20-
public String GENERAL__COMPLETED_MESSAGE;
21-
public String GENERAL__DELETED;
22-
public String GENERAL__LIST__HEADER;
23-
public String GENERAL__LIST__ITEM;
24-
public String GENERAL__LIST__FOOTER;
25-
public String GENERAL__ITEM__HEADER_CLAIMED;
26-
public String GENERAL__ITEM__HEADER_UNCLAIMED;
27-
public String GENERAL__ITEM__DETAILS;
28-
public String GENERAL__ITEM__REQUEST;
29-
public String GENERAL__ITEM__NOTE;
30-
public String MOD__NEW_REQUEST;
31-
public String MOD__NO_REQUESTS;
32-
public String MOD__EMPTY_PAGE;
33-
public String MOD__TELEPORT;
34-
public String MOD__UNCLAIM;
35-
public String MOD__REQUEST_TAKEN;
36-
public String MOD__COMPLETED;
37-
public String MOD__COMPLETED_MESSAGE;
38-
public String MOD__DELETED;
39-
public String MOD__REOPENED;
40-
public String MOD__FLAGGED;
41-
public String MOD__RESET;
42-
public String MOD__ALREADY_CLOSED;
43-
public String MOD__ALREADY_CLAIMED;
44-
public String MOD__NOTE_ADDED;
45-
public String MOD__NOTE_REMOVED;
46-
public String MOD__NOTE_NUMBER;
47-
public String MOD__NOTE_MISSING;
48-
public String COLOUR_ONLINE;
49-
public String COLOUR_OFFLINE;
50-
public int MAX_REQUESTS;
51-
public int PAGE_SIZE;
52-
public String DATE_FORMAT;
9+
private final ModReq plugin;
10+
11+
public String GENERAL__PAGE_ERROR;
12+
public String GENERAL__SEARCH_ERROR;
13+
public String GENERAL__REQUEST_NUMBER;
14+
public String GENERAL__REQUEST_FILED;
15+
public String GENERAL__MAX_REQUESTS;
16+
public String GENERAL__REQUEST_ERROR;
17+
public String GENERAL__NO_REQUESTS;
18+
public String GENERAL__CLOSE_ERROR;
19+
public String GENERAL__COMPLETED;
20+
public String GENERAL__COMPLETED_MESSAGE;
21+
public String GENERAL__DELETED;
22+
public String GENERAL__LIST__HEADER;
23+
public String GENERAL__LIST__ITEM;
24+
public String GENERAL__LIST__FOOTER;
25+
public String GENERAL__ITEM__HEADER_CLAIMED;
26+
public String GENERAL__ITEM__HEADER_UNCLAIMED;
27+
public String GENERAL__ITEM__DETAILS;
28+
public String GENERAL__ITEM__REQUEST;
29+
public String GENERAL__ITEM__NOTE;
30+
public String MOD__NEW_REQUEST;
31+
public String MOD__NO_REQUESTS;
32+
public String MOD__EMPTY_PAGE;
33+
public String MOD__TELEPORT;
34+
public String MOD__UNCLAIM;
35+
public String MOD__REQUEST_TAKEN;
36+
public String MOD__COMPLETED;
37+
public String MOD__COMPLETED_MESSAGE;
38+
public String MOD__DELETED;
39+
public String MOD__REOPENED;
40+
public String MOD__FLAGGED;
41+
public String MOD__RESET;
42+
public String MOD__ALREADY_CLOSED;
43+
public String MOD__ALREADY_CLAIMED;
44+
public String MOD__NOTE_ADDED;
45+
public String MOD__NOTE_REMOVED;
46+
public String MOD__NOTE_NUMBER;
47+
public String MOD__NOTE_MISSING;
48+
public String COLOUR_ONLINE;
49+
public String COLOUR_OFFLINE;
50+
public int MAX_REQUESTS;
51+
public int PAGE_SIZE;
52+
public String DATE_FORMAT;
5353

54-
public Configuration(ModReq plugin) {
55-
this.plugin = plugin;
56-
}
54+
public Configuration(ModReq plugin) {
55+
this.plugin = plugin;
56+
}
5757

58-
public void save() {
59-
plugin.saveConfig();
60-
}
58+
public void save() {
59+
plugin.saveConfig();
60+
}
6161

62-
public void load() {
63-
plugin.reloadConfig();
62+
public void load() {
63+
plugin.reloadConfig();
6464

65-
GENERAL__REQUEST_NUMBER = plugin.getConfig().getString("messages.general.request-number");
66-
GENERAL__REQUEST_FILED = plugin.getConfig().getString("messages.general.request-filed");
67-
GENERAL__MAX_REQUESTS = plugin.getConfig().getString("messages.general.max-requests");
68-
GENERAL__REQUEST_ERROR = plugin.getConfig().getString("messages.general.request-error");
69-
GENERAL__NO_REQUESTS = plugin.getConfig().getString("messages.general.no-requests");
70-
GENERAL__CLOSE_ERROR = plugin.getConfig().getString("messages.general.page-error");
71-
GENERAL__COMPLETED = plugin.getConfig().getString("messages.general.completed");
72-
GENERAL__COMPLETED_MESSAGE = plugin.getConfig().getString("messages.general.completed-message");
73-
GENERAL__DELETED = plugin.getConfig().getString("messages.general.deleted");
74-
GENERAL__PAGE_ERROR = plugin.getConfig().getString("messages.general.page-error");
75-
GENERAL__SEARCH_ERROR = plugin.getConfig().getString("messages.general.search-error");
76-
GENERAL__ITEM__DETAILS = plugin.getConfig().getString("messages.general.item.details");
77-
GENERAL__ITEM__HEADER_CLAIMED = plugin.getConfig().getString("messages.general.item.header-claimed");
78-
GENERAL__ITEM__HEADER_UNCLAIMED = plugin.getConfig().getString("messages.general.item.header-unclaimed");
79-
GENERAL__ITEM__REQUEST = plugin.getConfig().getString("messages.general.item.request");
80-
GENERAL__ITEM__NOTE = plugin.getConfig().getString("messages.general.item.note");
81-
GENERAL__LIST__FOOTER = plugin.getConfig().getString("messages.general.list.footer");
82-
GENERAL__LIST__HEADER = plugin.getConfig().getString("messages.general.list.header");
83-
GENERAL__LIST__ITEM = plugin.getConfig().getString("messages.general.list.item");
84-
MOD__COMPLETED = plugin.getConfig().getString("messages.mod.completed");
85-
MOD__COMPLETED_MESSAGE = plugin.getConfig().getString("messages.mod.completed-message");
86-
MOD__DELETED = plugin.getConfig().getString("messages.mod.deleted");
87-
MOD__EMPTY_PAGE = plugin.getConfig().getString("messages.mod.empty-page");
88-
MOD__FLAGGED = plugin.getConfig().getString("messages.mod.flagged");
89-
MOD__NEW_REQUEST = plugin.getConfig().getString("messages.mod.new-request");
90-
MOD__NO_REQUESTS = plugin.getConfig().getString("messages.mod.no-requests");
91-
MOD__REOPENED = plugin.getConfig().getString("messages.mod.reopened");
92-
MOD__RESET = plugin.getConfig().getString("messages.mod.reset");
93-
MOD__TELEPORT = plugin.getConfig().getString("messages.mod.teleport");
94-
MOD__UNCLAIM = plugin.getConfig().getString("messages.mod.unclaim");
95-
MOD__REQUEST_TAKEN = plugin.getConfig().getString("messages.mod.request-taken");
96-
MOD__ALREADY_CLOSED = plugin.getConfig().getString("messages.mod.already-closed");
97-
MOD__ALREADY_CLAIMED = plugin.getConfig().getString("messages.mod.already-claimed");
98-
MOD__NOTE_ADDED = plugin.getConfig().getString("messages.mod.note-added");
99-
MOD__NOTE_REMOVED = plugin.getConfig().getString("messages.mod.note-removed");
100-
MOD__NOTE_NUMBER = plugin.getConfig().getString("messages.mod.note-number");
101-
MOD__NOTE_MISSING = plugin.getConfig().getString("messages.mod.note-missing");
102-
COLOUR_OFFLINE = plugin.getConfig().getString("colour.offline");
103-
COLOUR_ONLINE = plugin.getConfig().getString("colour.online");
104-
MAX_REQUESTS = plugin.getConfig().getInt("max-requests", 5);
105-
PAGE_SIZE = plugin.getConfig().getInt("page-size", 5);
106-
DATE_FORMAT = plugin.getConfig().getString("date-format");
107-
}
65+
GENERAL__REQUEST_NUMBER = plugin.getConfig().getString("messages.general.request-number");
66+
GENERAL__REQUEST_FILED = plugin.getConfig().getString("messages.general.request-filed");
67+
GENERAL__MAX_REQUESTS = plugin.getConfig().getString("messages.general.max-requests");
68+
GENERAL__REQUEST_ERROR = plugin.getConfig().getString("messages.general.request-error");
69+
GENERAL__NO_REQUESTS = plugin.getConfig().getString("messages.general.no-requests");
70+
GENERAL__CLOSE_ERROR = plugin.getConfig().getString("messages.general.page-error");
71+
GENERAL__COMPLETED = plugin.getConfig().getString("messages.general.completed");
72+
GENERAL__COMPLETED_MESSAGE = plugin.getConfig().getString("messages.general.completed-message");
73+
GENERAL__DELETED = plugin.getConfig().getString("messages.general.deleted");
74+
GENERAL__PAGE_ERROR = plugin.getConfig().getString("messages.general.page-error");
75+
GENERAL__SEARCH_ERROR = plugin.getConfig().getString("messages.general.search-error");
76+
GENERAL__ITEM__DETAILS = plugin.getConfig().getString("messages.general.item.details");
77+
GENERAL__ITEM__HEADER_CLAIMED = plugin.getConfig().getString("messages.general.item.header-claimed");
78+
GENERAL__ITEM__HEADER_UNCLAIMED = plugin.getConfig().getString("messages.general.item.header-unclaimed");
79+
GENERAL__ITEM__REQUEST = plugin.getConfig().getString("messages.general.item.request");
80+
GENERAL__ITEM__NOTE = plugin.getConfig().getString("messages.general.item.note");
81+
GENERAL__LIST__FOOTER = plugin.getConfig().getString("messages.general.list.footer");
82+
GENERAL__LIST__HEADER = plugin.getConfig().getString("messages.general.list.header");
83+
GENERAL__LIST__ITEM = plugin.getConfig().getString("messages.general.list.item");
84+
MOD__COMPLETED = plugin.getConfig().getString("messages.mod.completed");
85+
MOD__COMPLETED_MESSAGE = plugin.getConfig().getString("messages.mod.completed-message");
86+
MOD__DELETED = plugin.getConfig().getString("messages.mod.deleted");
87+
MOD__EMPTY_PAGE = plugin.getConfig().getString("messages.mod.empty-page");
88+
MOD__FLAGGED = plugin.getConfig().getString("messages.mod.flagged");
89+
MOD__NEW_REQUEST = plugin.getConfig().getString("messages.mod.new-request");
90+
MOD__NO_REQUESTS = plugin.getConfig().getString("messages.mod.no-requests");
91+
MOD__REOPENED = plugin.getConfig().getString("messages.mod.reopened");
92+
MOD__RESET = plugin.getConfig().getString("messages.mod.reset");
93+
MOD__TELEPORT = plugin.getConfig().getString("messages.mod.teleport");
94+
MOD__UNCLAIM = plugin.getConfig().getString("messages.mod.unclaim");
95+
MOD__REQUEST_TAKEN = plugin.getConfig().getString("messages.mod.request-taken");
96+
MOD__ALREADY_CLOSED = plugin.getConfig().getString("messages.mod.already-closed");
97+
MOD__ALREADY_CLAIMED = plugin.getConfig().getString("messages.mod.already-claimed");
98+
MOD__NOTE_ADDED = plugin.getConfig().getString("messages.mod.note-added");
99+
MOD__NOTE_REMOVED = plugin.getConfig().getString("messages.mod.note-removed");
100+
MOD__NOTE_NUMBER = plugin.getConfig().getString("messages.mod.note-number");
101+
MOD__NOTE_MISSING = plugin.getConfig().getString("messages.mod.note-missing");
102+
COLOUR_OFFLINE = plugin.getConfig().getString("colour.offline");
103+
COLOUR_ONLINE = plugin.getConfig().getString("colour.online");
104+
MAX_REQUESTS = plugin.getConfig().getInt("max-requests", 5);
105+
PAGE_SIZE = plugin.getConfig().getInt("page-size", 5);
106+
DATE_FORMAT = plugin.getConfig().getString("date-format");
107+
}
108108
}

0 commit comments

Comments
 (0)