From 8e95b2eda1036784e09dc5e1795327e5e14aee31 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Tue, 9 Dec 2025 19:27:21 -0500 Subject: [PATCH] Update CI and java package naming (#7) * github: ci / workflow related updates * java: package renames --- .dockerignore | 1 + .github/dependabot.yml | 10 ++- .github/workflows/publish-docker.yml | 7 +- License.txt => LICENSE | 0 docker-compose.yaml | 2 +- .../pcsx2/hifumi}/BrowsableEmbed.java | 2 +- .../pcsx2/hifumi}/CompatIndex.java | 2 +- .../pcsx2/hifumi}/CpuIndex.java | 6 +- .../pcsx2/hifumi}/EventLogging.java | 17 ++--- .../pcsx2/hifumi}/GameIndex.java | 9 +-- .../pcsx2/hifumi}/GpuIndex.java | 6 +- .../pcsx2/hifumi}/HifumiBot.java | 46 ++++++------- .../pcsx2/hifumi}/Scheduler.java | 2 +- .../pcsx2/hifumi}/async/AntiBotRunnable.java | 15 ++-- .../hifumi}/async/AutoModReviewRunnable.java | 15 ++-- .../hifumi}/async/EntryBarrierRunnable.java | 7 +- .../async/MessageBulkDeleteRunnable.java | 5 +- .../MessageBulkDeleteTargetedRunnable.java | 5 +- .../hifumi}/async/SpamReviewRunnable.java | 13 ++-- .../async/UrlChangeReviewRunnable.java | 15 ++-- .../hifumi}/charting/AutomodChartData.java | 2 +- .../hifumi}/charting/ChartGenerator.java | 6 +- .../hifumi}/charting/MemberChartData.java | 2 +- .../hifumi}/charting/WarezChartData.java | 2 +- .../AbstractMessageContextCommand.java | 2 +- .../hifumi}/command/AbstractSlashCommand.java | 2 +- .../command/AbstractUserContextCommand.java | 2 +- .../pcsx2/hifumi}/command/CommandIndex.java | 69 ++++++++++--------- .../hifumi}/command/context/CommandBan.java | 9 +-- .../command/context/CommandReverseImage.java | 5 +- .../command/context/CommandTranslateEN.java | 8 +-- .../command/context/CommandWarezMsg.java | 9 +-- .../command/dynamic/DynamicChoice.java | 5 +- .../command/dynamic/DynamicCommand.java | 2 +- .../command/dynamic/DynamicSubcommand.java | 2 +- .../hifumi}/command/slash/CommandAbout.java | 15 ++-- .../command/slash/CommandBulkDelete.java | 9 +-- .../hifumi}/command/slash/CommandCPU.java | 13 ++-- .../command/slash/CommandChartGen.java | 7 +- .../hifumi}/command/slash/CommandDynCmd.java | 17 ++--- .../hifumi}/command/slash/CommandEmulog.java | 15 ++-- .../hifumi}/command/slash/CommandGPU.java | 13 ++-- .../command/slash/CommandGameIndex.java | 9 +-- .../hifumi}/command/slash/CommandPFP.java | 9 +-- .../hifumi}/command/slash/CommandPerms.java | 11 +-- .../hifumi}/command/slash/CommandPride.java | 13 ++-- .../hifumi}/command/slash/CommandPrompt.java | 5 +- .../hifumi}/command/slash/CommandReload.java | 7 +- .../hifumi}/command/slash/CommandRun.java | 7 +- .../hifumi}/command/slash/CommandSay.java | 5 +- .../hifumi}/command/slash/CommandSerial.java | 9 +-- .../command/slash/CommandServerMetadata.java | 9 +-- .../command/slash/CommandShutdown.java | 7 +- .../command/slash/CommandSpamKick.java | 15 ++-- .../command/slash/CommandTranslate.java | 8 +-- .../hifumi}/command/slash/CommandUnwarez.java | 19 ++--- .../hifumi}/command/slash/CommandWarez.java | 9 +-- .../command/slash/CommandWarezHistory.java | 7 +- .../hifumi}/command/slash/CommandWhois.java | 21 +++--- .../pcsx2/hifumi}/config/Config.java | 2 +- .../pcsx2/hifumi}/config/ConfigManager.java | 5 +- .../pcsx2/hifumi}/config/ConfigType.java | 2 +- .../pcsx2/hifumi}/config/DynCmdConfig.java | 4 +- .../hifumi}/config/EmulogParserConfig.java | 2 +- .../pcsx2/hifumi}/config/IConfig.java | 2 +- .../config/SettingsIniParserConfig.java | 2 +- .../pcsx2/hifumi}/database/Database.java | 35 +++++----- .../pcsx2/hifumi}/database/SQLite.java | 6 +- .../database/objects/AttachmentObject.java | 2 +- .../database/objects/AutoModEventObject.java | 2 +- .../database/objects/CommandEventObject.java | 2 +- .../database/objects/CounterObject.java | 2 +- .../objects/InteractionEventObject.java | 2 +- .../database/objects/MemberEventObject.java | 2 +- .../database/objects/MessageObject.java | 2 +- .../database/objects/WarezEventObject.java | 2 +- .../event/AbstractInteractionElement.java | 2 +- .../hifumi}/event/AutoModEventListener.java | 15 ++-- .../hifumi}/event/ButtonEventListener.java | 21 +++--- .../hifumi}/event/MemberEventListener.java | 15 ++-- .../event/MessageContextCommandListener.java | 15 ++-- .../hifumi}/event/MessageEventListener.java | 33 ++++----- .../hifumi}/event/ModalEventListener.java | 13 ++-- .../hifumi}/event/RoleEventListener.java | 9 +-- .../event/SelectMenuEventListener.java | 9 +-- .../hifumi}/event/SlashCommandListener.java | 19 ++--- .../hifumi}/event/UserEventListener.java | 5 +- .../pcsx2/hifumi}/modal/BanHandler.java | 11 +-- .../pcsx2/hifumi}/modal/DyncmdHandler.java | 19 ++--- .../pcsx2/hifumi}/modal/PromptHandler.java | 11 +-- .../pcsx2/hifumi}/modal/SayHandler.java | 9 +-- .../pcsx2/hifumi}/moderation/ModActions.java | 13 ++-- .../pcsx2/hifumi}/parse/AbstractParser.java | 2 +- .../pcsx2/hifumi}/parse/CrashParser.java | 7 +- .../pcsx2/hifumi}/parse/EmulogParser.java | 9 +-- .../pcsx2/hifumi}/parse/PnachParser.java | 7 +- .../pcsx2/hifumi}/parse/PnachParserError.java | 2 +- .../hifumi}/parse/SettingsIniParser.java | 13 ++-- .../hifumi}/permissions/PermissionLevel.java | 2 +- .../permissions/PermissionManager.java | 5 +- .../pcsx2/hifumi}/util/CommandUtils.java | 2 +- .../pcsx2/hifumi}/util/DNSQueryResult.java | 2 +- .../pcsx2/hifumi}/util/DateTimeUtils.java | 2 +- .../pcsx2/hifumi}/util/EmbedUtil.java | 7 +- .../pcsx2/hifumi}/util/Log.java | 2 +- .../pcsx2/hifumi}/util/MemberUtils.java | 2 +- .../pcsx2/hifumi}/util/Messaging.java | 5 +- .../hifumi}/util/PixivSourceFetcher.java | 5 +- .../pcsx2/hifumi}/util/Refreshable.java | 2 +- .../pcsx2/hifumi}/util/RoleUtils.java | 2 +- .../pcsx2/hifumi}/util/SimpleSearch.java | 2 +- .../pcsx2/hifumi}/util/Strings.java | 2 +- .../pcsx2/hifumi}/util/TimeUtils.java | 2 +- .../pcsx2/hifumi}/util/UserUtils.java | 5 +- .../pcsx2/hifumi}/util/WarezUtil.java | 13 ++-- 115 files changed, 521 insertions(+), 447 deletions(-) rename License.txt => LICENSE (100%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/BrowsableEmbed.java (99%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/CompatIndex.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/CpuIndex.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/EventLogging.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/GameIndex.java (99%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/GpuIndex.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/HifumiBot.java (84%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/Scheduler.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/AntiBotRunnable.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/AutoModReviewRunnable.java (87%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/EntryBarrierRunnable.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/MessageBulkDeleteRunnable.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/MessageBulkDeleteTargetedRunnable.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/SpamReviewRunnable.java (88%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/async/UrlChangeReviewRunnable.java (89%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/charting/AutomodChartData.java (69%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/charting/ChartGenerator.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/charting/MemberChartData.java (68%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/charting/WarezChartData.java (68%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/AbstractMessageContextCommand.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/AbstractSlashCommand.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/AbstractUserContextCommand.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/CommandIndex.java (75%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/context/CommandBan.java (91%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/context/CommandReverseImage.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/context/CommandTranslateEN.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/context/CommandWarezMsg.java (82%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/dynamic/DynamicChoice.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/dynamic/DynamicCommand.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/dynamic/DynamicSubcommand.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandAbout.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandBulkDelete.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandCPU.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandChartGen.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandDynCmd.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandEmulog.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandGPU.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandGameIndex.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandPFP.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandPerms.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandPride.java (87%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandPrompt.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandReload.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandRun.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandSay.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandSerial.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandServerMetadata.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandShutdown.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandSpamKick.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandTranslate.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandUnwarez.java (91%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandWarez.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandWarezHistory.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/command/slash/CommandWhois.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/Config.java (99%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/ConfigManager.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/ConfigType.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/DynCmdConfig.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/EmulogParserConfig.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/IConfig.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/config/SettingsIniParserConfig.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/Database.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/SQLite.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/AttachmentObject.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/AutoModEventObject.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/CommandEventObject.java (91%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/CounterObject.java (88%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/InteractionEventObject.java (89%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/MemberEventObject.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/MessageObject.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/database/objects/WarezEventObject.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/AbstractInteractionElement.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/AutoModEventListener.java (77%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/ButtonEventListener.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/MemberEventListener.java (89%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/MessageContextCommandListener.java (92%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/MessageEventListener.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/ModalEventListener.java (75%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/RoleEventListener.java (94%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/SelectMenuEventListener.java (86%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/SlashCommandListener.java (89%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/event/UserEventListener.java (83%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/modal/BanHandler.java (85%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/modal/DyncmdHandler.java (84%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/modal/PromptHandler.java (77%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/modal/SayHandler.java (77%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/moderation/ModActions.java (90%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/AbstractParser.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/CrashParser.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/EmulogParser.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/PnachParser.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/PnachParserError.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/parse/SettingsIniParser.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/permissions/PermissionLevel.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/permissions/PermissionManager.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/CommandUtils.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/DNSQueryResult.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/DateTimeUtils.java (85%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/EmbedUtil.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/Log.java (95%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/MemberUtils.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/Messaging.java (99%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/PixivSourceFetcher.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/Refreshable.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/RoleUtils.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/SimpleSearch.java (98%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/Strings.java (97%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/TimeUtils.java (96%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/UserUtils.java (93%) rename src/main/java/{io/github/redpanda4552/HifumiBot => net/pcsx2/hifumi}/util/WarezUtil.java (94%) diff --git a/.dockerignore b/.dockerignore index 72b4c2e..99fd9eb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,3 +8,4 @@ target/ *.iml .idea/ *.jar +data/ \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 23a21de..c903003 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,8 +6,16 @@ updates: schedule: # Check for updates to GitHub Actions every week interval: "monthly" + groups: + ci-deps: + patterns: + - "*" - package-ecosystem: "maven" directory: "/" schedule: # Check for updates to GitHub Actions every week - interval: "monthly" \ No newline at end of file + interval: "monthly" + groups: + java-deps: + patterns: + - "*" \ No newline at end of file diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index a8d846f..a15b277 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -18,9 +18,11 @@ jobs: steps: - name: Checkout + if: github.repository == 'PCSX2/hifumi' uses: actions/checkout@v4 - name: Log in to GHCR + if: github.repository == 'PCSX2/hifumi' uses: docker/login-action@v3 with: registry: ghcr.io @@ -28,11 +30,12 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build & Push Docker image + if: github.repository == 'PCSX2/hifumi' uses: docker/build-push-action@v6 with: context: . push: true # FIXME: replace these when transitioning repo ownership tags: | - ghcr.io/redpanda4552/hifumibot:latest - ghcr.io/redpanda4552/hifumibot:${{ github.ref_name }} + ghcr.io/pcsx2/hifumi:latest + ghcr.io/pcsx2/hifumi:${{ github.ref_name }} diff --git a/License.txt b/LICENSE similarity index 100% rename from License.txt rename to LICENSE diff --git a/docker-compose.yaml b/docker-compose.yaml index a32f27d..2598ff8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ services: hifumi: - image: ghcr.io/redpanda4552/hifumibot:latest + image: ghcr.io/pcsx2/hifumi:latest container_name: hifumi restart: unless-stopped environment: diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/BrowsableEmbed.java b/src/main/java/net/pcsx2/hifumi/BrowsableEmbed.java similarity index 99% rename from src/main/java/io/github/redpanda4552/HifumiBot/BrowsableEmbed.java rename to src/main/java/net/pcsx2/hifumi/BrowsableEmbed.java index 267d3a6..f587173 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/BrowsableEmbed.java +++ b/src/main/java/net/pcsx2/hifumi/BrowsableEmbed.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.time.OffsetDateTime; import java.util.ArrayList; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/CompatIndex.java b/src/main/java/net/pcsx2/hifumi/CompatIndex.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/CompatIndex.java rename to src/main/java/net/pcsx2/hifumi/CompatIndex.java index 01e1bc6..9451be9 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/CompatIndex.java +++ b/src/main/java/net/pcsx2/hifumi/CompatIndex.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; public class CompatIndex { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/CpuIndex.java b/src/main/java/net/pcsx2/hifumi/CpuIndex.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/CpuIndex.java rename to src/main/java/net/pcsx2/hifumi/CpuIndex.java index 9f5ae84..7a6c84b 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/CpuIndex.java +++ b/src/main/java/net/pcsx2/hifumi/CpuIndex.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.io.IOException; import java.util.Set; @@ -32,8 +32,8 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Refreshable; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Refreshable; public class CpuIndex implements Refreshable { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/EventLogging.java b/src/main/java/net/pcsx2/hifumi/EventLogging.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/EventLogging.java rename to src/main/java/net/pcsx2/hifumi/EventLogging.java index 5a41a35..04eb644 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/EventLogging.java +++ b/src/main/java/net/pcsx2/hifumi/EventLogging.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.awt.Color; import java.time.Duration; @@ -8,13 +8,14 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.AttachmentObject; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject.Action; -import io.github.redpanda4552.HifumiBot.util.DateTimeUtils; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.AttachmentObject; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.database.objects.WarezEventObject; +import net.pcsx2.hifumi.database.objects.WarezEventObject.Action; +import net.pcsx2.hifumi.util.DateTimeUtils; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message.Attachment; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/GameIndex.java b/src/main/java/net/pcsx2/hifumi/GameIndex.java similarity index 99% rename from src/main/java/io/github/redpanda4552/HifumiBot/GameIndex.java rename to src/main/java/net/pcsx2/hifumi/GameIndex.java index fa1a268..c8898cb 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/GameIndex.java +++ b/src/main/java/net/pcsx2/hifumi/GameIndex.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.io.IOException; import java.util.HashMap; @@ -31,9 +31,10 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.yaml.snakeyaml.Yaml; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Refreshable; +import net.pcsx2.hifumi.util.EmbedUtil; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Refreshable; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import okhttp3.Request; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/GpuIndex.java b/src/main/java/net/pcsx2/hifumi/GpuIndex.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/GpuIndex.java rename to src/main/java/net/pcsx2/hifumi/GpuIndex.java index 4c5aeea..0d61b99 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/GpuIndex.java +++ b/src/main/java/net/pcsx2/hifumi/GpuIndex.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.io.IOException; import java.util.HashMap; @@ -33,8 +33,8 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Refreshable; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Refreshable; public class GpuIndex implements Refreshable { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/HifumiBot.java b/src/main/java/net/pcsx2/hifumi/HifumiBot.java similarity index 84% rename from src/main/java/io/github/redpanda4552/HifumiBot/HifumiBot.java rename to src/main/java/net/pcsx2/hifumi/HifumiBot.java index d373587..450d8dd 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/HifumiBot.java +++ b/src/main/java/net/pcsx2/hifumi/HifumiBot.java @@ -21,35 +21,35 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.time.Duration; import java.time.Instant; import com.deepl.api.Translator; +import net.pcsx2.hifumi.command.CommandIndex; +import net.pcsx2.hifumi.config.Config; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.config.ConfigType; +import net.pcsx2.hifumi.config.DynCmdConfig; +import net.pcsx2.hifumi.config.EmulogParserConfig; +import net.pcsx2.hifumi.config.SettingsIniParserConfig; +import net.pcsx2.hifumi.database.SQLite; +import net.pcsx2.hifumi.event.AutoModEventListener; +import net.pcsx2.hifumi.event.ButtonEventListener; +import net.pcsx2.hifumi.event.MemberEventListener; +import net.pcsx2.hifumi.event.MessageContextCommandListener; +import net.pcsx2.hifumi.event.MessageEventListener; +import net.pcsx2.hifumi.event.ModalEventListener; +import net.pcsx2.hifumi.event.RoleEventListener; +import net.pcsx2.hifumi.event.SelectMenuEventListener; +import net.pcsx2.hifumi.event.SlashCommandListener; +import net.pcsx2.hifumi.event.UserEventListener; +import net.pcsx2.hifumi.permissions.PermissionManager; +import net.pcsx2.hifumi.util.Log; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Strings; -import io.github.redpanda4552.HifumiBot.command.CommandIndex; -import io.github.redpanda4552.HifumiBot.config.Config; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.config.ConfigType; -import io.github.redpanda4552.HifumiBot.config.DynCmdConfig; -import io.github.redpanda4552.HifumiBot.config.EmulogParserConfig; -import io.github.redpanda4552.HifumiBot.config.SettingsIniParserConfig; -import io.github.redpanda4552.HifumiBot.database.SQLite; -import io.github.redpanda4552.HifumiBot.event.AutoModEventListener; -import io.github.redpanda4552.HifumiBot.event.ButtonEventListener; -import io.github.redpanda4552.HifumiBot.event.MemberEventListener; -import io.github.redpanda4552.HifumiBot.event.MessageContextCommandListener; -import io.github.redpanda4552.HifumiBot.event.MessageEventListener; -import io.github.redpanda4552.HifumiBot.event.ModalEventListener; -import io.github.redpanda4552.HifumiBot.event.RoleEventListener; -import io.github.redpanda4552.HifumiBot.event.SelectMenuEventListener; -import io.github.redpanda4552.HifumiBot.event.SlashCommandListener; -import io.github.redpanda4552.HifumiBot.event.UserEventListener; -import io.github.redpanda4552.HifumiBot.permissions.PermissionManager; -import io.github.redpanda4552.HifumiBot.util.Log; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Strings; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/Scheduler.java b/src/main/java/net/pcsx2/hifumi/Scheduler.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/Scheduler.java rename to src/main/java/net/pcsx2/hifumi/Scheduler.java index 6b7b0f2..9a17e7f 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/Scheduler.java +++ b/src/main/java/net/pcsx2/hifumi/Scheduler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot; +package net.pcsx2.hifumi; import java.util.HashMap; import java.util.Set; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/AntiBotRunnable.java b/src/main/java/net/pcsx2/hifumi/async/AntiBotRunnable.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/AntiBotRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/AntiBotRunnable.java index 1bfd69a..aecd796 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/AntiBotRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/AntiBotRunnable.java @@ -1,15 +1,16 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.awt.Color; import java.time.OffsetDateTime; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Strings; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Strings; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/AutoModReviewRunnable.java b/src/main/java/net/pcsx2/hifumi/async/AutoModReviewRunnable.java similarity index 87% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/AutoModReviewRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/AutoModReviewRunnable.java index 8137425..b9cf593 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/AutoModReviewRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/AutoModReviewRunnable.java @@ -1,15 +1,16 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.awt.Color; import java.time.OffsetDateTime; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.AutoModEventObject; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.Log; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.AutoModEventObject; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.Log; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/EntryBarrierRunnable.java b/src/main/java/net/pcsx2/hifumi/async/EntryBarrierRunnable.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/EntryBarrierRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/EntryBarrierRunnable.java index 7f53d8c..b5600e7 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/EntryBarrierRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/EntryBarrierRunnable.java @@ -1,9 +1,10 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.util.List; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.permissions.PermissionLevel; + import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteRunnable.java b/src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteRunnable.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteRunnable.java index f8d03d7..608c924 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteRunnable.java @@ -1,11 +1,12 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.time.Duration; import java.time.OffsetDateTime; import java.util.List; import java.util.stream.Collectors; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteTargetedRunnable.java b/src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteTargetedRunnable.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteTargetedRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteTargetedRunnable.java index 0860fc6..9fa5cb9 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/MessageBulkDeleteTargetedRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/MessageBulkDeleteTargetedRunnable.java @@ -1,11 +1,12 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.time.Duration; import java.time.OffsetDateTime; import java.util.List; import java.util.stream.Collectors; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/SpamReviewRunnable.java b/src/main/java/net/pcsx2/hifumi/async/SpamReviewRunnable.java similarity index 88% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/SpamReviewRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/SpamReviewRunnable.java index 86076f9..ee84e37 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/SpamReviewRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/SpamReviewRunnable.java @@ -1,14 +1,15 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.awt.Color; import java.time.OffsetDateTime; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/async/UrlChangeReviewRunnable.java b/src/main/java/net/pcsx2/hifumi/async/UrlChangeReviewRunnable.java similarity index 89% rename from src/main/java/io/github/redpanda4552/HifumiBot/async/UrlChangeReviewRunnable.java rename to src/main/java/net/pcsx2/hifumi/async/UrlChangeReviewRunnable.java index 496682c..0d699d4 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/async/UrlChangeReviewRunnable.java +++ b/src/main/java/net/pcsx2/hifumi/async/UrlChangeReviewRunnable.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.async; +package net.pcsx2.hifumi.async; import java.awt.Color; import java.time.Duration; @@ -6,12 +6,13 @@ import java.util.ArrayList; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.Strings; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.Strings; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/charting/AutomodChartData.java b/src/main/java/net/pcsx2/hifumi/charting/AutomodChartData.java similarity index 69% rename from src/main/java/io/github/redpanda4552/HifumiBot/charting/AutomodChartData.java rename to src/main/java/net/pcsx2/hifumi/charting/AutomodChartData.java index 2dfd360..ea1465a 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/charting/AutomodChartData.java +++ b/src/main/java/net/pcsx2/hifumi/charting/AutomodChartData.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.charting; +package net.pcsx2.hifumi.charting; public class AutomodChartData { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/charting/ChartGenerator.java b/src/main/java/net/pcsx2/hifumi/charting/ChartGenerator.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/charting/ChartGenerator.java rename to src/main/java/net/pcsx2/hifumi/charting/ChartGenerator.java index 8405ae4..eef4719 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/charting/ChartGenerator.java +++ b/src/main/java/net/pcsx2/hifumi/charting/ChartGenerator.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.charting; +package net.pcsx2.hifumi.charting; import java.awt.Color; import java.io.ByteArrayOutputStream; @@ -13,8 +13,8 @@ import org.jfree.chart.renderer.category.BarRenderer; import org.jfree.chart.renderer.category.StandardBarPainter; import org.jfree.data.category.DefaultCategoryDataset; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.util.Messaging; public class ChartGenerator { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/charting/MemberChartData.java b/src/main/java/net/pcsx2/hifumi/charting/MemberChartData.java similarity index 68% rename from src/main/java/io/github/redpanda4552/HifumiBot/charting/MemberChartData.java rename to src/main/java/net/pcsx2/hifumi/charting/MemberChartData.java index 269a4c4..cbf60ca 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/charting/MemberChartData.java +++ b/src/main/java/net/pcsx2/hifumi/charting/MemberChartData.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.charting; +package net.pcsx2.hifumi.charting; public class MemberChartData { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/charting/WarezChartData.java b/src/main/java/net/pcsx2/hifumi/charting/WarezChartData.java similarity index 68% rename from src/main/java/io/github/redpanda4552/HifumiBot/charting/WarezChartData.java rename to src/main/java/net/pcsx2/hifumi/charting/WarezChartData.java index b7676df..59c0865 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/charting/WarezChartData.java +++ b/src/main/java/net/pcsx2/hifumi/charting/WarezChartData.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.charting; +package net.pcsx2.hifumi.charting; public class WarezChartData { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractMessageContextCommand.java b/src/main/java/net/pcsx2/hifumi/command/AbstractMessageContextCommand.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractMessageContextCommand.java rename to src/main/java/net/pcsx2/hifumi/command/AbstractMessageContextCommand.java index 2b0c365..c0dad6f 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractMessageContextCommand.java +++ b/src/main/java/net/pcsx2/hifumi/command/AbstractMessageContextCommand.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command; +package net.pcsx2.hifumi.command; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractSlashCommand.java b/src/main/java/net/pcsx2/hifumi/command/AbstractSlashCommand.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractSlashCommand.java rename to src/main/java/net/pcsx2/hifumi/command/AbstractSlashCommand.java index 87730ed..d28ece3 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractSlashCommand.java +++ b/src/main/java/net/pcsx2/hifumi/command/AbstractSlashCommand.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command; +package net.pcsx2.hifumi.command; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractUserContextCommand.java b/src/main/java/net/pcsx2/hifumi/command/AbstractUserContextCommand.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractUserContextCommand.java rename to src/main/java/net/pcsx2/hifumi/command/AbstractUserContextCommand.java index fcc8284..91d1c23 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/AbstractUserContextCommand.java +++ b/src/main/java/net/pcsx2/hifumi/command/AbstractUserContextCommand.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.command; +package net.pcsx2.hifumi.command; import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/CommandIndex.java b/src/main/java/net/pcsx2/hifumi/command/CommandIndex.java similarity index 75% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/CommandIndex.java rename to src/main/java/net/pcsx2/hifumi/command/CommandIndex.java index d76885b..403da0c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/CommandIndex.java +++ b/src/main/java/net/pcsx2/hifumi/command/CommandIndex.java @@ -21,43 +21,44 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command; +package net.pcsx2.hifumi.command; import java.util.HashMap; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.context.CommandBan; -import io.github.redpanda4552.HifumiBot.command.context.CommandReverseImage; -import io.github.redpanda4552.HifumiBot.command.context.CommandTranslateEN; -import io.github.redpanda4552.HifumiBot.command.context.CommandWarezMsg; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicChoice; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicSubcommand; -import io.github.redpanda4552.HifumiBot.command.slash.CommandAbout; -import io.github.redpanda4552.HifumiBot.command.slash.CommandBulkDelete; -import io.github.redpanda4552.HifumiBot.command.slash.CommandCPU; -import io.github.redpanda4552.HifumiBot.command.slash.CommandChartGen; -import io.github.redpanda4552.HifumiBot.command.slash.CommandDynCmd; -import io.github.redpanda4552.HifumiBot.command.slash.CommandEmulog; -import io.github.redpanda4552.HifumiBot.command.slash.CommandGPU; -import io.github.redpanda4552.HifumiBot.command.slash.CommandGameIndex; -import io.github.redpanda4552.HifumiBot.command.slash.CommandPFP; -import io.github.redpanda4552.HifumiBot.command.slash.CommandPerms; -import io.github.redpanda4552.HifumiBot.command.slash.CommandPride; -import io.github.redpanda4552.HifumiBot.command.slash.CommandPrompt; -import io.github.redpanda4552.HifumiBot.command.slash.CommandReload; -import io.github.redpanda4552.HifumiBot.command.slash.CommandRun; -import io.github.redpanda4552.HifumiBot.command.slash.CommandSay; -import io.github.redpanda4552.HifumiBot.command.slash.CommandSerial; -import io.github.redpanda4552.HifumiBot.command.slash.CommandServerMetadata; -import io.github.redpanda4552.HifumiBot.command.slash.CommandShutdown; -import io.github.redpanda4552.HifumiBot.command.slash.CommandSpamKick; -import io.github.redpanda4552.HifumiBot.command.slash.CommandTranslate; -import io.github.redpanda4552.HifumiBot.command.slash.CommandUnwarez; -import io.github.redpanda4552.HifumiBot.command.slash.CommandWarez; -import io.github.redpanda4552.HifumiBot.command.slash.CommandWarezHistory; -import io.github.redpanda4552.HifumiBot.command.slash.CommandWhois; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.context.CommandBan; +import net.pcsx2.hifumi.command.context.CommandReverseImage; +import net.pcsx2.hifumi.command.context.CommandTranslateEN; +import net.pcsx2.hifumi.command.context.CommandWarezMsg; +import net.pcsx2.hifumi.command.dynamic.DynamicChoice; +import net.pcsx2.hifumi.command.dynamic.DynamicCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicSubcommand; +import net.pcsx2.hifumi.command.slash.CommandAbout; +import net.pcsx2.hifumi.command.slash.CommandBulkDelete; +import net.pcsx2.hifumi.command.slash.CommandCPU; +import net.pcsx2.hifumi.command.slash.CommandChartGen; +import net.pcsx2.hifumi.command.slash.CommandDynCmd; +import net.pcsx2.hifumi.command.slash.CommandEmulog; +import net.pcsx2.hifumi.command.slash.CommandGPU; +import net.pcsx2.hifumi.command.slash.CommandGameIndex; +import net.pcsx2.hifumi.command.slash.CommandPFP; +import net.pcsx2.hifumi.command.slash.CommandPerms; +import net.pcsx2.hifumi.command.slash.CommandPride; +import net.pcsx2.hifumi.command.slash.CommandPrompt; +import net.pcsx2.hifumi.command.slash.CommandReload; +import net.pcsx2.hifumi.command.slash.CommandRun; +import net.pcsx2.hifumi.command.slash.CommandSay; +import net.pcsx2.hifumi.command.slash.CommandSerial; +import net.pcsx2.hifumi.command.slash.CommandServerMetadata; +import net.pcsx2.hifumi.command.slash.CommandShutdown; +import net.pcsx2.hifumi.command.slash.CommandSpamKick; +import net.pcsx2.hifumi.command.slash.CommandTranslate; +import net.pcsx2.hifumi.command.slash.CommandUnwarez; +import net.pcsx2.hifumi.command.slash.CommandWarez; +import net.pcsx2.hifumi.command.slash.CommandWarezHistory; +import net.pcsx2.hifumi.command.slash.CommandWhois; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandBan.java b/src/main/java/net/pcsx2/hifumi/command/context/CommandBan.java similarity index 91% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandBan.java rename to src/main/java/net/pcsx2/hifumi/command/context/CommandBan.java index 2bdba4d..e504d9d 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandBan.java +++ b/src/main/java/net/pcsx2/hifumi/command/context/CommandBan.java @@ -1,8 +1,9 @@ -package io.github.redpanda4552.HifumiBot.command.context; +package net.pcsx2.hifumi.command.context; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractUserContextCommand; +import net.pcsx2.hifumi.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractUserContextCommand; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandReverseImage.java b/src/main/java/net/pcsx2/hifumi/command/context/CommandReverseImage.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandReverseImage.java rename to src/main/java/net/pcsx2/hifumi/command/context/CommandReverseImage.java index a9c1dd2..b152873 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandReverseImage.java +++ b/src/main/java/net/pcsx2/hifumi/command/context/CommandReverseImage.java @@ -21,13 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.context; +package net.pcsx2.hifumi.command.context; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.command.AbstractMessageContextCommand; +import net.pcsx2.hifumi.command.AbstractMessageContextCommand; + import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandTranslateEN.java b/src/main/java/net/pcsx2/hifumi/command/context/CommandTranslateEN.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandTranslateEN.java rename to src/main/java/net/pcsx2/hifumi/command/context/CommandTranslateEN.java index 78cc56b..74c613b 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandTranslateEN.java +++ b/src/main/java/net/pcsx2/hifumi/command/context/CommandTranslateEN.java @@ -21,15 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.context; +package net.pcsx2.hifumi.command.context; import java.awt.Color; import com.deepl.api.TextResult; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractMessageContextCommand; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractMessageContextCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandWarezMsg.java b/src/main/java/net/pcsx2/hifumi/command/context/CommandWarezMsg.java similarity index 82% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandWarezMsg.java rename to src/main/java/net/pcsx2/hifumi/command/context/CommandWarezMsg.java index d9dd8ca..8d90651 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/context/CommandWarezMsg.java +++ b/src/main/java/net/pcsx2/hifumi/command/context/CommandWarezMsg.java @@ -1,10 +1,11 @@ -package io.github.redpanda4552.HifumiBot.command.context; +package net.pcsx2.hifumi.command.context; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.command.AbstractMessageContextCommand; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; -import io.github.redpanda4552.HifumiBot.util.WarezUtil; +import net.pcsx2.hifumi.command.AbstractMessageContextCommand; +import net.pcsx2.hifumi.util.MemberUtils; +import net.pcsx2.hifumi.util.WarezUtil; + import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicChoice.java b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicChoice.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicChoice.java rename to src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicChoice.java index 4bd6be7..3dfe7e7 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicChoice.java +++ b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicChoice.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.dynamic; +package net.pcsx2.hifumi.command.dynamic; + +import net.pcsx2.hifumi.util.EmbedUtil; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicCommand.java b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicCommand.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicCommand.java rename to src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicCommand.java index 5b7813e..1acaeac 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicCommand.java +++ b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicCommand.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.dynamic; +package net.pcsx2.hifumi.command.dynamic; import java.util.HashMap; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicSubcommand.java b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicSubcommand.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicSubcommand.java rename to src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicSubcommand.java index 683cb58..292bde3 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/dynamic/DynamicSubcommand.java +++ b/src/main/java/net/pcsx2/hifumi/command/dynamic/DynamicSubcommand.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.dynamic; +package net.pcsx2.hifumi.command.dynamic; import java.util.HashMap; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandAbout.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandAbout.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandAbout.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandAbout.java index 15662f0..33ad0dc 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandAbout.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandAbout.java @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.Scheduler.NoSuchRunnableException; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.config.ConfigType; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.Scheduler.NoSuchRunnableException; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.config.ConfigType; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandBulkDelete.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandBulkDelete.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandBulkDelete.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandBulkDelete.java index 7196799..93e4a30 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandBulkDelete.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandBulkDelete.java @@ -1,10 +1,11 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.Color; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.async.MessageBulkDeleteTargetedRunnable; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.async.MessageBulkDeleteTargetedRunnable; +import net.pcsx2.hifumi.command.AbstractSlashCommand; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandCPU.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandCPU.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandCPU.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandCPU.java index a43fc51..2e6a105 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandCPU.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandCPU.java @@ -21,18 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.HashMap; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.CpuIndex; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.SimpleSearch; +import net.pcsx2.hifumi.CpuIndex; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.SimpleSearch; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandChartGen.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandChartGen.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandChartGen.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandChartGen.java index 8e63e5b..cd5827b 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandChartGen.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandChartGen.java @@ -1,12 +1,13 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.time.LocalDate; import java.time.LocalTime; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import io.github.redpanda4552.HifumiBot.charting.ChartGenerator; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; +import net.pcsx2.hifumi.charting.ChartGenerator; +import net.pcsx2.hifumi.command.AbstractSlashCommand; + import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandDynCmd.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandDynCmd.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandDynCmd.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandDynCmd.java index d6e5fbd..45b47cd 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandDynCmd.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandDynCmd.java @@ -21,15 +21,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicChoice; +import net.pcsx2.hifumi.command.dynamic.DynamicCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicSubcommand; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.util.EmbedUtil; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicChoice; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicSubcommand; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandEmulog.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandEmulog.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandEmulog.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandEmulog.java index f6a2038..e0dac37 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandEmulog.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandEmulog.java @@ -21,16 +21,17 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.config.EmulogParserConfig.Rule; -import io.github.redpanda4552.HifumiBot.util.CommandUtils; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.config.EmulogParserConfig.Rule; +import net.pcsx2.hifumi.util.CommandUtils; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.actionrow.ActionRow; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGPU.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandGPU.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGPU.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandGPU.java index ddab521..b9308f5 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGPU.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandGPU.java @@ -21,17 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.HashMap; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.GpuIndex; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.SimpleSearch; +import net.pcsx2.hifumi.GpuIndex; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.SimpleSearch; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGameIndex.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandGameIndex.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGameIndex.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandGameIndex.java index 9c3f619..1da97fd 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandGameIndex.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandGameIndex.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.ArrayList; import java.util.Comparator; @@ -37,9 +37,10 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.similarity.FuzzyScore; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.selections.SelectMenu; import net.dv8tion.jda.api.components.selections.SelectOption; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPFP.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPFP.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPFP.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandPFP.java index 5d5b0cf..28647d8 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPFP.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPFP.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -32,9 +32,10 @@ import java.net.URL; import javax.imageio.ImageIO; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Icon; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPerms.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPerms.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPerms.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandPerms.java index 9ec9f48..6e4972c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPerms.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPerms.java @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.permissions.PermissionLevel; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPride.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPride.java similarity index 87% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPride.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandPride.java index 3b638c5..4bef73a 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPride.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPride.java @@ -1,14 +1,15 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.CounterObject; -import io.github.redpanda4552.HifumiBot.util.DateTimeUtils; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.CounterObject; +import net.pcsx2.hifumi.util.DateTimeUtils; +import net.pcsx2.hifumi.util.EmbedUtil; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPrompt.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPrompt.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPrompt.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandPrompt.java index bae8edf..a4ec774 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandPrompt.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandPrompt.java @@ -1,6 +1,7 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandReload.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandReload.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandReload.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandReload.java index 20e35a7..b9af7d9 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandReload.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandReload.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandRun.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandRun.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandRun.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandRun.java index 7091778..088e811 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandRun.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandRun.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSay.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSay.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSay.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandSay.java index ae36fdd..636d147 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSay.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSay.java @@ -21,9 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.label.Label; import net.dv8tion.jda.api.components.textinput.TextInput; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSerial.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSerial.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSerial.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandSerial.java index 046adc3..30aa3ac 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSerial.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSerial.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.HashMap; import java.util.LinkedHashMap; @@ -31,9 +31,10 @@ import java.util.TreeSet; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandServerMetadata.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandServerMetadata.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandServerMetadata.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandServerMetadata.java index c3b85d7..c80f508 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandServerMetadata.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandServerMetadata.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.Color; import java.time.format.DateTimeFormatter; @@ -6,9 +6,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.BrowsableEmbed; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; +import net.pcsx2.hifumi.BrowsableEmbed; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.actionrow.ActionRow; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandShutdown.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandShutdown.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandShutdown.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandShutdown.java index 7962ca2..cd4d85e 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandShutdown.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandShutdown.java @@ -21,10 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSpamKick.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSpamKick.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSpamKick.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandSpamKick.java index b00d9fc..2bc2f79 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandSpamKick.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandSpamKick.java @@ -21,18 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.time.Duration; import java.time.OffsetDateTime; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandTranslate.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandTranslate.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandTranslate.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandTranslate.java index b1ec712..8548263 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandTranslate.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandTranslate.java @@ -1,14 +1,14 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.Color; import java.util.HashMap; import com.deepl.api.Language; import com.deepl.api.TextResult; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandUnwarez.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandUnwarez.java similarity index 91% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandUnwarez.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandUnwarez.java index ebc30fe..7b2dc98 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandUnwarez.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandUnwarez.java @@ -3,20 +3,21 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.Color; import java.util.ArrayList; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.config.Config.SerializedEmbedField; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.InteractionEventObject; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.RoleUtils; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.config.Config.SerializedEmbedField; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.InteractionEventObject; +import net.pcsx2.hifumi.util.MemberUtils; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.RoleUtils; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.actionrow.ActionRow; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarez.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWarez.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarez.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandWarez.java index 6db0b6d..e6077ff 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarez.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWarez.java @@ -21,13 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; -import io.github.redpanda4552.HifumiBot.util.WarezUtil; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.MemberUtils; +import net.pcsx2.hifumi.util.WarezUtil; + import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarezHistory.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWarezHistory.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarezHistory.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandWarezHistory.java index 9e2bacb..522e37c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWarezHistory.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWarezHistory.java @@ -1,7 +1,8 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; + +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.WarezUtil; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.WarezUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWhois.java b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWhois.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWhois.java rename to src/main/java/net/pcsx2/hifumi/command/slash/CommandWhois.java index de12fc8..2a064be 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/command/slash/CommandWhois.java +++ b/src/main/java/net/pcsx2/hifumi/command/slash/CommandWhois.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.command.slash; +package net.pcsx2.hifumi.command.slash; import java.awt.Color; import java.time.OffsetDateTime; @@ -8,15 +8,16 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.BrowsableEmbed; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.AutoModEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.MemberEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; -import io.github.redpanda4552.HifumiBot.util.DateTimeUtils; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; -import io.github.redpanda4552.HifumiBot.util.UserUtils; +import net.pcsx2.hifumi.BrowsableEmbed; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.AutoModEventObject; +import net.pcsx2.hifumi.database.objects.MemberEventObject; +import net.pcsx2.hifumi.database.objects.WarezEventObject; +import net.pcsx2.hifumi.util.DateTimeUtils; +import net.pcsx2.hifumi.util.MemberUtils; +import net.pcsx2.hifumi.util.UserUtils; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.actionrow.ActionRow; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/Config.java b/src/main/java/net/pcsx2/hifumi/config/Config.java similarity index 99% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/Config.java rename to src/main/java/net/pcsx2/hifumi/config/Config.java index b83cc14..3c69b5b 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/Config.java +++ b/src/main/java/net/pcsx2/hifumi/config/Config.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; import java.util.ArrayList; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigManager.java b/src/main/java/net/pcsx2/hifumi/config/ConfigManager.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigManager.java rename to src/main/java/net/pcsx2/hifumi/config/ConfigManager.java index 1155a16..0464b07 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigManager.java +++ b/src/main/java/net/pcsx2/hifumi/config/ConfigManager.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; import java.io.File; import java.io.FileOutputStream; @@ -29,12 +29,11 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; +import net.pcsx2.hifumi.util.Messaging; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import io.github.redpanda4552.HifumiBot.util.Messaging; - public class ConfigManager { // static is evil, to avoid having to change all these signatures / propagating the directory everywhere diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigType.java b/src/main/java/net/pcsx2/hifumi/config/ConfigType.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigType.java rename to src/main/java/net/pcsx2/hifumi/config/ConfigType.java index 8faa4b3..45e1706 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/ConfigType.java +++ b/src/main/java/net/pcsx2/hifumi/config/ConfigType.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; public enum ConfigType { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/DynCmdConfig.java b/src/main/java/net/pcsx2/hifumi/config/DynCmdConfig.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/DynCmdConfig.java rename to src/main/java/net/pcsx2/hifumi/config/DynCmdConfig.java index c058c17..f82b1a3 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/DynCmdConfig.java +++ b/src/main/java/net/pcsx2/hifumi/config/DynCmdConfig.java @@ -21,11 +21,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; import java.util.HashMap; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicCommand; public class DynCmdConfig implements IConfig { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/EmulogParserConfig.java b/src/main/java/net/pcsx2/hifumi/config/EmulogParserConfig.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/EmulogParserConfig.java rename to src/main/java/net/pcsx2/hifumi/config/EmulogParserConfig.java index 5daff64..87bf976 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/EmulogParserConfig.java +++ b/src/main/java/net/pcsx2/hifumi/config/EmulogParserConfig.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; import java.util.ArrayList; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/IConfig.java b/src/main/java/net/pcsx2/hifumi/config/IConfig.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/IConfig.java rename to src/main/java/net/pcsx2/hifumi/config/IConfig.java index 07e46ac..ee13541 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/IConfig.java +++ b/src/main/java/net/pcsx2/hifumi/config/IConfig.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; public interface IConfig { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/config/SettingsIniParserConfig.java b/src/main/java/net/pcsx2/hifumi/config/SettingsIniParserConfig.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/config/SettingsIniParserConfig.java rename to src/main/java/net/pcsx2/hifumi/config/SettingsIniParserConfig.java index 89be4ac..5ede3b6 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/config/SettingsIniParserConfig.java +++ b/src/main/java/net/pcsx2/hifumi/config/SettingsIniParserConfig.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.config; +package net.pcsx2.hifumi.config; import java.util.ArrayList; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/Database.java b/src/main/java/net/pcsx2/hifumi/database/Database.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/Database.java rename to src/main/java/net/pcsx2/hifumi/database/Database.java index 27ede0f..cb5aa82 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/Database.java +++ b/src/main/java/net/pcsx2/hifumi/database/Database.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database; +package net.pcsx2.hifumi.database; import java.sql.Connection; import java.sql.PreparedStatement; @@ -10,22 +10,23 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.charting.AutomodChartData; -import io.github.redpanda4552.HifumiBot.charting.MemberChartData; -import io.github.redpanda4552.HifumiBot.charting.WarezChartData; -import io.github.redpanda4552.HifumiBot.database.objects.AttachmentObject; -import io.github.redpanda4552.HifumiBot.database.objects.AutoModEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.CommandEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.CounterObject; -import io.github.redpanda4552.HifumiBot.database.objects.InteractionEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.MemberEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; -import io.github.redpanda4552.HifumiBot.util.DateTimeUtils; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.TimeUtils; -import io.github.redpanda4552.HifumiBot.util.UserUtils; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.charting.AutomodChartData; +import net.pcsx2.hifumi.charting.MemberChartData; +import net.pcsx2.hifumi.charting.WarezChartData; +import net.pcsx2.hifumi.database.objects.AttachmentObject; +import net.pcsx2.hifumi.database.objects.AutoModEventObject; +import net.pcsx2.hifumi.database.objects.CommandEventObject; +import net.pcsx2.hifumi.database.objects.CounterObject; +import net.pcsx2.hifumi.database.objects.InteractionEventObject; +import net.pcsx2.hifumi.database.objects.MemberEventObject; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.database.objects.WarezEventObject; +import net.pcsx2.hifumi.util.DateTimeUtils; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.TimeUtils; +import net.pcsx2.hifumi.util.UserUtils; + import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message.Attachment; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/SQLite.java b/src/main/java/net/pcsx2/hifumi/database/SQLite.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/SQLite.java rename to src/main/java/net/pcsx2/hifumi/database/SQLite.java index 7b1d539..5a4c05f 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/SQLite.java +++ b/src/main/java/net/pcsx2/hifumi/database/SQLite.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database; +package net.pcsx2.hifumi.database; import java.io.FileNotFoundException; import java.io.InputStream; @@ -7,8 +7,8 @@ import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import io.github.redpanda4552.HifumiBot.util.Log; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.util.Log; +import net.pcsx2.hifumi.util.Messaging; public class SQLite { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AttachmentObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/AttachmentObject.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AttachmentObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/AttachmentObject.java index 15cdc5c..e045221 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AttachmentObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/AttachmentObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; import java.time.OffsetDateTime; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AutoModEventObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/AutoModEventObject.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AutoModEventObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/AutoModEventObject.java index dd7c38e..ecff2d8 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/AutoModEventObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/AutoModEventObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; import net.dv8tion.jda.api.entities.automod.AutoModResponse; import net.dv8tion.jda.api.entities.automod.AutoModTriggerType; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CommandEventObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/CommandEventObject.java similarity index 91% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CommandEventObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/CommandEventObject.java index eb11123..878993f 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CommandEventObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/CommandEventObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; public class CommandEventObject { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CounterObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/CounterObject.java similarity index 88% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CounterObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/CounterObject.java index a040cab..5b6c9a1 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/CounterObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/CounterObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; public class CounterObject { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/InteractionEventObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/InteractionEventObject.java similarity index 89% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/InteractionEventObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/InteractionEventObject.java index 14a19c5..bb8b760 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/InteractionEventObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/InteractionEventObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; public class InteractionEventObject { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MemberEventObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/MemberEventObject.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MemberEventObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/MemberEventObject.java index 593d85b..2121ce7 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MemberEventObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/MemberEventObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; public class MemberEventObject { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MessageObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/MessageObject.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MessageObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/MessageObject.java index 3aeefeb..5aa4032 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/MessageObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/MessageObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; import java.time.OffsetDateTime; import java.util.ArrayList; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/WarezEventObject.java b/src/main/java/net/pcsx2/hifumi/database/objects/WarezEventObject.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/database/objects/WarezEventObject.java rename to src/main/java/net/pcsx2/hifumi/database/objects/WarezEventObject.java index beae97d..72d5518 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/database/objects/WarezEventObject.java +++ b/src/main/java/net/pcsx2/hifumi/database/objects/WarezEventObject.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.database.objects; +package net.pcsx2.hifumi.database.objects; import java.util.Optional; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/AbstractInteractionElement.java b/src/main/java/net/pcsx2/hifumi/event/AbstractInteractionElement.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/AbstractInteractionElement.java rename to src/main/java/net/pcsx2/hifumi/event/AbstractInteractionElement.java index 5bc3640..d1e4908 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/AbstractInteractionElement.java +++ b/src/main/java/net/pcsx2/hifumi/event/AbstractInteractionElement.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/AutoModEventListener.java b/src/main/java/net/pcsx2/hifumi/event/AutoModEventListener.java similarity index 77% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/AutoModEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/AutoModEventListener.java index cb8f4ed..43da5c8 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/AutoModEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/AutoModEventListener.java @@ -1,14 +1,15 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.OffsetDateTime; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.async.AutoModReviewRunnable; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.Log; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.async.AutoModReviewRunnable; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.Log; +import net.pcsx2.hifumi.util.MemberUtils; + import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.automod.AutoModResponse; import net.dv8tion.jda.api.events.automod.AutoModExecutionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/ButtonEventListener.java b/src/main/java/net/pcsx2/hifumi/event/ButtonEventListener.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/ButtonEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/ButtonEventListener.java index b5074c1..c8a7529 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/ButtonEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/ButtonEventListener.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.Duration; import java.util.ArrayList; @@ -6,15 +6,16 @@ import java.util.HashMap; import java.util.Optional; import java.util.concurrent.TimeUnit; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.command.slash.CommandEmulog; -import io.github.redpanda4552.HifumiBot.command.slash.CommandServerMetadata; -import io.github.redpanda4552.HifumiBot.command.slash.CommandWhois; -import io.github.redpanda4552.HifumiBot.moderation.ModActions; -import io.github.redpanda4552.HifumiBot.util.MemberUtils; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.UserUtils; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.command.slash.CommandEmulog; +import net.pcsx2.hifumi.command.slash.CommandServerMetadata; +import net.pcsx2.hifumi.command.slash.CommandWhois; +import net.pcsx2.hifumi.moderation.ModActions; +import net.pcsx2.hifumi.util.MemberUtils; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.UserUtils; + import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.components.MessageTopLevelComponent; import net.dv8tion.jda.api.components.actionrow.ActionRow; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/MemberEventListener.java b/src/main/java/net/pcsx2/hifumi/event/MemberEventListener.java similarity index 89% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/MemberEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/MemberEventListener.java index 56f1c38..72d1348 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/MemberEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/MemberEventListener.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.Duration; import java.time.Instant; @@ -6,12 +6,13 @@ import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.EventLogging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MemberEventObject; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.EventLogging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MemberEventObject; +import net.pcsx2.hifumi.database.objects.WarezEventObject; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.guild.GuildBanEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/MessageContextCommandListener.java b/src/main/java/net/pcsx2/hifumi/event/MessageContextCommandListener.java similarity index 92% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/MessageContextCommandListener.java rename to src/main/java/net/pcsx2/hifumi/event/MessageContextCommandListener.java index 84c07a2..21aaf71 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/MessageContextCommandListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/MessageContextCommandListener.java @@ -21,17 +21,18 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.util.HashMap; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractMessageContextCommand; -import io.github.redpanda4552.HifumiBot.command.AbstractUserContextCommand; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.CommandEventObject; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractMessageContextCommand; +import net.pcsx2.hifumi.command.AbstractUserContextCommand; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.CommandEventObject; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/MessageEventListener.java b/src/main/java/net/pcsx2/hifumi/event/MessageEventListener.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/MessageEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/MessageEventListener.java index 25146c6..7b8cf2c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/MessageEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/MessageEventListener.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.Duration; import java.time.Instant; @@ -6,21 +6,22 @@ import java.time.OffsetDateTime; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.EventLogging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.async.AntiBotRunnable; -import io.github.redpanda4552.HifumiBot.async.EntryBarrierRunnable; -import io.github.redpanda4552.HifumiBot.async.SpamReviewRunnable; -import io.github.redpanda4552.HifumiBot.async.UrlChangeReviewRunnable; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.parse.CrashParser; -import io.github.redpanda4552.HifumiBot.parse.EmulogParser; -import io.github.redpanda4552.HifumiBot.parse.PnachParser; -import io.github.redpanda4552.HifumiBot.parse.SettingsIniParser; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.PixivSourceFetcher; +import net.pcsx2.hifumi.EventLogging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.async.AntiBotRunnable; +import net.pcsx2.hifumi.async.EntryBarrierRunnable; +import net.pcsx2.hifumi.async.SpamReviewRunnable; +import net.pcsx2.hifumi.async.UrlChangeReviewRunnable; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.parse.CrashParser; +import net.pcsx2.hifumi.parse.EmulogParser; +import net.pcsx2.hifumi.parse.PnachParser; +import net.pcsx2.hifumi.parse.SettingsIniParser; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.PixivSourceFetcher; + import net.dv8tion.jda.api.entities.channel.ChannelType; import net.dv8tion.jda.api.events.message.MessageBulkDeleteEvent; import net.dv8tion.jda.api.events.message.MessageDeleteEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/ModalEventListener.java b/src/main/java/net/pcsx2/hifumi/event/ModalEventListener.java similarity index 75% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/ModalEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/ModalEventListener.java index 37b1289..154c6ca 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/ModalEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/ModalEventListener.java @@ -1,10 +1,11 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; + +import net.pcsx2.hifumi.modal.BanHandler; +import net.pcsx2.hifumi.modal.DyncmdHandler; +import net.pcsx2.hifumi.modal.PromptHandler; +import net.pcsx2.hifumi.modal.SayHandler; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.modal.BanHandler; -import io.github.redpanda4552.HifumiBot.modal.DyncmdHandler; -import io.github.redpanda4552.HifumiBot.modal.PromptHandler; -import io.github.redpanda4552.HifumiBot.modal.SayHandler; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/RoleEventListener.java b/src/main/java/net/pcsx2/hifumi/event/RoleEventListener.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/RoleEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/RoleEventListener.java index 23a4677..9291221 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/RoleEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/RoleEventListener.java @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.time.OffsetDateTime; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.WarezEventObject; + import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/SelectMenuEventListener.java b/src/main/java/net/pcsx2/hifumi/event/SelectMenuEventListener.java similarity index 86% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/SelectMenuEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/SelectMenuEventListener.java index b550210..9a195f4 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/SelectMenuEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/SelectMenuEventListener.java @@ -3,13 +3,14 @@ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template */ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.util.HashMap; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/SlashCommandListener.java b/src/main/java/net/pcsx2/hifumi/event/SlashCommandListener.java similarity index 89% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/SlashCommandListener.java rename to src/main/java/net/pcsx2/hifumi/event/SlashCommandListener.java index 4bb45f7..87a17dd 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/SlashCommandListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/SlashCommandListener.java @@ -21,19 +21,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; import java.util.HashMap; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.AbstractSlashCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicChoice; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicSubcommand; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.CommandEventObject; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.AbstractSlashCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicChoice; +import net.pcsx2.hifumi.command.dynamic.DynamicCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicSubcommand; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.CommandEventObject; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.interactions.commands.OptionMapping; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/event/UserEventListener.java b/src/main/java/net/pcsx2/hifumi/event/UserEventListener.java similarity index 83% rename from src/main/java/io/github/redpanda4552/HifumiBot/event/UserEventListener.java rename to src/main/java/net/pcsx2/hifumi/event/UserEventListener.java index 7bfb3b2..04abd3e 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/event/UserEventListener.java +++ b/src/main/java/net/pcsx2/hifumi/event/UserEventListener.java @@ -1,6 +1,7 @@ -package io.github.redpanda4552.HifumiBot.event; +package net.pcsx2.hifumi.event; + +import net.pcsx2.hifumi.database.Database; -import io.github.redpanda4552.HifumiBot.database.Database; import net.dv8tion.jda.api.events.user.update.UserUpdateGlobalNameEvent; import net.dv8tion.jda.api.events.user.update.UserUpdateNameEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/modal/BanHandler.java b/src/main/java/net/pcsx2/hifumi/modal/BanHandler.java similarity index 85% rename from src/main/java/io/github/redpanda4552/HifumiBot/modal/BanHandler.java rename to src/main/java/net/pcsx2/hifumi/modal/BanHandler.java index b7bdf10..17c713b 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/modal/BanHandler.java +++ b/src/main/java/net/pcsx2/hifumi/modal/BanHandler.java @@ -1,12 +1,13 @@ -package io.github.redpanda4552.HifumiBot.modal; +package net.pcsx2.hifumi.modal; import java.util.Optional; import java.util.concurrent.TimeUnit; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.async.MessageBulkDeleteRunnable; -import io.github.redpanda4552.HifumiBot.util.Messaging; -import io.github.redpanda4552.HifumiBot.util.UserUtils; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.async.MessageBulkDeleteRunnable; +import net.pcsx2.hifumi.util.Messaging; +import net.pcsx2.hifumi.util.UserUtils; + import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/modal/DyncmdHandler.java b/src/main/java/net/pcsx2/hifumi/modal/DyncmdHandler.java similarity index 84% rename from src/main/java/io/github/redpanda4552/HifumiBot/modal/DyncmdHandler.java rename to src/main/java/net/pcsx2/hifumi/modal/DyncmdHandler.java index 92ee481..2de8104 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/modal/DyncmdHandler.java +++ b/src/main/java/net/pcsx2/hifumi/modal/DyncmdHandler.java @@ -1,13 +1,14 @@ -package io.github.redpanda4552.HifumiBot.modal; +package net.pcsx2.hifumi.modal; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.dynamic.DynamicChoice; +import net.pcsx2.hifumi.command.dynamic.DynamicCommand; +import net.pcsx2.hifumi.command.dynamic.DynamicSubcommand; +import net.pcsx2.hifumi.config.ConfigManager; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.EmbedUtil; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicChoice; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicCommand; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicSubcommand; -import io.github.redpanda4552.HifumiBot.config.ConfigManager; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/modal/PromptHandler.java b/src/main/java/net/pcsx2/hifumi/modal/PromptHandler.java similarity index 77% rename from src/main/java/io/github/redpanda4552/HifumiBot/modal/PromptHandler.java rename to src/main/java/net/pcsx2/hifumi/modal/PromptHandler.java index 2008b33..acd87b3 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/modal/PromptHandler.java +++ b/src/main/java/net/pcsx2/hifumi/modal/PromptHandler.java @@ -1,9 +1,10 @@ -package io.github.redpanda4552.HifumiBot.modal; +package net.pcsx2.hifumi.modal; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.EmbedUtil; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.EmbedUtil; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/modal/SayHandler.java b/src/main/java/net/pcsx2/hifumi/modal/SayHandler.java similarity index 77% rename from src/main/java/io/github/redpanda4552/HifumiBot/modal/SayHandler.java rename to src/main/java/net/pcsx2/hifumi/modal/SayHandler.java index fb20159..b5614f7 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/modal/SayHandler.java +++ b/src/main/java/net/pcsx2/hifumi/modal/SayHandler.java @@ -1,8 +1,9 @@ -package io.github.redpanda4552.HifumiBot.modal; +package net.pcsx2.hifumi.modal; + +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.permissions.PermissionLevel; +import net.pcsx2.hifumi.util.Messaging; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; -import io.github.redpanda4552.HifumiBot.util.Messaging; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; public class SayHandler { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/moderation/ModActions.java b/src/main/java/net/pcsx2/hifumi/moderation/ModActions.java similarity index 90% rename from src/main/java/io/github/redpanda4552/HifumiBot/moderation/ModActions.java rename to src/main/java/net/pcsx2/hifumi/moderation/ModActions.java index 84bc02d..182d55c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/moderation/ModActions.java +++ b/src/main/java/net/pcsx2/hifumi/moderation/ModActions.java @@ -1,14 +1,15 @@ -package io.github.redpanda4552.HifumiBot.moderation; +package net.pcsx2.hifumi.moderation; import java.awt.Color; import java.time.Duration; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.MessageObject; -import io.github.redpanda4552.HifumiBot.util.Log; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.MessageObject; +import net.pcsx2.hifumi.util.Log; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/AbstractParser.java b/src/main/java/net/pcsx2/hifumi/parse/AbstractParser.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/AbstractParser.java rename to src/main/java/net/pcsx2/hifumi/parse/AbstractParser.java index 04758df..37c13f4 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/AbstractParser.java +++ b/src/main/java/net/pcsx2/hifumi/parse/AbstractParser.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; import okhttp3.MediaType; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/CrashParser.java b/src/main/java/net/pcsx2/hifumi/parse/CrashParser.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/CrashParser.java rename to src/main/java/net/pcsx2/hifumi/parse/CrashParser.java index e9d33dc..51768d8 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/CrashParser.java +++ b/src/main/java/net/pcsx2/hifumi/parse/CrashParser.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -8,8 +8,9 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message.Attachment; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/EmulogParser.java b/src/main/java/net/pcsx2/hifumi/parse/EmulogParser.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/EmulogParser.java rename to src/main/java/net/pcsx2/hifumi/parse/EmulogParser.java index 8d84880..beb911e 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/EmulogParser.java +++ b/src/main/java/net/pcsx2/hifumi/parse/EmulogParser.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -32,9 +32,10 @@ import java.util.HashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.config.EmulogParserConfig.Rule; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.config.EmulogParserConfig.Rule; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message.Attachment; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParser.java b/src/main/java/net/pcsx2/hifumi/parse/PnachParser.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParser.java rename to src/main/java/net/pcsx2/hifumi/parse/PnachParser.java index e567622..52043b2 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParser.java +++ b/src/main/java/net/pcsx2/hifumi/parse/PnachParser.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; import java.io.BufferedReader; import java.io.IOException; @@ -34,8 +34,9 @@ import java.util.HashMap; import java.util.List; import java.util.regex.Pattern; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message.Attachment; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParserError.java b/src/main/java/net/pcsx2/hifumi/parse/PnachParserError.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParserError.java rename to src/main/java/net/pcsx2/hifumi/parse/PnachParserError.java index a395804..5104a28 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/PnachParserError.java +++ b/src/main/java/net/pcsx2/hifumi/parse/PnachParserError.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; public enum PnachParserError { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/parse/SettingsIniParser.java b/src/main/java/net/pcsx2/hifumi/parse/SettingsIniParser.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/parse/SettingsIniParser.java rename to src/main/java/net/pcsx2/hifumi/parse/SettingsIniParser.java index b2f2da6..a4e7154 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/parse/SettingsIniParser.java +++ b/src/main/java/net/pcsx2/hifumi/parse/SettingsIniParser.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.parse; +package net.pcsx2.hifumi.parse; import java.io.IOException; import java.net.URI; @@ -15,11 +15,12 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.text.WordUtils; import org.ini4j.Ini; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.config.SettingsIniParserConfig.Rule; -import io.github.redpanda4552.HifumiBot.config.SettingsIniParserConfig.Section; -import io.github.redpanda4552.HifumiBot.config.SettingsIniParserConfig.Setting; -import io.github.redpanda4552.HifumiBot.util.Messaging; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.config.SettingsIniParserConfig.Rule; +import net.pcsx2.hifumi.config.SettingsIniParserConfig.Section; +import net.pcsx2.hifumi.config.SettingsIniParserConfig.Setting; +import net.pcsx2.hifumi.util.Messaging; + import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message.Attachment; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionLevel.java b/src/main/java/net/pcsx2/hifumi/permissions/PermissionLevel.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionLevel.java rename to src/main/java/net/pcsx2/hifumi/permissions/PermissionLevel.java index 7547baa..444481c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionLevel.java +++ b/src/main/java/net/pcsx2/hifumi/permissions/PermissionLevel.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.permissions; +package net.pcsx2.hifumi.permissions; public enum PermissionLevel { SUPERUSER, SUPER_ADMIN, ADMIN, MOD, GUEST, BLOCKED diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionManager.java b/src/main/java/net/pcsx2/hifumi/permissions/PermissionManager.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionManager.java rename to src/main/java/net/pcsx2/hifumi/permissions/PermissionManager.java index 539e486..f1645be 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/permissions/PermissionManager.java +++ b/src/main/java/net/pcsx2/hifumi/permissions/PermissionManager.java @@ -21,11 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.permissions; +package net.pcsx2.hifumi.permissions; import java.util.ArrayList; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/CommandUtils.java b/src/main/java/net/pcsx2/hifumi/util/CommandUtils.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/CommandUtils.java rename to src/main/java/net/pcsx2/hifumi/util/CommandUtils.java index 7845ebe..0b09ca0 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/CommandUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/CommandUtils.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.interactions.commands.OptionMapping; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/DNSQueryResult.java b/src/main/java/net/pcsx2/hifumi/util/DNSQueryResult.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/DNSQueryResult.java rename to src/main/java/net/pcsx2/hifumi/util/DNSQueryResult.java index b9788b8..33b391d 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/DNSQueryResult.java +++ b/src/main/java/net/pcsx2/hifumi/util/DNSQueryResult.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; public enum DNSQueryResult { SUCCESS, FAIL, BLOCKED diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/DateTimeUtils.java b/src/main/java/net/pcsx2/hifumi/util/DateTimeUtils.java similarity index 85% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/DateTimeUtils.java rename to src/main/java/net/pcsx2/hifumi/util/DateTimeUtils.java index b9e7612..1499332 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/DateTimeUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.time.Instant; import java.time.OffsetDateTime; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/EmbedUtil.java b/src/main/java/net/pcsx2/hifumi/util/EmbedUtil.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/EmbedUtil.java rename to src/main/java/net/pcsx2/hifumi/util/EmbedUtil.java index 80c4092..36af367 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/EmbedUtil.java +++ b/src/main/java/net/pcsx2/hifumi/util/EmbedUtil.java @@ -21,12 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.command.dynamic.DynamicChoice; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.command.dynamic.DynamicChoice; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/Log.java b/src/main/java/net/pcsx2/hifumi/util/Log.java similarity index 95% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/Log.java rename to src/main/java/net/pcsx2/hifumi/util/Log.java index ea67fff..c6e3bec 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/Log.java +++ b/src/main/java/net/pcsx2/hifumi/util/Log.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import org.slf4j.Logger; import org.slf4j.simple.SimpleLoggerFactory; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/MemberUtils.java b/src/main/java/net/pcsx2/hifumi/util/MemberUtils.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/MemberUtils.java rename to src/main/java/net/pcsx2/hifumi/util/MemberUtils.java index b8193f7..19111c0 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/MemberUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/MemberUtils.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.util.Optional; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/Messaging.java b/src/main/java/net/pcsx2/hifumi/util/Messaging.java similarity index 99% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/Messaging.java rename to src/main/java/net/pcsx2/hifumi/util/Messaging.java index 1c00466..a8c272c 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/Messaging.java +++ b/src/main/java/net/pcsx2/hifumi/util/Messaging.java @@ -21,14 +21,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/PixivSourceFetcher.java b/src/main/java/net/pcsx2/hifumi/util/PixivSourceFetcher.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/PixivSourceFetcher.java rename to src/main/java/net/pcsx2/hifumi/util/PixivSourceFetcher.java index 639fafc..07d25ed 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/PixivSourceFetcher.java +++ b/src/main/java/net/pcsx2/hifumi/util/PixivSourceFetcher.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.net.HttpURLConnection; import java.net.URI; @@ -30,7 +30,8 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.components.actionrow.ActionRow; import net.dv8tion.jda.api.components.buttons.Button; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/Refreshable.java b/src/main/java/net/pcsx2/hifumi/util/Refreshable.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/Refreshable.java rename to src/main/java/net/pcsx2/hifumi/util/Refreshable.java index 6dd690e..cf5a5aa 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/Refreshable.java +++ b/src/main/java/net/pcsx2/hifumi/util/Refreshable.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; public interface Refreshable { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/RoleUtils.java b/src/main/java/net/pcsx2/hifumi/util/RoleUtils.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/RoleUtils.java rename to src/main/java/net/pcsx2/hifumi/util/RoleUtils.java index 6eced49..bcf39ca 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/RoleUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/RoleUtils.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/SimpleSearch.java b/src/main/java/net/pcsx2/hifumi/util/SimpleSearch.java similarity index 98% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/SimpleSearch.java rename to src/main/java/net/pcsx2/hifumi/util/SimpleSearch.java index 95e725b..7c28c79 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/SimpleSearch.java +++ b/src/main/java/net/pcsx2/hifumi/util/SimpleSearch.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/Strings.java b/src/main/java/net/pcsx2/hifumi/util/Strings.java similarity index 97% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/Strings.java rename to src/main/java/net/pcsx2/hifumi/util/Strings.java index db980da..7322743 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/Strings.java +++ b/src/main/java/net/pcsx2/hifumi/util/Strings.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.util.ArrayList; import java.util.regex.Matcher; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/TimeUtils.java b/src/main/java/net/pcsx2/hifumi/util/TimeUtils.java similarity index 96% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/TimeUtils.java rename to src/main/java/net/pcsx2/hifumi/util/TimeUtils.java index 0606a61..3dda964 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/TimeUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/TimeUtils.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.time.Clock; import java.time.OffsetDateTime; diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/UserUtils.java b/src/main/java/net/pcsx2/hifumi/util/UserUtils.java similarity index 93% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/UserUtils.java rename to src/main/java/net/pcsx2/hifumi/util/UserUtils.java index 46ea914..5b32f9e 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/UserUtils.java +++ b/src/main/java/net/pcsx2/hifumi/util/UserUtils.java @@ -1,10 +1,11 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.time.Duration; import java.time.OffsetDateTime; import java.util.Optional; -import io.github.redpanda4552.HifumiBot.HifumiBot; +import net.pcsx2.hifumi.HifumiBot; + import net.dv8tion.jda.api.entities.User; public class UserUtils { diff --git a/src/main/java/io/github/redpanda4552/HifumiBot/util/WarezUtil.java b/src/main/java/net/pcsx2/hifumi/util/WarezUtil.java similarity index 94% rename from src/main/java/io/github/redpanda4552/HifumiBot/util/WarezUtil.java rename to src/main/java/net/pcsx2/hifumi/util/WarezUtil.java index d40d350..15278cb 100644 --- a/src/main/java/io/github/redpanda4552/HifumiBot/util/WarezUtil.java +++ b/src/main/java/net/pcsx2/hifumi/util/WarezUtil.java @@ -1,4 +1,4 @@ -package io.github.redpanda4552.HifumiBot.util; +package net.pcsx2.hifumi.util; import java.awt.Color; import java.time.OffsetDateTime; @@ -8,11 +8,12 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; -import io.github.redpanda4552.HifumiBot.HifumiBot; -import io.github.redpanda4552.HifumiBot.config.Config.SerializedEmbedField; -import io.github.redpanda4552.HifumiBot.database.Database; -import io.github.redpanda4552.HifumiBot.database.objects.WarezEventObject; -import io.github.redpanda4552.HifumiBot.permissions.PermissionLevel; +import net.pcsx2.hifumi.HifumiBot; +import net.pcsx2.hifumi.config.Config.SerializedEmbedField; +import net.pcsx2.hifumi.database.Database; +import net.pcsx2.hifumi.database.objects.WarezEventObject; +import net.pcsx2.hifumi.permissions.PermissionLevel; + import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message;