From 835605181e10a76ba4db9b4b596d4654378be97d Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 30 Mar 2020 22:00:39 +0200
Subject: [PATCH] Update to GameBox v3.0.0-beta.2

---
 changelog.md                                  |  6 ++
 pom.xml                                       | 72 ++++++++++++++++---
 .../me/nikl/gamebox/games/GemCrushMain.java   | 26 +++----
 src/main/resources/module.yml                 | 10 +++
 src/main/resources/plugin.yml                 |  7 --
 5 files changed, 87 insertions(+), 34 deletions(-)
 create mode 100644 src/main/resources/module.yml
 delete mode 100644 src/main/resources/plugin.yml

diff --git a/changelog.md b/changelog.md
index 3f3c8da..8fe1f10 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Change log
 
+
+### v4.0.0-beta
+- update to GAmeBox v3 and MC 1.14+
+
+#
+
 ### v 3.0.1
 - empty inventory when player closes the game to stop players from taking ghost items.
 
diff --git a/pom.xml b/pom.xml
index 14e02da..cd5a6eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,63 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>me.nikl.gamebox.games</groupId>
-    <artifactId>GemCrush</artifactId>
-    <version>4.0.0-alpha</version>
+    <artifactId>gemcrush</artifactId>
+    <name>GemCrush</name>
+    <packaging>jar</packaging>
+    <version>4.0.0-beta</version>
+    <description>Match items and let it rain gems</description>
+
+    <distributionManagement>
+        <repository>
+            <id>nikl-repo</id>
+            <url>http://repo.nikl.me/artifactory/public</url>
+        </repository>
+    </distributionManagement>
+
+    <scm>
+        <url>https://github.com/NiklasEi/gemcrush-for-gamebox</url>
+        <connection>git@github.com:NiklasEi/gemcrush-for-gamebox.git</connection>
+    </scm>
+
+    <build>
+        <defaultGoal>clean package</defaultGoal>
+        <finalName>${project.name}</finalName>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <directory>target</directory>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/*.yml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>1.4</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create-timestamp</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <repositories>
         <repository>
@@ -30,20 +85,17 @@
         <!-- GameBox -->
         <dependency>
             <groupId>me.nikl</groupId>
-            <artifactId>gamebox-core</artifactId>
-            <version>3.0.0-alpha</version>
+            <artifactId>gamebox</artifactId>
+            <version>${gamebox.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <defaultGoal>clean package</defaultGoal>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <gamebox.version>3.0.0-beta.2</gamebox.version>
     </properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/me/nikl/gamebox/games/GemCrushMain.java b/src/main/java/me/nikl/gamebox/games/GemCrushMain.java
index 7c9235b..a921a18 100644
--- a/src/main/java/me/nikl/gamebox/games/GemCrushMain.java
+++ b/src/main/java/me/nikl/gamebox/games/GemCrushMain.java
@@ -1,29 +1,21 @@
 package me.nikl.gamebox.games;
 
-import me.nikl.gamebox.GameBox;
-import me.nikl.gamebox.Module;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
+import me.nikl.gamebox.games.gemcrush.GemCrush;
+import me.nikl.gamebox.module.GameBoxModule;
 
 /**
  * @author Niklas Eicker
  */
-public class GemCrushMain extends JavaPlugin {
+public class GemCrushMain extends GameBoxModule {
     public static final String GEM_CRUSH = "gemcrush";
-    private GameBox gameBox;
 
     @Override
     public void onEnable() {
-        Plugin plugin = Bukkit.getPluginManager().getPlugin("GameBox");
-        if (plugin == null || !plugin.isEnabled()) {
-            getLogger().warning(" GameBox was not found! Disabling GemCrush...");
-            Bukkit.getPluginManager().disablePlugin(this);
-            return;
-        }
-        gameBox = (GameBox) plugin;
-        new Module(gameBox, GEM_CRUSH
-                , "me.nikl.gamebox.games.gemcrush.GemCrush"
-                , this, GEM_CRUSH, "gc");
+        registerGame(GEM_CRUSH, GemCrush.class, "gc");
+    }
+
+    @Override
+    public void onDisable() {
+
     }
 }
diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml
new file mode 100644
index 0000000..324d1dd
--- /dev/null
+++ b/src/main/resources/module.yml
@@ -0,0 +1,10 @@
+id: ${project.artifactId}
+version: ${project.version}
+authors: ["Niklas Eicker"]
+name: ${project.name}
+description: ${project.description}
+sourceUrl: ${project.scm.url}
+updatedAt: !!java.lang.Long ${timestamp}
+dependencies:
+  - id: gamebox
+    versionConstrain: ">= ${gamebox.version}"
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
deleted file mode 100644
index e27fef4..0000000
--- a/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: GemCrush
-author: Nikl
-main: me.nikl.gamebox.games.GemCrushMain
-version: 4.0.0-alpha
-api-version: 1.14
-website: nikl.me
-depend: [GameBox]
\ No newline at end of file