From dba2654ffada987bc0a0db7283c78a234830dbf1 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Fri, 31 Jan 2020 18:08:23 +0000
Subject: [PATCH] Split api

---
 RPGRegions.iml                                |  2 +-
 api/build.gradle                              | 33 +++++++++++++++++++
 .../api/events}/RegionDiscoverEvent.java      |  8 ++---
 .../api/events}/RegionsEnterEvent.java        |  6 +---
 .../rewards/ConsoleCommandReward.java         |  0
 .../rpgregions/rewards/DiscoveryReward.java   |  0
 .../rpgregions/rewards/ExperienceReward.java  |  0
 .../rpgregions/rewards/ItemReward.java        |  0
 .../rewards/PlayerCommandReward.java          |  0
 build.gradle                                  |  1 +
 gradle.properties                             |  2 +-
 legacy/build.gradle                           |  1 +
 .../WorldGuardLegacyIntegration.java          |  2 +-
 modern/build.gradle                           |  1 +
 .../worldguard/WorldGuardIntegration.java     |  2 +-
 rpgregions/build.gradle                       |  2 ++
 .../rpgregions/listener/RegionListener.java   |  4 +--
 settings.gradle                               |  1 +
 18 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 api/build.gradle
 rename {rpgregions/src/main/java/net/islandearth/rpgregions/api/event => api/src/main/java/net/islandearth/rpgregions/api/events}/RegionDiscoverEvent.java (84%)
 rename {rpgregions/src/main/java/net/islandearth/rpgregions/api/event => api/src/main/java/net/islandearth/rpgregions/api/events}/RegionsEnterEvent.java (85%)
 rename {rpgregions => api}/src/main/java/net/islandearth/rpgregions/rewards/ConsoleCommandReward.java (100%)
 rename {rpgregions => api}/src/main/java/net/islandearth/rpgregions/rewards/DiscoveryReward.java (100%)
 rename {rpgregions => api}/src/main/java/net/islandearth/rpgregions/rewards/ExperienceReward.java (100%)
 rename {rpgregions => api}/src/main/java/net/islandearth/rpgregions/rewards/ItemReward.java (100%)
 rename {rpgregions => api}/src/main/java/net/islandearth/rpgregions/rewards/PlayerCommandReward.java (100%)

diff --git a/RPGRegions.iml b/RPGRegions.iml
index 7e24b61..6aba877 100644
--- a/RPGRegions.iml
+++ b/RPGRegions.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="RPGRegions" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.islandearth" external.system.module.version="1.0.5" type="JAVA_MODULE" version="4">
-  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="net.islandearth" externalSystemModuleVersion="1.0.8" linkedProjectId="RPGRegions" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
+  <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="net.islandearth" externalSystemModuleVersion="1.0.9" linkedProjectId="RPGRegions" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/api/build.gradle b/api/build.gradle
new file mode 100644
index 0000000..6f2e2a6
--- /dev/null
+++ b/api/build.gradle
@@ -0,0 +1,33 @@
+plugins {
+    id 'java'
+}
+
+group 'net.islandearth'
+version '1.0.8'
+
+sourceCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+    maven {
+        name = 'papermc-repo'
+        url = 'https://papermc.io/repo/repository/maven-public/'
+    }
+
+    maven {
+        name = 'sonatype'
+        url = 'https://oss.sonatype.org/content/groups/public/'
+    }
+
+    maven {
+        name = 'CodeMC'
+        url = 'https://repo.codemc.org/repository/maven-public'
+    }
+
+    maven { url = "https://repo.aikar.co/content/groups/aikar/" }
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compileOnly 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT' // spigot
+}
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionDiscoverEvent.java b/api/src/main/java/net/islandearth/rpgregions/api/events/RegionDiscoverEvent.java
similarity index 84%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionDiscoverEvent.java
rename to api/src/main/java/net/islandearth/rpgregions/api/events/RegionDiscoverEvent.java
index 0410966..ac4ed5e 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionDiscoverEvent.java
+++ b/api/src/main/java/net/islandearth/rpgregions/api/events/RegionDiscoverEvent.java
@@ -1,9 +1,8 @@
-package net.islandearth.rpgregions.api.event;
+package net.islandearth.rpgregions.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
 
 public class RegionDiscoverEvent extends Event {
 
@@ -15,18 +14,15 @@ public class RegionDiscoverEvent extends Event {
 		this.player = player;
 		this.region = region;
 	}
-	
-	@NotNull
+
 	public Player getPlayer() {
 		return player;
 	}
 
-	@NotNull
 	public String getRegion() {
 		return region;
 	}
 
-	@NotNull
 	@Override
 	public HandlerList getHandlers() {
 		return HANDLER_LIST;
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionsEnterEvent.java b/api/src/main/java/net/islandearth/rpgregions/api/events/RegionsEnterEvent.java
similarity index 85%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionsEnterEvent.java
rename to api/src/main/java/net/islandearth/rpgregions/api/events/RegionsEnterEvent.java
index c84cb56..02117c6 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/api/event/RegionsEnterEvent.java
+++ b/api/src/main/java/net/islandearth/rpgregions/api/events/RegionsEnterEvent.java
@@ -1,9 +1,8 @@
-package net.islandearth.rpgregions.api.event;
+package net.islandearth.rpgregions.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -18,17 +17,14 @@ public class RegionsEnterEvent extends Event {
 		this.regions = regions;
 	}
 
-	@NotNull
 	public Player getPlayer() {
 		return player;
 	}
 
-	@NotNull
 	public List<String> getRegions() {
 		return regions;
 	}
 
-	@NotNull
 	@Override
 	public HandlerList getHandlers() {
 		return HANDLER_LIST;
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ConsoleCommandReward.java b/api/src/main/java/net/islandearth/rpgregions/rewards/ConsoleCommandReward.java
similarity index 100%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ConsoleCommandReward.java
rename to api/src/main/java/net/islandearth/rpgregions/rewards/ConsoleCommandReward.java
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/rewards/DiscoveryReward.java b/api/src/main/java/net/islandearth/rpgregions/rewards/DiscoveryReward.java
similarity index 100%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/rewards/DiscoveryReward.java
rename to api/src/main/java/net/islandearth/rpgregions/rewards/DiscoveryReward.java
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ExperienceReward.java b/api/src/main/java/net/islandearth/rpgregions/rewards/ExperienceReward.java
similarity index 100%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ExperienceReward.java
rename to api/src/main/java/net/islandearth/rpgregions/rewards/ExperienceReward.java
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ItemReward.java b/api/src/main/java/net/islandearth/rpgregions/rewards/ItemReward.java
similarity index 100%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/rewards/ItemReward.java
rename to api/src/main/java/net/islandearth/rpgregions/rewards/ItemReward.java
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/rewards/PlayerCommandReward.java b/api/src/main/java/net/islandearth/rpgregions/rewards/PlayerCommandReward.java
similarity index 100%
rename from rpgregions/src/main/java/net/islandearth/rpgregions/rewards/PlayerCommandReward.java
rename to api/src/main/java/net/islandearth/rpgregions/rewards/PlayerCommandReward.java
diff --git a/build.gradle b/build.gradle
index 3ebe1f9..5a4e04e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     compile project(':rpgregions')
     compile project(':modern')
     compile project(':legacy')
+    compile project(':api')
 }
 
 shadowJar {
diff --git a/gradle.properties b/gradle.properties
index 11ec1e3..e0f48f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 pluginGroup=net.islandearth
-pluginVersion=1.0.8
+pluginVersion=1.0.9
diff --git a/legacy/build.gradle b/legacy/build.gradle
index f5ff6e8..2716896 100644
--- a/legacy/build.gradle
+++ b/legacy/build.gradle
@@ -43,4 +43,5 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT' // spigot
     compileOnly 'net.islandearth:languagy:1.2.6-SNAPSHOT' // languagy
     compileOnly project(':rpgregions')
+    compileOnly project(':api')
 }
diff --git a/legacy/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardLegacyIntegration.java b/legacy/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardLegacyIntegration.java
index fafde03..4486c40 100644
--- a/legacy/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardLegacyIntegration.java
+++ b/legacy/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardLegacyIntegration.java
@@ -3,7 +3,7 @@ package net.islandearth.rpgregions.api.integrations.worldguard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import net.islandearth.rpgregions.RPGRegions;
-import net.islandearth.rpgregions.api.event.RegionsEnterEvent;
+import net.islandearth.rpgregions.api.events.RegionsEnterEvent;
 import net.islandearth.rpgregions.api.integrations.IntegrationManager;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import org.bukkit.Bukkit;
diff --git a/modern/build.gradle b/modern/build.gradle
index ab7e28e..9d6fc08 100644
--- a/modern/build.gradle
+++ b/modern/build.gradle
@@ -40,5 +40,6 @@ dependencies {
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.1-SNAPSHOT' // worldguard
     compileOnly 'org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT' // spigot
     compileOnly 'net.islandearth:languagy:1.2.6-SNAPSHOT' // languagy
+    compileOnly project(':api')
     compileOnly project(':rpgregions')
 }
diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java
index a5069c2..ee92b4b 100644
--- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java
+++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/worldguard/WorldGuardIntegration.java
@@ -5,7 +5,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import net.islandearth.rpgregions.RPGRegions;
-import net.islandearth.rpgregions.api.event.RegionsEnterEvent;
+import net.islandearth.rpgregions.api.events.RegionsEnterEvent;
 import net.islandearth.rpgregions.api.integrations.IntegrationManager;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import org.bukkit.Bukkit;
diff --git a/rpgregions/build.gradle b/rpgregions/build.gradle
index 1d01eca..271f865 100644
--- a/rpgregions/build.gradle
+++ b/rpgregions/build.gradle
@@ -55,6 +55,8 @@ dependencies {
     implementation 'com.github.stefvanschie.inventoryframework:IF:0.5.17' // inventory framework
     implementation 'org.bstats:bstats-bukkit:1.5' // plugin stats
     implementation "io.papermc:paperlib:1.0.2" // paperlib - async teleport on Paper
+
+    compileOnly project(':api')
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java
index 56a79e3..23d3d5f 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/listener/RegionListener.java
@@ -1,8 +1,8 @@
 package net.islandearth.rpgregions.listener;
 
 import net.islandearth.rpgregions.RPGRegions;
-import net.islandearth.rpgregions.api.event.RegionDiscoverEvent;
-import net.islandearth.rpgregions.api.event.RegionsEnterEvent;
+import net.islandearth.rpgregions.api.events.RegionDiscoverEvent;
+import net.islandearth.rpgregions.api.events.RegionsEnterEvent;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import net.islandearth.rpgregions.managers.data.region.Discovery;
 import net.islandearth.rpgregions.managers.data.region.WorldDiscovery;
diff --git a/settings.gradle b/settings.gradle
index e98315f..90eca82 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 include 'rpgregions'
 include 'modern'
 include 'legacy'
+include 'api'