更改包名（top.xujiayao -> com.xujiayao）

Xujiayao · Jan 3, 2024 · e845376 · e845376
1 parent d42e3a6
commit e845376
Show file tree

Hide file tree

Showing 36 changed files with 226 additions and 226 deletions.
diff --git a/README.md b/README.md
@@ -159,9 +159,9 @@ Languages currently available:
 
 This project is licensed under the [MIT license](https://github.com/Xujiayao/MC-Discord-Chat/blob/master/LICENSE).
 
-Exceptionally, the `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file was obtained from BRForgers/DisFabric on December 31, 2020, licensed under the Mozilla Public License 2.0 (MPL-2.0).
+Exceptionally, the `src/main/java/com/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file was obtained from BRForgers/DisFabric on December 31, 2020, licensed under the Mozilla Public License 2.0 (MPL-2.0).
 
-> More details of the `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file:
+> More details of the `src/main/java/com/xujiayao/mcdiscordchat/utils/MarkdownParser.java` file:
 >
 > Author: allanf181 (Allan Fernando)
 >

diff --git a/README_CN.md b/README_CN.md
@@ -159,9 +159,9 @@ MC-Discord-Chat (MCDC), formerly known as MCDiscordChat, a practical and powerfu
 
 本项目采用 [MIT 许可证](https://github.com/Xujiayao/MC-Discord-Chat/blob/master/LICENSE) 进行授权。
 
-作为例外，`src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件于 2020 年 12 月 31 日从 BRForgers/DisFabric 获取，采用 Mozilla 公共许可证 2.0 (MPL-2.0) 进行授权。
+作为例外，`src/main/java/com/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件于 2020 年 12 月 31 日从 BRForgers/DisFabric 获取，采用 Mozilla 公共许可证 2.0 (MPL-2.0) 进行授权。
 
-> `src/main/java/top/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件的更多详情：
+> `src/main/java/com/xujiayao/mcdiscordchat/utils/MarkdownParser.java` 文件的更多详情：
 >
 > 作者：allanf181 (Allan Fernando)
 >

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # Mod Properties
 mod_version=2.2.5
-maven_group=top.xujiayao
+maven_group=com.xujiayao
 archives_base_name=MC-Discord-Chat
 
 # Wrapper Properties

diff --git a/...va/top/xujiayao/mcdiscordchat/Config.java → ...va/com/xujiayao/mcdiscordchat/Config.java b/...va/top/xujiayao/mcdiscordchat/Config.java → ...va/com/xujiayao/mcdiscordchat/Config.java
@@ -1,9 +1,9 @@
-package top.xujiayao.mcdiscordchat;
+package com.xujiayao.mcdiscordchat;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static top.xujiayao.mcdiscordchat.Main.VERSION;
+import static com.xujiayao.mcdiscordchat.Main.VERSION;
 
 /**
  * @author Xujiayao

diff --git a/...java/top/xujiayao/mcdiscordchat/Main.java → ...java/com/xujiayao/mcdiscordchat/Main.java b/...java/top/xujiayao/mcdiscordchat/Main.java → ...java/com/xujiayao/mcdiscordchat/Main.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat;
+package com.xujiayao.mcdiscordchat;
 
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -25,13 +25,13 @@
 //$$ import org.apache.logging.log4j.Logger;
 //$$ import org.apache.logging.log4j.LogManager;
 //#endif
-import top.xujiayao.mcdiscordchat.discord.DiscordEventListener;
-import top.xujiayao.mcdiscordchat.minecraft.MinecraftCommands;
-import top.xujiayao.mcdiscordchat.multi_server.MultiServer;
-import top.xujiayao.mcdiscordchat.utils.ConfigManager;
-import top.xujiayao.mcdiscordchat.utils.ConsoleLogListener;
-import top.xujiayao.mcdiscordchat.utils.Translations;
-import top.xujiayao.mcdiscordchat.utils.Utils;
+import com.xujiayao.mcdiscordchat.discord.DiscordEventListener;
+import com.xujiayao.mcdiscordchat.minecraft.MinecraftCommands;
+import com.xujiayao.mcdiscordchat.multi_server.MultiServer;
+import com.xujiayao.mcdiscordchat.utils.ConfigManager;
+import com.xujiayao.mcdiscordchat.utils.ConsoleLogListener;
+import com.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Utils;
 
 import java.io.File;
 import java.time.Duration;

diff --git a/...ordchat/discord/DiscordCommandOutput.java → ...ordchat/discord/DiscordCommandOutput.java b/...ordchat/discord/DiscordCommandOutput.java → ...ordchat/discord/DiscordCommandOutput.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.discord;
+package com.xujiayao.mcdiscordchat.discord;
 
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.minecraft.server.command.CommandOutput;

diff --git a/...ordchat/discord/DiscordEventListener.java → ...ordchat/discord/DiscordEventListener.java b/...ordchat/discord/DiscordEventListener.java → ...ordchat/discord/DiscordEventListener.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.discord;
+package com.xujiayao.mcdiscordchat.discord;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.ParseResults;
@@ -37,9 +37,9 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import top.xujiayao.mcdiscordchat.utils.MarkdownParser;
-import top.xujiayao.mcdiscordchat.utils.Translations;
-import top.xujiayao.mcdiscordchat.utils.Utils;
+import com.xujiayao.mcdiscordchat.utils.MarkdownParser;
+import com.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -53,12 +53,12 @@
 import java.util.stream.Stream;
 import java.util.zip.GZIPInputStream;
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.JDA;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
-import static top.xujiayao.mcdiscordchat.Main.SERVER;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.JDA;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.SERVER;
 
 /**
  * @author Xujiayao

diff --git a/...cordchat/minecraft/MinecraftCommands.java → ...cordchat/minecraft/MinecraftCommands.java b/...cordchat/minecraft/MinecraftCommands.java → ...cordchat/minecraft/MinecraftCommands.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.minecraft;
+package com.xujiayao.mcdiscordchat.minecraft;
 
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -7,13 +7,13 @@
 //$$ import net.minecraft.text.LiteralText;
 //#endif
 import net.minecraft.text.Text;
-import top.xujiayao.mcdiscordchat.utils.MarkdownParser;
-import top.xujiayao.mcdiscordchat.utils.Translations;
-import top.xujiayao.mcdiscordchat.utils.Utils;
+import com.xujiayao.mcdiscordchat.utils.MarkdownParser;
+import com.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Utils;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
 
 /**
  * @author Xujiayao

diff --git a/...dchat/minecraft/mixins/MixinLanguage.java → ...dchat/minecraft/mixins/MixinLanguage.java b/...dchat/minecraft/mixins/MixinLanguage.java → ...dchat/minecraft/mixins/MixinLanguage.java
@@ -1,5 +1,5 @@
 //#if MC >= 11900
-package top.xujiayao.mcdiscordchat.minecraft.mixins;
+package com.xujiayao.mcdiscordchat.minecraft.mixins;
 
 import net.minecraft.util.Language;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...mixins/MixinPlayerAdvancementTracker.java → ...mixins/MixinPlayerAdvancementTracker.java b/...mixins/MixinPlayerAdvancementTracker.java → ...mixins/MixinPlayerAdvancementTracker.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.minecraft.mixins;
+package com.xujiayao.mcdiscordchat.minecraft.mixins;
 
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
 import net.minecraft.advancement.AdvancementEntry;
@@ -11,11 +11,11 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import top.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Translations;
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
 
 /**
  * @author Xujiayao

diff --git a/.../minecraft/mixins/MixinPlayerManager.java → .../minecraft/mixins/MixinPlayerManager.java b/.../minecraft/mixins/MixinPlayerManager.java → .../minecraft/mixins/MixinPlayerManager.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.minecraft.mixins;
+package com.xujiayao.mcdiscordchat.minecraft.mixins;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -24,20 +24,20 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import top.xujiayao.mcdiscordchat.utils.Translations;
-import top.xujiayao.mcdiscordchat.utils.Utils;
+import com.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Utils;
 
 //#if MC < 11900
 //$$ import java.util.UUID;
 //#endif
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.HTTP_CLIENT;
-import static top.xujiayao.mcdiscordchat.Main.JDA;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
-import static top.xujiayao.mcdiscordchat.Main.WEBHOOK;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.HTTP_CLIENT;
+import static com.xujiayao.mcdiscordchat.Main.JDA;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.WEBHOOK;
 
 /**
  * @author Xujiayao

diff --git a/...mixins/MixinServerPlayNetworkHandler.java → ...mixins/MixinServerPlayNetworkHandler.java b/...mixins/MixinServerPlayNetworkHandler.java → ...mixins/MixinServerPlayNetworkHandler.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.minecraft.mixins;
+package com.xujiayao.mcdiscordchat.minecraft.mixins;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
@@ -37,24 +37,24 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import top.xujiayao.mcdiscordchat.utils.MarkdownParser;
-import top.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.MarkdownParser;
+import com.xujiayao.mcdiscordchat.utils.Translations;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.HTTP_CLIENT;
-import static top.xujiayao.mcdiscordchat.Main.JDA;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
-import static top.xujiayao.mcdiscordchat.Main.MINECRAFT_LAST_RESET_TIME;
-import static top.xujiayao.mcdiscordchat.Main.MINECRAFT_SEND_COUNT;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
-import static top.xujiayao.mcdiscordchat.Main.SERVER;
-import static top.xujiayao.mcdiscordchat.Main.WEBHOOK;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.HTTP_CLIENT;
+import static com.xujiayao.mcdiscordchat.Main.JDA;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.MINECRAFT_LAST_RESET_TIME;
+import static com.xujiayao.mcdiscordchat.Main.MINECRAFT_SEND_COUNT;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.SERVER;
+import static com.xujiayao.mcdiscordchat.Main.WEBHOOK;
 
 /**
  * @author Xujiayao

diff --git a/...craft/mixins/MixinServerPlayerEntity.java → ...craft/mixins/MixinServerPlayerEntity.java b/...craft/mixins/MixinServerPlayerEntity.java → ...craft/mixins/MixinServerPlayerEntity.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.minecraft.mixins;
+package com.xujiayao.mcdiscordchat.minecraft.mixins;
 
 import com.mojang.authlib.GameProfile;
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
@@ -18,11 +18,11 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import top.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Translations;
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
 
 /**
  * @author Xujiayao

diff --git a/...discordchat/multi_server/MultiServer.java → ...discordchat/multi_server/MultiServer.java b/...discordchat/multi_server/MultiServer.java → ...discordchat/multi_server/MultiServer.java
@@ -1,12 +1,12 @@
-package top.xujiayao.mcdiscordchat.multi_server;
+package com.xujiayao.mcdiscordchat.multi_server;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import top.xujiayao.mcdiscordchat.multi_server.client.Client;
-import top.xujiayao.mcdiscordchat.multi_server.server.Server;
-import top.xujiayao.mcdiscordchat.multi_server.server.UserThread;
-import top.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.multi_server.client.Client;
+import com.xujiayao.mcdiscordchat.multi_server.server.Server;
+import com.xujiayao.mcdiscordchat.multi_server.server.UserThread;
+import com.xujiayao.mcdiscordchat.utils.Translations;
 
 import java.time.Instant;
 import java.util.Collections;
@@ -15,11 +15,11 @@
 import java.util.Set;
 import java.util.TimerTask;
 
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.CHANNEL_TOPIC_MONITOR_TIMER;
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.CONSOLE_LOG_CHANNEL;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.CHANNEL_TOPIC_MONITOR_TIMER;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.CONSOLE_LOG_CHANNEL;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
 
 /**
  * @author Xujiayao

diff --git a/...scordchat/multi_server/client/Client.java → ...scordchat/multi_server/client/Client.java b/...scordchat/multi_server/client/Client.java → ...scordchat/multi_server/client/Client.java
@@ -1,9 +1,9 @@
-package top.xujiayao.mcdiscordchat.multi_server.client;
+package com.xujiayao.mcdiscordchat.multi_server.client;
 
 import java.net.Socket;
 
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
 
 /**
  * @author Xujiayao

diff --git a/...dchat/multi_server/client/ReadThread.java → ...dchat/multi_server/client/ReadThread.java b/...dchat/multi_server/client/ReadThread.java → ...dchat/multi_server/client/ReadThread.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.multi_server.client;
+package com.xujiayao.mcdiscordchat.multi_server.client;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
@@ -13,9 +13,9 @@
 //#endif
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import top.xujiayao.mcdiscordchat.utils.MarkdownParser;
-import top.xujiayao.mcdiscordchat.utils.Translations;
-import top.xujiayao.mcdiscordchat.utils.Utils;
+import com.xujiayao.mcdiscordchat.utils.MarkdownParser;
+import com.xujiayao.mcdiscordchat.utils.Translations;
+import com.xujiayao.mcdiscordchat.utils.Utils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,12 +35,12 @@
 import java.util.Properties;
 import java.util.Set;
 
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.JDA;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
-import static top.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
-import static top.xujiayao.mcdiscordchat.Main.SERVER;
-import static top.xujiayao.mcdiscordchat.Main.SERVER_STARTED_TIME;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.JDA;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.MULTI_SERVER;
+import static com.xujiayao.mcdiscordchat.Main.SERVER;
+import static com.xujiayao.mcdiscordchat.Main.SERVER_STARTED_TIME;
 
 /**
  * @author Xujiayao

diff --git a/...chat/multi_server/client/WriteThread.java → ...chat/multi_server/client/WriteThread.java b/...chat/multi_server/client/WriteThread.java → ...chat/multi_server/client/WriteThread.java
@@ -1,4 +1,4 @@
-package top.xujiayao.mcdiscordchat.multi_server.client;
+package com.xujiayao.mcdiscordchat.multi_server.client;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
@@ -7,7 +7,7 @@
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
 
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
 
 /**
  * @author Xujiayao

diff --git a/...scordchat/multi_server/server/Server.java → ...scordchat/multi_server/server/Server.java b/...scordchat/multi_server/server/Server.java → ...scordchat/multi_server/server/Server.java
@@ -1,12 +1,12 @@
-package top.xujiayao.mcdiscordchat.multi_server.server;
+package com.xujiayao.mcdiscordchat.multi_server.server;
 
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import static top.xujiayao.mcdiscordchat.Main.CONFIG;
-import static top.xujiayao.mcdiscordchat.Main.LOGGER;
+import static com.xujiayao.mcdiscordchat.Main.CONFIG;
+import static com.xujiayao.mcdiscordchat.Main.LOGGER;
 
 /**
  * @author Xujiayao