From cc267d8cfe2355227c2439bc2cf8624497d85db6 Mon Sep 17 00:00:00 2001
From: 5gi <5giwastooshort@gmail.com>
Date: Fri, 1 Jul 2022 19:20:42 -0400
Subject: [PATCH] Refactor

---
 .idea/.name                                      |  2 +-
 .../{the5gi.main.iml => SimpleTTT.main.iml}      |  0
 build.gradle                                     |  2 +-
 settings.gradle                                  |  2 +-
 .../the5gi => net/nevet5gi}/SimpleTTTCore.java   | 16 +++++++---------
 .../nevet5gi}/commands/StartGameCommand.java     |  7 ++-----
 .../nevet5gi}/events/GameStartTTTEvent.java      |  4 ++--
 .../nevet5gi}/events/PreStartTTTEvent.java       |  2 +-
 .../nevet5gi}/events/TTTGamesOnEvent.java        |  4 ++--
 .../listeners/GameStartTTTListener.java          |  8 ++++----
 .../nevet5gi}/listeners/GamesOnTTTListener.java  | 10 ++++------
 .../PlayerInteractAtEntityListener.java          |  2 +-
 .../nevet5gi}/listeners/PreStartTTTListener.java | 10 +++++-----
 .../nevet5gi}/util/GameDecision.java             |  2 +-
 .../the5gi => net/nevet5gi}/util/GameHelper.java |  2 +-
 .../{com/the5gi => net/nevet5gi}/util/Role.java  |  2 +-
 .../nevet5gi}/util/RoleAmountHelper.java         |  2 +-
 .../nevet5gi}/util/RoleColorHelper.java          |  2 +-
 .../nevet5gi}/util/RoleDescriptionHelper.java    |  2 +-
 .../nevet5gi}/util/RoleWinnerHelper.java         |  2 +-
 20 files changed, 38 insertions(+), 45 deletions(-)
 rename .idea/modules/{the5gi.main.iml => SimpleTTT.main.iml} (100%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/SimpleTTTCore.java (78%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/commands/StartGameCommand.java (89%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/events/GameStartTTTEvent.java (97%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/events/PreStartTTTEvent.java (96%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/events/TTTGamesOnEvent.java (95%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/listeners/GameStartTTTListener.java (91%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/listeners/GamesOnTTTListener.java (95%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/listeners/PlayerInteractAtEntityListener.java (93%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/listeners/PreStartTTTListener.java (91%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/GameDecision.java (69%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/GameHelper.java (98%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/Role.java (93%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/RoleAmountHelper.java (99%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/RoleColorHelper.java (96%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/RoleDescriptionHelper.java (98%)
 rename src/main/java/{com/the5gi => net/nevet5gi}/util/RoleWinnerHelper.java (94%)

diff --git a/.idea/.name b/.idea/.name
index b571437..5a0bab9 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-the5gi
\ No newline at end of file
+SimpleTTT
\ No newline at end of file
diff --git a/.idea/modules/the5gi.main.iml b/.idea/modules/SimpleTTT.main.iml
similarity index 100%
rename from .idea/modules/the5gi.main.iml
rename to .idea/modules/SimpleTTT.main.iml
diff --git a/build.gradle b/build.gradle
index 9723ccc..206f5ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     compileOnly 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT'
 }
 
-group = 'com'
+group = 'net.nevet5gi'
 version = '1.0.0'
 description = 'SimpleTTT'
 java.sourceCompatibility = JavaVersion.VERSION_17
diff --git a/settings.gradle b/settings.gradle
index ed4e0c0..90fe620 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'the5gi'
\ No newline at end of file
+rootProject.name = 'SimpleTTT'
\ No newline at end of file
diff --git a/src/main/java/com/the5gi/SimpleTTTCore.java b/src/main/java/net/nevet5gi/SimpleTTTCore.java
similarity index 78%
rename from src/main/java/com/the5gi/SimpleTTTCore.java
rename to src/main/java/net/nevet5gi/SimpleTTTCore.java
index 7b89aa7..f7b35be 100644
--- a/src/main/java/com/the5gi/SimpleTTTCore.java
+++ b/src/main/java/net/nevet5gi/SimpleTTTCore.java
@@ -1,13 +1,11 @@
-package com.the5gi;
+package net.nevet5gi;
 
-import com.the5gi.commands.StartGameCommand;
-import com.the5gi.events.GameStartTTTEvent;
-import com.the5gi.events.PreStartTTTEvent;
-import com.the5gi.listeners.GameStartTTTListener;
-import com.the5gi.listeners.GamesOnTTTListener;
-import com.the5gi.listeners.PlayerInteractAtEntityListener;
-import com.the5gi.listeners.PreStartTTTListener;
-import org.bukkit.Bukkit;
+import net.nevet5gi.commands.StartGameCommand;
+import net.nevet5gi.events.PreStartTTTEvent;
+import net.nevet5gi.listeners.GameStartTTTListener;
+import net.nevet5gi.listeners.GamesOnTTTListener;
+import net.nevet5gi.listeners.PlayerInteractAtEntityListener;
+import net.nevet5gi.listeners.PreStartTTTListener;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
diff --git a/src/main/java/com/the5gi/commands/StartGameCommand.java b/src/main/java/net/nevet5gi/commands/StartGameCommand.java
similarity index 89%
rename from src/main/java/com/the5gi/commands/StartGameCommand.java
rename to src/main/java/net/nevet5gi/commands/StartGameCommand.java
index 3ec5991..0a72a1b 100644
--- a/src/main/java/com/the5gi/commands/StartGameCommand.java
+++ b/src/main/java/net/nevet5gi/commands/StartGameCommand.java
@@ -1,15 +1,12 @@
-package com.the5gi.commands;
+package net.nevet5gi.commands;
 
-import com.the5gi.SimpleTTTCore;
-import com.the5gi.util.Role;
+import net.nevet5gi.SimpleTTTCore;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Random;
-
 public class StartGameCommand implements CommandExecutor {
     private JavaPlugin plugin;
 
diff --git a/src/main/java/com/the5gi/events/GameStartTTTEvent.java b/src/main/java/net/nevet5gi/events/GameStartTTTEvent.java
similarity index 97%
rename from src/main/java/com/the5gi/events/GameStartTTTEvent.java
rename to src/main/java/net/nevet5gi/events/GameStartTTTEvent.java
index 92ded63..ade676e 100644
--- a/src/main/java/com/the5gi/events/GameStartTTTEvent.java
+++ b/src/main/java/net/nevet5gi/events/GameStartTTTEvent.java
@@ -1,6 +1,6 @@
-package com.the5gi.events;
+package net.nevet5gi.events;
 
-import com.the5gi.util.Role;
+import net.nevet5gi.util.Role;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/com/the5gi/events/PreStartTTTEvent.java b/src/main/java/net/nevet5gi/events/PreStartTTTEvent.java
similarity index 96%
rename from src/main/java/com/the5gi/events/PreStartTTTEvent.java
rename to src/main/java/net/nevet5gi/events/PreStartTTTEvent.java
index d7a5361..8ad5552 100644
--- a/src/main/java/com/the5gi/events/PreStartTTTEvent.java
+++ b/src/main/java/net/nevet5gi/events/PreStartTTTEvent.java
@@ -1,4 +1,4 @@
-package com.the5gi.events;
+package net.nevet5gi.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/com/the5gi/events/TTTGamesOnEvent.java b/src/main/java/net/nevet5gi/events/TTTGamesOnEvent.java
similarity index 95%
rename from src/main/java/com/the5gi/events/TTTGamesOnEvent.java
rename to src/main/java/net/nevet5gi/events/TTTGamesOnEvent.java
index 4e9669c..ac1cd3c 100644
--- a/src/main/java/com/the5gi/events/TTTGamesOnEvent.java
+++ b/src/main/java/net/nevet5gi/events/TTTGamesOnEvent.java
@@ -1,6 +1,6 @@
-package com.the5gi.events;
+package net.nevet5gi.events;
 
-import com.the5gi.util.Role;
+import net.nevet5gi.util.Role;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/src/main/java/com/the5gi/listeners/GameStartTTTListener.java b/src/main/java/net/nevet5gi/listeners/GameStartTTTListener.java
similarity index 91%
rename from src/main/java/com/the5gi/listeners/GameStartTTTListener.java
rename to src/main/java/net/nevet5gi/listeners/GameStartTTTListener.java
index f19a065..50fbea9 100644
--- a/src/main/java/com/the5gi/listeners/GameStartTTTListener.java
+++ b/src/main/java/net/nevet5gi/listeners/GameStartTTTListener.java
@@ -1,8 +1,8 @@
-package com.the5gi.listeners;
+package net.nevet5gi.listeners;
 
-import com.the5gi.events.GameStartTTTEvent;
-import com.the5gi.events.TTTGamesOnEvent;
-import com.the5gi.util.Role;
+import net.nevet5gi.events.GameStartTTTEvent;
+import net.nevet5gi.events.TTTGamesOnEvent;
+import net.nevet5gi.util.Role;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/com/the5gi/listeners/GamesOnTTTListener.java b/src/main/java/net/nevet5gi/listeners/GamesOnTTTListener.java
similarity index 95%
rename from src/main/java/com/the5gi/listeners/GamesOnTTTListener.java
rename to src/main/java/net/nevet5gi/listeners/GamesOnTTTListener.java
index 36979c2..ffaa24d 100644
--- a/src/main/java/com/the5gi/listeners/GamesOnTTTListener.java
+++ b/src/main/java/net/nevet5gi/listeners/GamesOnTTTListener.java
@@ -1,10 +1,10 @@
-package com.the5gi.listeners;
+package net.nevet5gi.listeners;
 
-import com.the5gi.SimpleTTTCore;
-import com.the5gi.events.TTTGamesOnEvent;
-import com.the5gi.util.*;
+import net.nevet5gi.SimpleTTTCore;
+import net.nevet5gi.events.TTTGamesOnEvent;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.nevet5gi.util.*;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.boss.BarColor;
@@ -71,7 +71,5 @@ public class GamesOnTTTListener implements Listener {
                 }
             }
         }, 20 , 20);
-
-
     }
 }
diff --git a/src/main/java/com/the5gi/listeners/PlayerInteractAtEntityListener.java b/src/main/java/net/nevet5gi/listeners/PlayerInteractAtEntityListener.java
similarity index 93%
rename from src/main/java/com/the5gi/listeners/PlayerInteractAtEntityListener.java
rename to src/main/java/net/nevet5gi/listeners/PlayerInteractAtEntityListener.java
index 8221b66..a903a0f 100644
--- a/src/main/java/com/the5gi/listeners/PlayerInteractAtEntityListener.java
+++ b/src/main/java/net/nevet5gi/listeners/PlayerInteractAtEntityListener.java
@@ -1,4 +1,4 @@
-package com.the5gi.listeners;
+package net.nevet5gi.listeners;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/com/the5gi/listeners/PreStartTTTListener.java b/src/main/java/net/nevet5gi/listeners/PreStartTTTListener.java
similarity index 91%
rename from src/main/java/com/the5gi/listeners/PreStartTTTListener.java
rename to src/main/java/net/nevet5gi/listeners/PreStartTTTListener.java
index 54ba91d..0b00b60 100644
--- a/src/main/java/com/the5gi/listeners/PreStartTTTListener.java
+++ b/src/main/java/net/nevet5gi/listeners/PreStartTTTListener.java
@@ -1,9 +1,9 @@
-package com.the5gi.listeners;
+package net.nevet5gi.listeners;
 
-import com.the5gi.SimpleTTTCore;
-import com.the5gi.events.GameStartTTTEvent;
-import com.the5gi.events.PreStartTTTEvent;
-import com.the5gi.util.RoleAmountHelper;
+import net.nevet5gi.SimpleTTTCore;
+import net.nevet5gi.events.GameStartTTTEvent;
+import net.nevet5gi.events.PreStartTTTEvent;
+import net.nevet5gi.util.RoleAmountHelper;
 import org.bukkit.Bukkit;
 import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
diff --git a/src/main/java/com/the5gi/util/GameDecision.java b/src/main/java/net/nevet5gi/util/GameDecision.java
similarity index 69%
rename from src/main/java/com/the5gi/util/GameDecision.java
rename to src/main/java/net/nevet5gi/util/GameDecision.java
index 08cbb8e..3c66b70 100644
--- a/src/main/java/com/the5gi/util/GameDecision.java
+++ b/src/main/java/net/nevet5gi/util/GameDecision.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 public enum GameDecision {
     OVERTIME,
diff --git a/src/main/java/com/the5gi/util/GameHelper.java b/src/main/java/net/nevet5gi/util/GameHelper.java
similarity index 98%
rename from src/main/java/com/the5gi/util/GameHelper.java
rename to src/main/java/net/nevet5gi/util/GameHelper.java
index 72d2762..f687f56 100644
--- a/src/main/java/com/the5gi/util/GameHelper.java
+++ b/src/main/java/net/nevet5gi/util/GameHelper.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 public class GameHelper {
 
diff --git a/src/main/java/com/the5gi/util/Role.java b/src/main/java/net/nevet5gi/util/Role.java
similarity index 93%
rename from src/main/java/com/the5gi/util/Role.java
rename to src/main/java/net/nevet5gi/util/Role.java
index f107944..dce56b9 100644
--- a/src/main/java/com/the5gi/util/Role.java
+++ b/src/main/java/net/nevet5gi/util/Role.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 public enum Role {
     DETECTIVE(0),
diff --git a/src/main/java/com/the5gi/util/RoleAmountHelper.java b/src/main/java/net/nevet5gi/util/RoleAmountHelper.java
similarity index 99%
rename from src/main/java/com/the5gi/util/RoleAmountHelper.java
rename to src/main/java/net/nevet5gi/util/RoleAmountHelper.java
index 309cd11..84d96eb 100644
--- a/src/main/java/com/the5gi/util/RoleAmountHelper.java
+++ b/src/main/java/net/nevet5gi/util/RoleAmountHelper.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/the5gi/util/RoleColorHelper.java b/src/main/java/net/nevet5gi/util/RoleColorHelper.java
similarity index 96%
rename from src/main/java/com/the5gi/util/RoleColorHelper.java
rename to src/main/java/net/nevet5gi/util/RoleColorHelper.java
index f585ea7..f6085c8 100644
--- a/src/main/java/com/the5gi/util/RoleColorHelper.java
+++ b/src/main/java/net/nevet5gi/util/RoleColorHelper.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 import org.bukkit.ChatColor;
 
diff --git a/src/main/java/com/the5gi/util/RoleDescriptionHelper.java b/src/main/java/net/nevet5gi/util/RoleDescriptionHelper.java
similarity index 98%
rename from src/main/java/com/the5gi/util/RoleDescriptionHelper.java
rename to src/main/java/net/nevet5gi/util/RoleDescriptionHelper.java
index c52916d..9f9cd9c 100644
--- a/src/main/java/com/the5gi/util/RoleDescriptionHelper.java
+++ b/src/main/java/net/nevet5gi/util/RoleDescriptionHelper.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 public class RoleDescriptionHelper {
 
diff --git a/src/main/java/com/the5gi/util/RoleWinnerHelper.java b/src/main/java/net/nevet5gi/util/RoleWinnerHelper.java
similarity index 94%
rename from src/main/java/com/the5gi/util/RoleWinnerHelper.java
rename to src/main/java/net/nevet5gi/util/RoleWinnerHelper.java
index 2f5cb5d..2c31704 100644
--- a/src/main/java/com/the5gi/util/RoleWinnerHelper.java
+++ b/src/main/java/net/nevet5gi/util/RoleWinnerHelper.java
@@ -1,4 +1,4 @@
-package com.the5gi.util;
+package net.nevet5gi.util;
 
 public class RoleWinnerHelper {
     public static String getTitle(Role role) {