From b602020b4cef92dfc7636cf9a7cbe21f695f6a40 Mon Sep 17 00:00:00 2001 From: WakelessSloth56 Date: Mon, 4 Apr 2022 18:32:35 +0800 Subject: [PATCH] refactor: compatibility --- src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java | 3 +++ .../java/org/auioc/mods/arnicalib/Initialization.java | 2 ++ .../mods/arnicalib/client/command/AHClientCommands.java | 8 ++++---- .../mods/arnicalib/server/command/AHServerCommands.java | 8 ++++---- src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java | 2 ++ .../auioc/mods/arnicalib/utils/game/RegistryUtils.java | 2 ++ .../org/auioc/mods/arnicalib/utils/java/VersionUtils.java | 2 ++ 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java b/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java index f69fd0ee..8d768471 100644 --- a/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java +++ b/src/main/java/org/auioc/mods/arnicalib/ArnicaLib.java @@ -38,4 +38,7 @@ public static String i18n(String key) { return MOD_ID + "." + key; } + @Deprecated /** For compatibility only */ + public static final String MODID = "arnicalib"; + } diff --git a/src/main/java/org/auioc/mods/arnicalib/Initialization.java b/src/main/java/org/auioc/mods/arnicalib/Initialization.java index eab9db40..e1711edd 100644 --- a/src/main/java/org/auioc/mods/arnicalib/Initialization.java +++ b/src/main/java/org/auioc/mods/arnicalib/Initialization.java @@ -20,6 +20,8 @@ @SuppressWarnings("unused") public final class Initialization { + private Initialization() {} + public static void init() { final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); final IEventBus forgeEventBus = MinecraftForge.EVENT_BUS; diff --git a/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java b/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java index 2843881d..f7990edf 100644 --- a/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java +++ b/src/main/java/org/auioc/mods/arnicalib/client/command/AHClientCommands.java @@ -15,6 +15,10 @@ public static void register(CommandDispatcher dispatcher) { getAHNode(dispatcher); } + public static CommandNode getAHNode(CommandDispatcher dispatcher) { + return getRootNode(dispatcher); + } + /** * @since 5.0.2 * @deprecated Use {@link #getAHNode} instead @@ -28,8 +32,4 @@ public static CommandNode getRootNode(CommandDispatcher getAHNode(CommandDispatcher dispatcher) { - return getRootNode(dispatcher); - } - } diff --git a/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java b/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java index bcee950c..a27da305 100644 --- a/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java +++ b/src/main/java/org/auioc/mods/arnicalib/server/command/AHServerCommands.java @@ -22,6 +22,10 @@ public static void register(CommandDispatcher dispatcher) { getAHNode(dispatcher).addChild(NODE); } + public static CommandNode getAHNode(CommandDispatcher dispatcher) { + return getRootNode(dispatcher); + } + /** * @since 4.1.0 * @deprecated Use {@link #getAHNode} instead @@ -35,8 +39,4 @@ public static CommandNode getRootNode(CommandDispatcher getAHNode(CommandDispatcher dispatcher) { - return getRootNode(dispatcher); - } - } diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java b/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java index b35d7d9c..352cb113 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/LogUtil.java @@ -7,6 +7,8 @@ public class LogUtil { + private LogUtil() {} + private static StackTraceElement getCaller() { StackTraceElement[] callStack = Thread.currentThread().getStackTrace(); diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java b/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java index 8cfda480..77627d76 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/game/RegistryUtils.java @@ -15,6 +15,8 @@ public class RegistryUtils { + private RegistryUtils() {} + public static final Predicate> IS_VANILLA = (entry) -> entry.getRegistryName().getNamespace().equals("minecraft"); public static > List getAllRegistryObjects(DeferredRegister deferredRegister) { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java b/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java index c4c7a57e..9864d21b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/java/VersionUtils.java @@ -10,6 +10,8 @@ public class VersionUtils { + private VersionUtils() {} + private static final Marker MARKER = LogUtil.getMarker(VersionUtils.class); private static final Pair DEFAULT_VERSION_TUPLE = Pair.of("0", "0");