From cd44ed6f61617c6d1e40935f5c0bb79386f018b5 Mon Sep 17 00:00:00 2001 From: Ryan Barlow <7389646+ryanbarlow97@users.noreply.github.com> Date: Wed, 14 Oct 2026 21:36:36 +0000 Subject: [PATCH] Build ConditionalEvents as a TFMC plugin for Paper 1.21.10 Move the sources to net.tfminecraft.conditionalevents, build against Paper 1.21.10 with Java 21 and name the runtime jar conditionalevents-.jar. ItemsAdder's API is no longer published, so build against the pinned ItemsAdder jar from ServerAssets like the other plugins. Add the shared workflows. Drop the update checker and bStats, which reported this copy as upstream ConditionalEvents. Co-Authored-By: Claude Opus 5.5 --- .editorconfig | 8 + .github/dependencies.sha256 | 1 + .github/scripts/install-local-dependencies.sh | 9 + .github/scripts/plugin-artifact.py | 70 ++ .github/scripts/prepare-release.sh | 7 + .github/workflows/build.yml | 84 ++ .github/workflows/maven-release.yml | 137 +++ .github/workflows/pr-size.yml | 26 + .github/workflows/release.yml | 18 + .gitignore | 83 +- .jitpack.yml | 2 - README.md | 28 +- pom.xml | 155 ++- .../libs/itemselectevent/DropType.java | 7 - .../libs/itemselectevent/SelectType.java | 7 - .../managers/UpdateCheckerManager.java | 41 - .../managers/dependencies/Metrics.java | 882 ------------------ .../ajneb97/model/internal/SeparatorType.java | 7 - .../model/internal/UpdateCheckerResult.java | 28 - .../conditionalevents}/ConditionalEvents.java | 66 +- .../conditionalevents}/MainCommand.java | 18 +- .../api/ConditionalEventsAPI.java | 10 +- .../api/ConditionalEventsAction.java | 2 +- .../api/ConditionalEventsCallEvent.java | 6 +- .../api/ConditionalEventsEvent.java | 2 +- .../conditionalevents}/api/ExpansionCE.java | 4 +- .../configs/ConfigsManager.java | 18 +- .../configs/DataFolderConfigManager.java | 6 +- .../configs/EventsFolderConfigManager.java | 6 +- .../configs/MainConfigManager.java | 15 +- .../configs/PlayersConfigsManager.java | 12 +- .../configs/SavedItemsConfigManager.java | 6 +- .../configs/model/CommonConfig.java | 4 +- .../libs/actionbar/ActionBarAPI.java | 12 +- .../libs/armorequipevent/ArmorEquipEvent.java | 2 +- .../libs/armorequipevent/ArmorListener.java | 10 +- .../libs/armorequipevent/ArmorType.java | 6 +- .../centeredmessages/DefaultFontInfo.java | 2 +- .../libs/itemselectevent/DropType.java | 7 + .../libs/itemselectevent/ItemSelectEvent.java | 2 +- .../itemselectevent/ItemSelectListener.java | 4 +- .../ItemSelectListenerNew.java | 2 +- .../PlayerCustomDropEvent.java | 2 +- .../libs/itemselectevent/SelectType.java | 7 + .../libs/offhandevent/OffHandEvent.java | 2 +- .../libs/offhandevent/OffHandListener.java | 6 +- .../libs/repairevent/RepairEvent.java | 2 +- .../libs/repairevent/RepairListener.java | 8 +- .../libs/titles/TitleAPI.java | 10 +- .../listeners/CustomEventListener.java | 18 +- .../listeners/ItemEventsListener.java | 22 +- .../listeners/OtherEventsListener.java | 16 +- .../listeners/PaperEventsListener.java | 18 +- .../listeners/PlayerEventsListener.java | 29 +- .../PlayerEventsListenerNew1_16.java | 10 +- .../listeners/PlayerEventsListenerNew1_9.java | 10 +- .../dependencies/CitizensListener.java | 10 +- .../dependencies/WGRegionEventsListener.java | 10 +- .../managers/APIManager.java | 6 +- .../managers/BungeeMessagingManager.java | 4 +- .../managers/DebugManager.java | 12 +- .../managers/DependencyManager.java | 10 +- .../managers/EventsManager.java | 22 +- .../managers/InterruptEventManager.java | 6 +- .../managers/MessagesManager.java | 10 +- .../managers/PlayerManager.java | 16 +- .../managers/RepetitiveManager.java | 10 +- .../managers/SavedItemsManager.java | 6 +- .../managers/VerifyManager.java | 22 +- .../managers/chatevents/ReceiveChatEvent.java | 2 +- .../chatevents/ReceiveChatMessageType.java | 2 +- .../managers/commandregister/CECommand.java | 2 +- .../CommandRegisterManager.java | 4 +- .../dependencies/DiscordSRVManager.java | 4 +- .../PacketEventsChatListener.java | 14 +- .../dependencies/PacketEventsManager.java | 4 +- .../dependencies/ProtocolLibManager.java | 16 +- .../ProtocolLibReceiveMessageEvent.java | 2 +- .../conditionalevents}/model/CEEvent.java | 6 +- .../model/ConditionalType.java | 2 +- .../model/CustomEventProperties.java | 2 +- .../conditionalevents}/model/EventType.java | 2 +- .../model/StoredVariable.java | 2 +- .../model/ToConditionGroup.java | 2 +- .../model/actions/ActionGroup.java | 2 +- .../model/actions/ActionTargeter.java | 2 +- .../model/actions/ActionTargeterType.java | 2 +- .../model/actions/ActionType.java | 2 +- .../model/actions/CEAction.java | 2 +- .../internal/AdditionalEventStorage.java | 2 +- .../model/internal/CheckConditionsResult.java | 2 +- .../model/internal/ConditionEvent.java | 24 +- .../model/internal/DebugSender.java | 2 +- .../model/internal/ExecutedEvent.java | 24 +- .../internal/PostEventVariableResult.java | 2 +- .../model/internal/SeparatorType.java | 7 + .../model/internal/VariablesProperties.java | 6 +- .../model/internal/WaitActionTask.java | 2 +- .../minimessage/GetVariablesItemLore.java | 2 +- .../model/player/EventData.java | 2 +- .../model/player/GenericCallback.java | 2 +- .../model/player/PlayerData.java | 2 +- .../model/verify/CEError.java | 2 +- .../model/verify/CEErrorAction.java | 10 +- .../model/verify/CEErrorCondition.java | 8 +- .../model/verify/CEErrorEventType.java | 8 +- .../model/verify/CEErrorRandomVariable.java | 8 +- .../tasks/PlayerDataSaveTask.java | 4 +- .../conditionalevents}/utils/ActionUtils.java | 26 +- .../conditionalevents}/utils/BlockUtils.java | 4 +- .../utils/GlobalVariablesUtils.java | 8 +- .../utils/InventoryUtils.java | 2 +- .../conditionalevents}/utils/ItemUtils.java | 8 +- .../conditionalevents}/utils/JSONMessage.java | 2 +- .../utils/JSONMessageAdventure.java | 2 +- .../conditionalevents}/utils/MathUtils.java | 2 +- .../utils/MiniMessageUtils.java | 6 +- .../conditionalevents}/utils/OtherUtils.java | 4 +- .../conditionalevents}/utils/PlayerUtils.java | 4 +- .../utils/ServerVersion.java | 2 +- .../conditionalevents}/utils/TimeUtils.java | 4 +- .../utils/VariablesUtils.java | 12 +- .../utils/VariablesUtilsExperimental.java | 10 +- src/main/resources/config.yml | 1 - src/main/resources/plugin.yml | 4 +- 125 files changed, 905 insertions(+), 1517 deletions(-) create mode 100644 .editorconfig create mode 100644 .github/dependencies.sha256 create mode 100644 .github/scripts/install-local-dependencies.sh create mode 100644 .github/scripts/plugin-artifact.py create mode 100644 .github/scripts/prepare-release.sh create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/maven-release.yml create mode 100644 .github/workflows/pr-size.yml create mode 100644 .github/workflows/release.yml delete mode 100644 .jitpack.yml delete mode 100644 src/main/java/ce/ajneb97/libs/itemselectevent/DropType.java delete mode 100644 src/main/java/ce/ajneb97/libs/itemselectevent/SelectType.java delete mode 100644 src/main/java/ce/ajneb97/managers/UpdateCheckerManager.java delete mode 100644 src/main/java/ce/ajneb97/managers/dependencies/Metrics.java delete mode 100644 src/main/java/ce/ajneb97/model/internal/SeparatorType.java delete mode 100644 src/main/java/ce/ajneb97/model/internal/UpdateCheckerResult.java rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/ConditionalEvents.java (77%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/MainCommand.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/api/ConditionalEventsAPI.java (87%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/api/ConditionalEventsAction.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/api/ConditionalEventsCallEvent.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/api/ConditionalEventsEvent.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/api/ExpansionCE.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/ConfigsManager.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/DataFolderConfigManager.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/EventsFolderConfigManager.java (71%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/MainConfigManager.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/PlayersConfigsManager.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/SavedItemsConfigManager.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/configs/model/CommonConfig.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/actionbar/ActionBarAPI.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/armorequipevent/ArmorEquipEvent.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/armorequipevent/ArmorListener.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/armorequipevent/ArmorType.java (87%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/centeredmessages/DefaultFontInfo.java (97%) create mode 100644 src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/DropType.java rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/itemselectevent/ItemSelectEvent.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/itemselectevent/ItemSelectListener.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/itemselectevent/ItemSelectListenerNew.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/itemselectevent/PlayerCustomDropEvent.java (93%) create mode 100644 src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/SelectType.java rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/offhandevent/OffHandEvent.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/offhandevent/OffHandListener.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/repairevent/RepairEvent.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/repairevent/RepairListener.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/libs/titles/TitleAPI.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/CustomEventListener.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/ItemEventsListener.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/OtherEventsListener.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/PaperEventsListener.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/PlayerEventsListener.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/PlayerEventsListenerNew1_16.java (75%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/PlayerEventsListenerNew1_9.java (82%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/dependencies/CitizensListener.java (73%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/listeners/dependencies/WGRegionEventsListener.java (78%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/APIManager.java (91%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/BungeeMessagingManager.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/DebugManager.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/DependencyManager.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/EventsManager.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/InterruptEventManager.java (87%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/MessagesManager.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/PlayerManager.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/RepetitiveManager.java (85%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/SavedItemsManager.java (91%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/VerifyManager.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/chatevents/ReceiveChatEvent.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/chatevents/ReceiveChatMessageType.java (55%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/commandregister/CECommand.java (85%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/commandregister/CommandRegisterManager.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/dependencies/DiscordSRVManager.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/dependencies/PacketEventsChatListener.java (85%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/dependencies/PacketEventsManager.java (81%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/dependencies/ProtocolLibManager.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/managers/dependencies/ProtocolLibReceiveMessageEvent.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/CEEvent.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/ConditionalType.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/CustomEventProperties.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/EventType.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/StoredVariable.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/ToConditionGroup.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/actions/ActionGroup.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/actions/ActionTargeter.java (89%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/actions/ActionTargeterType.java (70%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/actions/ActionType.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/actions/CEAction.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/AdditionalEventStorage.java (90%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/CheckConditionsResult.java (91%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/ConditionEvent.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/DebugSender.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/ExecutedEvent.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/PostEventVariableResult.java (93%) create mode 100644 src/main/java/net/tfminecraft/conditionalevents/model/internal/SeparatorType.java rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/VariablesProperties.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/WaitActionTask.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/internal/minimessage/GetVariablesItemLore.java (92%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/player/EventData.java (93%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/player/GenericCallback.java (55%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/player/PlayerData.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/verify/CEError.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/verify/CEErrorAction.java (87%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/verify/CEErrorCondition.java (89%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/verify/CEErrorEventType.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/model/verify/CEErrorRandomVariable.java (88%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/tasks/PlayerDataSaveTask.java (85%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/ActionUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/BlockUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/GlobalVariablesUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/InventoryUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/ItemUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/JSONMessage.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/JSONMessageAdventure.java (96%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/MathUtils.java (98%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/MiniMessageUtils.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/OtherUtils.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/PlayerUtils.java (94%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/ServerVersion.java (95%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/TimeUtils.java (87%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/VariablesUtils.java (97%) rename src/main/java/{ce/ajneb97 => net/tfminecraft/conditionalevents}/utils/VariablesUtilsExperimental.java (89%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..94f6f5c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +# Shared TFMC XML formatting; see Docs/POM-CONVENTIONS.md. +[*.xml] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256 new file mode 100644 index 0000000..f554c32 --- /dev/null +++ b/.github/dependencies.sha256 @@ -0,0 +1 @@ +5a01b37bd7442fb0f2c809cadac82ba70f75173956e04efac3336595cc070368 libs/ItemsAdder-4.0.18.jar diff --git a/.github/scripts/install-local-dependencies.sh b/.github/scripts/install-local-dependencies.sh new file mode 100644 index 0000000..b9fe05a --- /dev/null +++ b/.github/scripts/install-local-dependencies.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -euo pipefail +# Run from the repository root after downloading the pinned JARs. +# Hash-qualified versions prevent different private JARs sharing a Maven cache key. +sha256sum --check .github/dependencies.sha256 + +mvn -B --no-transfer-progress org.apache.maven.plugins:maven-install-plugin:3.1.4:install-file \ + -Dfile="libs/ItemsAdder-4.0.18.jar" -DgroupId="local" -DartifactId="ItemsAdder" \ + -Dversion="4.0.18-tfmc-5a01b37bd744" -Dpackaging=jar -DgeneratePom=true "$@" diff --git a/.github/scripts/plugin-artifact.py b/.github/scripts/plugin-artifact.py new file mode 100644 index 0000000..c730186 --- /dev/null +++ b/.github/scripts/plugin-artifact.py @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 +"""Validate the Maven runtime JAR and optionally stage a release bundle.""" +import argparse +import hashlib +import json +import os +from pathlib import Path +import re +import shutil +import zipfile + + +def validate(source, version): + source = Path(source).resolve() + target = Path.cwd().resolve() / "target" + if not source.is_relative_to(target) or not source.is_file(): + raise ValueError("Expected the Maven runtime JAR inside target/") + if not re.fullmatch(r"[a-z][a-z0-9]*-" + re.escape(version) + r"\.jar", source.name): + raise ValueError("Runtime JAR filename must use a lowercase alphanumeric name followed by the Maven version") + with zipfile.ZipFile(source) as jar: + descriptors = {"plugin.yml", "paper-plugin.yml"}.intersection(jar.namelist()) + if not descriptors: + raise ValueError("Runtime JAR has no plugin descriptor") + if jar.testzip() is not None: + raise ValueError("Runtime JAR is corrupt") + for name in descriptors: + text = jar.read(name).decode("utf-8-sig") + versions = re.findall( + r'''^version:[ \t]*(?:"([^"\r\n]*)"|'([^'\r\n]*)'|([^\s#]+))(?:(?:[ \t]+\#[^\r\n]*)|[ \t]*)\r?$''', + text, re.MULTILINE, + ) + if len(versions) != 1 or next((v for v in versions[0] if v), "") != version: + raise ValueError(f"{name} version must match Maven version {version}") + return source + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument("--jar", required=True, type=Path) + parser.add_argument("--version", required=True) + parser.add_argument("--stage", type=Path) + parser.add_argument("--dependencies", type=Path) + args = parser.parse_args() + try: + source = validate(args.jar, args.version) + if args.stage: + if os.environ["TAG"] != f"v{args.version}": + raise ValueError("Release tag must match the Maven version") + dependencies = json.loads(args.dependencies.read_text()) if args.dependencies else [] + digest = hashlib.sha256(source.read_bytes()).hexdigest() + metadata = { + "repository": os.environ["GITHUB_REPOSITORY"], + "commit": os.environ["GITHUB_SHA"], + "tag": os.environ["TAG"], + "run": f"{os.environ['GITHUB_SERVER_URL']}/{os.environ['GITHUB_REPOSITORY']}/actions/runs/{os.environ['GITHUB_RUN_ID']}", + "plugin_dependencies": dependencies, + "artifact": source.name, + "sha256": digest, + } + args.stage.mkdir() + shutil.copyfile(source, args.stage / source.name) + (args.stage / "SHA256SUMS").write_text(f"{digest} {source.name}\n") + (args.stage / "build.json").write_text(json.dumps(metadata, indent=2) + "\n") + print(f"Verified {source.name}: filename and embedded version match {args.version}") + except (ValueError, OSError, KeyError, zipfile.BadZipFile) as error: + parser.exit(1, f"Plugin artifact validation failed: {error}\n") + + +if __name__ == "__main__": + main() diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh new file mode 100644 index 0000000..7b071e7 --- /dev/null +++ b/.github/scripts/prepare-release.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +set -euo pipefail +: "${GH_TOKEN:?Set DEPS_TOKEN with Contents read access to TF-Minecraft/ServerAssets}" +ref=4b80431398e4ff35d703cad915b7ee4e5924a763 +mkdir -p libs +curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/5a01b37bd744/ItemsAdder-4.0.18.jar?ref=$ref" > "libs/ItemsAdder-4.0.18.jar" +bash .github/scripts/install-local-dependencies.sh "$@" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..3d42f99 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,84 @@ +name: Build + +on: + push: + branches: [main] + pull_request: + branches: [main] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-24.04 + timeout-minutes: 20 + steps: + - uses: actions/checkout@v7 + with: + persist-credentials: false + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: '21' + - name: Install shared plugin dependencies + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@8ef41de589f121c98ff892b10696e7c1feb4ca74 + with: + mode: pinned + + - name: Prepare pinned dependencies + env: + GH_TOKEN: ${{ secrets.DEPS_TOKEN }} + run: bash .github/scripts/prepare-release.sh + - name: Set build version + id: dev + shell: bash + run: | + dev_version="main-SNAPSHOT" + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + dev_version="DEV-$(date -u +%Y%m%d-%H%M)" + fi + mvn -B --no-transfer-progress org.codehaus.mojo:versions-maven-plugin:2.22.0:set \ + -DnewVersion="$dev_version" -DgenerateBackupPoms=false + mvn -B --no-transfer-progress help:evaluate \ + -Dexpression=project.build.finalName -Doutput="$RUNNER_TEMP/final-name" + final_name=$(cat "$RUNNER_TEMP/final-name") + [[ "$final_name" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]] || exit 1 + echo "version=$dev_version" >> "$GITHUB_OUTPUT" + echo "name=$final_name" >> "$GITHUB_OUTPUT" + echo "jar=target/$final_name.jar" >> "$GITHUB_OUTPUT" + + - name: Run unit tests and build + run: mvn -B --no-transfer-progress clean verify -DskipTests=false -Dmaven.test.skip=false + + - name: Verify runtime JAR + env: + ARTIFACT_PATH: ${{ steps.dev.outputs.jar }} + BUILD_VERSION: ${{ steps.dev.outputs.version }} + run: python3 .github/scripts/plugin-artifact.py --jar "$ARTIFACT_PATH" --version "$BUILD_VERSION" + + - if: github.event_name == 'pull_request' + uses: actions/upload-artifact@v7 + with: + name: ${{ steps.dev.outputs.name }}-${{ github.run_id }}-${{ github.run_attempt }} + path: | + ${{ steps.dev.outputs.jar }} + .build/plugin-dependencies.json + include-hidden-files: true + if-no-files-found: error + + - name: Upload unit test reports + if: ${{ !cancelled() && hashFiles('target/surefire-reports/*.xml') != '' }} + uses: actions/upload-artifact@v7 + with: + name: unit-test-reports-${{ github.run_id }}-${{ github.run_attempt }} + path: target/surefire-reports/ + if-no-files-found: error + + - name: Upload coverage reports + if: ${{ !cancelled() && hashFiles('target/site/jacoco/jacoco.xml') != '' }} + uses: actions/upload-artifact@v7 + with: + name: coverage-reports-${{ github.run_id }}-${{ github.run_attempt }} + path: target/site/jacoco/ + if-no-files-found: error diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml new file mode 100644 index 0000000..87d147c --- /dev/null +++ b/.github/workflows/maven-release.yml @@ -0,0 +1,137 @@ +name: Maven plugin release + +on: + workflow_call: + inputs: + java-version: + required: true + type: string + secrets: + DEPS_TOKEN: + required: false + +permissions: + contents: read + +concurrency: + group: plugin-release-${{ github.repository }}-${{ github.ref }} + cancel-in-progress: false + +defaults: + run: + shell: bash + +jobs: + build: + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') + runs-on: ubuntu-24.04 + timeout-minutes: 20 + steps: + - uses: actions/checkout@v7 + with: + persist-credentials: false + + - uses: actions/setup-java@v6 + with: + distribution: temurin + java-version: ${{ inputs.java-version }} + + - name: Validate release version + env: + TAG: ${{ github.ref_name }} + run: | + [[ "$TAG" =~ ^v[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9A-Za-z]+([.-][0-9A-Za-z]+)*)?$ ]] || { + echo '::error::Expected vMAJOR.MINOR or vMAJOR.MINOR.PATCH, with an optional prerelease suffix.' + exit 1 + } + [[ "${TAG^^}" != *SNAPSHOT* ]] || exit 1 + + - name: Install shared plugin dependencies + uses: TF-Minecraft/TLibs/.github/actions/setup-plugins@8ef41de589f121c98ff892b10696e7c1feb4ca74 + with: + mode: pinned + + - name: Prepare pinned dependencies + env: + GH_TOKEN: ${{ secrets.DEPS_TOKEN }} + run: | + if [[ -f .github/scripts/prepare-release.sh ]]; then + bash .github/scripts/prepare-release.sh + fi + + - name: Set version from tag and build + id: maven + env: + TAG: ${{ github.ref_name }} + run: | + mvn -B --no-transfer-progress org.codehaus.mojo:versions-maven-plugin:2.22.0:set \ + -DnewVersion="${TAG#v}" -DgenerateBackupPoms=false + mvn -B --no-transfer-progress help:evaluate \ + -Dexpression=project.build.finalName -Doutput="$RUNNER_TEMP/final-name" + final_name=$(cat "$RUNNER_TEMP/final-name") + [[ "$final_name" =~ ^[A-Za-z0-9][A-Za-z0-9._-]*$ ]] || exit 1 + echo "jar=target/$final_name.jar" >> "$GITHUB_OUTPUT" + mvn -B --no-transfer-progress clean verify -DskipTests=false -Dmaven.test.skip=false + + - name: Stage only the release JAR + env: + ARTIFACT_PATH: ${{ steps.maven.outputs.jar }} + TAG: ${{ github.ref_name }} + run: | + python3 .github/scripts/plugin-artifact.py \ + --jar "$ARTIFACT_PATH" --version "${TAG#v}" \ + --stage "$RUNNER_TEMP/plugin-release" \ + --dependencies .build/plugin-dependencies.json + + - uses: actions/upload-artifact@v7 + with: + name: plugin-release-${{ github.sha }} + path: ${{ runner.temp }}/plugin-release/ + if-no-files-found: error + retention-days: 30 + + publish: + needs: build + runs-on: ubuntu-24.04 + timeout-minutes: 5 + permissions: + contents: write + steps: + - uses: actions/download-artifact@v8 + with: + name: plugin-release-${{ github.sha }} + path: release + + - name: Create draft release + working-directory: release + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + TAG: ${{ github.ref_name }} + run: | + sha256sum --check SHA256SUMS + flags=() + if [[ "$TAG" == *-* ]]; then flags+=(--prerelease); fi + gh api --method POST "repos/$GH_REPO/releases/generate-notes" \ + -f tag_name="$TAG" --jq .body > "$RUNNER_TEMP/release-changes.md" + python3 - <<'PY' + import os, re + from pathlib import Path + from urllib.parse import quote + temp = Path(os.environ['RUNNER_TEMP']) + changes = (temp / 'release-changes.md').read_text().strip() + changes = re.sub(r"^## What's Changed\s*", '', changes) + changes = re.sub(r'^(#{1,5}) ', r'\1# ', changes, flags=re.MULTILINE) + lines = ['## Changes', '', changes or 'Initial release.', '', '## Downloads', ''] + assets = sorted([*Path('.').glob('*.jar'), *Path('.').glob('*.tar.gz')]) + assets += [Path('SHA256SUMS'), Path('build.json')] + base = f"https://github.com/{os.environ['GH_REPO']}/releases/download/{quote(os.environ['TAG'], safe='')}/" + for asset in assets: + if not asset.is_file(): + raise SystemExit(f'Missing release asset: {asset}') + description = {'SHA256SUMS': ' — SHA-256 checksums.', 'build.json': ' — Build metadata.'}.get(asset.name, '') + lines.append(f'- [`{asset.name}`]({base}{quote(asset.name)}){description}') + (temp / 'release-notes.md').write_text('\n'.join(lines) + '\n') + PY + gh release create "$TAG" ./*.jar SHA256SUMS build.json \ + --verify-tag --draft --title "$TAG" --notes-file "$RUNNER_TEMP/release-notes.md" "${flags[@]}" diff --git a/.github/workflows/pr-size.yml b/.github/workflows/pr-size.yml new file mode 100644 index 0000000..f407cae --- /dev/null +++ b/.github/workflows/pr-size.yml @@ -0,0 +1,26 @@ +name: PR size + +on: + pull_request: + types: [opened, reopened, synchronize, ready_for_review, converted_to_draft] + +permissions: + contents: read + issues: write + pull-requests: write + +concurrency: + group: pr-size-${{ github.event.pull_request.number }} + cancel-in-progress: true + +jobs: + size: + name: PR size + runs-on: ubuntu-24.04 + timeout-minutes: 5 + steps: + - uses: actions/checkout@v7 + with: + fetch-depth: 0 + persist-credentials: false + - uses: TF-Minecraft/TLibs/.github/actions/pr-size@0bfb259256648c6139c6a94a0935492830cbbec9 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..241e773 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,18 @@ +name: Release + +on: + push: + tags: ['v*'] + +permissions: + contents: read + +jobs: + release: + permissions: + contents: write + uses: ./.github/workflows/maven-release.yml + with: + java-version: '21' + secrets: + DEPS_TOKEN: ${{ secrets.DEPS_TOKEN }} diff --git a/.gitignore b/.gitignore index 085705a..3f6fe9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,57 @@ - +# Build output +target/ +build/ +out/ +dist/ +nbbuild/ +nbdist/ *.class +dependency-reduced-pom.xml +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties + +# Build dependencies +/.build/ +*.jar +!.mvn/wrapper/maven-wrapper.jar +# Python caches and environments +__pycache__/ +*.py[cod] +.venv/ +venv/ -*.log - - -*.ctxt - - -.mtj.tmp/ - - -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar +# IDE files +.idea/ *.iml +*.ipr +*.iws +.vscode/ +.project +.classpath +.settings/ +nbproject/private/ +.nb-gradle/ - +# Logs and temporary files +*.log hs_err_pid* - - -.metadata -bin/ -tmp/ -*.tmp +replay_pid* *.bak *.swp -*~.nib -*.classpath -*.project -local.properties -.settings/ -.loadpath -dependency-reduced-pom.xml -.recommenders -.idea/ -target/ +*.tmp +*~ + +# Operating system files +.DS_Store +Thumbs.db +Desktop.ini + +# Local investigation notes and test artifacts +/.scratch/ + +# Technical documentation is maintained in TF-Minecraft/Docs +/docs/ diff --git a/.jitpack.yml b/.jitpack.yml deleted file mode 100644 index a202792..0000000 --- a/.jitpack.yml +++ /dev/null @@ -1,2 +0,0 @@ -jdk: - - openjdk21 \ No newline at end of file diff --git a/README.md b/README.md index 0de4a62..aa1aceb 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,25 @@ # ConditionalEvents -Minecraft Plugin that allows you to add different conditions to certain events. If these conditions are accomplished, then custom actions will be executed. The possibilities of what you can do with the plugin are endless. +> Event triggers for TF-Minecraft, maintained from [Ajneb97/ConditionalEvents](https://github.com/Ajneb97/ConditionalEvents). -**Spigot / Paper 1.8.9+** +ConditionalEvents runs actions when Minecraft events meet configured conditions: +commands, item use, joins, deaths, regions and more. Events can run once only or +on a cooldown. This copy tracks upstream 4.80.3 and builds for Paper 1.21.10. It +has no update checker or bStats reporting. -## Download Links -- [SpigotMC](https://www.spigotmc.org/resources/conditionalevents-custom-actions-for-specific-events-1-8-26-2.82271/) -- [Modrinth](https://modrinth.com/plugin/conditionalevents) +## Documentation +[Project documentation](https://github.com/TF-Minecraft/Docs/blob/main/projects/ConditionalEvents/README.md) -## Other Links -- [Wiki](https://ajneb97.gitbook.io/conditionalevents) -- [bStats](https://bstats.org/plugin/bukkit/ConditionalEvents/19371) -- [Support me on Ko-fi](https://ko-fi.com/ajneb97) \ No newline at end of file +The upstream [ConditionalEvents wiki](https://ajneb97.gitbook.io/conditionalevents) +covers event types, conditions, actions and variables. + +## Tests + +With Java 21 and the private build inputs prepared by +`.github/scripts/prepare-release.sh`, run `mvn clean verify`. + +## License + +[MIT](LICENSE), copyright Ajneb97. TF-Minecraft changes are released under the +same license. diff --git a/pom.xml b/pom.xml index b073583..0f3d7fb 100644 --- a/pom.xml +++ b/pom.xml @@ -1,81 +1,27 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ce.ajneb97 - ConditionalEvents - 4.80.3 + net.tfminecraft + conditionalevents + main-SNAPSHOT + + ConditionalEvents + TFMC-maintained ConditionalEvents: event triggers for TFMC Minecraft servers. + https://github.com/TF-Minecraft/ConditionalEvents - 21 - 21 + 21 + UTF-8 - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - placeholderapi - https://repo.extendedclip.com/content/repositories/placeholderapi/ - - - minecraft-repo - https://libraries.minecraft.net/ - - - everything - https://repo.citizensnpcs.co/ - - - jitpack.io - https://jitpack.io - - - sk89q-repo - https://maven.enginehub.org/repo/ - - - dv8tion - m2-dv8tion - https://m2.dv8tion.net/releases - - - Scarsz-Nexus - https://nexus.scarsz.me/content/groups/public/ - - - dmulloy2-repo - https://repo.dmulloy2.net/repository/public/ - - - matteodev - https://maven.devs.beer/ - - - codemc-releases - https://repo.codemc.io/repository/maven-releases/ - - - io.papermc.paper paper-api - 26.3.build.136-beta - provided - - - org.spigotmc - spigot-api - 26.3-R0.1-SNAPSHOT + 1.21.10-R0.1-SNAPSHOT provided @@ -126,9 +72,9 @@ provided - dev.lone - api-itemsadder - 4.0.10 + local + ItemsAdder + 4.0.18-tfmc-5a01b37bd744 provided @@ -139,32 +85,83 @@ + + + papermc + https://repo.papermc.io/repository/maven-public/ + + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + minecraft-repo + https://libraries.minecraft.net/ + + + everything + https://repo.citizensnpcs.co/ + + + jitpack.io + https://jitpack.io + + + sk89q-repo + https://maven.enginehub.org/repo/ + + + dv8tion + m2-dv8tion + https://m2.dv8tion.net/releases + + + Scarsz-Nexus + https://nexus.scarsz.me/content/groups/public/ + + + dmulloy2-repo + https://repo.dmulloy2.net/repository/public/ + + + codemc-releases + https://repo.codemc.io/repository/maven-releases/ + + + + conditionalevents-${project.version} src/main/resources true + + plugin.yml + + + + src/main/resources + false + + plugin.yml + + org.apache.maven.plugins maven-resources-plugin 3.3.1 + org.apache.maven.plugins maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - + 3.14.1 org.apache.maven.plugins maven-shade-plugin - 3.2.4 - - + 3.6.2 package @@ -172,10 +169,11 @@ shade + false net.objecthunter.exp4j - ce.ajneb97.libs.exp4j + net.tfminecraft.conditionalevents.libs.exp4j @@ -184,5 +182,4 @@ - - \ No newline at end of file + diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/DropType.java b/src/main/java/ce/ajneb97/libs/itemselectevent/DropType.java deleted file mode 100644 index ab73b3e..0000000 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/DropType.java +++ /dev/null @@ -1,7 +0,0 @@ -package ce.ajneb97.libs.itemselectevent; - -public enum DropType { - - PLAYER, - INVENTORY -} diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/SelectType.java b/src/main/java/ce/ajneb97/libs/itemselectevent/SelectType.java deleted file mode 100644 index 870fe68..0000000 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/SelectType.java +++ /dev/null @@ -1,7 +0,0 @@ -package ce.ajneb97.libs.itemselectevent; - -public enum SelectType { - - SELECT, - DESELECT -} diff --git a/src/main/java/ce/ajneb97/managers/UpdateCheckerManager.java b/src/main/java/ce/ajneb97/managers/UpdateCheckerManager.java deleted file mode 100644 index eba5ca0..0000000 --- a/src/main/java/ce/ajneb97/managers/UpdateCheckerManager.java +++ /dev/null @@ -1,41 +0,0 @@ -package ce.ajneb97.managers; - -import ce.ajneb97.model.internal.UpdateCheckerResult; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -public class UpdateCheckerManager { - - private String version; - private String latestVersion; - - public UpdateCheckerManager(String version){ - this.version = version; - } - - public UpdateCheckerResult check(){ - try { - HttpURLConnection con = (HttpURLConnection) new URL( - "https://api.spigotmc.org/legacy/update.php?resource=82271").openConnection(); - int timed_out = 1500; - con.setConnectTimeout(timed_out); - con.setReadTimeout(timed_out); - latestVersion = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine(); - if (latestVersion.length() <= 7) { - if(!version.equals(latestVersion)){ - return UpdateCheckerResult.noErrors(latestVersion); - } - } - return UpdateCheckerResult.noErrors(null); - } catch (Exception ex) { - return UpdateCheckerResult.error(); - } - } - - public String getLatestVersion() { - return latestVersion; - } -} diff --git a/src/main/java/ce/ajneb97/managers/dependencies/Metrics.java b/src/main/java/ce/ajneb97/managers/dependencies/Metrics.java deleted file mode 100644 index 2cd94c5..0000000 --- a/src/main/java/ce/ajneb97/managers/dependencies/Metrics.java +++ /dev/null @@ -1,882 +0,0 @@ -package ce.ajneb97.managers.dependencies; - -/* - * This Metrics class was auto-generated and can be copied into your project if you are - * not using a build tool like Gradle or Maven for dependency management. - * - * IMPORTANT: You are not allowed to modify this class, except changing the package. - * - * Disallowed modifications include but are not limited to: - * - Remove the option for users to opt-out - * - Change the frequency for data submission - * - Obfuscate the code (every obfuscator should allow you to make an exception for specific files) - * - Reformat the code (if you use a linter, add an exception) - * - * Violations will result in a ban of your plugin and account from bStats. - */ - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Method; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.stream.Collectors; -import java.util.zip.GZIPOutputStream; -import javax.net.ssl.HttpsURLConnection; -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; - -public class Metrics { - - private final Plugin plugin; - - private final MetricsBase metricsBase; - - /** - * Creates a new Metrics instance. - * - * @param plugin Your plugin instance. - * @param serviceId The id of the service. It can be found at What is my plugin id? - */ - public Metrics(JavaPlugin plugin, int serviceId) { - this.plugin = plugin; - // Get the config file - File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); - File configFile = new File(bStatsFolder, "config.yml"); - YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); - if (!config.isSet("serverUuid")) { - config.addDefault("enabled", true); - config.addDefault("serverUuid", UUID.randomUUID().toString()); - config.addDefault("logFailedRequests", false); - config.addDefault("logSentData", false); - config.addDefault("logResponseStatusText", false); - // Inform the server owners about bStats - config - .options() - .header( - "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" - + "many people use their plugin and their total player count. It's recommended to keep bStats\n" - + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" - + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" - + "anonymous.") - .copyDefaults(true); - try { - config.save(configFile); - } catch (IOException ignored) { - } - } - // Load the data - boolean enabled = config.getBoolean("enabled", true); - String serverUUID = config.getString("serverUuid"); - boolean logErrors = config.getBoolean("logFailedRequests", false); - boolean logSentData = config.getBoolean("logSentData", false); - boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); - metricsBase = - new MetricsBase( - "bukkit", - serverUUID, - serviceId, - enabled, - this::appendPlatformData, - this::appendServiceData, - submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), - plugin::isEnabled, - (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error), - (message) -> this.plugin.getLogger().log(Level.INFO, message), - logErrors, - logSentData, - logResponseStatusText); - } - - /** Shuts down the underlying scheduler service. */ - public void shutdown() { - metricsBase.shutdown(); - } - - /** - * Adds a custom chart. - * - * @param chart The chart to add. - */ - public void addCustomChart(CustomChart chart) { - metricsBase.addCustomChart(chart); - } - - private void appendPlatformData(JsonObjectBuilder builder) { - builder.appendField("playerAmount", getPlayerAmount()); - builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0); - builder.appendField("bukkitVersion", Bukkit.getVersion()); - builder.appendField("bukkitName", Bukkit.getName()); - builder.appendField("javaVersion", System.getProperty("java.version")); - builder.appendField("osName", System.getProperty("os.name")); - builder.appendField("osArch", System.getProperty("os.arch")); - builder.appendField("osVersion", System.getProperty("os.version")); - builder.appendField("coreCount", Runtime.getRuntime().availableProcessors()); - } - - private void appendServiceData(JsonObjectBuilder builder) { - builder.appendField("pluginVersion", plugin.getDescription().getVersion()); - } - - private int getPlayerAmount() { - try { - // Around MC 1.8 the return type was changed from an array to a collection, - // This fixes java.lang.NoSuchMethodError: - // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection; - Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers"); - return onlinePlayersMethod.getReturnType().equals(Collection.class) - ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() - : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; - } catch (Exception e) { - // Just use the new method if the reflection failed - return Bukkit.getOnlinePlayers().size(); - } - } - - public static class MetricsBase { - - /** The version of the Metrics class. */ - public static final String METRICS_VERSION = "3.0.2"; - - private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s"; - - private final ScheduledExecutorService scheduler; - - private final String platform; - - private final String serverUuid; - - private final int serviceId; - - private final Consumer appendPlatformDataConsumer; - - private final Consumer appendServiceDataConsumer; - - private final Consumer submitTaskConsumer; - - private final Supplier checkServiceEnabledSupplier; - - private final BiConsumer errorLogger; - - private final Consumer infoLogger; - - private final boolean logErrors; - - private final boolean logSentData; - - private final boolean logResponseStatusText; - - private final Set customCharts = new HashSet<>(); - - private final boolean enabled; - - /** - * Creates a new MetricsBase class instance. - * - * @param platform The platform of the service. - * @param serviceId The id of the service. - * @param serverUuid The server uuid. - * @param enabled Whether or not data sending is enabled. - * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and - * appends all platform-specific data. - * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and - * appends all service-specific data. - * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be - * used to delegate the data collection to a another thread to prevent errors caused by - * concurrency. Can be {@code null}. - * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled. - * @param errorLogger A consumer that accepts log message and an error. - * @param infoLogger A consumer that accepts info log messages. - * @param logErrors Whether or not errors should be logged. - * @param logSentData Whether or not the sent data should be logged. - * @param logResponseStatusText Whether or not the response status text should be logged. - */ - public MetricsBase( - String platform, - String serverUuid, - int serviceId, - boolean enabled, - Consumer appendPlatformDataConsumer, - Consumer appendServiceDataConsumer, - Consumer submitTaskConsumer, - Supplier checkServiceEnabledSupplier, - BiConsumer errorLogger, - Consumer infoLogger, - boolean logErrors, - boolean logSentData, - boolean logResponseStatusText) { - ScheduledThreadPoolExecutor scheduler = - new ScheduledThreadPoolExecutor(1, task -> new Thread(task, "bStats-Metrics")); - // We want delayed tasks (non-periodic) that will execute in the future to be - // cancelled when the scheduler is shutdown. - // Otherwise, we risk preventing the server from shutting down even when - // MetricsBase#shutdown() is called - scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); - this.scheduler = scheduler; - this.platform = platform; - this.serverUuid = serverUuid; - this.serviceId = serviceId; - this.enabled = enabled; - this.appendPlatformDataConsumer = appendPlatformDataConsumer; - this.appendServiceDataConsumer = appendServiceDataConsumer; - this.submitTaskConsumer = submitTaskConsumer; - this.checkServiceEnabledSupplier = checkServiceEnabledSupplier; - this.errorLogger = errorLogger; - this.infoLogger = infoLogger; - this.logErrors = logErrors; - this.logSentData = logSentData; - this.logResponseStatusText = logResponseStatusText; - checkRelocation(); - if (enabled) { - // WARNING: Removing the option to opt-out will get your plugin banned from - // bStats - startSubmitting(); - } - } - - public void addCustomChart(CustomChart chart) { - this.customCharts.add(chart); - } - - public void shutdown() { - scheduler.shutdown(); - } - - private void startSubmitting() { - final Runnable submitTask = - () -> { - if (!enabled || !checkServiceEnabledSupplier.get()) { - // Submitting data or service is disabled - scheduler.shutdown(); - return; - } - if (submitTaskConsumer != null) { - submitTaskConsumer.accept(this::submitData); - } else { - this.submitData(); - } - }; - // Many servers tend to restart at a fixed time at xx:00 which causes an uneven - // distribution of requests on the - // bStats backend. To circumvent this problem, we introduce some randomness into - // the initial and second delay. - // WARNING: You must not modify and part of this Metrics class, including the - // submit delay or frequency! - // WARNING: Modifying this code will get your plugin banned on bStats. Just - // don't do it! - long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3)); - long secondDelay = (long) (1000 * 60 * (Math.random() * 30)); - scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS); - scheduler.scheduleAtFixedRate( - submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS); - } - - private void submitData() { - final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder(); - appendPlatformDataConsumer.accept(baseJsonBuilder); - final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder(); - appendServiceDataConsumer.accept(serviceJsonBuilder); - JsonObjectBuilder.JsonObject[] chartData = - customCharts.stream() - .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors)) - .filter(Objects::nonNull) - .toArray(JsonObjectBuilder.JsonObject[]::new); - serviceJsonBuilder.appendField("id", serviceId); - serviceJsonBuilder.appendField("customCharts", chartData); - baseJsonBuilder.appendField("service", serviceJsonBuilder.build()); - baseJsonBuilder.appendField("serverUUID", serverUuid); - baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION); - JsonObjectBuilder.JsonObject data = baseJsonBuilder.build(); - scheduler.execute( - () -> { - try { - // Send the data - sendData(data); - } catch (Exception e) { - // Something went wrong! :( - if (logErrors) { - errorLogger.accept("Could not submit bStats metrics data", e); - } - } - }); - } - - private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { - if (logSentData) { - infoLogger.accept("Sent bStats metrics data: " + data.toString()); - } - String url = String.format(REPORT_URL, platform); - HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); - // Compress the data to save bandwidth - byte[] compressedData = compress(data.toString()); - connection.setRequestMethod("POST"); - connection.addRequestProperty("Accept", "application/json"); - connection.addRequestProperty("Connection", "close"); - connection.addRequestProperty("Content-Encoding", "gzip"); - connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); - connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("User-Agent", "Metrics-Service/1"); - connection.setDoOutput(true); - try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) { - outputStream.write(compressedData); - } - StringBuilder builder = new StringBuilder(); - try (BufferedReader bufferedReader = - new BufferedReader(new InputStreamReader(connection.getInputStream()))) { - String line; - while ((line = bufferedReader.readLine()) != null) { - builder.append(line); - } - } - if (logResponseStatusText) { - infoLogger.accept("Sent data to bStats and received response: " + builder); - } - } - - /** Checks that the class was properly relocated. */ - private void checkRelocation() { - // You can use the property to disable the check in your test environment - if (System.getProperty("bstats.relocatecheck") == null - || !System.getProperty("bstats.relocatecheck").equals("false")) { - // Maven's Relocate is clever and changes strings, too. So we have to use this - // little "trick" ... :D - final String defaultPackage = - new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'}); - final String examplePackage = - new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); - // We want to make sure no one just copy & pastes the example and uses the wrong - // package names - if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage) - || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) { - throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); - } - } - } - - /** - * Gzips the given string. - * - * @param str The string to gzip. - * @return The gzipped string. - */ - private static byte[] compress(final String str) throws IOException { - if (str == null) { - return null; - } - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { - gzip.write(str.getBytes(StandardCharsets.UTF_8)); - } - return outputStream.toByteArray(); - } - } - - public static class SimplePie extends CustomChart { - - private final Callable callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SimplePie(String chartId, Callable callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - String value = callable.call(); - if (value == null || value.isEmpty()) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("value", value).build(); - } - } - - public static class MultiLineChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public MultiLineChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue() == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class AdvancedPie extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public AdvancedPie(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue() == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class SimpleBarChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SimpleBarChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - for (Map.Entry entry : map.entrySet()) { - valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()}); - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class AdvancedBarChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public AdvancedBarChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue().length == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class DrilldownPie extends CustomChart { - - private final Callable>> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public DrilldownPie(String chartId, Callable>> callable) { - super(chartId); - this.callable = callable; - } - - @Override - public JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map> map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean reallyAllSkipped = true; - for (Map.Entry> entryValues : map.entrySet()) { - JsonObjectBuilder valueBuilder = new JsonObjectBuilder(); - boolean allSkipped = true; - for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) { - valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); - allSkipped = false; - } - if (!allSkipped) { - reallyAllSkipped = false; - valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build()); - } - } - if (reallyAllSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public abstract static class CustomChart { - - private final String chartId; - - protected CustomChart(String chartId) { - if (chartId == null) { - throw new IllegalArgumentException("chartId must not be null"); - } - this.chartId = chartId; - } - - public JsonObjectBuilder.JsonObject getRequestJsonObject( - BiConsumer errorLogger, boolean logErrors) { - JsonObjectBuilder builder = new JsonObjectBuilder(); - builder.appendField("chartId", chartId); - try { - JsonObjectBuilder.JsonObject data = getChartData(); - if (data == null) { - // If the data is null we don't send the chart. - return null; - } - builder.appendField("data", data); - } catch (Throwable t) { - if (logErrors) { - errorLogger.accept("Failed to get data for custom chart with id " + chartId, t); - } - return null; - } - return builder.build(); - } - - protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; - } - - public static class SingleLineChart extends CustomChart { - - private final Callable callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SingleLineChart(String chartId, Callable callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - int value = callable.call(); - if (value == 0) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("value", value).build(); - } - } - - /** - * An extremely simple JSON builder. - * - *

While this class is neither feature-rich nor the most performant one, it's sufficient enough - * for its use-case. - */ - public static class JsonObjectBuilder { - - private StringBuilder builder = new StringBuilder(); - - private boolean hasAtLeastOneField = false; - - public JsonObjectBuilder() { - builder.append("{"); - } - - /** - * Appends a null field to the JSON. - * - * @param key The key of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendNull(String key) { - appendFieldUnescaped(key, "null"); - return this; - } - - /** - * Appends a string field to the JSON. - * - * @param key The key of the field. - * @param value The value of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, String value) { - if (value == null) { - throw new IllegalArgumentException("JSON value must not be null"); - } - appendFieldUnescaped(key, "\"" + escape(value) + "\""); - return this; - } - - /** - * Appends an integer field to the JSON. - * - * @param key The key of the field. - * @param value The value of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, int value) { - appendFieldUnescaped(key, String.valueOf(value)); - return this; - } - - /** - * Appends an object to the JSON. - * - * @param key The key of the field. - * @param object The object. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, JsonObject object) { - if (object == null) { - throw new IllegalArgumentException("JSON object must not be null"); - } - appendFieldUnescaped(key, object.toString()); - return this; - } - - /** - * Appends a string array to the JSON. - * - * @param key The key of the field. - * @param values The string array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, String[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values) - .map(value -> "\"" + escape(value) + "\"") - .collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends an integer array to the JSON. - * - * @param key The key of the field. - * @param values The integer array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, int[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends an object array to the JSON. - * - * @param key The key of the field. - * @param values The integer array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, JsonObject[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends a field to the object. - * - * @param key The key of the field. - * @param escapedValue The escaped value of the field. - */ - private void appendFieldUnescaped(String key, String escapedValue) { - if (builder == null) { - throw new IllegalStateException("JSON has already been built"); - } - if (key == null) { - throw new IllegalArgumentException("JSON key must not be null"); - } - if (hasAtLeastOneField) { - builder.append(","); - } - builder.append("\"").append(escape(key)).append("\":").append(escapedValue); - hasAtLeastOneField = true; - } - - /** - * Builds the JSON string and invalidates this builder. - * - * @return The built JSON string. - */ - public JsonObject build() { - if (builder == null) { - throw new IllegalStateException("JSON has already been built"); - } - JsonObject object = new JsonObject(builder.append("}").toString()); - builder = null; - return object; - } - - /** - * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt. - * - *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. - * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n"). - * - * @param value The value to escape. - * @return The escaped value. - */ - private static String escape(String value) { - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < value.length(); i++) { - char c = value.charAt(i); - if (c == '"') { - builder.append("\\\""); - } else if (c == '\\') { - builder.append("\\\\"); - } else if (c <= '\u000F') { - builder.append("\\u000").append(Integer.toHexString(c)); - } else if (c <= '\u001F') { - builder.append("\\u00").append(Integer.toHexString(c)); - } else { - builder.append(c); - } - } - return builder.toString(); - } - - /** - * A super simple representation of a JSON object. - * - *

This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not - * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String, - * JsonObject)}. - */ - public static class JsonObject { - - private final String value; - - private JsonObject(String value) { - this.value = value; - } - - @Override - public String toString() { - return value; - } - } - } -} \ No newline at end of file diff --git a/src/main/java/ce/ajneb97/model/internal/SeparatorType.java b/src/main/java/ce/ajneb97/model/internal/SeparatorType.java deleted file mode 100644 index 3feafb7..0000000 --- a/src/main/java/ce/ajneb97/model/internal/SeparatorType.java +++ /dev/null @@ -1,7 +0,0 @@ -package ce.ajneb97.model.internal; - -public enum SeparatorType { - AND, - OR, - NONE -} diff --git a/src/main/java/ce/ajneb97/model/internal/UpdateCheckerResult.java b/src/main/java/ce/ajneb97/model/internal/UpdateCheckerResult.java deleted file mode 100644 index 23b195c..0000000 --- a/src/main/java/ce/ajneb97/model/internal/UpdateCheckerResult.java +++ /dev/null @@ -1,28 +0,0 @@ -package ce.ajneb97.model.internal; - -public class UpdateCheckerResult { - - private String latestVersion; - private boolean error; - - public UpdateCheckerResult(String latestVersion, boolean error){ - this.latestVersion = latestVersion; - this.error = error; - } - - public String getLatestVersion() { - return latestVersion; - } - - public boolean isError() { - return error; - } - - public static UpdateCheckerResult noErrors(String latestVersion){ - return new UpdateCheckerResult(latestVersion,false); - } - - public static UpdateCheckerResult error(){ - return new UpdateCheckerResult(null,true); - } -} diff --git a/src/main/java/ce/ajneb97/ConditionalEvents.java b/src/main/java/net/tfminecraft/conditionalevents/ConditionalEvents.java similarity index 77% rename from src/main/java/ce/ajneb97/ConditionalEvents.java rename to src/main/java/net/tfminecraft/conditionalevents/ConditionalEvents.java index faf3e25..3c547d8 100644 --- a/src/main/java/ce/ajneb97/ConditionalEvents.java +++ b/src/main/java/net/tfminecraft/conditionalevents/ConditionalEvents.java @@ -1,25 +1,23 @@ -package ce.ajneb97; - - -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.api.ExpansionCE; -import ce.ajneb97.configs.ConfigsManager; -import ce.ajneb97.libs.armorequipevent.ArmorListener; -import ce.ajneb97.libs.itemselectevent.ItemSelectListener; -import ce.ajneb97.libs.itemselectevent.ItemSelectListenerNew; -import ce.ajneb97.libs.offhandevent.OffHandListener; -import ce.ajneb97.libs.repairevent.RepairListener; -import ce.ajneb97.listeners.*; -import ce.ajneb97.listeners.dependencies.CitizensListener; -import ce.ajneb97.managers.dependencies.Metrics; -import ce.ajneb97.listeners.dependencies.WGRegionEventsListener; -import ce.ajneb97.managers.*; -import ce.ajneb97.managers.commandregister.CommandRegisterManager; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.internal.ConditionEvent; -import ce.ajneb97.model.internal.UpdateCheckerResult; -import ce.ajneb97.tasks.PlayerDataSaveTask; -import ce.ajneb97.utils.ServerVersion; +package net.tfminecraft.conditionalevents; + + +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.api.ExpansionCE; +import net.tfminecraft.conditionalevents.configs.ConfigsManager; +import net.tfminecraft.conditionalevents.libs.armorequipevent.ArmorListener; +import net.tfminecraft.conditionalevents.libs.itemselectevent.ItemSelectListener; +import net.tfminecraft.conditionalevents.libs.itemselectevent.ItemSelectListenerNew; +import net.tfminecraft.conditionalevents.libs.offhandevent.OffHandListener; +import net.tfminecraft.conditionalevents.libs.repairevent.RepairListener; +import net.tfminecraft.conditionalevents.listeners.*; +import net.tfminecraft.conditionalevents.listeners.dependencies.CitizensListener; +import net.tfminecraft.conditionalevents.listeners.dependencies.WGRegionEventsListener; +import net.tfminecraft.conditionalevents.managers.*; +import net.tfminecraft.conditionalevents.managers.commandregister.CommandRegisterManager; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.tasks.PlayerDataSaveTask; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import org.bukkit.plugin.PluginDescriptionFile; @@ -42,7 +40,6 @@ public class ConditionalEvents extends JavaPlugin { private BungeeMessagingManager bungeeMessagingManager; private MessagesManager messagesManager; private VerifyManager verifyManager; - private UpdateCheckerManager updateCheckerManager; private CommandRegisterManager commandRegisterManager; private SavedItemsManager savedItemsManager; private APIManager apiManager; @@ -83,15 +80,8 @@ public void onEnable(){ if(getServer().getPluginManager().getPlugin("PlaceholderAPI") != null){ new ExpansionCE(this).register(); } - Metrics metrics = new Metrics(this, 19371); Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eHas been enabled! &fVersion: "+version)); - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &eThanks for using my plugin! &f~Ajneb97")); - - updateCheckerManager = new UpdateCheckerManager(version); - if(configsManager.getMainConfigManager().isUpdateNotifications()){ - updateMessage(updateCheckerManager.check()); - } new ConditionEvent(this, null, null, EventType.SERVER_START, null) .checkEvent(); @@ -249,10 +239,6 @@ public VerifyManager getVerifyManager() { return verifyManager; } - public UpdateCheckerManager getUpdateCheckerManager() { - return updateCheckerManager; - } - public CommandRegisterManager getCommandRegisterManager() { return commandRegisterManager; } @@ -269,17 +255,5 @@ public InterruptEventManager getInterruptEventManager() { return interruptEventManager; } - public void updateMessage(UpdateCheckerResult result){ - if(!result.isError()){ - String latestVersion = result.getLatestVersion(); - if(latestVersion != null){ - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)")); - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/conditionalevents")); - } - }else{ - Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+" &cError while checking update.")); - } - - } } diff --git a/src/main/java/ce/ajneb97/MainCommand.java b/src/main/java/net/tfminecraft/conditionalevents/MainCommand.java similarity index 96% rename from src/main/java/ce/ajneb97/MainCommand.java rename to src/main/java/net/tfminecraft/conditionalevents/MainCommand.java index 20e6458..fb21cbc 100644 --- a/src/main/java/ce/ajneb97/MainCommand.java +++ b/src/main/java/net/tfminecraft/conditionalevents/MainCommand.java @@ -1,16 +1,16 @@ -package ce.ajneb97; +package net.tfminecraft.conditionalevents; -import ce.ajneb97.configs.MainConfigManager; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.managers.PlayerManager; -import ce.ajneb97.managers.SavedItemsManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.player.PlayerData; -import ce.ajneb97.utils.ActionUtils; +import net.tfminecraft.conditionalevents.configs.MainConfigManager; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.managers.PlayerManager; +import net.tfminecraft.conditionalevents.managers.SavedItemsManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.player.PlayerData; +import net.tfminecraft.conditionalevents.utils.ActionUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/ce/ajneb97/api/ConditionalEventsAPI.java b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAPI.java similarity index 87% rename from src/main/java/ce/ajneb97/api/ConditionalEventsAPI.java rename to src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAPI.java index d024e9a..3780038 100644 --- a/src/main/java/ce/ajneb97/api/ConditionalEventsAPI.java +++ b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAPI.java @@ -1,9 +1,9 @@ -package ce.ajneb97.api; +package net.tfminecraft.conditionalevents.api; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.utils.TimeUtils; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.utils.TimeUtils; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/ce/ajneb97/api/ConditionalEventsAction.java b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAction.java similarity index 92% rename from src/main/java/ce/ajneb97/api/ConditionalEventsAction.java rename to src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAction.java index 4dc5544..f190f19 100644 --- a/src/main/java/ce/ajneb97/api/ConditionalEventsAction.java +++ b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsAction.java @@ -1,4 +1,4 @@ -package ce.ajneb97.api; +package net.tfminecraft.conditionalevents.api; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/main/java/ce/ajneb97/api/ConditionalEventsCallEvent.java b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsCallEvent.java similarity index 88% rename from src/main/java/ce/ajneb97/api/ConditionalEventsCallEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsCallEvent.java index ca5e31a..cdeb1b4 100644 --- a/src/main/java/ce/ajneb97/api/ConditionalEventsCallEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsCallEvent.java @@ -1,7 +1,7 @@ -package ce.ajneb97.api; +package net.tfminecraft.conditionalevents.api; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.AdditionalEventStorage; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.AdditionalEventStorage; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/main/java/ce/ajneb97/api/ConditionalEventsEvent.java b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsEvent.java similarity index 94% rename from src/main/java/ce/ajneb97/api/ConditionalEventsEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsEvent.java index 8779e26..8eb4411 100644 --- a/src/main/java/ce/ajneb97/api/ConditionalEventsEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/api/ConditionalEventsEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.api; +package net.tfminecraft.conditionalevents.api; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/main/java/ce/ajneb97/api/ExpansionCE.java b/src/main/java/net/tfminecraft/conditionalevents/api/ExpansionCE.java similarity index 93% rename from src/main/java/ce/ajneb97/api/ExpansionCE.java rename to src/main/java/net/tfminecraft/conditionalevents/api/ExpansionCE.java index 6ccf95c..4cbac33 100644 --- a/src/main/java/ce/ajneb97/api/ExpansionCE.java +++ b/src/main/java/net/tfminecraft/conditionalevents/api/ExpansionCE.java @@ -1,6 +1,6 @@ -package ce.ajneb97.api; +package net.tfminecraft.conditionalevents.api; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import org.bukkit.entity.Player; import me.clip.placeholderapi.expansion.PlaceholderExpansion; diff --git a/src/main/java/ce/ajneb97/configs/ConfigsManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/ConfigsManager.java similarity index 96% rename from src/main/java/ce/ajneb97/configs/ConfigsManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/ConfigsManager.java index af77997..d4799c2 100644 --- a/src/main/java/ce/ajneb97/configs/ConfigsManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/ConfigsManager.java @@ -1,12 +1,12 @@ -package ce.ajneb97.configs; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; -import ce.ajneb97.managers.RepetitiveManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.CustomEventProperties; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.actions.*; +package net.tfminecraft.conditionalevents.configs; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.managers.RepetitiveManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.CustomEventProperties; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.actions.*; import org.bukkit.configuration.file.FileConfiguration; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/configs/DataFolderConfigManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/DataFolderConfigManager.java similarity index 93% rename from src/main/java/ce/ajneb97/configs/DataFolderConfigManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/DataFolderConfigManager.java index 7335739..22b74fb 100644 --- a/src/main/java/ce/ajneb97/configs/DataFolderConfigManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/DataFolderConfigManager.java @@ -1,7 +1,7 @@ -package ce.ajneb97.configs; +package net.tfminecraft.conditionalevents.configs; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; import java.io.File; import java.nio.file.Path; diff --git a/src/main/java/ce/ajneb97/configs/EventsFolderConfigManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/EventsFolderConfigManager.java similarity index 71% rename from src/main/java/ce/ajneb97/configs/EventsFolderConfigManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/EventsFolderConfigManager.java index 9480a1a..3e8f0f3 100644 --- a/src/main/java/ce/ajneb97/configs/EventsFolderConfigManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/EventsFolderConfigManager.java @@ -1,8 +1,8 @@ -package ce.ajneb97.configs; +package net.tfminecraft.conditionalevents.configs; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; public class EventsFolderConfigManager extends DataFolderConfigManager{ diff --git a/src/main/java/ce/ajneb97/configs/MainConfigManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/MainConfigManager.java similarity index 95% rename from src/main/java/ce/ajneb97/configs/MainConfigManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/MainConfigManager.java index 5126c63..7250bea 100644 --- a/src/main/java/ce/ajneb97/configs/MainConfigManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/MainConfigManager.java @@ -1,9 +1,9 @@ -package ce.ajneb97.configs; +package net.tfminecraft.conditionalevents.configs; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.model.ToConditionGroup; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.model.ToConditionGroup; import org.bukkit.configuration.file.FileConfiguration; import java.io.IOException; @@ -18,7 +18,6 @@ public class MainConfigManager { private CommonConfig configFile; private ConditionalEvents plugin; - private boolean updateNotifications; private boolean debugActions; private boolean experimentalVariableReplacement; private boolean itemMetaVariableEnabled; @@ -35,7 +34,6 @@ public MainConfigManager(ConditionalEvents plugin){ public void configure(){ FileConfiguration config = configFile.getConfig(); - updateNotifications = config.getBoolean("Config.update_notification"); debugActions = config.getBoolean("Config.debug_actions"); experimentalVariableReplacement = config.getBoolean("Config.experimental.variable_replacement"); itemMetaVariableEnabled = config.getBoolean("Config.item_meta_variable_enabled"); @@ -184,9 +182,6 @@ public void checkMessagesUpdate(){ } } - public boolean isUpdateNotifications() { - return updateNotifications; - } public boolean isDebugActions() { return debugActions; diff --git a/src/main/java/ce/ajneb97/configs/PlayersConfigsManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/PlayersConfigsManager.java similarity index 90% rename from src/main/java/ce/ajneb97/configs/PlayersConfigsManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/PlayersConfigsManager.java index 4d28bee..bc5df89 100644 --- a/src/main/java/ce/ajneb97/configs/PlayersConfigsManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/PlayersConfigsManager.java @@ -1,10 +1,10 @@ -package ce.ajneb97.configs; +package net.tfminecraft.conditionalevents.configs; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; -import ce.ajneb97.model.player.EventData; -import ce.ajneb97.model.player.GenericCallback; -import ce.ajneb97.model.player.PlayerData; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.model.player.EventData; +import net.tfminecraft.conditionalevents.model.player.GenericCallback; +import net.tfminecraft.conditionalevents.model.player.PlayerData; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/ce/ajneb97/configs/SavedItemsConfigManager.java b/src/main/java/net/tfminecraft/conditionalevents/configs/SavedItemsConfigManager.java similarity index 90% rename from src/main/java/ce/ajneb97/configs/SavedItemsConfigManager.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/SavedItemsConfigManager.java index f573b56..a83c7eb 100644 --- a/src/main/java/ce/ajneb97/configs/SavedItemsConfigManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/SavedItemsConfigManager.java @@ -1,7 +1,7 @@ -package ce.ajneb97.configs; +package net.tfminecraft.conditionalevents.configs; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.inventory.ItemStack; import java.util.HashMap; diff --git a/src/main/java/ce/ajneb97/configs/model/CommonConfig.java b/src/main/java/net/tfminecraft/conditionalevents/configs/model/CommonConfig.java similarity index 96% rename from src/main/java/ce/ajneb97/configs/model/CommonConfig.java rename to src/main/java/net/tfminecraft/conditionalevents/configs/model/CommonConfig.java index 37fe735..b2fc05d 100644 --- a/src/main/java/ce/ajneb97/configs/model/CommonConfig.java +++ b/src/main/java/net/tfminecraft/conditionalevents/configs/model/CommonConfig.java @@ -1,6 +1,6 @@ -package ce.ajneb97.configs.model; +package net.tfminecraft.conditionalevents.configs.model; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/ce/ajneb97/libs/actionbar/ActionBarAPI.java b/src/main/java/net/tfminecraft/conditionalevents/libs/actionbar/ActionBarAPI.java similarity index 93% rename from src/main/java/ce/ajneb97/libs/actionbar/ActionBarAPI.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/actionbar/ActionBarAPI.java index 69102e8..f56c8a3 100644 --- a/src/main/java/ce/ajneb97/libs/actionbar/ActionBarAPI.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/actionbar/ActionBarAPI.java @@ -1,16 +1,16 @@ -package ce.ajneb97.libs.actionbar; +package net.tfminecraft.conditionalevents.libs.actionbar; import java.lang.reflect.Field; import java.lang.reflect.Method; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.utils.MiniMessageUtils; -import ce.ajneb97.utils.OtherUtils; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.utils.MiniMessageUtils; +import net.tfminecraft.conditionalevents.utils.OtherUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorEquipEvent.java b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorEquipEvent.java similarity index 98% rename from src/main/java/ce/ajneb97/libs/armorequipevent/ArmorEquipEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorEquipEvent.java index 23552de..e6e3773 100644 --- a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorEquipEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorEquipEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.armorequipevent; +package net.tfminecraft.conditionalevents.libs.armorequipevent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorListener.java b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorListener.java similarity index 97% rename from src/main/java/ce/ajneb97/libs/armorequipevent/ArmorListener.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorListener.java index d298e6b..9eb0c27 100644 --- a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorListener.java @@ -1,10 +1,10 @@ -package ce.ajneb97.libs.armorequipevent; +package net.tfminecraft.conditionalevents.libs.armorequipevent; import java.util.List; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.utils.PlayerUtils; -import ce.ajneb97.utils.ServerVersion; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.utils.PlayerUtils; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -20,7 +20,7 @@ import org.bukkit.event.player.PlayerItemBreakEvent; import org.bukkit.inventory.ItemStack; -import ce.ajneb97.libs.armorequipevent.ArmorEquipEvent.EquipMethod; +import net.tfminecraft.conditionalevents.libs.armorequipevent.ArmorEquipEvent.EquipMethod; /** diff --git a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorType.java b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorType.java similarity index 87% rename from src/main/java/ce/ajneb97/libs/armorequipevent/ArmorType.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorType.java index bb817b5..363c84f 100644 --- a/src/main/java/ce/ajneb97/libs/armorequipevent/ArmorType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/armorequipevent/ArmorType.java @@ -1,7 +1,7 @@ -package ce.ajneb97.libs.armorequipevent; +package net.tfminecraft.conditionalevents.libs.armorequipevent; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.utils.ServerVersion; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/ce/ajneb97/libs/centeredmessages/DefaultFontInfo.java b/src/main/java/net/tfminecraft/conditionalevents/libs/centeredmessages/DefaultFontInfo.java similarity index 97% rename from src/main/java/ce/ajneb97/libs/centeredmessages/DefaultFontInfo.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/centeredmessages/DefaultFontInfo.java index cc74e3a..1480d1e 100644 --- a/src/main/java/ce/ajneb97/libs/centeredmessages/DefaultFontInfo.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/centeredmessages/DefaultFontInfo.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.centeredmessages; +package net.tfminecraft.conditionalevents.libs.centeredmessages; public enum DefaultFontInfo{ diff --git a/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/DropType.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/DropType.java new file mode 100644 index 0000000..bb88133 --- /dev/null +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/DropType.java @@ -0,0 +1,7 @@ +package net.tfminecraft.conditionalevents.libs.itemselectevent; + +public enum DropType { + + PLAYER, + INVENTORY +} diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectEvent.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectEvent.java similarity index 92% rename from src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectEvent.java index de90294..321e26a 100644 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.itemselectevent; +package net.tfminecraft.conditionalevents.libs.itemselectevent; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListener.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListener.java similarity index 97% rename from src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListener.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListener.java index 53b1a06..35f308a 100644 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListener.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.itemselectevent; +package net.tfminecraft.conditionalevents.libs.itemselectevent; import java.util.ArrayList; import org.bukkit.Bukkit; @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; public class ItemSelectListener implements Listener{ diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListenerNew.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListenerNew.java similarity index 94% rename from src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListenerNew.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListenerNew.java index f68b360..819d7ff 100644 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListenerNew.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/ItemSelectListenerNew.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.itemselectevent; +package net.tfminecraft.conditionalevents.libs.itemselectevent; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/libs/itemselectevent/PlayerCustomDropEvent.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/PlayerCustomDropEvent.java similarity index 93% rename from src/main/java/ce/ajneb97/libs/itemselectevent/PlayerCustomDropEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/PlayerCustomDropEvent.java index 28069d5..3e11b67 100644 --- a/src/main/java/ce/ajneb97/libs/itemselectevent/PlayerCustomDropEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/PlayerCustomDropEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.itemselectevent; +package net.tfminecraft.conditionalevents.libs.itemselectevent; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/SelectType.java b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/SelectType.java new file mode 100644 index 0000000..5488846 --- /dev/null +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/itemselectevent/SelectType.java @@ -0,0 +1,7 @@ +package net.tfminecraft.conditionalevents.libs.itemselectevent; + +public enum SelectType { + + SELECT, + DESELECT +} diff --git a/src/main/java/ce/ajneb97/libs/offhandevent/OffHandEvent.java b/src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandEvent.java similarity index 96% rename from src/main/java/ce/ajneb97/libs/offhandevent/OffHandEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandEvent.java index 32f7446..d217daf 100644 --- a/src/main/java/ce/ajneb97/libs/offhandevent/OffHandEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.offhandevent; +package net.tfminecraft.conditionalevents.libs.offhandevent; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/libs/offhandevent/OffHandListener.java b/src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandListener.java similarity index 93% rename from src/main/java/ce/ajneb97/libs/offhandevent/OffHandListener.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandListener.java index c7f7a74..0a376bd 100644 --- a/src/main/java/ce/ajneb97/libs/offhandevent/OffHandListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/offhandevent/OffHandListener.java @@ -1,7 +1,7 @@ -package ce.ajneb97.libs.offhandevent; +package net.tfminecraft.conditionalevents.libs.offhandevent; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.utils.ServerVersion; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/ce/ajneb97/libs/repairevent/RepairEvent.java b/src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairEvent.java similarity index 95% rename from src/main/java/ce/ajneb97/libs/repairevent/RepairEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairEvent.java index 2def078..8293043 100644 --- a/src/main/java/ce/ajneb97/libs/repairevent/RepairEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.libs.repairevent; +package net.tfminecraft.conditionalevents.libs.repairevent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/ce/ajneb97/libs/repairevent/RepairListener.java b/src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairListener.java similarity index 95% rename from src/main/java/ce/ajneb97/libs/repairevent/RepairListener.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairListener.java index 16832e0..e234b3e 100644 --- a/src/main/java/ce/ajneb97/libs/repairevent/RepairListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/repairevent/RepairListener.java @@ -1,8 +1,8 @@ -package ce.ajneb97.libs.repairevent; +package net.tfminecraft.conditionalevents.libs.repairevent; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.utils.InventoryUtils; -import ce.ajneb97.utils.ServerVersion; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.utils.InventoryUtils; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/libs/titles/TitleAPI.java b/src/main/java/net/tfminecraft/conditionalevents/libs/titles/TitleAPI.java similarity index 94% rename from src/main/java/ce/ajneb97/libs/titles/TitleAPI.java rename to src/main/java/net/tfminecraft/conditionalevents/libs/titles/TitleAPI.java index 74665ad..dd169ed 100644 --- a/src/main/java/ce/ajneb97/libs/titles/TitleAPI.java +++ b/src/main/java/net/tfminecraft/conditionalevents/libs/titles/TitleAPI.java @@ -1,9 +1,9 @@ -package ce.ajneb97.libs.titles; +package net.tfminecraft.conditionalevents.libs.titles; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.utils.MiniMessageUtils; -import ce.ajneb97.utils.OtherUtils; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.utils.MiniMessageUtils; +import net.tfminecraft.conditionalevents.utils.OtherUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/listeners/CustomEventListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/CustomEventListener.java similarity index 92% rename from src/main/java/ce/ajneb97/listeners/CustomEventListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/CustomEventListener.java index c230eaf..fba5e0a 100644 --- a/src/main/java/ce/ajneb97/listeners/CustomEventListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/CustomEventListener.java @@ -1,12 +1,12 @@ -package ce.ajneb97.listeners; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.CustomEventProperties; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +package net.tfminecraft.conditionalevents.listeners; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.CustomEventProperties; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/main/java/ce/ajneb97/listeners/ItemEventsListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/ItemEventsListener.java similarity index 92% rename from src/main/java/ce/ajneb97/listeners/ItemEventsListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/ItemEventsListener.java index 50e03d4..1b5a841 100644 --- a/src/main/java/ce/ajneb97/listeners/ItemEventsListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/ItemEventsListener.java @@ -1,14 +1,14 @@ -package ce.ajneb97.listeners; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.libs.itemselectevent.ItemSelectEvent; -import ce.ajneb97.libs.repairevent.RepairEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; -import ce.ajneb97.utils.InventoryUtils; -import ce.ajneb97.utils.MiniMessageUtils; -import ce.ajneb97.utils.ServerVersion; +package net.tfminecraft.conditionalevents.listeners; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.libs.itemselectevent.ItemSelectEvent; +import net.tfminecraft.conditionalevents.libs.repairevent.RepairEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.utils.InventoryUtils; +import net.tfminecraft.conditionalevents.utils.MiniMessageUtils; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.ChatColor; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Item; diff --git a/src/main/java/ce/ajneb97/listeners/OtherEventsListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/OtherEventsListener.java similarity index 88% rename from src/main/java/ce/ajneb97/listeners/OtherEventsListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/OtherEventsListener.java index a384fcf..c1263e7 100644 --- a/src/main/java/ce/ajneb97/listeners/OtherEventsListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/OtherEventsListener.java @@ -1,12 +1,12 @@ -package ce.ajneb97.listeners; +package net.tfminecraft.conditionalevents.listeners; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsCallEvent; -import ce.ajneb97.managers.EventsManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsCallEvent; +import net.tfminecraft.conditionalevents.managers.EventsManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; diff --git a/src/main/java/ce/ajneb97/listeners/PaperEventsListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/PaperEventsListener.java similarity index 88% rename from src/main/java/ce/ajneb97/listeners/PaperEventsListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/PaperEventsListener.java index c96b5b1..c220dcc 100644 --- a/src/main/java/ce/ajneb97/listeners/PaperEventsListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/PaperEventsListener.java @@ -1,13 +1,13 @@ -package ce.ajneb97.listeners; +package net.tfminecraft.conditionalevents.listeners; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.managers.chatevents.ReceiveChatEvent; -import ce.ajneb97.managers.chatevents.ReceiveChatMessageType; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.managers.chatevents.ReceiveChatEvent; +import net.tfminecraft.conditionalevents.managers.chatevents.ReceiveChatMessageType; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import com.destroystokyo.paper.event.player.PlayerJumpEvent; import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.audience.Audience; diff --git a/src/main/java/ce/ajneb97/listeners/PlayerEventsListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListener.java similarity index 96% rename from src/main/java/ce/ajneb97/listeners/PlayerEventsListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListener.java index a2b9472..103569c 100644 --- a/src/main/java/ce/ajneb97/listeners/PlayerEventsListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListener.java @@ -1,14 +1,13 @@ -package ce.ajneb97.listeners; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.libs.armorequipevent.ArmorEquipEvent; -import ce.ajneb97.libs.offhandevent.OffHandEvent; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; -import ce.ajneb97.model.player.PlayerData; -import ce.ajneb97.utils.*; +package net.tfminecraft.conditionalevents.listeners; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.libs.armorequipevent.ArmorEquipEvent; +import net.tfminecraft.conditionalevents.libs.offhandevent.OffHandEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.model.player.PlayerData; +import net.tfminecraft.conditionalevents.utils.*; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.entity.*; @@ -57,14 +56,6 @@ public void onJoin(PlayerJoinEvent event){ new ConditionEvent(plugin, player, event, EventType.PLAYER_JOIN, null) .checkEvent(); - - //Update notification - String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion(); - if(player.isOp() && !(plugin.version.equals(latestVersion)) && - plugin.getConfigsManager().getMainConfigManager().isUpdateNotifications()){ - player.sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cThere is a new version available. &e(&7"+latestVersion+"&e)")); - player.sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/conditionalevents")); - } } @EventHandler(priority = EventPriority.HIGHEST) diff --git a/src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_16.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_16.java similarity index 75% rename from src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_16.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_16.java index c9f44fc..06ce980 100644 --- a/src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_16.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_16.java @@ -1,9 +1,9 @@ -package ce.ajneb97.listeners; +package net.tfminecraft.conditionalevents.listeners; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_9.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_9.java similarity index 82% rename from src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_9.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_9.java index 771d46b..e0671f1 100644 --- a/src/main/java/ce/ajneb97/listeners/PlayerEventsListenerNew1_9.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/PlayerEventsListenerNew1_9.java @@ -1,9 +1,9 @@ -package ce.ajneb97.listeners; +package net.tfminecraft.conditionalevents.listeners; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/ce/ajneb97/listeners/dependencies/CitizensListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/CitizensListener.java similarity index 73% rename from src/main/java/ce/ajneb97/listeners/dependencies/CitizensListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/CitizensListener.java index 2cb66a9..b6fcbd3 100644 --- a/src/main/java/ce/ajneb97/listeners/dependencies/CitizensListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/CitizensListener.java @@ -1,9 +1,9 @@ -package ce.ajneb97.listeners.dependencies; +package net.tfminecraft.conditionalevents.listeners.dependencies; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import net.citizensnpcs.api.event.NPCRightClickEvent; import net.citizensnpcs.api.npc.NPC; import org.bukkit.Bukkit; diff --git a/src/main/java/ce/ajneb97/listeners/dependencies/WGRegionEventsListener.java b/src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/WGRegionEventsListener.java similarity index 78% rename from src/main/java/ce/ajneb97/listeners/dependencies/WGRegionEventsListener.java rename to src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/WGRegionEventsListener.java index 1453aef..6570a1b 100644 --- a/src/main/java/ce/ajneb97/listeners/dependencies/WGRegionEventsListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/listeners/dependencies/WGRegionEventsListener.java @@ -1,9 +1,9 @@ -package ce.ajneb97.listeners.dependencies; +package net.tfminecraft.conditionalevents.listeners.dependencies; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import net.raidstone.wgevents.events.RegionEnteredEvent; import net.raidstone.wgevents.events.RegionLeftEvent; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/managers/APIManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/APIManager.java similarity index 91% rename from src/main/java/ce/ajneb97/managers/APIManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/APIManager.java index 60f221d..c8b87c8 100644 --- a/src/main/java/ce/ajneb97/managers/APIManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/APIManager.java @@ -1,7 +1,7 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAction; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAction; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/managers/BungeeMessagingManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/BungeeMessagingManager.java similarity index 90% rename from src/main/java/ce/ajneb97/managers/BungeeMessagingManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/BungeeMessagingManager.java index 4013972..5413478 100644 --- a/src/main/java/ce/ajneb97/managers/BungeeMessagingManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/BungeeMessagingManager.java @@ -1,6 +1,6 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import org.bukkit.Bukkit; diff --git a/src/main/java/ce/ajneb97/managers/DebugManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/DebugManager.java similarity index 93% rename from src/main/java/ce/ajneb97/managers/DebugManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/DebugManager.java index 8b5b612..5f1286a 100644 --- a/src/main/java/ce/ajneb97/managers/DebugManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/DebugManager.java @@ -1,10 +1,10 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.actions.ActionTargeter; -import ce.ajneb97.model.actions.ActionTargeterType; -import ce.ajneb97.model.actions.ActionType; -import ce.ajneb97.model.internal.DebugSender; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.actions.ActionTargeter; +import net.tfminecraft.conditionalevents.model.actions.ActionTargeterType; +import net.tfminecraft.conditionalevents.model.actions.ActionType; +import net.tfminecraft.conditionalevents.model.internal.DebugSender; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/ce/ajneb97/managers/DependencyManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/DependencyManager.java similarity index 88% rename from src/main/java/ce/ajneb97/managers/DependencyManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/DependencyManager.java index c7fdb43..d41d0be 100644 --- a/src/main/java/ce/ajneb97/managers/DependencyManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/DependencyManager.java @@ -1,9 +1,9 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.managers.dependencies.DiscordSRVManager; -import ce.ajneb97.managers.dependencies.PacketEventsManager; -import ce.ajneb97.managers.dependencies.ProtocolLibManager; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.managers.dependencies.DiscordSRVManager; +import net.tfminecraft.conditionalevents.managers.dependencies.PacketEventsManager; +import net.tfminecraft.conditionalevents.managers.dependencies.ProtocolLibManager; import org.bukkit.Bukkit; public class DependencyManager { diff --git a/src/main/java/ce/ajneb97/managers/EventsManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/EventsManager.java similarity index 97% rename from src/main/java/ce/ajneb97/managers/EventsManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/EventsManager.java index e960b42..e5e1476 100644 --- a/src/main/java/ce/ajneb97/managers/EventsManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/EventsManager.java @@ -1,14 +1,14 @@ -package ce.ajneb97.managers; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.ConditionalType; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.*; -import ce.ajneb97.utils.MathUtils; -import ce.ajneb97.utils.TimeUtils; -import ce.ajneb97.utils.VariablesUtils; +package net.tfminecraft.conditionalevents.managers; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.ConditionalType; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.*; +import net.tfminecraft.conditionalevents.utils.MathUtils; +import net.tfminecraft.conditionalevents.utils.TimeUtils; +import net.tfminecraft.conditionalevents.utils.VariablesUtils; import org.bukkit.Bukkit; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/managers/InterruptEventManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/InterruptEventManager.java similarity index 87% rename from src/main/java/ce/ajneb97/managers/InterruptEventManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/InterruptEventManager.java index 712371d..11bffba 100644 --- a/src/main/java/ce/ajneb97/managers/InterruptEventManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/InterruptEventManager.java @@ -1,7 +1,7 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.internal.WaitActionTask; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.internal.WaitActionTask; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/ce/ajneb97/managers/MessagesManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/MessagesManager.java similarity index 92% rename from src/main/java/ce/ajneb97/managers/MessagesManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/MessagesManager.java index 0e762bf..449b077 100644 --- a/src/main/java/ce/ajneb97/managers/MessagesManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/MessagesManager.java @@ -1,9 +1,9 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.libs.centeredmessages.DefaultFontInfo; -import ce.ajneb97.utils.MiniMessageUtils; -import ce.ajneb97.utils.OtherUtils; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.libs.centeredmessages.DefaultFontInfo; +import net.tfminecraft.conditionalevents.utils.MiniMessageUtils; +import net.tfminecraft.conditionalevents.utils.OtherUtils; import net.md_5.bungee.api.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/ce/ajneb97/managers/PlayerManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/PlayerManager.java similarity index 94% rename from src/main/java/ce/ajneb97/managers/PlayerManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/PlayerManager.java index cc30092..36a0e98 100644 --- a/src/main/java/ce/ajneb97/managers/PlayerManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/PlayerManager.java @@ -1,11 +1,11 @@ -package ce.ajneb97.managers; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.PlayersConfigsManager; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.internal.ConditionEvent; -import ce.ajneb97.model.player.GenericCallback; -import ce.ajneb97.model.player.PlayerData; +package net.tfminecraft.conditionalevents.managers; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.PlayersConfigsManager; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.model.player.GenericCallback; +import net.tfminecraft.conditionalevents.model.player.PlayerData; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; diff --git a/src/main/java/ce/ajneb97/managers/RepetitiveManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/RepetitiveManager.java similarity index 85% rename from src/main/java/ce/ajneb97/managers/RepetitiveManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/RepetitiveManager.java index 288a903..4cb05bc 100644 --- a/src/main/java/ce/ajneb97/managers/RepetitiveManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/RepetitiveManager.java @@ -1,9 +1,9 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/ce/ajneb97/managers/SavedItemsManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/SavedItemsManager.java similarity index 91% rename from src/main/java/ce/ajneb97/managers/SavedItemsManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/SavedItemsManager.java index 6ea2027..4d1637f 100644 --- a/src/main/java/ce/ajneb97/managers/SavedItemsManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/SavedItemsManager.java @@ -1,7 +1,7 @@ -package ce.ajneb97.managers; +package net.tfminecraft.conditionalevents.managers; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.utils.OtherUtils; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.utils.OtherUtils; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; diff --git a/src/main/java/ce/ajneb97/managers/VerifyManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/VerifyManager.java similarity index 93% rename from src/main/java/ce/ajneb97/managers/VerifyManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/VerifyManager.java index fd6b5e8..d5ad8ff 100644 --- a/src/main/java/ce/ajneb97/managers/VerifyManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/VerifyManager.java @@ -1,14 +1,14 @@ -package ce.ajneb97.managers; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.model.CommonConfig; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.ConditionalType; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.actions.ActionGroup; -import ce.ajneb97.model.actions.ActionType; -import ce.ajneb97.model.actions.CEAction; -import ce.ajneb97.model.verify.*; +package net.tfminecraft.conditionalevents.managers; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.model.CommonConfig; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.ConditionalType; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.actions.ActionGroup; +import net.tfminecraft.conditionalevents.model.actions.ActionType; +import net.tfminecraft.conditionalevents.model.actions.CEAction; +import net.tfminecraft.conditionalevents.model.verify.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatEvent.java b/src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatEvent.java similarity index 94% rename from src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatEvent.java index 40638d9..8d3c21d 100644 --- a/src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.managers.chatevents; +package net.tfminecraft.conditionalevents.managers.chatevents; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatMessageType.java b/src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatMessageType.java similarity index 55% rename from src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatMessageType.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatMessageType.java index 501d963..0b3d04e 100644 --- a/src/main/java/ce/ajneb97/managers/chatevents/ReceiveChatMessageType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/chatevents/ReceiveChatMessageType.java @@ -1,4 +1,4 @@ -package ce.ajneb97.managers.chatevents; +package net.tfminecraft.conditionalevents.managers.chatevents; public enum ReceiveChatMessageType { PLAYER_MESSAGE, diff --git a/src/main/java/ce/ajneb97/managers/commandregister/CECommand.java b/src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CECommand.java similarity index 85% rename from src/main/java/ce/ajneb97/managers/commandregister/CECommand.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CECommand.java index 935b0bc..7ddec06 100644 --- a/src/main/java/ce/ajneb97/managers/commandregister/CECommand.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CECommand.java @@ -1,4 +1,4 @@ -package ce.ajneb97.managers.commandregister; +package net.tfminecraft.conditionalevents.managers.commandregister; import org.bukkit.command.CommandSender; import org.bukkit.command.defaults.BukkitCommand; diff --git a/src/main/java/ce/ajneb97/managers/commandregister/CommandRegisterManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CommandRegisterManager.java similarity index 92% rename from src/main/java/ce/ajneb97/managers/commandregister/CommandRegisterManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CommandRegisterManager.java index 2d2511f..aa208dc 100644 --- a/src/main/java/ce/ajneb97/managers/commandregister/CommandRegisterManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/commandregister/CommandRegisterManager.java @@ -1,6 +1,6 @@ -package ce.ajneb97.managers.commandregister; +package net.tfminecraft.conditionalevents.managers.commandregister; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.command.SimpleCommandMap; diff --git a/src/main/java/ce/ajneb97/managers/dependencies/DiscordSRVManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/DiscordSRVManager.java similarity index 96% rename from src/main/java/ce/ajneb97/managers/dependencies/DiscordSRVManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/DiscordSRVManager.java index 713f60c..1f59405 100644 --- a/src/main/java/ce/ajneb97/managers/dependencies/DiscordSRVManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/DiscordSRVManager.java @@ -1,6 +1,6 @@ -package ce.ajneb97.managers.dependencies; +package net.tfminecraft.conditionalevents.managers.dependencies; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import github.scarsz.discordsrv.DiscordSRV; import github.scarsz.discordsrv.dependencies.jda.api.EmbedBuilder; import github.scarsz.discordsrv.dependencies.jda.api.entities.MessageChannel; diff --git a/src/main/java/ce/ajneb97/managers/dependencies/PacketEventsChatListener.java b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsChatListener.java similarity index 85% rename from src/main/java/ce/ajneb97/managers/dependencies/PacketEventsChatListener.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsChatListener.java index 7d854ff..28c4fdf 100644 --- a/src/main/java/ce/ajneb97/managers/dependencies/PacketEventsChatListener.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsChatListener.java @@ -1,11 +1,11 @@ -package ce.ajneb97.managers.dependencies; +package net.tfminecraft.conditionalevents.managers.dependencies; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.managers.chatevents.ReceiveChatEvent; -import ce.ajneb97.listeners.PaperEventsListener; -import ce.ajneb97.managers.chatevents.ReceiveChatMessageType; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.managers.chatevents.ReceiveChatEvent; +import net.tfminecraft.conditionalevents.listeners.PaperEventsListener; +import net.tfminecraft.conditionalevents.managers.chatevents.ReceiveChatMessageType; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; import com.github.retrooper.packetevents.event.PacketListener; import com.github.retrooper.packetevents.event.PacketSendEvent; import com.github.retrooper.packetevents.protocol.packettype.PacketType; diff --git a/src/main/java/ce/ajneb97/managers/dependencies/PacketEventsManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsManager.java similarity index 81% rename from src/main/java/ce/ajneb97/managers/dependencies/PacketEventsManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsManager.java index 51b5bc7..2d72e31 100644 --- a/src/main/java/ce/ajneb97/managers/dependencies/PacketEventsManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/PacketEventsManager.java @@ -1,6 +1,6 @@ -package ce.ajneb97.managers.dependencies; +package net.tfminecraft.conditionalevents.managers.dependencies; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.event.EventManager; import com.github.retrooper.packetevents.event.PacketListenerPriority; diff --git a/src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibManager.java b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibManager.java similarity index 93% rename from src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibManager.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibManager.java index f8667bb..05afaf2 100644 --- a/src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibManager.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibManager.java @@ -1,11 +1,11 @@ -package ce.ajneb97.managers.dependencies; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.ConditionEvent; -import ce.ajneb97.utils.OtherUtils; +package net.tfminecraft.conditionalevents.managers.dependencies; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.ConditionEvent; +import net.tfminecraft.conditionalevents.utils.OtherUtils; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.ListenerPriority; diff --git a/src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibReceiveMessageEvent.java b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibReceiveMessageEvent.java similarity index 94% rename from src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibReceiveMessageEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibReceiveMessageEvent.java index 62dcfdc..c71f8a1 100644 --- a/src/main/java/ce/ajneb97/managers/dependencies/ProtocolLibReceiveMessageEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/managers/dependencies/ProtocolLibReceiveMessageEvent.java @@ -1,4 +1,4 @@ -package ce.ajneb97.managers.dependencies; +package net.tfminecraft.conditionalevents.managers.dependencies; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/ce/ajneb97/model/CEEvent.java b/src/main/java/net/tfminecraft/conditionalevents/model/CEEvent.java similarity index 96% rename from src/main/java/ce/ajneb97/model/CEEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/model/CEEvent.java index 8d611f3..b8ca79b 100644 --- a/src/main/java/ce/ajneb97/model/CEEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/CEEvent.java @@ -1,7 +1,7 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; -import ce.ajneb97.managers.RepetitiveManager; -import ce.ajneb97.model.actions.ActionGroup; +import net.tfminecraft.conditionalevents.managers.RepetitiveManager; +import net.tfminecraft.conditionalevents.model.actions.ActionGroup; import org.bukkit.Bukkit; import java.util.List; diff --git a/src/main/java/ce/ajneb97/model/ConditionalType.java b/src/main/java/net/tfminecraft/conditionalevents/model/ConditionalType.java similarity index 93% rename from src/main/java/ce/ajneb97/model/ConditionalType.java rename to src/main/java/net/tfminecraft/conditionalevents/model/ConditionalType.java index e40de04..c737afa 100644 --- a/src/main/java/ce/ajneb97/model/ConditionalType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/ConditionalType.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; public enum ConditionalType { EQUALS("=="), diff --git a/src/main/java/ce/ajneb97/model/CustomEventProperties.java b/src/main/java/net/tfminecraft/conditionalevents/model/CustomEventProperties.java similarity index 95% rename from src/main/java/ce/ajneb97/model/CustomEventProperties.java rename to src/main/java/net/tfminecraft/conditionalevents/model/CustomEventProperties.java index 055f528..eb1cf26 100644 --- a/src/main/java/ce/ajneb97/model/CustomEventProperties.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/CustomEventProperties.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; import java.util.List; diff --git a/src/main/java/ce/ajneb97/model/EventType.java b/src/main/java/net/tfminecraft/conditionalevents/model/EventType.java similarity index 95% rename from src/main/java/ce/ajneb97/model/EventType.java rename to src/main/java/net/tfminecraft/conditionalevents/model/EventType.java index 8747441..ffcfbbc 100644 --- a/src/main/java/ce/ajneb97/model/EventType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/EventType.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; public enum EventType { PLAYER_RESPAWN, diff --git a/src/main/java/ce/ajneb97/model/StoredVariable.java b/src/main/java/net/tfminecraft/conditionalevents/model/StoredVariable.java similarity index 90% rename from src/main/java/ce/ajneb97/model/StoredVariable.java rename to src/main/java/net/tfminecraft/conditionalevents/model/StoredVariable.java index 6ce9fde..185d8f6 100644 --- a/src/main/java/ce/ajneb97/model/StoredVariable.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/StoredVariable.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; public class StoredVariable { private String name; diff --git a/src/main/java/ce/ajneb97/model/ToConditionGroup.java b/src/main/java/net/tfminecraft/conditionalevents/model/ToConditionGroup.java similarity index 92% rename from src/main/java/ce/ajneb97/model/ToConditionGroup.java rename to src/main/java/net/tfminecraft/conditionalevents/model/ToConditionGroup.java index 50385a8..92e502f 100644 --- a/src/main/java/ce/ajneb97/model/ToConditionGroup.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/ToConditionGroup.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model; +package net.tfminecraft.conditionalevents.model; import java.util.List; diff --git a/src/main/java/ce/ajneb97/model/actions/ActionGroup.java b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionGroup.java similarity index 90% rename from src/main/java/ce/ajneb97/model/actions/ActionGroup.java rename to src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionGroup.java index 7a97b1e..b5d3245 100644 --- a/src/main/java/ce/ajneb97/model/actions/ActionGroup.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionGroup.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.actions; +package net.tfminecraft.conditionalevents.model.actions; import java.util.List; diff --git a/src/main/java/ce/ajneb97/model/actions/ActionTargeter.java b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeter.java similarity index 89% rename from src/main/java/ce/ajneb97/model/actions/ActionTargeter.java rename to src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeter.java index 3556e98..34f3ca4 100644 --- a/src/main/java/ce/ajneb97/model/actions/ActionTargeter.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeter.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.actions; +package net.tfminecraft.conditionalevents.model.actions; public class ActionTargeter { private ActionTargeterType type; diff --git a/src/main/java/ce/ajneb97/model/actions/ActionTargeterType.java b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeterType.java similarity index 70% rename from src/main/java/ce/ajneb97/model/actions/ActionTargeterType.java rename to src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeterType.java index 6d5abf4..9a075fb 100644 --- a/src/main/java/ce/ajneb97/model/actions/ActionTargeterType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionTargeterType.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.actions; +package net.tfminecraft.conditionalevents.model.actions; public enum ActionTargeterType { TO_ALL, diff --git a/src/main/java/ce/ajneb97/model/actions/ActionType.java b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionType.java similarity index 94% rename from src/main/java/ce/ajneb97/model/actions/ActionType.java rename to src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionType.java index 7f3f694..1998948 100644 --- a/src/main/java/ce/ajneb97/model/actions/ActionType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/actions/ActionType.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.actions; +package net.tfminecraft.conditionalevents.model.actions; public enum ActionType { MESSAGE, diff --git a/src/main/java/ce/ajneb97/model/actions/CEAction.java b/src/main/java/net/tfminecraft/conditionalevents/model/actions/CEAction.java similarity index 94% rename from src/main/java/ce/ajneb97/model/actions/CEAction.java rename to src/main/java/net/tfminecraft/conditionalevents/model/actions/CEAction.java index 4bd8b01..286d32c 100644 --- a/src/main/java/ce/ajneb97/model/actions/CEAction.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/actions/CEAction.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.actions; +package net.tfminecraft.conditionalevents.model.actions; public class CEAction { diff --git a/src/main/java/ce/ajneb97/model/internal/AdditionalEventStorage.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/AdditionalEventStorage.java similarity index 90% rename from src/main/java/ce/ajneb97/model/internal/AdditionalEventStorage.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/AdditionalEventStorage.java index 8b26643..966f9a4 100644 --- a/src/main/java/ce/ajneb97/model/internal/AdditionalEventStorage.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/AdditionalEventStorage.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/ce/ajneb97/model/internal/CheckConditionsResult.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/CheckConditionsResult.java similarity index 91% rename from src/main/java/ce/ajneb97/model/internal/CheckConditionsResult.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/CheckConditionsResult.java index fb11764..681aee9 100644 --- a/src/main/java/ce/ajneb97/model/internal/CheckConditionsResult.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/CheckConditionsResult.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; public class CheckConditionsResult { diff --git a/src/main/java/ce/ajneb97/model/internal/ConditionEvent.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/ConditionEvent.java similarity index 95% rename from src/main/java/ce/ajneb97/model/internal/ConditionEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/ConditionEvent.java index da7b00f..f19cecc 100644 --- a/src/main/java/ce/ajneb97/model/internal/ConditionEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/ConditionEvent.java @@ -1,15 +1,15 @@ -package ce.ajneb97.model.internal; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.configs.MainConfigManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.minimessage.GetVariablesItemLore; -import ce.ajneb97.utils.BlockUtils; -import ce.ajneb97.utils.MiniMessageUtils; -import ce.ajneb97.utils.OtherUtils; -import ce.ajneb97.utils.ServerVersion; +package net.tfminecraft.conditionalevents.model.internal; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.configs.MainConfigManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.minimessage.GetVariablesItemLore; +import net.tfminecraft.conditionalevents.utils.BlockUtils; +import net.tfminecraft.conditionalevents.utils.MiniMessageUtils; +import net.tfminecraft.conditionalevents.utils.OtherUtils; +import net.tfminecraft.conditionalevents.utils.ServerVersion; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.NamespacedKey; diff --git a/src/main/java/ce/ajneb97/model/internal/DebugSender.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/DebugSender.java similarity index 93% rename from src/main/java/ce/ajneb97/model/internal/DebugSender.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/DebugSender.java index 4391c5e..3a091c7 100644 --- a/src/main/java/ce/ajneb97/model/internal/DebugSender.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/DebugSender.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; import org.bukkit.command.CommandSender; diff --git a/src/main/java/ce/ajneb97/model/internal/ExecutedEvent.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/ExecutedEvent.java similarity index 96% rename from src/main/java/ce/ajneb97/model/internal/ExecutedEvent.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/ExecutedEvent.java index 34e3d87..30d97d1 100644 --- a/src/main/java/ce/ajneb97/model/internal/ExecutedEvent.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/ExecutedEvent.java @@ -1,15 +1,15 @@ -package ce.ajneb97.model.internal; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsEvent; -import ce.ajneb97.managers.DebugManager; -import ce.ajneb97.managers.EventsManager; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.ToConditionGroup; -import ce.ajneb97.model.actions.*; -import ce.ajneb97.utils.ActionUtils; -import ce.ajneb97.utils.VariablesUtils; +package net.tfminecraft.conditionalevents.model.internal; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsEvent; +import net.tfminecraft.conditionalevents.managers.DebugManager; +import net.tfminecraft.conditionalevents.managers.EventsManager; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.ToConditionGroup; +import net.tfminecraft.conditionalevents.model.actions.*; +import net.tfminecraft.conditionalevents.utils.ActionUtils; +import net.tfminecraft.conditionalevents.utils.VariablesUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/ce/ajneb97/model/internal/PostEventVariableResult.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/PostEventVariableResult.java similarity index 93% rename from src/main/java/ce/ajneb97/model/internal/PostEventVariableResult.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/PostEventVariableResult.java index 909867c..44df020 100644 --- a/src/main/java/ce/ajneb97/model/internal/PostEventVariableResult.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/PostEventVariableResult.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; public class PostEventVariableResult { private String variable; diff --git a/src/main/java/net/tfminecraft/conditionalevents/model/internal/SeparatorType.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/SeparatorType.java new file mode 100644 index 0000000..7ec5424 --- /dev/null +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/SeparatorType.java @@ -0,0 +1,7 @@ +package net.tfminecraft.conditionalevents.model.internal; + +public enum SeparatorType { + AND, + OR, + NONE +} diff --git a/src/main/java/ce/ajneb97/model/internal/VariablesProperties.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/VariablesProperties.java similarity index 92% rename from src/main/java/ce/ajneb97/model/internal/VariablesProperties.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/VariablesProperties.java index a4e3bc0..df56706 100644 --- a/src/main/java/ce/ajneb97/model/internal/VariablesProperties.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/VariablesProperties.java @@ -1,7 +1,7 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; -import ce.ajneb97.model.CEEvent; -import ce.ajneb97.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.CEEvent; +import net.tfminecraft.conditionalevents.model.StoredVariable; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/src/main/java/ce/ajneb97/model/internal/WaitActionTask.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/WaitActionTask.java similarity index 93% rename from src/main/java/ce/ajneb97/model/internal/WaitActionTask.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/WaitActionTask.java index 4779bd1..b46fe92 100644 --- a/src/main/java/ce/ajneb97/model/internal/WaitActionTask.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/WaitActionTask.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal; +package net.tfminecraft.conditionalevents.model.internal; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/ce/ajneb97/model/internal/minimessage/GetVariablesItemLore.java b/src/main/java/net/tfminecraft/conditionalevents/model/internal/minimessage/GetVariablesItemLore.java similarity index 92% rename from src/main/java/ce/ajneb97/model/internal/minimessage/GetVariablesItemLore.java rename to src/main/java/net/tfminecraft/conditionalevents/model/internal/minimessage/GetVariablesItemLore.java index 218a51f..14677dc 100644 --- a/src/main/java/ce/ajneb97/model/internal/minimessage/GetVariablesItemLore.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/internal/minimessage/GetVariablesItemLore.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.internal.minimessage; +package net.tfminecraft.conditionalevents.model.internal.minimessage; import java.util.List; diff --git a/src/main/java/ce/ajneb97/model/player/EventData.java b/src/main/java/net/tfminecraft/conditionalevents/model/player/EventData.java similarity index 93% rename from src/main/java/ce/ajneb97/model/player/EventData.java rename to src/main/java/net/tfminecraft/conditionalevents/model/player/EventData.java index 8cced5b..69b6c3d 100644 --- a/src/main/java/ce/ajneb97/model/player/EventData.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/player/EventData.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.player; +package net.tfminecraft.conditionalevents.model.player; public class EventData { private String name; diff --git a/src/main/java/ce/ajneb97/model/player/GenericCallback.java b/src/main/java/net/tfminecraft/conditionalevents/model/player/GenericCallback.java similarity index 55% rename from src/main/java/ce/ajneb97/model/player/GenericCallback.java rename to src/main/java/net/tfminecraft/conditionalevents/model/player/GenericCallback.java index a1bd6c9..e4856e0 100644 --- a/src/main/java/ce/ajneb97/model/player/GenericCallback.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/player/GenericCallback.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.player; +package net.tfminecraft.conditionalevents.model.player; public interface GenericCallback { diff --git a/src/main/java/ce/ajneb97/model/player/PlayerData.java b/src/main/java/net/tfminecraft/conditionalevents/model/player/PlayerData.java similarity index 97% rename from src/main/java/ce/ajneb97/model/player/PlayerData.java rename to src/main/java/net/tfminecraft/conditionalevents/model/player/PlayerData.java index 546c259..b69d5da 100644 --- a/src/main/java/ce/ajneb97/model/player/PlayerData.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/player/PlayerData.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.player; +package net.tfminecraft.conditionalevents.model.player; import java.util.ArrayList; import java.util.UUID; diff --git a/src/main/java/ce/ajneb97/model/verify/CEError.java b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEError.java similarity index 94% rename from src/main/java/ce/ajneb97/model/verify/CEError.java rename to src/main/java/net/tfminecraft/conditionalevents/model/verify/CEError.java index fed6921..f1406cb 100644 --- a/src/main/java/ce/ajneb97/model/verify/CEError.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEError.java @@ -1,4 +1,4 @@ -package ce.ajneb97.model.verify; +package net.tfminecraft.conditionalevents.model.verify; import org.bukkit.entity.Player; diff --git a/src/main/java/ce/ajneb97/model/verify/CEErrorAction.java b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorAction.java similarity index 87% rename from src/main/java/ce/ajneb97/model/verify/CEErrorAction.java rename to src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorAction.java index 6e666cc..20f28c7 100644 --- a/src/main/java/ce/ajneb97/model/verify/CEErrorAction.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorAction.java @@ -1,9 +1,9 @@ -package ce.ajneb97.model.verify; +package net.tfminecraft.conditionalevents.model.verify; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.utils.JSONMessage; -import ce.ajneb97.utils.JSONMessageAdventure; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.utils.JSONMessage; +import net.tfminecraft.conditionalevents.utils.JSONMessageAdventure; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/model/verify/CEErrorCondition.java b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorCondition.java similarity index 89% rename from src/main/java/ce/ajneb97/model/verify/CEErrorCondition.java rename to src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorCondition.java index 830314f..a3ecc88 100644 --- a/src/main/java/ce/ajneb97/model/verify/CEErrorCondition.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorCondition.java @@ -1,8 +1,8 @@ -package ce.ajneb97.model.verify; +package net.tfminecraft.conditionalevents.model.verify; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.utils.JSONMessage; -import ce.ajneb97.utils.JSONMessageAdventure; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.utils.JSONMessage; +import net.tfminecraft.conditionalevents.utils.JSONMessageAdventure; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/model/verify/CEErrorEventType.java b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorEventType.java similarity index 88% rename from src/main/java/ce/ajneb97/model/verify/CEErrorEventType.java rename to src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorEventType.java index 1b5aca4..4ecb79f 100644 --- a/src/main/java/ce/ajneb97/model/verify/CEErrorEventType.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorEventType.java @@ -1,8 +1,8 @@ -package ce.ajneb97.model.verify; +package net.tfminecraft.conditionalevents.model.verify; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.utils.JSONMessage; -import ce.ajneb97.utils.JSONMessageAdventure; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.utils.JSONMessage; +import net.tfminecraft.conditionalevents.utils.JSONMessageAdventure; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/model/verify/CEErrorRandomVariable.java b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorRandomVariable.java similarity index 88% rename from src/main/java/ce/ajneb97/model/verify/CEErrorRandomVariable.java rename to src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorRandomVariable.java index 81f504d..765aaf0 100644 --- a/src/main/java/ce/ajneb97/model/verify/CEErrorRandomVariable.java +++ b/src/main/java/net/tfminecraft/conditionalevents/model/verify/CEErrorRandomVariable.java @@ -1,8 +1,8 @@ -package ce.ajneb97.model.verify; +package net.tfminecraft.conditionalevents.model.verify; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.utils.JSONMessage; -import ce.ajneb97.utils.JSONMessageAdventure; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.utils.JSONMessage; +import net.tfminecraft.conditionalevents.utils.JSONMessageAdventure; import org.bukkit.entity.Player; import java.util.ArrayList; diff --git a/src/main/java/ce/ajneb97/tasks/PlayerDataSaveTask.java b/src/main/java/net/tfminecraft/conditionalevents/tasks/PlayerDataSaveTask.java similarity index 85% rename from src/main/java/ce/ajneb97/tasks/PlayerDataSaveTask.java rename to src/main/java/net/tfminecraft/conditionalevents/tasks/PlayerDataSaveTask.java index 8b20275..400a5e1 100644 --- a/src/main/java/ce/ajneb97/tasks/PlayerDataSaveTask.java +++ b/src/main/java/net/tfminecraft/conditionalevents/tasks/PlayerDataSaveTask.java @@ -1,6 +1,6 @@ -package ce.ajneb97.tasks; +package net.tfminecraft.conditionalevents.tasks; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import org.bukkit.scheduler.BukkitRunnable; public class PlayerDataSaveTask { diff --git a/src/main/java/ce/ajneb97/utils/ActionUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/ActionUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/ActionUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/ActionUtils.java index c1f1c07..6939a22 100644 --- a/src/main/java/ce/ajneb97/utils/ActionUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/ActionUtils.java @@ -1,16 +1,16 @@ -package ce.ajneb97.utils; - -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.api.ConditionalEventsCallEvent; -import ce.ajneb97.libs.actionbar.ActionBarAPI; -import ce.ajneb97.libs.titles.TitleAPI; -import ce.ajneb97.managers.InterruptEventManager; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.managers.dependencies.DiscordSRVManager; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.AdditionalEventStorage; -import ce.ajneb97.model.internal.ExecutedEvent; +package net.tfminecraft.conditionalevents.utils; + +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.api.ConditionalEventsCallEvent; +import net.tfminecraft.conditionalevents.libs.actionbar.ActionBarAPI; +import net.tfminecraft.conditionalevents.libs.titles.TitleAPI; +import net.tfminecraft.conditionalevents.managers.InterruptEventManager; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.managers.dependencies.DiscordSRVManager; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.AdditionalEventStorage; +import net.tfminecraft.conditionalevents.model.internal.ExecutedEvent; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; import org.bukkit.*; diff --git a/src/main/java/ce/ajneb97/utils/BlockUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/BlockUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/BlockUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/BlockUtils.java index 1efc92f..492cb95 100644 --- a/src/main/java/ce/ajneb97/utils/BlockUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/BlockUtils.java @@ -1,6 +1,6 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/ce/ajneb97/utils/GlobalVariablesUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/GlobalVariablesUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/GlobalVariablesUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/GlobalVariablesUtils.java index 2eafd74..ed6d1f9 100644 --- a/src/main/java/ce/ajneb97/utils/GlobalVariablesUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/GlobalVariablesUtils.java @@ -1,8 +1,8 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.model.internal.AdditionalEventStorage; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.model.internal.AdditionalEventStorage; import dev.lone.itemsadder.api.CustomStack; import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; diff --git a/src/main/java/ce/ajneb97/utils/InventoryUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/InventoryUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/InventoryUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/InventoryUtils.java index 16f644c..fee7c38 100644 --- a/src/main/java/ce/ajneb97/utils/InventoryUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/InventoryUtils.java @@ -1,4 +1,4 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryEvent; diff --git a/src/main/java/ce/ajneb97/utils/ItemUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/ItemUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/ItemUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/ItemUtils.java index 8aecf48..36d111b 100644 --- a/src/main/java/ce/ajneb97/utils/ItemUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/ItemUtils.java @@ -1,8 +1,8 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.ConditionalEvents; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.managers.MessagesManager; +import net.tfminecraft.conditionalevents.ConditionalEvents; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.managers.MessagesManager; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/ce/ajneb97/utils/JSONMessage.java b/src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessage.java similarity index 97% rename from src/main/java/ce/ajneb97/utils/JSONMessage.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessage.java index 19ab859..6872b13 100644 --- a/src/main/java/ce/ajneb97/utils/JSONMessage.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessage.java @@ -1,4 +1,4 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; import java.util.List; diff --git a/src/main/java/ce/ajneb97/utils/JSONMessageAdventure.java b/src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessageAdventure.java similarity index 96% rename from src/main/java/ce/ajneb97/utils/JSONMessageAdventure.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessageAdventure.java index b890db0..5a1ec72 100644 --- a/src/main/java/ce/ajneb97/utils/JSONMessageAdventure.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/JSONMessageAdventure.java @@ -1,4 +1,4 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; import net.kyori.adventure.text.Component; diff --git a/src/main/java/ce/ajneb97/utils/MathUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/MathUtils.java similarity index 98% rename from src/main/java/ce/ajneb97/utils/MathUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/MathUtils.java index a149c70..99d93dc 100644 --- a/src/main/java/ce/ajneb97/utils/MathUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/MathUtils.java @@ -1,4 +1,4 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; import net.objecthunter.exp4j.Expression; import net.objecthunter.exp4j.ExpressionBuilder; diff --git a/src/main/java/ce/ajneb97/utils/MiniMessageUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/MiniMessageUtils.java similarity index 97% rename from src/main/java/ce/ajneb97/utils/MiniMessageUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/MiniMessageUtils.java index 064ccdc..df670a1 100644 --- a/src/main/java/ce/ajneb97/utils/MiniMessageUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/MiniMessageUtils.java @@ -1,7 +1,7 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.managers.MessagesManager; -import ce.ajneb97.model.internal.minimessage.GetVariablesItemLore; +import net.tfminecraft.conditionalevents.managers.MessagesManager; +import net.tfminecraft.conditionalevents.model.internal.minimessage.GetVariablesItemLore; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/src/main/java/ce/ajneb97/utils/OtherUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/OtherUtils.java similarity index 95% rename from src/main/java/ce/ajneb97/utils/OtherUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/OtherUtils.java index 41eb900..f7ea5fd 100644 --- a/src/main/java/ce/ajneb97/utils/OtherUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/OtherUtils.java @@ -1,5 +1,5 @@ -package ce.ajneb97.utils; -import ce.ajneb97.ConditionalEvents; +package net.tfminecraft.conditionalevents.utils; +import net.tfminecraft.conditionalevents.ConditionalEvents; import me.clip.placeholderapi.PlaceholderAPI; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.chat.ComponentSerializer; diff --git a/src/main/java/ce/ajneb97/utils/PlayerUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/PlayerUtils.java similarity index 94% rename from src/main/java/ce/ajneb97/utils/PlayerUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/PlayerUtils.java index 065d9ef..15b443d 100644 --- a/src/main/java/ce/ajneb97/utils/PlayerUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/PlayerUtils.java @@ -1,6 +1,6 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.ConditionalEvents; +import net.tfminecraft.conditionalevents.ConditionalEvents; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; diff --git a/src/main/java/ce/ajneb97/utils/ServerVersion.java b/src/main/java/net/tfminecraft/conditionalevents/utils/ServerVersion.java similarity index 95% rename from src/main/java/ce/ajneb97/utils/ServerVersion.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/ServerVersion.java index 9405e4c..e299275 100644 --- a/src/main/java/ce/ajneb97/utils/ServerVersion.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/ServerVersion.java @@ -1,4 +1,4 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; import org.bukkit.Bukkit; diff --git a/src/main/java/ce/ajneb97/utils/TimeUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/TimeUtils.java similarity index 87% rename from src/main/java/ce/ajneb97/utils/TimeUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/TimeUtils.java index 7c00452..c68536f 100644 --- a/src/main/java/ce/ajneb97/utils/TimeUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/TimeUtils.java @@ -1,6 +1,6 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.managers.MessagesManager; +import net.tfminecraft.conditionalevents.managers.MessagesManager; public class TimeUtils { diff --git a/src/main/java/ce/ajneb97/utils/VariablesUtils.java b/src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtils.java similarity index 97% rename from src/main/java/ce/ajneb97/utils/VariablesUtils.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtils.java index e215027..318b3b3 100644 --- a/src/main/java/ce/ajneb97/utils/VariablesUtils.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtils.java @@ -1,10 +1,10 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.api.ConditionalEventsAPI; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.PostEventVariableResult; -import ce.ajneb97.model.internal.VariablesProperties; +import net.tfminecraft.conditionalevents.api.ConditionalEventsAPI; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.PostEventVariableResult; +import net.tfminecraft.conditionalevents.model.internal.VariablesProperties; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.Location; import org.bukkit.block.Block; diff --git a/src/main/java/ce/ajneb97/utils/VariablesUtilsExperimental.java b/src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtilsExperimental.java similarity index 89% rename from src/main/java/ce/ajneb97/utils/VariablesUtilsExperimental.java rename to src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtilsExperimental.java index 89c51f7..c4ccf9b 100644 --- a/src/main/java/ce/ajneb97/utils/VariablesUtilsExperimental.java +++ b/src/main/java/net/tfminecraft/conditionalevents/utils/VariablesUtilsExperimental.java @@ -1,9 +1,9 @@ -package ce.ajneb97.utils; +package net.tfminecraft.conditionalevents.utils; -import ce.ajneb97.model.EventType; -import ce.ajneb97.model.StoredVariable; -import ce.ajneb97.model.internal.PostEventVariableResult; -import ce.ajneb97.model.internal.VariablesProperties; +import net.tfminecraft.conditionalevents.model.EventType; +import net.tfminecraft.conditionalevents.model.StoredVariable; +import net.tfminecraft.conditionalevents.model.internal.PostEventVariableResult; +import net.tfminecraft.conditionalevents.model.internal.VariablesProperties; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 51883ac..0d35cd3 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,4 @@ Config: - update_notification: true data_save_time: 5 retain_player_data_until_restart: true debug_actions: true diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 975632e..4645221 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ -main: ce.ajneb97.ConditionalEvents +main: net.tfminecraft.conditionalevents.ConditionalEvents version: ${project.version} name: ConditionalEvents -api-version: 1.13 +api-version: '1.21.10' softdepend: [PlaceholderAPI,Citizens,WorldGuardEvents,WorldGuard,ProtocolLib,DiscordSRV,ItemsAdder,PacketEvents] author: Ajneb97