Migrate to just an expansion and drop direct plugin support

.gitignore

@@ -1,9 +1,9 @@
 
-# Created by https://www.gitignore.io/api/intellij
-# Edit at https://www.gitignore.io/?templates=intellij
+# Created by https://www.toptal.com/developers/gitignore/api/intellij+all
+# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
@@ -13,6 +13,9 @@
 .idea/**/dictionaries
 .idea/**/shelf
 
+# AWS User-specific
+.idea/**/aws.xml
+
 # Generated files
 .idea/**/contentModel.xml
 
@@ -33,6 +36,9 @@
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
@@ -60,6 +66,9 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
+# SonarLint plugin
+.idea/sonarlint/
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -72,24 +81,22 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+### Intellij+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
 
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
+.idea/*
 
-# Sonarlint plugin
-.idea/**/sonarlint/
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
 
-# SonarQube Plugin
-.idea/**/sonarIssues.xml
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
 
-# Markdown Navigator plugin
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator/
+# Sonarlint plugin
+.idea/sonarlint
 
-# End of https://www.gitignore.io/api/intellij
+# End of https://www.toptal.com/developers/gitignore/api/intellij+all
 
 target/

README.md

@@ -1,5 +1,5 @@
 # FloodgatePlaceholders
-[![forthebadge made-with-java](https://ForTheBadge.com/images/badges/made-with-java.svg)](https://java.com/)
+[![forthebadge](https://forthebadge.com/images/badges/made-with-java.svg)](https://java.com)
 
 [![HitCount](https://hits.dwyl.com/rtm516/FloodgatePlaceholders.svg)](http://hits.dwyl.com/rtm516/FloodgatePlaceholders)
 
@@ -19,8 +19,6 @@ You can download the plugin/extension from GitHub releases or eCloud
 
 https://api.extendedclip.com/expansions/floodgate/ or `/papi ecloud download Floodgate` ingame
 
-https://github.com/rtm516/FloodgatePlaceholders/releases/
-
 ## Placeholders:
 - Device:
 	- `%floodgate_device%`

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.rtm516</groupId>
     <artifactId>FloodgatePlaceholders</artifactId>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <name>FloodgatePlaceholders</name>
 
     <developers>
@@ -144,20 +144,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.9.10.7</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.9.9</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

src/main/java/com/rtm516/FloodgatePlaceholders/Placeholder.java → src/main/java/com/rtm516/FloodgatePlaceholders/FloodgateExpansion.java

@@ -10,16 +10,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class Placeholder extends PlaceholderExpansion implements Configurable {
+public class FloodgateExpansion extends PlaceholderExpansion implements Configurable {
 
-    private Config config;
+    public static final String VERSION = "DEV";
 
-    public Placeholder() {
-        config = new ExpansionConfig(this);
-    }
+    private FloodgateExpansionConfig config;
 
-    public Placeholder(Config config){
-        this.config = config;
+    public FloodgateExpansion() {
+        config = new FloodgateExpansionConfig(this);
     }
 
     @Override
@@ -49,7 +47,7 @@ public String getIdentifier(){
 
     @Override
     public String getVersion(){
-        return Main.VERSION;
+        return VERSION;
     }
 
     @Override
@@ -146,10 +144,6 @@ private String getPlayerDeviceString(Player player) {
 
     @Override
     public Map<String, Object> getDefaults() {
-        if (!(config instanceof ExpansionConfig)) {
-            return null;
-        }
-
         final Map<String, Object> defaults = new HashMap<>();
         defaults.put("device.java", "&8[&aJava&8]");
         defaults.put("device.generic", "&8[&7Bedrock&8]");