changed package to digital.murl

murl-digital · Mar 24, 2021 · 7b702b2 · 7b702b2
1 parent 670314d
commit 7b702b2
Show file tree

Hide file tree

Showing 233 changed files with 585 additions and 551 deletions.
diff --git a/.idea/aurora.iml b/.idea/aurora.iml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-pluginGroup=fyi.sorenneedscoffee
+pluginGroup=digital.murl
 pluginVersion=1.1.4
diff --git a/...a/fyi/sorenneedscoffee/aurora/Aurora.java → ...main/java/digital/murl/aurora/Aurora.java b/...a/fyi/sorenneedscoffee/aurora/Aurora.java → ...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,14 +37,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
-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 {
 
@@ -75,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()

diff --git a/...ffee/aurora/annotations/StaticAction.java → ...murl/aurora/annotations/StaticAction.java b/...ffee/aurora/annotations/StaticAction.java → ...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;

diff --git a/...ffee/aurora/annotations/StaticEffect.java → ...murl/aurora/annotations/StaticEffect.java b/...ffee/aurora/annotations/StaticEffect.java → ...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;

diff --git a/...offee/aurora/annotations/StaticModel.java → .../murl/aurora/annotations/StaticModel.java b/...offee/aurora/annotations/StaticModel.java → .../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;

diff --git a/...eedscoffee/aurora/commands/EffectCmd.java → ...gital/murl/aurora/commands/EffectCmd.java b/...eedscoffee/aurora/commands/EffectCmd.java → ...gital/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;

diff --git a/...needscoffee/aurora/commands/PointCmd.java → ...igital/murl/aurora/commands/PointCmd.java b/...needscoffee/aurora/commands/PointCmd.java → ...igital/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

diff --git a/...scoffee/aurora/effects/CacheBehavior.java → ...al/murl/aurora/effects/CacheBehavior.java b/...scoffee/aurora/effects/CacheBehavior.java → ...al/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

diff --git a/...renneedscoffee/aurora/effects/Effect.java → ...a/digital/murl/aurora/effects/Effect.java b/...renneedscoffee/aurora/effects/Effect.java → ...a/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;
 

diff --git a/...dscoffee/aurora/effects/EffectAction.java → ...tal/murl/aurora/effects/EffectAction.java b/...dscoffee/aurora/effects/EffectAction.java → ...tal/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

diff --git a/...edscoffee/aurora/effects/EffectGroup.java → ...ital/murl/aurora/effects/EffectGroup.java b/...edscoffee/aurora/effects/EffectGroup.java → ...ital/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;

diff --git a/...aurora/effects/bossbar/BossBarEffect.java → ...aurora/effects/bossbar/BossBarEffect.java b/...aurora/effects/bossbar/BossBarEffect.java → ...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);

diff --git a/...e/aurora/effects/dragon/DragonEffect.java → ...l/aurora/effects/dragon/DragonEffect.java b/...e/aurora/effects/dragon/DragonEffect.java → ...l/aurora/effects/dragon/DragonEffect.java
@@ -1,21 +1,15 @@
-package fyi.sorenneedscoffee.aurora.effects.dragon;
-
-import static org.bukkit.Bukkit.getServer;
+package digital.murl.aurora.effects.dragon;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.effects.Effect;
-import fyi.sorenneedscoffee.aurora.effects.EffectAction;
-import fyi.sorenneedscoffee.aurora.points.Point;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityStatus;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerNamedSoundEffect;
-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.points.Point;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityStatus;
+import digital.murl.aurora.wrapper.WrapperPlayServerNamedSoundEffect;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -28,6 +22,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 DragonEffect extends Effect {
 
   protected static boolean active = false;

diff --git a/.../aurora/effects/laser/EndLaserEffect.java → .../aurora/effects/laser/EndLaserEffect.java b/.../aurora/effects/laser/EndLaserEffect.java → .../aurora/effects/laser/EndLaserEffect.java
@@ -1,7 +1,7 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
-import fyi.sorenneedscoffee.aurora.effects.Effect;
-import fyi.sorenneedscoffee.aurora.effects.EffectAction;
+import digital.murl.aurora.effects.Effect;
+import digital.murl.aurora.effects.EffectAction;
 import org.bukkit.Location;
 import org.bukkit.entity.EnderCrystal;
 

diff --git a/...fee/aurora/effects/laser/LaserEffect.java → ...url/aurora/effects/laser/LaserEffect.java b/...fee/aurora/effects/laser/LaserEffect.java → ...url/aurora/effects/laser/LaserEffect.java
@@ -1,15 +1,13 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.effects.Effect;
-import fyi.sorenneedscoffee.aurora.effects.EffectAction;
-import fyi.sorenneedscoffee.aurora.points.Point;
-import java.util.ArrayList;
-import java.util.List;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.effects.Effect;
+import digital.murl.aurora.effects.EffectAction;
+import digital.murl.aurora.points.Point;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.ArmorStand;
@@ -20,6 +18,9 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class LaserEffect extends Effect {
 
   private final Point start, end;

diff --git a/...ora/effects/laser/LaserPacketFactory.java → ...ora/effects/laser/LaserPacketFactory.java b/...ora/effects/laser/LaserPacketFactory.java → ...ora/effects/laser/LaserPacketFactory.java
@@ -1,9 +1,9 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityDestroy;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityMetadata;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityDestroy;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityMetadata;
+import digital.murl.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
 import net.minecraft.server.v1_16_R3.EntityGuardian;
 import net.minecraft.server.v1_16_R3.EntitySquid;
 import net.minecraft.server.v1_16_R3.EntityTypes;
@@ -65,7 +65,7 @@ public static WrapperPlayServerEntityDestroy createDestroyPacket(int[] ids) {
   }
 
   public static WrapperPlayServerEntityMetadata createInvisibilityPacket(int eId,
-      Entity fakeEntity) {
+                                                                         Entity fakeEntity) {
     WrappedDataWatcher watcher = WrappedDataWatcher.getEntityWatcher(fakeEntity);
     watcher.setObject(0, (byte) 32);
 

diff --git a/...e/aurora/effects/laser/ProtocolLaser.java → ...l/aurora/effects/laser/ProtocolLaser.java b/...e/aurora/effects/laser/ProtocolLaser.java → ...l/aurora/effects/laser/ProtocolLaser.java
@@ -1,9 +1,9 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityDestroy;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityMetadata;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityDestroy;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityMetadata;
+import digital.murl.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;

diff --git a/.../effects/laser/ProtocolTargetedLaser.java → .../effects/laser/ProtocolTargetedLaser.java b/.../effects/laser/ProtocolTargetedLaser.java → .../effects/laser/ProtocolTargetedLaser.java
@@ -1,12 +1,11 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityDestroy;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerEntityMetadata;
-import fyi.sorenneedscoffee.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityDestroy;
+import digital.murl.aurora.wrapper.WrapperPlayServerEntityMetadata;
+import digital.murl.aurora.wrapper.WrapperPlayServerSpawnEntityLiving;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class ProtocolTargetedLaser {
 

diff --git a/...ra/effects/laser/TargetedLaserEffect.java → ...ra/effects/laser/TargetedLaserEffect.java b/...ra/effects/laser/TargetedLaserEffect.java → ...ra/effects/laser/TargetedLaserEffect.java
@@ -1,15 +1,13 @@
-package fyi.sorenneedscoffee.aurora.effects.laser;
+package digital.murl.aurora.effects.laser;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
-import fyi.sorenneedscoffee.aurora.Aurora;
-import fyi.sorenneedscoffee.aurora.effects.Effect;
-import fyi.sorenneedscoffee.aurora.effects.EffectAction;
-import fyi.sorenneedscoffee.aurora.points.Point;
-import java.util.ArrayList;
-import java.util.List;
+import digital.murl.aurora.Aurora;
+import digital.murl.aurora.effects.Effect;
+import digital.murl.aurora.effects.EffectAction;
+import digital.murl.aurora.points.Point;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -19,6 +17,9 @@
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.plugin.Plugin;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class TargetedLaserEffect extends Effect {
 
   private final Point start;