From 65975ae094f8e7b18087271ef9ef0e558018066b Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Mon, 26 Aug 2019 09:07:02 +0200 Subject: [PATCH] Refactored Code --- src/me/mrCookieSlime/Slimefun/SlimefunGuide.java | 4 ++-- src/me/mrCookieSlime/Slimefun/SlimefunStartup.java | 6 +++--- .../Slimefun/{GitHub => hooks/github}/Contributor.java | 2 +- .../Slimefun/{GitHub => hooks/github}/GitHubConnector.java | 2 +- .../Slimefun/{GitHub => hooks/github}/GitHubSetup.java | 2 +- .../Slimefun/{GitHub => hooks/github}/IntegerFormat.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename src/me/mrCookieSlime/Slimefun/{GitHub => hooks/github}/Contributor.java (97%) rename src/me/mrCookieSlime/Slimefun/{GitHub => hooks/github}/GitHubConnector.java (98%) rename src/me/mrCookieSlime/Slimefun/{GitHub => hooks/github}/GitHubSetup.java (99%) rename src/me/mrCookieSlime/Slimefun/{GitHub => hooks/github}/IntegerFormat.java (86%) diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index bdcabcfee..479d46b5d 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -33,8 +33,6 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem; import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler; import me.mrCookieSlime.CSCoreLibPlugin.general.String.StringUtils; import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull; -import me.mrCookieSlime.Slimefun.GitHub.Contributor; -import me.mrCookieSlime.Slimefun.GitHub.IntegerFormat; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Misc.BookDesign; import me.mrCookieSlime.Slimefun.Objects.Category; @@ -52,6 +50,8 @@ import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.GuideHandler; import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.Slimefun; +import me.mrCookieSlime.Slimefun.hooks.github.Contributor; +import me.mrCookieSlime.Slimefun.hooks.github.IntegerFormat; public class SlimefunGuide { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index 6c37676da..be4d316eb 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -24,9 +24,6 @@ import me.mrCookieSlime.Slimefun.GEO.OreGenSystem; import me.mrCookieSlime.Slimefun.GEO.Resources.NetherIceResource; import me.mrCookieSlime.Slimefun.GEO.Resources.OilResource; import me.mrCookieSlime.Slimefun.GPS.Elevator; -import me.mrCookieSlime.Slimefun.GitHub.Contributor; -import me.mrCookieSlime.Slimefun.GitHub.GitHubConnector; -import me.mrCookieSlime.Slimefun.GitHub.GitHubSetup; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; import me.mrCookieSlime.Slimefun.Objects.MultiBlock; import me.mrCookieSlime.Slimefun.Objects.Research; @@ -59,6 +56,9 @@ import me.mrCookieSlime.Slimefun.commands.SlimefunCommand; import me.mrCookieSlime.Slimefun.commands.SlimefunTabCompleter; import me.mrCookieSlime.Slimefun.hooks.PlaceholderAPIHook; import me.mrCookieSlime.Slimefun.hooks.WorldEditHook; +import me.mrCookieSlime.Slimefun.hooks.github.Contributor; +import me.mrCookieSlime.Slimefun.hooks.github.GitHubConnector; +import me.mrCookieSlime.Slimefun.hooks.github.GitHubSetup; import me.mrCookieSlime.Slimefun.listeners.AncientAltarListener; import me.mrCookieSlime.Slimefun.listeners.AndroidKillingListener; import me.mrCookieSlime.Slimefun.listeners.ArmorListener; diff --git a/src/me/mrCookieSlime/Slimefun/GitHub/Contributor.java b/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java similarity index 97% rename from src/me/mrCookieSlime/Slimefun/GitHub/Contributor.java rename to src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java index 7638b4df2..a16211c91 100644 --- a/src/me/mrCookieSlime/Slimefun/GitHub/Contributor.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/Contributor.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.GitHub; +package me.mrCookieSlime.Slimefun.hooks.github; import java.util.HashMap; import java.util.Map; diff --git a/src/me/mrCookieSlime/Slimefun/GitHub/GitHubConnector.java b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java similarity index 98% rename from src/me/mrCookieSlime/Slimefun/GitHub/GitHubConnector.java rename to src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java index bb949a7c6..450fb4691 100644 --- a/src/me/mrCookieSlime/Slimefun/GitHub/GitHubConnector.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubConnector.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.GitHub; +package me.mrCookieSlime.Slimefun.hooks.github; import java.io.BufferedReader; import java.io.File; diff --git a/src/me/mrCookieSlime/Slimefun/GitHub/GitHubSetup.java b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java similarity index 99% rename from src/me/mrCookieSlime/Slimefun/GitHub/GitHubSetup.java rename to src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java index 43bc92cf5..bef92fced 100644 --- a/src/me/mrCookieSlime/Slimefun/GitHub/GitHubSetup.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.GitHub; +package me.mrCookieSlime.Slimefun.hooks.github; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/me/mrCookieSlime/Slimefun/GitHub/IntegerFormat.java b/src/me/mrCookieSlime/Slimefun/hooks/github/IntegerFormat.java similarity index 86% rename from src/me/mrCookieSlime/Slimefun/GitHub/IntegerFormat.java rename to src/me/mrCookieSlime/Slimefun/hooks/github/IntegerFormat.java index 5b190e78d..3b4d1cf82 100644 --- a/src/me/mrCookieSlime/Slimefun/GitHub/IntegerFormat.java +++ b/src/me/mrCookieSlime/Slimefun/hooks/github/IntegerFormat.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.GitHub; +package me.mrCookieSlime.Slimefun.hooks.github; import java.text.NumberFormat; import java.text.ParseException; @@ -8,7 +8,7 @@ import java.util.Locale; public class IntegerFormat { - private static SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public static String formatBigNumber(int i) { return NumberFormat.getNumberInstance(Locale.US).format(i);