Merge pull request #21 from NerdNu/v3.0.0-Dev

V3.0.0 dev

Author: PPGOME

config.yml

@@ -12,6 +12,8 @@ messages:
     completed: "&A{mod} completed your request."
     completed-message: "&A{mod} completed your request &F- &7{close_message}"
     deleted: "&ARequest {request_id} has been closed by you."
+    request-process-error: "Error processing request #{request_id}: {request_message}"
+    request-display-error: "Error displaying request #{request_id}"
     list:
       header: "&B---- {num_requests} Mod Requests ----"
       item: "&6{request_id}.{note_count}{admin}&6 [&A{mod}{status}&6] {time} {player} -&7 {request_message}"

pom.xml

@@ -3,10 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nu.nerd</groupId>
 	<artifactId>ModReq</artifactId>
-	<version>2.0</version>
+	<version>3.0.0</version>
 	<packaging>jar</packaging>
 	<name>ModReq</name>
-	<description>Moderator Request Sytem</description>
+	<description>Moderator Request System</description>
 	<url>https://github.com/NerdNu/ModReq</url>
 	<scm>
 		<connection>scm:git:https://github.com/NerdNu/ModReq.git</connection>
@@ -19,18 +19,17 @@
 
 	<repositories>
 		<repository>
-			<id>spigot-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+			<id>papermc</id>
+			<url>https://repo.papermc.io/repository/maven-public/</url>
 		</repository>
 	</repositories>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.18.1-R0.1-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
+			<groupId>io.papermc.paper</groupId>
+			<artifactId>paper-api</artifactId>
+			<version>1.20-R0.1-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 		<!--
 			Must build locally from https://github.com/NerdNu/bukkit-migration-tools
@@ -44,9 +43,14 @@
 			<version>0.2</version>
 		</dependency>
 		<dependency>
-			<groupId>nu.nerd</groupId>
-			<artifactId>BukkitEbean</artifactId>
-			<version>1.0.1</version>
+			<groupId>com.j256.ormlite</groupId>
+			<artifactId>ormlite-jdbc</artifactId>
+			<version>6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.46.0.0</version>
 		</dependency>
 	</dependencies>
 
@@ -85,7 +89,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.3.0-SNAPSHOT</version>
+				<version>3.5.3</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -100,12 +104,14 @@
 								<includes>
 									<include>org.gestern:bukkit-migration-tools:jar:*</include>
 									<include>nu.nerd:BukkitEbean:jar:*</include>
+									<include>com.j256.ormlite:ormlite-jdbc:jar:*</include>
+									<include>org.xerial:sqlite-jdbc:jar:*</include>
 								</includes>
 							</artifactSet>
 							<relocations>
 								<relocation>
-									<pattern>nu.nerd.BukkitEbean</pattern>
-									<shadedPattern>nu.nerd.modreq.BukkitEbean</shadedPattern>
+									<pattern>com.j256.ormlite</pattern>
+									<shadedPattern>nu.nerd.modreq.ormlite</shadedPattern>
 								</relocation>
 							</relocations>
 						</configuration>
@@ -129,7 +135,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<release>17</release>
 					<annotationProcessorPaths>

src/nu/nerd/modreq/Configuration.java

@@ -19,6 +19,7 @@ public class Configuration {
 	public String GENERAL__COMPLETED;
 	public String GENERAL__COMPLETED_MESSAGE;
 	public String GENERAL__DELETED;
+	public String GENERAL__PERMISSION_ERROR;
 	public String GENERAL__LIST__HEADER;
 	public String GENERAL__LIST__ITEM;
 	public String GENERAL__LIST__FOOTER;
@@ -72,6 +73,7 @@ public void load() {
 		GENERAL__COMPLETED_MESSAGE = plugin.getConfig().getString("messages.general.completed-message");
 		GENERAL__DELETED = plugin.getConfig().getString("messages.general.deleted");
 		GENERAL__PAGE_ERROR = plugin.getConfig().getString("messages.general.page-error");
+		GENERAL__PERMISSION_ERROR = plugin.getConfig().getString("messages.general.permission-error");
 		GENERAL__SEARCH_ERROR = plugin.getConfig().getString("messages.general.search-error");
 		GENERAL__ITEM__DETAILS = plugin.getConfig().getString("messages.general.item.details");
 		GENERAL__ITEM__HEADER_CLAIMED = plugin.getConfig().getString("messages.general.item.header-claimed");