Compare commits

..

No commits in common. "96f8ef153fd1354e7e73722e5fff19123a6fa874" and "40399655b1c2c3b3e0ee388c13b3f6d28a2b20b4" have entirely different histories.

34 changed files with 176 additions and 114 deletions

41
HubThat-Reborn.iml Normal file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/17.0.0/annotations-17.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="PROVIDED">
<library>
<CLASSES>
<root url="jar://D:/Coding/# Server per Test Plugins #/spigot-1.15.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://D:/Coding/# Server per Test Plugins #/spigot-1.15.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
</component>
</module>

22
HubThat.iml Normal file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.15-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.15.2-R0.1-SNAPSHOT" level="project" />
</component>
</module>

@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
#Tue May 31 20:08:48 CEST 2022
buildNumber=186
#Thu Jun 25 22:07:48 CEST 2020
buildNumber=184

@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>wtf.beatrice.hubthat</groupId>
<groupId>net.mindoverflow.hubthat</groupId>
<artifactId>HubThat</artifactId>
<version>10.1</version>
<scm>
@ -84,13 +84,11 @@
<!--This adds the Bukkit API artifact to the build -->
<!-- Do not include this in the pom.xml file if the Spigot API is already added -->
<!--
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
</project>

@ -1,19 +1,19 @@
package wtf.beatrice.hubthat;
package net.mindoverflow.hubthat;
import wtf.beatrice.hubthat.commands.*;
import wtf.beatrice.hubthat.completers.InfoCompleter;
import wtf.beatrice.hubthat.completers.SpawnCompleter;
import wtf.beatrice.hubthat.listeners.PlayerChatListener;
import wtf.beatrice.hubthat.listeners.PlayerJoinListener;
import wtf.beatrice.hubthat.listeners.PlayerMoveListener;
import wtf.beatrice.hubthat.listeners.PlayerRespawnListener;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.Debugger;
import wtf.beatrice.hubthat.utils.TeleportUtils;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import wtf.beatrice.hubthat.utils.files.OldConfigConversion;
import wtf.beatrice.hubthat.utils.metrics.Metrics;
import wtf.beatrice.hubthat.utils.metrics.UpdateChecker;
import net.mindoverflow.hubthat.commands.*;
import net.mindoverflow.hubthat.completers.InfoCompleter;
import net.mindoverflow.hubthat.completers.SpawnCompleter;
import net.mindoverflow.hubthat.listeners.PlayerChatListener;
import net.mindoverflow.hubthat.listeners.PlayerJoinListener;
import net.mindoverflow.hubthat.listeners.PlayerMoveListener;
import net.mindoverflow.hubthat.listeners.PlayerRespawnListener;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.Debugger;
import net.mindoverflow.hubthat.utils.TeleportUtils;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.utils.files.OldConfigConversion;
import net.mindoverflow.hubthat.utils.metrics.Metrics;
import net.mindoverflow.hubthat.utils.metrics.UpdateChecker;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;

@ -1,8 +1,8 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.*;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

@ -1,11 +1,11 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.commands.hubthatcommands.HelpCommand;
import wtf.beatrice.hubthat.commands.hubthatcommands.ReloadCommand;
import wtf.beatrice.hubthat.utils.Debugger;
import wtf.beatrice.hubthat.utils.MessageUtils;
import wtf.beatrice.hubthat.utils.PluginCache;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.commands.hubthatcommands.HelpCommand;
import net.mindoverflow.hubthat.commands.hubthatcommands.ReloadCommand;
import net.mindoverflow.hubthat.utils.Debugger;
import net.mindoverflow.hubthat.utils.MessageUtils;
import net.mindoverflow.hubthat.utils.PluginCache;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;

@ -1,7 +1,7 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.utils.*;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.utils.*;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.Location;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

@ -1,8 +1,8 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.*;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.Command;

@ -1,8 +1,8 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.*;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import org.bukkit.World;
import org.bukkit.WorldCreator;

@ -1,12 +1,13 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import org.bukkit.Difficulty;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import wtf.beatrice.hubthat.utils.*;
import org.bukkit.entity.Player;
import java.util.logging.Level;

@ -1,6 +1,7 @@
package wtf.beatrice.hubthat.commands;
package net.mindoverflow.hubthat.commands;
import wtf.beatrice.hubthat.HubThat;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.Command;
@ -8,12 +9,11 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
import wtf.beatrice.hubthat.utils.*;
import java.util.logging.Level;
import static wtf.beatrice.hubthat.utils.TeleportUtils.fixInvisibilityAfter;
import static wtf.beatrice.hubthat.utils.TeleportUtils.fixInvisibilityBefore;
import static net.mindoverflow.hubthat.utils.TeleportUtils.fixInvisibilityAfter;
import static net.mindoverflow.hubthat.utils.TeleportUtils.fixInvisibilityBefore;
public class WorldTpCommand implements CommandExecutor
{

@ -1,9 +1,9 @@
package wtf.beatrice.hubthat.commands.hubthatcommands;
package net.mindoverflow.hubthat.commands.hubthatcommands;
import wtf.beatrice.hubthat.utils.LocalizedMessages;
import wtf.beatrice.hubthat.utils.MessageUtils;
import wtf.beatrice.hubthat.utils.PermissionUtils;
import wtf.beatrice.hubthat.utils.Permissions;
import net.mindoverflow.hubthat.utils.LocalizedMessages;
import net.mindoverflow.hubthat.utils.MessageUtils;
import net.mindoverflow.hubthat.utils.PermissionUtils;
import net.mindoverflow.hubthat.utils.Permissions;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.Plugin;

@ -1,8 +1,8 @@
package wtf.beatrice.hubthat.commands.hubthatcommands;
package net.mindoverflow.hubthat.commands.hubthatcommands;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.*;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.command.CommandSender;
import java.util.logging.Level;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.completers;
package net.mindoverflow.hubthat.completers;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.completers;
package net.mindoverflow.hubthat.completers;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;

@ -1,9 +1,9 @@
package wtf.beatrice.hubthat.listeners;
package net.mindoverflow.hubthat.listeners;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.Debugger;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.Debugger;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;

@ -1,12 +1,12 @@
package wtf.beatrice.hubthat.listeners;
package net.mindoverflow.hubthat.listeners;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.commands.HubCommand;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.Debugger;
import wtf.beatrice.hubthat.utils.MessageUtils;
import wtf.beatrice.hubthat.utils.PluginCache;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.commands.HubCommand;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.Debugger;
import net.mindoverflow.hubthat.utils.MessageUtils;
import net.mindoverflow.hubthat.utils.PluginCache;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.GameMode;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;

@ -1,10 +1,10 @@
package wtf.beatrice.hubthat.listeners;
package net.mindoverflow.hubthat.listeners;
import wtf.beatrice.hubthat.utils.PluginCache;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.LocalizedMessages;
import wtf.beatrice.hubthat.utils.MessageUtils;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.utils.PluginCache;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.LocalizedMessages;
import net.mindoverflow.hubthat.utils.MessageUtils;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerMoveEvent;

@ -1,10 +1,10 @@
package wtf.beatrice.hubthat.listeners;
package net.mindoverflow.hubthat.listeners;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.commands.HubCommand;
import wtf.beatrice.hubthat.commands.SpawnCommand;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.commands.HubCommand;
import net.mindoverflow.hubthat.commands.SpawnCommand;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
public enum ConfigEntries
{

@ -1,6 +1,6 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
import wtf.beatrice.hubthat.HubThat;
import net.mindoverflow.hubthat.HubThat;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
public enum LocalizedMessages
{

@ -1,7 +1,7 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
import org.bukkit.command.CommandSender;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
public enum Permissions
{

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

@ -1,7 +1,7 @@
package wtf.beatrice.hubthat.utils;
package net.mindoverflow.hubthat.utils;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.files.FileUtils;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.files.FileUtils;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.command.CommandSender;

@ -1,10 +1,10 @@
package wtf.beatrice.hubthat.utils.files;
package net.mindoverflow.hubthat.utils.files;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.PluginCache;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.Debugger;
import wtf.beatrice.hubthat.utils.metrics.UpdateChecker;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.PluginCache;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.Debugger;
import net.mindoverflow.hubthat.utils.metrics.UpdateChecker;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.*;

@ -1,8 +1,8 @@
package wtf.beatrice.hubthat.utils.files;
package net.mindoverflow.hubthat.utils.files;
import wtf.beatrice.hubthat.HubThat;
import wtf.beatrice.hubthat.utils.ConfigEntries;
import wtf.beatrice.hubthat.utils.LocalizedMessages;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.ConfigEntries;
import net.mindoverflow.hubthat.utils.LocalizedMessages;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;

@ -1,4 +1,4 @@
package wtf.beatrice.hubthat.utils.metrics;
package net.mindoverflow.hubthat.utils.metrics;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;

@ -1,14 +1,14 @@
package wtf.beatrice.hubthat.utils.metrics;
package net.mindoverflow.hubthat.utils.metrics;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import wtf.beatrice.hubthat.HubThat;
import net.mindoverflow.hubthat.HubThat;
import net.mindoverflow.hubthat.utils.*;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask;
import wtf.beatrice.hubthat.utils.*;
import javax.net.ssl.HttpsURLConnection;
import java.io.IOException;

@ -1,7 +1,7 @@
name: HubThat
version: ${versionName}.${buildNumber}
author: mind_overflow
main: wtf.beatrice.hubthat.HubThat
main: net.mindoverflow.hubthat.HubThat
api-version: 1.13
commands:
hubthat: