Merge pull request #34 from murl-digital/development

1.1.4

build.gradle

@@ -17,8 +17,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT'
-    compileOnly 'org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.0'
     compileOnly 'io.netty:netty-all:4.1.29.Final'
     compileOnly 'org.jetbrains:annotations:19.0.0'
@@ -27,8 +27,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'org.reflections:reflections:0.9.12'
     implementation 'com.google.guava:guava:29.0-jre'
-
-    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 }
 
 import org.apache.tools.ant.filters.ReplaceTokens

gradle.properties

@@ -1,2 +1,2 @@
-pluginGroup=fyi.sorenneedscoffee
-pluginVersion=1.1.3
+pluginGroup=digital.murl
+pluginVersion=1.1.4

src/main/java/fyi/sorenneedscoffee/aurora/Aurora.java → src/main/java/digital/murl/aurora/Aurora.java

@@ -1,24 +1,28 @@
-package fyi.sorenneedscoffee.aurora;
+package digital.murl.aurora;
 
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.google.gson.*;
 import com.sun.net.httpserver.HttpServer;
-import fyi.sorenneedscoffee.aurora.annotations.StaticAction;
-import fyi.sorenneedscoffee.aurora.annotations.StaticEffect;
-import fyi.sorenneedscoffee.aurora.annotations.StaticModel;
-import fyi.sorenneedscoffee.aurora.commands.EffectCmd;
-import fyi.sorenneedscoffee.aurora.commands.PointCmd;
-import fyi.sorenneedscoffee.aurora.http.Endpoint;
-import fyi.sorenneedscoffee.aurora.http.RestHandler;
-import fyi.sorenneedscoffee.aurora.managers.EffectManager;
-import fyi.sorenneedscoffee.aurora.points.DataContext;
-import fyi.sorenneedscoffee.aurora.points.PointUtil;
+import digital.murl.aurora.annotations.StaticAction;
+import digital.murl.aurora.annotations.StaticEffect;
+import digital.murl.aurora.annotations.StaticModel;
+import digital.murl.aurora.commands.EffectCmd;
+import digital.murl.aurora.commands.PointCmd;
+import digital.murl.aurora.http.Endpoint;
+import digital.murl.aurora.http.RestHandler;
+import digital.murl.aurora.managers.EffectManager;
+import digital.murl.aurora.points.DataContext;
+import digital.murl.aurora.points.PointUtil;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.reflections.Reflections;
+import org.reflections.scanners.MethodAnnotationsScanner;
+import org.reflections.scanners.SubTypesScanner;
+import org.reflections.scanners.TypeAnnotationsScanner;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -33,23 +37,9 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.reflections.Reflections;
-import org.reflections.scanners.MethodAnnotationsScanner;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
 
 public final class Aurora extends JavaPlugin {
 
-  private static final OkHttpClient client = new OkHttpClient();
-
   public static Aurora plugin;
   public static Logger logger;
   public static FileConfiguration config;
@@ -81,7 +71,7 @@ public void onEnable() {
     dataContext = new DataContext(plugin);
     pointUtil = new PointUtil().load();
 
-    Reflections reflections = new Reflections("fyi.sorenneedscoffee.aurora.http",
+    Reflections reflections = new Reflections("digital.murl.aurora.http",
         new TypeAnnotationsScanner(),
         new MethodAnnotationsScanner(),
         new SubTypesScanner()
@@ -116,25 +106,6 @@ public void onEnable() {
         httpExecutor = Executors.newCachedThreadPool();
         httpServer.setExecutor(httpExecutor);
         httpServer.start();
-
-        if (config.getBoolean("remote.solarflare.enabled")) {
-          logger.info("Registering with SolarFlare...");
-          String host =
-              Objects.equals(config.getString("remote.solarflare.providedHostname"), "auto") ? base
-                  .getHost()
-                  : config.getString("remote.solarflare.providedHostname") + ":" + base.getPort();
-
-          JsonObject object = new JsonObject();
-          object.addProperty("privateAddress", host);
-
-          RequestBody body = RequestBody
-              .create(object.getAsString(), MediaType.parse(object.getAsString()));
-          Request request = new Request.Builder()
-              .url(Objects.requireNonNull(config.getString("remote.solarflare.url")))
-              .post(body)
-              .build();
-          client.newCall(request).execute();
-        }
       } catch (Exception e) {
         logger.severe(ExceptionUtils.getMessage(e));
         logger.severe(ExceptionUtils.getStackTrace(e));

src/main/java/fyi/sorenneedscoffee/aurora/annotations/StaticAction.java → src/main/java/digital/murl/aurora/annotations/StaticAction.java

@@ -1,4 +1,4 @@
-package fyi.sorenneedscoffee.aurora.annotations;
+package digital.murl.aurora.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/fyi/sorenneedscoffee/aurora/annotations/StaticEffect.java → src/main/java/digital/murl/aurora/annotations/StaticEffect.java

@@ -1,4 +1,4 @@
-package fyi.sorenneedscoffee.aurora.annotations;
+package digital.murl.aurora.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/fyi/sorenneedscoffee/aurora/annotations/StaticModel.java → src/main/java/digital/murl/aurora/annotations/StaticModel.java

@@ -1,4 +1,4 @@
-package fyi.sorenneedscoffee.aurora.annotations;
+package digital.murl.aurora.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/fyi/sorenneedscoffee/aurora/commands/EffectCmd.java → src/main/java/digital/murl/aurora/commands/EffectCmd.java

@@ -1,6 +1,6 @@
-package fyi.sorenneedscoffee.aurora.commands;
+package digital.murl.aurora.commands;
 
-import fyi.sorenneedscoffee.aurora.managers.EffectManager;
+import digital.murl.aurora.managers.EffectManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

src/main/java/fyi/sorenneedscoffee/aurora/commands/PointCmd.java → src/main/java/digital/murl/aurora/commands/PointCmd.java

@@ -1,8 +1,7 @@
-package fyi.sorenneedscoffee.aurora.commands;
+package digital.murl.aurora.commands;
 
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.points.Point;
-import java.util.Arrays;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.points.Point;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
@@ -11,6 +10,8 @@
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
+
 public class PointCmd implements CommandExecutor {
 
   @Override

src/main/java/fyi/sorenneedscoffee/aurora/effects/CacheBehavior.java → src/main/java/digital/murl/aurora/effects/CacheBehavior.java

@@ -1,4 +1,4 @@
-package fyi.sorenneedscoffee.aurora.effects;
+package digital.murl.aurora.effects;
 
 public enum CacheBehavior {
   DEFAULT, PERSIST, DISABLED

src/main/java/fyi/sorenneedscoffee/aurora/effects/Effect.java → src/main/java/digital/murl/aurora/effects/Effect.java

@@ -1,6 +1,6 @@
-package fyi.sorenneedscoffee.aurora.effects;
+package digital.murl.aurora.effects;
 
-import fyi.sorenneedscoffee.aurora.Aurora;
+import digital.murl.aurora.Aurora;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.IllegalPluginAccessException;
 

src/main/java/fyi/sorenneedscoffee/aurora/effects/EffectAction.java → src/main/java/digital/murl/aurora/effects/EffectAction.java

@@ -1,4 +1,4 @@
-package fyi.sorenneedscoffee.aurora.effects;
+package digital.murl.aurora.effects;
 
 public enum EffectAction {
   START, STOP, RESTART, TRIGGER

src/main/java/fyi/sorenneedscoffee/aurora/effects/EffectGroup.java → src/main/java/digital/murl/aurora/effects/EffectGroup.java

@@ -1,6 +1,7 @@
-package fyi.sorenneedscoffee.aurora.effects;
+package digital.murl.aurora.effects;
 
 import com.google.common.base.Objects;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;

src/main/java/fyi/sorenneedscoffee/aurora/effects/bossbar/BossBarEffect.java → src/main/java/digital/murl/aurora/effects/bossbar/BossBarEffect.java

@@ -1,20 +1,14 @@
-package fyi.sorenneedscoffee.aurora.effects.bossbar;
-
-import static org.bukkit.Bukkit.getServer;
+package digital.murl.aurora.effects.bossbar;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.effects.Effect;
-import fyi.sorenneedscoffee.aurora.effects.EffectAction;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerBoss;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.effects.Effect;
+import digital.murl.aurora.effects.EffectAction;
+import digital.murl.aurora.wrapper.WrapperPlayServerBoss;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
@@ -24,6 +18,13 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.Plugin;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.bukkit.Bukkit.getServer;
+
 public class BossBarEffect extends Effect {
 
   private final BossBarListener bossBarListener = new BossBarListener(Aurora.plugin, this);