diff --git a/build.gradle b/build.gradle index 0f18f34e..51d24591 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,7 @@ tasks.named('jar', Jar).configure { @SuppressWarnings('GrMethodMayBeStatic') def relocate(origin) { - shadowJar.relocate(origin, "tk.sciwhiz12.concord.shadow.$origin") + shadowJar.relocate(origin, "dev.sciwhiz12.concord.shadow.$origin") } // noinspection UnnecessaryQualifiedReference diff --git a/gradle.properties b/gradle.properties index 84e633fd..512fb78b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # suppress inspection "UnusedProperty" for whole file # The information for the mod project -group=tk.sciwhiz12 +group=dev.sciwhiz12 modid=concord author=sciwhiz12 diff --git a/src/data/java/tk/sciwhiz12/concord/datagen/DataGeneration.java b/src/data/java/dev/sciwhiz12/concord/datagen/DataGeneration.java similarity index 97% rename from src/data/java/tk/sciwhiz12/concord/datagen/DataGeneration.java rename to src/data/java/dev/sciwhiz12/concord/datagen/DataGeneration.java index 9518a25a..af6cf5d2 100644 --- a/src/data/java/tk/sciwhiz12/concord/datagen/DataGeneration.java +++ b/src/data/java/dev/sciwhiz12/concord/datagen/DataGeneration.java @@ -20,8 +20,9 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.datagen; +package dev.sciwhiz12.concord.datagen; +import dev.sciwhiz12.concord.Concord; import net.minecraft.SharedConstants; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; @@ -33,7 +34,6 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.data.event.GatherDataEvent; -import tk.sciwhiz12.concord.Concord; import java.util.Optional; diff --git a/src/data/java/tk/sciwhiz12/concord/datagen/EnglishLanguage.java b/src/data/java/dev/sciwhiz12/concord/datagen/EnglishLanguage.java similarity index 90% rename from src/data/java/tk/sciwhiz12/concord/datagen/EnglishLanguage.java rename to src/data/java/dev/sciwhiz12/concord/datagen/EnglishLanguage.java index b6769f13..ce3158f5 100644 --- a/src/data/java/tk/sciwhiz12/concord/datagen/EnglishLanguage.java +++ b/src/data/java/dev/sciwhiz12/concord/datagen/EnglishLanguage.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.datagen; +package dev.sciwhiz12.concord.datagen; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.util.Messages; +import dev.sciwhiz12.concord.util.Translations; import net.minecraft.data.PackOutput; import net.neoforged.neoforge.common.data.LanguageProvider; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.util.Messages; -import tk.sciwhiz12.concord.util.Translations; public class EnglishLanguage extends LanguageProvider { public EnglishLanguage(PackOutput output) { diff --git a/src/main/java/tk/sciwhiz12/concord/ChatBot.java b/src/main/java/dev/sciwhiz12/concord/ChatBot.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/ChatBot.java rename to src/main/java/dev/sciwhiz12/concord/ChatBot.java index 4d81ffcc..23fc9e9a 100644 --- a/src/main/java/tk/sciwhiz12/concord/ChatBot.java +++ b/src/main/java/dev/sciwhiz12/concord/ChatBot.java @@ -20,9 +20,14 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord; +package dev.sciwhiz12.concord; import com.google.common.collect.Sets; +import dev.sciwhiz12.concord.msg.*; +import dev.sciwhiz12.concord.msg.chat.ChatForwarder; +import dev.sciwhiz12.concord.msg.chat.DefaultChatForwarder; +import dev.sciwhiz12.concord.msg.chat.WebhookChatForwarder; +import dev.sciwhiz12.concord.util.Messages; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.Permission; @@ -43,11 +48,6 @@ import org.jetbrains.annotations.ApiStatus; import org.slf4j.Marker; import org.slf4j.MarkerFactory; -import tk.sciwhiz12.concord.msg.*; -import tk.sciwhiz12.concord.msg.chat.ChatForwarder; -import tk.sciwhiz12.concord.msg.chat.DefaultChatForwarder; -import tk.sciwhiz12.concord.msg.chat.WebhookChatForwarder; -import tk.sciwhiz12.concord.util.Messages; import javax.annotation.Nullable; import java.util.Collections; diff --git a/src/main/java/tk/sciwhiz12/concord/Concord.java b/src/main/java/dev/sciwhiz12/concord/Concord.java similarity index 93% rename from src/main/java/tk/sciwhiz12/concord/Concord.java rename to src/main/java/dev/sciwhiz12/concord/Concord.java index dc611cd8..ec528d94 100644 --- a/src/main/java/tk/sciwhiz12/concord/Concord.java +++ b/src/main/java/dev/sciwhiz12/concord/Concord.java @@ -20,10 +20,17 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord; +package dev.sciwhiz12.concord; import com.google.common.base.Strings; import com.mojang.logging.LogUtils; +import dev.sciwhiz12.concord.command.ConcordCommand; +import dev.sciwhiz12.concord.command.EmoteCommandHook; +import dev.sciwhiz12.concord.command.ReportCommand; +import dev.sciwhiz12.concord.command.SayCommandHook; +import dev.sciwhiz12.concord.features.ConcordFeatures; +import dev.sciwhiz12.concord.network.ConcordNetwork; +import dev.sciwhiz12.concord.util.Messages; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.OnlineStatus; @@ -42,13 +49,6 @@ import net.neoforged.neoforge.event.server.ServerStartingEvent; import net.neoforged.neoforge.event.server.ServerStoppingEvent; import org.slf4j.Logger; -import tk.sciwhiz12.concord.command.ConcordCommand; -import tk.sciwhiz12.concord.command.EmoteCommandHook; -import tk.sciwhiz12.concord.command.ReportCommand; -import tk.sciwhiz12.concord.command.SayCommandHook; -import tk.sciwhiz12.concord.features.ConcordFeatures; -import tk.sciwhiz12.concord.network.ConcordNetwork; -import tk.sciwhiz12.concord.util.Messages; import javax.annotation.Nullable; import java.util.EnumSet; diff --git a/src/main/java/tk/sciwhiz12/concord/ConcordConfig.java b/src/main/java/dev/sciwhiz12/concord/ConcordConfig.java similarity index 99% rename from src/main/java/tk/sciwhiz12/concord/ConcordConfig.java rename to src/main/java/dev/sciwhiz12/concord/ConcordConfig.java index e42e429f..df63db97 100644 --- a/src/main/java/tk/sciwhiz12/concord/ConcordConfig.java +++ b/src/main/java/dev/sciwhiz12/concord/ConcordConfig.java @@ -20,12 +20,12 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord; +package dev.sciwhiz12.concord; +import dev.sciwhiz12.concord.util.Messages; import net.neoforged.fml.ModContainer; import net.neoforged.fml.config.ModConfig; import net.neoforged.neoforge.common.ModConfigSpec; -import tk.sciwhiz12.concord.util.Messages; import javax.annotation.Nullable; diff --git a/src/main/java/tk/sciwhiz12/concord/command/ConcordCommand.java b/src/main/java/dev/sciwhiz12/concord/command/ConcordCommand.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/command/ConcordCommand.java rename to src/main/java/dev/sciwhiz12/concord/command/ConcordCommand.java index 206e9ad0..953cd0ac 100644 --- a/src/main/java/tk/sciwhiz12/concord/command/ConcordCommand.java +++ b/src/main/java/dev/sciwhiz12/concord/command/ConcordCommand.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.command; +package dev.sciwhiz12.concord.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.util.Translations; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.network.chat.Component; import net.neoforged.neoforge.event.RegisterCommandsEvent; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.util.Translations; import static net.minecraft.ChatFormatting.GREEN; import static net.minecraft.ChatFormatting.RED; diff --git a/src/main/java/tk/sciwhiz12/concord/command/EmoteCommandHook.java b/src/main/java/dev/sciwhiz12/concord/command/EmoteCommandHook.java similarity index 95% rename from src/main/java/tk/sciwhiz12/concord/command/EmoteCommandHook.java rename to src/main/java/dev/sciwhiz12/concord/command/EmoteCommandHook.java index b6c15ea0..22a02209 100644 --- a/src/main/java/tk/sciwhiz12/concord/command/EmoteCommandHook.java +++ b/src/main/java/dev/sciwhiz12/concord/command/EmoteCommandHook.java @@ -20,12 +20,15 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.command; +package dev.sciwhiz12.concord.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.logging.LogUtils; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Messages; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.arguments.MessageArgument; import net.minecraft.network.chat.ChatType; @@ -33,9 +36,6 @@ import net.minecraft.server.players.PlayerList; import net.neoforged.neoforge.event.RegisterCommandsEvent; import org.slf4j.Logger; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Messages; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; import static net.minecraft.commands.Commands.argument; diff --git a/src/main/java/tk/sciwhiz12/concord/command/ReportCommand.java b/src/main/java/dev/sciwhiz12/concord/command/ReportCommand.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/command/ReportCommand.java rename to src/main/java/dev/sciwhiz12/concord/command/ReportCommand.java index d8241cbc..6f602f7d 100644 --- a/src/main/java/tk/sciwhiz12/concord/command/ReportCommand.java +++ b/src/main/java/dev/sciwhiz12/concord/command/ReportCommand.java @@ -20,12 +20,16 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.command; +package dev.sciwhiz12.concord.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Translations; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.minecraft.commands.CommandSourceStack; @@ -33,10 +37,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.neoforged.neoforge.event.RegisterCommandsEvent; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Translations; import java.time.Instant; diff --git a/src/main/java/tk/sciwhiz12/concord/command/SayCommandHook.java b/src/main/java/dev/sciwhiz12/concord/command/SayCommandHook.java similarity index 95% rename from src/main/java/tk/sciwhiz12/concord/command/SayCommandHook.java rename to src/main/java/dev/sciwhiz12/concord/command/SayCommandHook.java index 24572656..33d6cd23 100644 --- a/src/main/java/tk/sciwhiz12/concord/command/SayCommandHook.java +++ b/src/main/java/dev/sciwhiz12/concord/command/SayCommandHook.java @@ -20,12 +20,15 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.command; +package dev.sciwhiz12.concord.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.logging.LogUtils; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Messages; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.MessageArgument; @@ -34,9 +37,6 @@ import net.minecraft.server.players.PlayerList; import net.neoforged.neoforge.event.RegisterCommandsEvent; import org.slf4j.Logger; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Messages; import static net.minecraft.commands.Commands.argument; import static net.minecraft.commands.Commands.literal; diff --git a/src/main/java/tk/sciwhiz12/concord/command/package-info.java b/src/main/java/dev/sciwhiz12/concord/command/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/command/package-info.java rename to src/main/java/dev/sciwhiz12/concord/command/package-info.java index b14342ff..95bae45d 100644 --- a/src/main/java/tk/sciwhiz12/concord/command/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/command/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord.command; +package dev.sciwhiz12.concord.command; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/tk/sciwhiz12/concord/features/ConcordFeatures.java b/src/main/java/dev/sciwhiz12/concord/features/ConcordFeatures.java similarity index 98% rename from src/main/java/tk/sciwhiz12/concord/features/ConcordFeatures.java rename to src/main/java/dev/sciwhiz12/concord/features/ConcordFeatures.java index 09f6c7d0..6a9b4b69 100644 --- a/src/main/java/tk/sciwhiz12/concord/features/ConcordFeatures.java +++ b/src/main/java/dev/sciwhiz12/concord/features/ConcordFeatures.java @@ -20,8 +20,9 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.features; +package dev.sciwhiz12.concord.features; +import dev.sciwhiz12.concord.Concord; import net.minecraft.nbt.Tag; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.attachment.AttachmentType; @@ -30,7 +31,6 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.NeoForgeRegistries; import org.apache.maven.artifact.versioning.ArtifactVersion; -import tk.sciwhiz12.concord.Concord; import javax.annotation.Nullable; import java.util.Map; diff --git a/src/main/java/tk/sciwhiz12/concord/features/FeatureVersion.java b/src/main/java/dev/sciwhiz12/concord/features/FeatureVersion.java similarity index 98% rename from src/main/java/tk/sciwhiz12/concord/features/FeatureVersion.java rename to src/main/java/dev/sciwhiz12/concord/features/FeatureVersion.java index ea0b1508..8f510d8f 100644 --- a/src/main/java/tk/sciwhiz12/concord/features/FeatureVersion.java +++ b/src/main/java/dev/sciwhiz12/concord/features/FeatureVersion.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.features; +package dev.sciwhiz12.concord.features; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; diff --git a/src/main/java/tk/sciwhiz12/concord/network/package-info.java b/src/main/java/dev/sciwhiz12/concord/features/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/network/package-info.java rename to src/main/java/dev/sciwhiz12/concord/features/package-info.java index 72aa7801..11cec3e4 100644 --- a/src/main/java/tk/sciwhiz12/concord/network/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/features/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord.network; +package dev.sciwhiz12.concord.features; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/FormattingUtilities.java b/src/main/java/dev/sciwhiz12/concord/msg/FormattingUtilities.java similarity index 98% rename from src/main/java/tk/sciwhiz12/concord/msg/FormattingUtilities.java rename to src/main/java/dev/sciwhiz12/concord/msg/FormattingUtilities.java index becd4e2a..081cad76 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/FormattingUtilities.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/FormattingUtilities.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; +import dev.sciwhiz12.concord.ConcordConfig; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; import net.minecraft.network.chat.TextColor; -import tk.sciwhiz12.concord.ConcordConfig; import static net.minecraft.ChatFormatting.WHITE; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/MemberStatus.java b/src/main/java/dev/sciwhiz12/concord/msg/MemberStatus.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/msg/MemberStatus.java rename to src/main/java/dev/sciwhiz12/concord/msg/MemberStatus.java index 14e38d90..95b79c19 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/MemberStatus.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/MemberStatus.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; +import dev.sciwhiz12.concord.util.Translation; +import dev.sciwhiz12.concord.util.Translations; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.entities.Member; import net.minecraft.network.chat.TextColor; -import tk.sciwhiz12.concord.util.Translation; -import tk.sciwhiz12.concord.util.Translations; public enum MemberStatus { ONLINE(OnlineStatus.ONLINE, Translations.STATUS_ONLINE, 0x43b581, '\u25cf'), diff --git a/src/main/java/tk/sciwhiz12/concord/msg/MessageFormatter.java b/src/main/java/dev/sciwhiz12/concord/msg/MessageFormatter.java similarity index 98% rename from src/main/java/tk/sciwhiz12/concord/msg/MessageFormatter.java rename to src/main/java/dev/sciwhiz12/concord/msg/MessageFormatter.java index 276e8aeb..0e24a734 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/MessageFormatter.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/MessageFormatter.java @@ -20,9 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; import com.mojang.authlib.GameProfile; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Translations; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; @@ -33,8 +35,6 @@ import net.minecraft.network.chat.*; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.players.PlayerList; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Translations; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/MessageListener.java b/src/main/java/dev/sciwhiz12/concord/msg/MessageListener.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/msg/MessageListener.java rename to src/main/java/dev/sciwhiz12/concord/msg/MessageListener.java index 69887cdc..e6c40a4c 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/MessageListener.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/MessageListener.java @@ -20,8 +20,10 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.ConcordConfig; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageReference; @@ -33,8 +35,6 @@ import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.ServerChatEvent; import net.neoforged.neoforge.event.TickEvent; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.ConcordConfig; import java.util.Objects; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/Messaging.java b/src/main/java/dev/sciwhiz12/concord/msg/Messaging.java similarity index 94% rename from src/main/java/tk/sciwhiz12/concord/msg/Messaging.java rename to src/main/java/dev/sciwhiz12/concord/msg/Messaging.java index f00e23fc..5b39f8f4 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/Messaging.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/Messaging.java @@ -20,8 +20,16 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; - +package dev.sciwhiz12.concord.msg; + +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.features.ConcordFeatures; +import dev.sciwhiz12.concord.features.FeatureVersion; +import dev.sciwhiz12.concord.util.IntelligentTranslator; +import dev.sciwhiz12.concord.util.Translation; +import dev.sciwhiz12.concord.util.TranslationUtil; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; @@ -36,14 +44,6 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.jetbrains.annotations.ApiStatus; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.features.ConcordFeatures; -import tk.sciwhiz12.concord.features.FeatureVersion; -import tk.sciwhiz12.concord.util.IntelligentTranslator; -import tk.sciwhiz12.concord.util.Translation; -import tk.sciwhiz12.concord.util.TranslationUtil; import javax.annotation.Nullable; import java.util.EnumSet; @@ -53,8 +53,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.function.Function; -import static tk.sciwhiz12.concord.Concord.LOGGER; -import static tk.sciwhiz12.concord.Concord.MODID; +import static dev.sciwhiz12.concord.Concord.LOGGER; +import static dev.sciwhiz12.concord.Concord.MODID; public class Messaging { public static final ResourceLocation ICONS_FONT = new ResourceLocation(MODID, "icons"); diff --git a/src/main/java/tk/sciwhiz12/concord/msg/PlayerListener.java b/src/main/java/dev/sciwhiz12/concord/msg/PlayerListener.java similarity index 95% rename from src/main/java/tk/sciwhiz12/concord/msg/PlayerListener.java rename to src/main/java/dev/sciwhiz12/concord/msg/PlayerListener.java index 29f1c088..10f453d1 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/PlayerListener.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/PlayerListener.java @@ -20,8 +20,12 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Messages; +import dev.sciwhiz12.concord.util.Translation; import net.minecraft.advancements.DisplayInfo; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; @@ -33,10 +37,6 @@ import net.neoforged.neoforge.event.entity.living.LivingDeathEvent; import net.neoforged.neoforge.event.entity.player.AdvancementEvent; import net.neoforged.neoforge.event.entity.player.PlayerEvent; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Messages; -import tk.sciwhiz12.concord.util.Translation; public class PlayerListener { private final ChatBot bot; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/SentMessageMemory.java b/src/main/java/dev/sciwhiz12/concord/msg/SentMessageMemory.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/msg/SentMessageMemory.java rename to src/main/java/dev/sciwhiz12/concord/msg/SentMessageMemory.java index 1a00c46a..ceca544b 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/SentMessageMemory.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/SentMessageMemory.java @@ -20,13 +20,13 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.mojang.authlib.GameProfile; +import dev.sciwhiz12.concord.ChatBot; import net.minecraft.network.chat.Component; -import tk.sciwhiz12.concord.ChatBot; import javax.annotation.Nullable; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/StatusListener.java b/src/main/java/dev/sciwhiz12/concord/msg/StatusListener.java similarity index 92% rename from src/main/java/tk/sciwhiz12/concord/msg/StatusListener.java rename to src/main/java/dev/sciwhiz12/concord/msg/StatusListener.java index ed8d5b8f..39ebe7fa 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/StatusListener.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/StatusListener.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.msg; +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.util.Messages; import net.neoforged.bus.api.EventPriority; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.server.ServerStartedEvent; import net.neoforged.neoforge.event.server.ServerStoppingEvent; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.util.Messages; public class StatusListener { private final ChatBot bot; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/chat/ChatForwarder.java b/src/main/java/dev/sciwhiz12/concord/msg/chat/ChatForwarder.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/msg/chat/ChatForwarder.java rename to src/main/java/dev/sciwhiz12/concord/msg/chat/ChatForwarder.java index 9d0d6f57..3f64fb36 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/chat/ChatForwarder.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/chat/ChatForwarder.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg.chat; +package dev.sciwhiz12.concord.msg.chat; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java b/src/main/java/dev/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java similarity index 95% rename from src/main/java/tk/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java rename to src/main/java/dev/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java index fa31af20..007cd7ec 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/chat/DefaultChatForwarder.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg.chat; +package dev.sciwhiz12.concord.msg.chat; +import dev.sciwhiz12.concord.ChatBot; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; -import tk.sciwhiz12.concord.ChatBot; public class DefaultChatForwarder implements ChatForwarder { private final ChatBot bot; diff --git a/src/main/java/tk/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java b/src/main/java/dev/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java rename to src/main/java/dev/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java index eb68f4d7..ee7ebdc8 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/chat/WebhookChatForwarder.java @@ -20,15 +20,15 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.msg.chat; +package dev.sciwhiz12.concord.msg.chat; +import dev.sciwhiz12.concord.ChatBot; +import dev.sciwhiz12.concord.ConcordConfig; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.WebhookClient; import net.dv8tion.jda.api.requests.restaction.WebhookMessageCreateAction; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; -import tk.sciwhiz12.concord.ChatBot; -import tk.sciwhiz12.concord.ConcordConfig; import javax.annotation.Nullable; import java.util.EnumSet; diff --git a/src/main/java/tk/sciwhiz12/concord/util/package-info.java b/src/main/java/dev/sciwhiz12/concord/msg/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/util/package-info.java rename to src/main/java/dev/sciwhiz12/concord/msg/package-info.java index 2c646634..62485cf9 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/msg/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.msg; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/tk/sciwhiz12/concord/network/ConcordNetwork.java b/src/main/java/dev/sciwhiz12/concord/network/ConcordNetwork.java similarity index 94% rename from src/main/java/tk/sciwhiz12/concord/network/ConcordNetwork.java rename to src/main/java/dev/sciwhiz12/concord/network/ConcordNetwork.java index 22809641..8f7f5c18 100644 --- a/src/main/java/tk/sciwhiz12/concord/network/ConcordNetwork.java +++ b/src/main/java/dev/sciwhiz12/concord/network/ConcordNetwork.java @@ -20,8 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.network; +package dev.sciwhiz12.concord.network; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.features.ConcordFeatures; +import dev.sciwhiz12.concord.features.FeatureVersion; import net.minecraft.Util; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.network.event.OnGameConfigurationEvent; @@ -29,9 +32,6 @@ import net.neoforged.neoforge.network.handling.IPayloadContext; import net.neoforged.neoforge.network.registration.IPayloadRegistrar; import org.apache.maven.artifact.versioning.ArtifactVersion; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.features.ConcordFeatures; -import tk.sciwhiz12.concord.features.FeatureVersion; import java.util.Arrays; import java.util.Map; diff --git a/src/main/java/tk/sciwhiz12/concord/network/FeaturesPayload.java b/src/main/java/dev/sciwhiz12/concord/network/FeaturesPayload.java similarity index 96% rename from src/main/java/tk/sciwhiz12/concord/network/FeaturesPayload.java rename to src/main/java/dev/sciwhiz12/concord/network/FeaturesPayload.java index 08cf4e89..0309aeab 100644 --- a/src/main/java/tk/sciwhiz12/concord/network/FeaturesPayload.java +++ b/src/main/java/dev/sciwhiz12/concord/network/FeaturesPayload.java @@ -20,14 +20,14 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.network; +package dev.sciwhiz12.concord.network; +import dev.sciwhiz12.concord.Concord; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.resources.ResourceLocation; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import tk.sciwhiz12.concord.Concord; import java.util.Map; diff --git a/src/main/java/tk/sciwhiz12/concord/network/FeaturesTask.java b/src/main/java/dev/sciwhiz12/concord/network/FeaturesTask.java similarity index 94% rename from src/main/java/tk/sciwhiz12/concord/network/FeaturesTask.java rename to src/main/java/dev/sciwhiz12/concord/network/FeaturesTask.java index a1599644..ee129ed4 100644 --- a/src/main/java/tk/sciwhiz12/concord/network/FeaturesTask.java +++ b/src/main/java/dev/sciwhiz12/concord/network/FeaturesTask.java @@ -20,16 +20,16 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.network; +package dev.sciwhiz12.concord.network; +import dev.sciwhiz12.concord.Concord; +import dev.sciwhiz12.concord.features.FeatureVersion; import net.minecraft.Util; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; import net.minecraft.network.protocol.configuration.ServerConfigurationPacketListener; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.network.configuration.ICustomConfigurationTask; import org.apache.maven.artifact.versioning.ArtifactVersion; -import tk.sciwhiz12.concord.Concord; -import tk.sciwhiz12.concord.features.FeatureVersion; import java.util.Arrays; import java.util.Map; diff --git a/src/main/java/tk/sciwhiz12/concord/features/package-info.java b/src/main/java/dev/sciwhiz12/concord/network/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/features/package-info.java rename to src/main/java/dev/sciwhiz12/concord/network/package-info.java index 7dc96453..239d3d57 100644 --- a/src/main/java/tk/sciwhiz12/concord/features/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/network/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord.features; +package dev.sciwhiz12.concord.network; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/tk/sciwhiz12/concord/package-info.java b/src/main/java/dev/sciwhiz12/concord/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/package-info.java rename to src/main/java/dev/sciwhiz12/concord/package-info.java index 50fd1338..e595d763 100644 --- a/src/main/java/tk/sciwhiz12/concord/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord; +package dev.sciwhiz12.concord; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/tk/sciwhiz12/concord/util/IntelligentTranslator.java b/src/main/java/dev/sciwhiz12/concord/util/IntelligentTranslator.java similarity index 99% rename from src/main/java/tk/sciwhiz12/concord/util/IntelligentTranslator.java rename to src/main/java/dev/sciwhiz12/concord/util/IntelligentTranslator.java index 43a97f8a..3161277a 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/IntelligentTranslator.java +++ b/src/main/java/dev/sciwhiz12/concord/util/IntelligentTranslator.java @@ -20,7 +20,7 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.util; import com.google.common.collect.Maps; import net.minecraft.network.chat.Component; diff --git a/src/main/java/tk/sciwhiz12/concord/util/Messages.java b/src/main/java/dev/sciwhiz12/concord/util/Messages.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/util/Messages.java rename to src/main/java/dev/sciwhiz12/concord/util/Messages.java index 5643c04e..ff303b20 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/Messages.java +++ b/src/main/java/dev/sciwhiz12/concord/util/Messages.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.util; +import dev.sciwhiz12.concord.Concord; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import tk.sciwhiz12.concord.Concord; public enum Messages implements Translation { BOT_START("bot.start", "1.0.0", "_Discord integration is now active!_"), diff --git a/src/main/java/tk/sciwhiz12/concord/util/Translation.java b/src/main/java/dev/sciwhiz12/concord/util/Translation.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/util/Translation.java rename to src/main/java/dev/sciwhiz12/concord/util/Translation.java index 33a853a0..04433139 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/Translation.java +++ b/src/main/java/dev/sciwhiz12/concord/util/Translation.java @@ -20,8 +20,12 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.util; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.features.ConcordFeatures; +import dev.sciwhiz12.concord.features.FeatureVersion; +import dev.sciwhiz12.concord.network.ConcordNetwork; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -29,10 +33,6 @@ import net.minecraft.world.entity.Entity; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.checkerframework.checker.nullness.qual.Nullable; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.features.ConcordFeatures; -import tk.sciwhiz12.concord.features.FeatureVersion; -import tk.sciwhiz12.concord.network.ConcordNetwork; /** * A message with a translation key and its corresponding default text in English ({@code en_us}). diff --git a/src/main/java/tk/sciwhiz12/concord/util/TranslationUtil.java b/src/main/java/dev/sciwhiz12/concord/util/TranslationUtil.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/util/TranslationUtil.java rename to src/main/java/dev/sciwhiz12/concord/util/TranslationUtil.java index 907599ac..2871595f 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/TranslationUtil.java +++ b/src/main/java/dev/sciwhiz12/concord/util/TranslationUtil.java @@ -20,9 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.util; import com.google.common.collect.Streams; +import dev.sciwhiz12.concord.ConcordConfig; +import dev.sciwhiz12.concord.features.ConcordFeatures; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.HoverEvent; @@ -30,8 +32,6 @@ import net.minecraft.network.chat.Style; import net.minecraft.network.chat.contents.TranslatableContents; import net.minecraft.server.level.ServerPlayer; -import tk.sciwhiz12.concord.ConcordConfig; -import tk.sciwhiz12.concord.features.ConcordFeatures; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/tk/sciwhiz12/concord/util/Translations.java b/src/main/java/dev/sciwhiz12/concord/util/Translations.java similarity index 98% rename from src/main/java/tk/sciwhiz12/concord/util/Translations.java rename to src/main/java/dev/sciwhiz12/concord/util/Translations.java index 80b21030..c979ae74 100644 --- a/src/main/java/tk/sciwhiz12/concord/util/Translations.java +++ b/src/main/java/dev/sciwhiz12/concord/util/Translations.java @@ -20,11 +20,11 @@ * SOFTWARE. */ -package tk.sciwhiz12.concord.util; +package dev.sciwhiz12.concord.util; +import dev.sciwhiz12.concord.Concord; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import tk.sciwhiz12.concord.Concord; public enum Translations implements Translation { // Member status diff --git a/src/main/java/tk/sciwhiz12/concord/msg/package-info.java b/src/main/java/dev/sciwhiz12/concord/util/package-info.java similarity index 97% rename from src/main/java/tk/sciwhiz12/concord/msg/package-info.java rename to src/main/java/dev/sciwhiz12/concord/util/package-info.java index cf907604..460e12e4 100644 --- a/src/main/java/tk/sciwhiz12/concord/msg/package-info.java +++ b/src/main/java/dev/sciwhiz12/concord/util/package-info.java @@ -23,7 +23,7 @@ @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault -package tk.sciwhiz12.concord.msg; +package dev.sciwhiz12.concord.util; import net.minecraft.FieldsAreNonnullByDefault; import net.minecraft.MethodsReturnNonnullByDefault;