refactor(next): mod client

auioc · Sep 28, 2022 · 3404bd1 · 3404bd1
1 parent 92df613
commit 3404bd1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java b/src/main/java/org/auioc/mcmod/arnicalib/Initialization.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib;
 
-import org.auioc.mcmod.arnicalib.client.config.AHClientConfig;
-import org.auioc.mcmod.arnicalib.client.event.AHClientEventHandler;
+import org.auioc.mcmod.arnicalib.mod.client.config.AHClientConfig;
+import org.auioc.mcmod.arnicalib.mod.client.event.AHClientEventHandler;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHGlobalLootModifiers;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemConditions;
 import org.auioc.mcmod.arnicalib.mod.server.loot.AHLootItemFunctions;

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/AHCommands.java
@@ -1,6 +1,6 @@
 package org.auioc.mcmod.arnicalib.game.command;
 
-import org.auioc.mcmod.arnicalib.client.command.AHClientCommands;
+import org.auioc.mcmod.arnicalib.mod.client.command.AHClientCommands;
 import org.auioc.mcmod.arnicalib.server.command.AHServerCommands;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.tree.CommandNode;

diff --git a/...alib/client/command/AHClientCommands.java → .../mod/client/command/AHClientCommands.java b/...alib/client/command/AHClientCommands.java → .../mod/client/command/AHClientCommands.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.client.command;
+package org.auioc.mcmod.arnicalib.mod.client.command;
 
 import static net.minecraft.commands.Commands.literal;
 import java.util.List;

diff --git a/...nicalib/client/config/AHClientConfig.java → ...lib/mod/client/config/AHClientConfig.java b/...nicalib/client/config/AHClientConfig.java → ...lib/mod/client/config/AHClientConfig.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.client.config;
+package org.auioc.mcmod.arnicalib.mod.client.config;
 
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -10,19 +10,19 @@ public class AHClientConfig {
 
     public static final ForgeConfigSpec CONFIG;
 
-    public static final BooleanValue EnableAdvancedTooltip;
-    public static final BooleanValue AdvancedTooltipOnlyOnDebug;
-    public static final BooleanValue AdvancedTooltipOnlyOnShift;
+    public static final BooleanValue enableAdvancedTooltip;
+    public static final BooleanValue advancedTooltipOnlyOnDebug;
+    public static final BooleanValue advancedTooltipOnlyOnShift;
 
     static {
         final ForgeConfigSpec.Builder b = new ForgeConfigSpec.Builder();
 
         {
             b.push("advanced_tooltip");
 
-            EnableAdvancedTooltip = b.define("enable", true);
-            AdvancedTooltipOnlyOnDebug = b.define("only_on_debug", true);
-            AdvancedTooltipOnlyOnShift = b.define("only_on_shift", false);
+            enableAdvancedTooltip = b.define("enable", true);
+            advancedTooltipOnlyOnDebug = b.define("only_on_debug", true);
+            advancedTooltipOnlyOnShift = b.define("only_on_shift", false);
 
             b.pop();
         }

diff --git a/...ib/client/event/AHClientEventHandler.java → ...od/client/event/AHClientEventHandler.java b/...ib/client/event/AHClientEventHandler.java → ...od/client/event/AHClientEventHandler.java
@@ -1,7 +1,7 @@
-package org.auioc.mcmod.arnicalib.client.event;
+package org.auioc.mcmod.arnicalib.mod.client.event;
 
-import org.auioc.mcmod.arnicalib.client.command.AHClientCommands;
-import org.auioc.mcmod.arnicalib.client.event.handler.TooltipEventHandler;
+import org.auioc.mcmod.arnicalib.mod.client.command.AHClientCommands;
+import org.auioc.mcmod.arnicalib.mod.client.event.handler.TooltipEventHandler;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.RegisterClientCommandsEvent;

diff --git a/...nt/event/handler/TooltipEventHandler.java → ...nt/event/handler/TooltipEventHandler.java b/...nt/event/handler/TooltipEventHandler.java → ...nt/event/handler/TooltipEventHandler.java
@@ -1,8 +1,8 @@
-package org.auioc.mcmod.arnicalib.client.event.handler;
+package org.auioc.mcmod.arnicalib.mod.client.event.handler;
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.client.config.AHClientConfig;
 import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
+import org.auioc.mcmod.arnicalib.mod.client.config.AHClientConfig;
 import org.lwjgl.glfw.GLFW;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
@@ -23,9 +23,9 @@ public class TooltipEventHandler {
     private static Minecraft mc = Minecraft.getInstance();
 
     public static void handle(ItemTooltipEvent event) {
-        if (!AHClientConfig.EnableAdvancedTooltip.get()) return;
-        if (AHClientConfig.AdvancedTooltipOnlyOnDebug.get() && !isDebugMode()) return;
-        if (AHClientConfig.AdvancedTooltipOnlyOnShift.get() && !isShiftKeyDown()) return;
+        if (!AHClientConfig.enableAdvancedTooltip.get()) return;
+        if (AHClientConfig.advancedTooltipOnlyOnDebug.get() && !isDebugMode()) return;
+        if (AHClientConfig.advancedTooltipOnlyOnShift.get() && !isShiftKeyDown()) return;
 
         ItemStack itemStack = event.getItemStack();
         if (itemStack.isEmpty()) return;