Updated for Spigot 1.12, with baked-in ebean support

NerdNu · Jun 13, 2017 · 5308b88 · 5308b88
1 parent a47c384
commit 5308b88
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nu.nerd</groupId>
 	<artifactId>ModReq</artifactId>
-	<version>1.7</version>
+	<version>1.8</version>
 	<packaging>jar</packaging>
 	<name>ModReq</name>
 	<description>Moderator Request Sytem</description>
@@ -33,7 +33,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.8.8-R0.1-SNAPSHOT</version>
+			<version>1.12-R0.1-SNAPSHOT</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -42,6 +42,11 @@
 			<artifactId>bukkit-migration-tools</artifactId>
 			<version>0.1</version>
 		</dependency>
+		<dependency>
+			<groupId>nu.nerd</groupId>
+			<artifactId>BukkitEbean</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -102,8 +107,15 @@
 							<artifactSet>
 								<includes>
 									<include>org.gestern:bukkit-migration-tools:jar:*</include>
+									<include>nu.nerd:BukkitEbean:jar:*</include>
 								</includes>
 							</artifactSet>
+							<relocations>
+								<relocation>
+									<pattern>nu.nerd.BukkitEbean</pattern>
+									<shadedPattern>nu.nerd.modreq.BukkitEbean</shadedPattern>
+								</relocation>
+							</relocations>
 						</configuration>
 					</execution>
 				</executions>

diff --git a/src/nu/nerd/modreq/ModReq.java b/src/nu/nerd/modreq/ModReq.java
@@ -1,5 +1,6 @@
 package nu.nerd.modreq;
 
+import com.avaje.ebean.EbeanServer;
 import com.avaje.ebean.SqlRow;
 
 import java.io.File;
@@ -22,6 +23,8 @@
 
 import javax.persistence.PersistenceException;
 
+import nu.nerd.BukkitEbean.EbeanBuilder;
+import nu.nerd.BukkitEbean.EbeanHelper;
 import nu.nerd.modreq.database.Note;
 import nu.nerd.modreq.database.NoteTable;
 import nu.nerd.modreq.database.Request;
@@ -61,6 +64,7 @@ public class ModReq extends JavaPlugin {
     Map<UUID, Integer> claimedIds = new HashMap<UUID, Integer>();
     File claimsFile;
 
+    EbeanServer db;
     RequestTable reqTable;
     NoteTable noteTable;
 
@@ -90,11 +94,12 @@ public void onDisable() {
 
     public boolean setupDatabase() {
         try {
-            getDatabase().find(Request.class).findRowCount();
-            getDatabase().find(Note.class).findRowCount();
+            db = new EbeanBuilder(this).setClasses(getDatabaseClasses()).build();
+            db.find(Request.class).findRowCount();
+            db.find(Note.class).findRowCount();
         } catch (PersistenceException ex) {
             getLogger().log(Level.INFO, "First run, initializing database.");
-            installDDL();
+            EbeanHelper.installDDL(db);
             return true;
         }
 
@@ -113,7 +118,7 @@ public void resetDatabase() {
 		Set<String> unknownNames = new HashSet<String>();
 
         getLogger().log(Level.INFO, "Executing remove ddl");
-        removeDDL();
+        EbeanHelper.removeDDL(db);
 
         if (setupDatabase()) {
             getLogger().log(Level.INFO, "Schema created, converting " + rowRequests.size() + " requests and " + rowNotes.size() + " notes");
@@ -268,14 +273,17 @@ public void resetDatabase() {
         getLogger().log(Level.INFO, "Done");
     }
 
-    @Override
     public ArrayList<Class<?>> getDatabaseClasses() {
         ArrayList<Class<?>> list = new ArrayList<Class<?>>();
         list.add(Request.class);
         list.add(Note.class);
         return list;
     }
 
+    public EbeanServer getDatabase() {
+        return db;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String name, String[] args) {
         String senderName = ChatColor.stripColor(sender.getName());
@@ -800,7 +808,6 @@ private void mrUpgrade() {
 
       BukkitScheduler scheduler = Bukkit.getServer().getScheduler();
       scheduler.scheduleSyncDelayedTask(this, new Runnable() {
-          @Override
           public void run() {
               resetDatabase();
           }