From 8a7fbd6b22c6262a071b7819ec54da28fc598cc2 Mon Sep 17 00:00:00 2001
From: WakelessSloth56 <wsloth56@foxmail.com>
Date: Wed, 28 Sep 2022 01:04:12 +0800
Subject: [PATCH] refactor(next): chat

---
 .../arnicalib/client/event/handler/TooltipEventHandler.java     | 2 +-
 .../arnicalib/{utils/game => game/chat}/MessageHelper.java      | 2 +-
 .../mcmod/arnicalib/{utils/game => game/chat}/TextUtils.java    | 2 +-
 .../auioc/mcmod/arnicalib/game/command/CommandExceptions.java   | 2 +-
 .../arnicalib/game/command/argument/LanguageInfoArgument.java   | 2 +-
 .../mcmod/arnicalib/game/command/node/VersionCommandNode.java   | 2 +-
 .../org/auioc/mcmod/arnicalib/game/gui/screen/SimpleScreen.java | 2 +-
 .../mcmod/arnicalib/server/event/AHServerEventFactory.java      | 2 +-
 .../auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java | 1 +
 .../java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java    | 1 +
 10 files changed, 10 insertions(+), 8 deletions(-)
 rename src/main/java/org/auioc/mcmod/arnicalib/{utils/game => game/chat}/MessageHelper.java (98%)
 rename src/main/java/org/auioc/mcmod/arnicalib/{utils/game => game/chat}/TextUtils.java (98%)

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java b/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java
index e5a9e93d..54b71099 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/client/event/handler/TooltipEventHandler.java
@@ -2,7 +2,7 @@
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
 import org.auioc.mcmod.arnicalib.client.config.AHClientConfig;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import org.lwjgl.glfw.GLFW;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/MessageHelper.java b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/MessageHelper.java
similarity index 98%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/MessageHelper.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/chat/MessageHelper.java
index 0b93e4a5..cdd32f08 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/MessageHelper.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/MessageHelper.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game;
+package org.auioc.mcmod.arnicalib.game.chat;
 
 import org.auioc.mcmod.arnicalib.base.function.StringToStringFunction;
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java
similarity index 98%
rename from src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java
rename to src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java
index 211306ad..b65ed87b 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java
@@ -1,4 +1,4 @@
-package org.auioc.mcmod.arnicalib.utils.game;
+package org.auioc.mcmod.arnicalib.game.chat;
 
 import java.util.List;
 import net.minecraft.Util;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
index 5f0f0a15..f9be773c 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/CommandExceptions.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.game.command;
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.mojang.brigadier.exceptions.BuiltInExceptionProvider;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
index b9fb6766..c7875551 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/argument/LanguageInfoArgument.java
@@ -3,7 +3,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
index 36bb046a..8eb60314 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/node/VersionCommandNode.java
@@ -6,7 +6,7 @@
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.ArnicaLib;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/gui/screen/SimpleScreen.java b/src/main/java/org/auioc/mcmod/arnicalib/game/gui/screen/SimpleScreen.java
index 498cc0e0..f9bd1077 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/game/gui/screen/SimpleScreen.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/game/gui/screen/SimpleScreen.java
@@ -1,7 +1,7 @@
 package org.auioc.mcmod.arnicalib.game.gui.screen;
 
 import org.auioc.mcmod.arnicalib.ArnicaLib;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java b/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java
index 7ce4663c..cd70ad25 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/server/event/AHServerEventFactory.java
@@ -8,6 +8,7 @@
 import javax.annotation.Nullable;
 import org.apache.logging.log4j.Marker;
 import org.auioc.mcmod.arnicalib.base.log.LogUtil;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import org.auioc.mcmod.arnicalib.server.event.impl.CatMorningGiftChanceEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.EyeOfEnderSurvivableEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.FishingRodCastEvent;
@@ -16,7 +17,6 @@
 import org.auioc.mcmod.arnicalib.server.event.impl.PiglinStanceEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerLoginEvent;
 import org.auioc.mcmod.arnicalib.server.event.impl.ServerPlayerSendMessageEvent;
-import org.auioc.mcmod.arnicalib.utils.game.TextUtils;
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java
index ba92540b..a91adfef 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java
@@ -2,6 +2,7 @@
 
 import java.util.function.Function;
 import javax.annotation.Nullable;
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.ChatFormatting;
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java
index 12cb9a22..c0356f9c 100644
--- a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java
+++ b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/I18nUtils.java
@@ -1,5 +1,6 @@
 package org.auioc.mcmod.arnicalib.utils.game;
 
+import org.auioc.mcmod.arnicalib.game.chat.TextUtils;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;