From 9043005d62fdbcbb137daa58d86a78905ca7f53c Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Thu, 27 Jan 2022 15:38:44 -0600 Subject: [PATCH] Dont call the plugin every time tl() is used --- src/main/java/dev/plex/PlexBase.java | 2 +- src/main/java/dev/plex/util/PlexLog.java | 6 +++--- src/main/java/dev/plex/util/PlexUtils.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/dev/plex/PlexBase.java b/src/main/java/dev/plex/PlexBase.java index ed0c474..89550bc 100644 --- a/src/main/java/dev/plex/PlexBase.java +++ b/src/main/java/dev/plex/PlexBase.java @@ -2,5 +2,5 @@ package dev.plex; public class PlexBase { - protected static Plex plugin = Plex.get(); + protected final static Plex plugin = Plex.get(); } diff --git a/src/main/java/dev/plex/util/PlexLog.java b/src/main/java/dev/plex/util/PlexLog.java index 9f79051..878b44b 100644 --- a/src/main/java/dev/plex/util/PlexLog.java +++ b/src/main/java/dev/plex/util/PlexLog.java @@ -1,12 +1,12 @@ package dev.plex.util; -import dev.plex.Plex; +import dev.plex.PlexBase; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -public class PlexLog +public class PlexLog extends PlexBase { - private static final boolean debugEnabled = Plex.get().config.getBoolean("debug"); + private static final boolean debugEnabled = plugin.config.getBoolean("debug"); public static void log(String message) { diff --git a/src/main/java/dev/plex/util/PlexUtils.java b/src/main/java/dev/plex/util/PlexUtils.java index 41e1f78..be671cc 100644 --- a/src/main/java/dev/plex/util/PlexUtils.java +++ b/src/main/java/dev/plex/util/PlexUtils.java @@ -1,6 +1,7 @@ package dev.plex.util; import dev.plex.Plex; +import dev.plex.PlexBase; import dev.plex.config.Config; import dev.plex.storage.StorageType; import java.io.BufferedReader; @@ -33,7 +34,7 @@ import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; -public class PlexUtils +public class PlexUtils extends PlexBase { public static Map CHAT_COLOR_NAMES; public static List CHAT_COLOR_POOL; @@ -114,7 +115,6 @@ public class PlexUtils // if you think the name of this method is dumb feel free to change it i just thought it'd be cool public static String tl(String s, Object... objects) { - Plex plugin = Plex.get(); if (s.equals("baseColor") || s.equals("errorColor") || s.equals("broadcastColor")) { return getChatColorFromConfig(plugin.messages, ChatColor.WHITE, s).toString();