diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 315ef85..ecdf590 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,35 +1,35 @@ ---- -name: Bug report -about: Your bug reports help us improve the plugin for others -title: "[BUG]" -labels: bug -assignees: AdzelFirestar - ---- - -**Describe the bug** -Please describe the bug as accurately and concisely as possible. That helps us track where it is coming from. - -**To Reproduce** -Steps to reproduce the behavior: Please be as descriptive as possible so I can track where the bug is happening. - -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. This will help us a lot with visualizing the bug/error. - -**Error Log, Stack Trace, or Error Message you are seeing** -Please paste any error logs, messages, or stack traces from your console so I can see what is going on. - -**Server Information (please complete the following information):** - - Velocity Version: - - Minecraft version you are running: - -**Additional context** -Add any other context about the problem here. +--- +name: Bug report +about: Your bug reports help us improve the plugin for others +title: "[BUG]" +labels: bug +assignees: AdzelFirestar + +--- + +**Describe the bug** +Please describe the bug as accurately and concisely as possible. That helps us track where it is coming from. + +**To Reproduce** +Steps to reproduce the behavior: Please be as descriptive as possible so I can track where the bug is happening. + +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. This will help us a lot with visualizing the bug/error. + +**Error Log, Stack Trace, or Error Message you are seeing** +Please paste any error logs, messages, or stack traces from your console so I can see what is going on. + +**Server Information (please complete the following information):** + - Velocity Version: + - Minecraft version you are running: + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 4096eed..cdbcf2c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,20 +1,20 @@ ---- -name: Feature request -about: Request a new feature for Velocity Broadcast Reborn -title: "[FEATURE REQUEST]" -labels: feature-request -assignees: AdzelFirestar - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. +--- +name: Feature request +about: Request a new feature for Velocity Broadcast Reborn +title: "[FEATURE REQUEST]" +labels: feature-request +assignees: AdzelFirestar + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/feedback-and-review.md b/.github/ISSUE_TEMPLATE/feedback-and-review.md index b5725b7..4e7e1fe 100644 --- a/.github/ISSUE_TEMPLATE/feedback-and-review.md +++ b/.github/ISSUE_TEMPLATE/feedback-and-review.md @@ -1,15 +1,15 @@ ---- -name: Feedback and Review -about: Have some general feedback or want to review us through GitHub? You are in - the right place -title: "[FEEDBACK/REVIEW]" -labels: '' -assignees: AdzelFirestar - ---- - -**Is this Feedback or a Review?** -[Answer Here] - -**Please leave your feedback or review here** -[Leave your feedback or review on this line] +--- +name: Feedback and Review +about: Have some general feedback or want to review us through GitHub? You are in + the right place +title: "[FEEDBACK/REVIEW]" +labels: '' +assignees: AdzelFirestar + +--- + +**Is this Feedback or a Review?** +[Answer Here] + +**Please leave your feedback or review here** +[Leave your feedback or review on this line] diff --git a/.gitignore b/.gitignore index 524f096..3b622cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -replay_pid* +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* diff --git a/.vscode/settings.json b/.vscode/settings.json index 0be1c0c..29248f0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ -{ - "java.configuration.updateBuildConfiguration": "automatic", - "java.compile.nullAnalysis.mode": "automatic" +{ + "java.configuration.updateBuildConfiguration": "automatic", + "java.compile.nullAnalysis.mode": "automatic" } \ No newline at end of file diff --git a/LICENSE b/LICENSE index 261eeb9..b6382b4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,22 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Creative Commons Attribution-NonCommercial 4.0 International - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Copyright (c) 2025 Ryan "Adzel" Hawley - 1. Definitions. +You are free to: - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. +Share — copy and redistribute the material in any medium or format +Adapt — remix, transform, and build upon the material - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. +The licensor cannot revoke these freedoms as long as you follow these license terms: - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. +Attribution — You must give appropriate credit, provide a link to the license, +and indicate if changes were made. - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. +NonCommercial — You may not use the material for commercial purposes. +Commercial purposes include any use intended for or directed toward commercial +advantage or monetary compensation. - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. +No additional restrictions — You may not apply legal terms or technological +measures that legally restrict others from doing anything the license permits. - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Full License: https://creativecommons.org/licenses/by-nc/4.0/legalcode \ No newline at end of file diff --git a/README.md b/README.md index 1ed2f5f..1e24787 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,32 @@ -## VelocityBroadcast Reborn -The new and improved version of my old popular plugin called "Velocity Broadcast". The best known and lightweight broadcasting plugin for any network to use. - -# Introduction -Welcome to the GitHub repo and source code for the plugin VelocityBroadcast Reborn. This is a complete rewrite of my previous VelocityBroadcast plugin. I reworked and rebuilt the plugin from scratch. Due to the fact a ton of promised features sadly did not work out correctly. The biggest complaint being permissions. Well, I did it. I was able to fix a few old grievances and even add some new features. So without further ado, the information regarding VelocityBroadcast Reborn! - -VelocityBroadcast Reborn is a unique and lightweight plugin that allows people with specific permission nodes/groups with permission nodes assigned to LuckPerms for Velocity to broadcast a message across the entire network. This is useful for events, maintenance announcements, and more. I do plan to add more features one day, but for now this is what we have. Light, simple, and easy to use. Please use the Issue Tracker above to report any issues or feedback about the plugin. - -# Dependencies -- The latest stable build of Velocity -- The latest stable build of LuckPerms -- A main hub/lobby server (Preferably running Paper, but it should work on any type of server. Including modded) -- A secondary/multiple servers on the network to receive full compatibility - -# Setup -1. Download the latest version from Spigot or the Releases page on the right -2. Upload the plugin file to your ***Proxy's*** plugin folder (Do not upload it to the hub server's plugin folder) -3. Restart the proxy -4. In the console of your proxy server, run the following command(s) depending on your preferred usage. (4a for users specifically, 4b for groups) -4a. lpv user {username} permission set {permission node} true {context (optional)} -4b. lpv group {group} permission set {permission node} true {context (optional)} -4c. Or you can do it in GUI mode with the command "lpv editor" -5. Restart your proxy again -6. Now the setup is complete, enjoy! - -# Commands and Permissions -- /vb - When typed on its own will show the help page - No permission needed -- /vb {message} - When typed and paired with a message, it will send a message across all servers on a network (Legacy Color Codes and MiniMessage compatible) - vb.broadcast -- /vp prefix {new prefix} - This allows whoever has the required permission to change the prefix in front of the message broadcasted - vb.admin -- /vb reload - Allows people with the correct permission node to reload the config if it was edited manually - vb.admin - +## VelocityBroadcast Reborn +The new and improved version of my old popular plugin called "Velocity Broadcast". The best known and lightweight broadcasting plugin for any network to use. + +# Introduction +Welcome to the GitHub repo and source code for the plugin VelocityBroadcast Reborn. This is a complete rewrite of my previous VelocityBroadcast plugin. I reworked and rebuilt the plugin from scratch. Due to the fact a ton of promised features sadly did not work out correctly. The biggest complaint being permissions. Well, I did it. I was able to fix a few old grievances and even add some new features. So without further ado, the information regarding VelocityBroadcast Reborn! + +VelocityBroadcast Reborn is a unique and lightweight plugin that allows people with specific permission nodes/groups with permission nodes assigned to LuckPerms for Velocity to broadcast a message across the entire network. This is useful for events, maintenance announcements, and more. I do plan to add more features one day, but for now this is what we have. Light, simple, and easy to use. Please use the Issue Tracker above to report any issues or feedback about the plugin. + +# Dependencies +- The latest stable build of Velocity +- The latest stable build of LuckPerms +- A main hub/lobby server (Preferably running Paper, but it should work on any type of server. Including modded) +- A secondary/multiple servers on the network to receive full compatibility + +# Setup +1. Download the latest version from Spigot or the Releases page on the right +2. Upload the plugin file to your ***Proxy's*** plugin folder (Do not upload it to the hub server's plugin folder) +3. Restart the proxy +4. In the console of your proxy server, run the following command(s) depending on your preferred usage. (4a for users specifically, 4b for groups) +4a. lpv user {username} permission set {permission node} true {context (optional)} +4b. lpv group {group} permission set {permission node} true {context (optional)} +4c. Or you can do it in GUI mode with the command "lpv editor" +5. Restart your proxy again +6. Now the setup is complete, enjoy! + +# Commands and Permissions +- /vb - When typed on its own will show the help page - No permission needed +- /vb {message} - When typed and paired with a message, it will send a message across all servers on a network (Legacy Color Codes and MiniMessage compatible) - vb.broadcast +- /vp prefix {new prefix} - This allows whoever has the required permission to change the prefix in front of the message broadcasted - vb.admin +- /vb reload - Allows people with the correct permission node to reload the config if it was edited manually - vb.admin + ***Currently due to the limitations of Velocity, you can not run the commands while being opped. You MUST have the correct permission nodes for it to work.*** \ No newline at end of file diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index dcf5918..9017300 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -1,64 +1,64 @@ - - - 4.0.0 - com.adzel.velocitybroadcast - velocitybroadcast - VelocityBroadcast - 0.3.5 - Broadcast plugin for Minecraft Velocity proxy. - - - - maven-compiler-plugin - 3.10.1 - - 17 - - - - maven-shade-plugin - 3.4.1 - - - package - - shade - - - false - - - - - - - - - velocitypowered-repo - https://repo.velocitypowered.com/releases/ - - - central - https://repo.maven.apache.org/maven2 - - - - - com.velocitypowered - velocity-api - 3.1.1 - provided - - - net.luckperms - api - 5.4 - provided - - - - 17 - 17 - UTF-8 - - + + + 4.0.0 + com.adzel.velocitybroadcast + velocitybroadcast + VelocityBroadcast + 0.3.7 + Broadcast plugin for Minecraft Velocity proxy. + + + + maven-compiler-plugin + 3.10.1 + + 17 + + + + maven-shade-plugin + 3.4.1 + + + package + + shade + + + false + + + + + + + + + velocitypowered-repo + https://repo.velocitypowered.com/releases/ + + + central + https://repo.maven.apache.org/maven2 + + + + + com.velocitypowered + velocity-api + 3.1.1 + provided + + + net.luckperms + api + 5.4 + provided + + + + 17 + 17 + UTF-8 + + diff --git a/pom.xml b/pom.xml index 07a6210..0610fed 100644 --- a/pom.xml +++ b/pom.xml @@ -1,123 +1,123 @@ - - 4.0.0 - - com.adzel.velocitybroadcast - velocitybroadcast - 0.3.5 - jar - VelocityBroadcast - Broadcast plugin for Minecraft Velocity proxy. - - - UTF-8 - 17 - 17 - - - - - velocitypowered-repo - https://repo.velocitypowered.com/releases/ - - - central - https://repo.maven.apache.org/maven2 - - - - - - - com.velocitypowered - velocity-api - 3.1.1 - provided - - - - - net.kyori - adventure-api - 4.15.0 - - - - - net.kyori - adventure-text-minimessage - 4.15.0 - - - - - org.json - json - 20240303 - - - - - org.xerial - sqlite-jdbc - 3.43.2.2 - - - - - com.mysql - mysql-connector-j - 8.4.0 - - - - - org.yaml - snakeyaml - 2.2 - - - - - net.luckperms - api - 5.4 - provided - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 17 - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.1 - - - package - - shade - - - false - - - - - - - - + + com.velocitypowered + velocity-api + 3.1.1 + provided + + + + + net.kyori + adventure-api + 4.15.0 + + + + + net.kyori + adventure-text-minimessage + 4.15.0 + + + + + org.json + json + 20240303 + + + + + org.xerial + sqlite-jdbc + 3.43.2.2 + + + + + com.mysql + mysql-connector-j + 8.4.0 + + + + + org.yaml + snakeyaml + 2.2 + + + + + net.luckperms + api + 5.4 + provided + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 17 + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + + package + + shade + + + false + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/adzel/velocitybroadcast/BroadcastCommand.java b/src/main/java/com/adzel/velocitybroadcast/BroadcastCommand.java index 0855bfd..e3fc766 100644 --- a/src/main/java/com/adzel/velocitybroadcast/BroadcastCommand.java +++ b/src/main/java/com/adzel/velocitybroadcast/BroadcastCommand.java @@ -1,58 +1,58 @@ -package com.adzel.velocitybroadcast; - -import java.util.List; - -import com.adzel.velocitybroadcast.util.DatabaseManager; -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.SimpleCommand; -import com.velocitypowered.api.proxy.Player; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; - -public class BroadcastCommand implements SimpleCommand { - - private final VelocityBroadcast plugin; - private final DatabaseManager databaseManager; - private final MiniMessage mm = MiniMessage.miniMessage(); - - public BroadcastCommand(VelocityBroadcast plugin) { - this.plugin = plugin; - this.databaseManager = plugin.getDatabaseManager(); - } - - @Override - public void execute(Invocation invocation) { - CommandSource source = invocation.source(); - List args = List.of(invocation.arguments()); - - if (!source.hasPermission("vb.broadcast")) { - source.sendMessage(mm.deserialize("You don't have permission to use this command.")); - return; - } - - if (args.isEmpty()) { - source.sendMessage(mm.deserialize("Usage: /vb ")); - return; - } - - String messageRaw = String.join(" ", args); - String prefix = plugin.getConfigHandler().getPrefix(); - String fullMessage = prefix + messageRaw; - - Component broadcast = mm.deserialize(fullMessage); - plugin.getServer().getAllPlayers().forEach(player -> player.sendMessage(broadcast)); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); - } - - // ✅ Log to the database with proper sender - String sender = (source instanceof Player player) ? player.getUsername() : "Console"; - String sourceServer = plugin.getServer().getBoundAddress().toString(); - databaseManager.logBroadcast(sender, messageRaw, sourceServer); - - // Optional feedback to source - source.sendMessage(mm.deserialize("Broadcast sent.")); - } -} +package com.adzel.velocitybroadcast; + +import java.util.List; + +import com.adzel.velocitybroadcast.util.DatabaseManager; +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; +import com.velocitypowered.api.proxy.Player; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class BroadcastCommand implements SimpleCommand { + + private final VelocityBroadcast plugin; + private final DatabaseManager databaseManager; + private final MiniMessage mm = MiniMessage.miniMessage(); + + public BroadcastCommand(VelocityBroadcast plugin) { + this.plugin = plugin; + this.databaseManager = plugin.getDatabaseManager(); + } + + @Override + public void execute(Invocation invocation) { + CommandSource source = invocation.source(); + List args = List.of(invocation.arguments()); + + if (!source.hasPermission("vb.broadcast")) { + source.sendMessage(mm.deserialize("You don't have permission to use this command.")); + return; + } + + if (args.isEmpty()) { + source.sendMessage(mm.deserialize("Usage: /vb ")); + return; + } + + String messageRaw = String.join(" ", args); + String prefix = plugin.getConfigHandler().getPrefix(); + String fullMessage = prefix + messageRaw; + + Component broadcast = mm.deserialize(fullMessage); + plugin.getServer().getAllPlayers().forEach(player -> player.sendMessage(broadcast)); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); + } + + // ✅ Log to the database with proper sender + String sender = (source instanceof Player player) ? player.getUsername() : "Console"; + String sourceServer = plugin.getServer().getBoundAddress().toString(); + databaseManager.logBroadcast(sender, messageRaw, sourceServer); + + // Optional feedback to source + source.sendMessage(mm.deserialize("Broadcast sent.")); + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/ConfigHandler.java b/src/main/java/com/adzel/velocitybroadcast/ConfigHandler.java index bb3fd04..8740101 100644 --- a/src/main/java/com/adzel/velocitybroadcast/ConfigHandler.java +++ b/src/main/java/com/adzel/velocitybroadcast/ConfigHandler.java @@ -1,172 +1,172 @@ -package com.adzel.velocitybroadcast; - -import java.io.BufferedWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.LinkedHashMap; -import java.util.Map; - -import org.slf4j.Logger; -import org.yaml.snakeyaml.DumperOptions; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.representer.Representer; - -public class ConfigHandler { - private final Path configPath; - private final Logger logger; - - private boolean debugEnabled = false; - private boolean versionCheckEnabled = true; - private String prefix = "&9&l[&3&lServer&9&l]&r "; - - private String dbType = "sqlite"; - private String dbHost = "localhost"; - private int dbPort = 3306; - private String dbName = "velocitybroadcast"; - private String dbUser = "vb_user"; - private String dbPassword = "securepassword"; - - private static final String CURRENT_VERSION = VelocityBroadcast.PLUGIN_VERSION; - private static final String VERSION_LINE = "# DO NOT EDIT\nPlugin Version: '" + CURRENT_VERSION + "' # Do not edit this value, as it will mess up version checking and break the plugin"; - - private final Yaml yaml; - - public ConfigHandler(Path configPath, Logger logger) { - this.configPath = configPath; - this.logger = logger; - - DumperOptions options = new DumperOptions(); - options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); - options.setIndent(2); - options.setPrettyFlow(true); - - Representer representer = new Representer(options); - representer.getPropertyUtils().setSkipMissingProperties(true); - - yaml = new Yaml(representer, options); - } - - @SuppressWarnings("unchecked") - public void load() { - try { - Files.createDirectories(configPath.getParent()); - - boolean shouldSave = false; - - if (!Files.exists(configPath)) { - save(); - return; - } - - String fileVersion = Files.readAllLines(configPath).stream() - .filter(line -> line.startsWith("Plugin Version:")) - .map(line -> line.replaceAll(".*'(.*?)'.*", "$1").trim()) - .findFirst() - .orElse(null); - - if (fileVersion == null || !fileVersion.equals(CURRENT_VERSION)) { - shouldSave = true; - } - - Map root = yaml.load(Files.newBufferedReader(configPath)); - if (root == null) root = new LinkedHashMap<>(); - - Map general = (Map) root.getOrDefault("general", new LinkedHashMap<>()); - debugEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("debug-messages-enabled", "false"))); - versionCheckEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("version-check-enabled", "true"))); - prefix = String.valueOf(general.getOrDefault("prefix", "&9&l[&3&lServer&9&l]&r ")); - - Map database = (Map) root.getOrDefault("database", new LinkedHashMap<>()); - dbType = String.valueOf(database.getOrDefault("type", "sqlite")); - dbHost = String.valueOf(database.getOrDefault("host", "localhost")); - dbPort = Integer.parseInt(String.valueOf(database.getOrDefault("port", "3306"))); - dbName = String.valueOf(database.getOrDefault("name", "velocitybroadcast")); - dbUser = String.valueOf(database.getOrDefault("user", "vb_user")); - dbPassword = String.valueOf(database.getOrDefault("password", "securepassword")); - - if (shouldSave) { - save(); - } - - } catch (IOException e) { - logger.error("Failed to load VelocityBroadcast config!", e); - } - } - - public void save() { - try { - Files.createDirectories(configPath.getParent()); - - Map general = new LinkedHashMap<>(); - general.put("debug-messages-enabled", debugEnabled); - general.put("version-check-enabled", versionCheckEnabled); - general.put("prefix", prefix); - - Map database = new LinkedHashMap<>(); - database.put("type", dbType); - database.put("host", dbHost); - database.put("port", dbPort); - database.put("name", dbName); - database.put("user", dbUser); - database.put("password", dbPassword); - - Map root = new LinkedHashMap<>(); - root.put("general", general); - root.put("database", database); - - try (BufferedWriter writer = Files.newBufferedWriter(configPath)) { - writer.write(VERSION_LINE + "\n\n"); - yaml.dump(root, writer); - } - - } catch (IOException e) { - logger.error("Failed to save VelocityBroadcast config!", e); - } - } - - public void reload() { - load(); - } - - public boolean isDebugEnabled() { - return debugEnabled; - } - - public boolean isVersionCheckEnabled() { - return versionCheckEnabled; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String newPrefix) { - this.prefix = newPrefix; - save(); - } - - public String getDbType() { - return dbType; - } - - public String getDbHost() { - return dbHost; - } - - public int getDbPort() { - return dbPort; - } - - public String getDbName() { - return dbName; - } - - public String getDbUser() { - return dbUser; - } - - public String getDbPassword() { - return dbPassword; - } -} +package com.adzel.velocitybroadcast; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.slf4j.Logger; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.representer.Representer; + +public class ConfigHandler { + private final Path configPath; + private final Logger logger; + + private boolean debugEnabled = false; + private boolean versionCheckEnabled = true; + private String prefix = "&9&l[&3&lServer&9&l]&r "; + + private String dbType = "sqlite"; + private String dbHost = "localhost"; + private int dbPort = 3306; + private String dbName = "velocitybroadcast"; + private String dbUser = "vb_user"; + private String dbPassword = "securepassword"; + + private static final String CURRENT_VERSION = VelocityBroadcast.PLUGIN_VERSION; + private static final String VERSION_LINE = "# DO NOT EDIT\nPlugin Version: '" + CURRENT_VERSION + "' # Do not edit this value, as it will mess up version checking and break the plugin"; + + private final Yaml yaml; + + public ConfigHandler(Path configPath, Logger logger) { + this.configPath = configPath; + this.logger = logger; + + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + options.setIndent(2); + options.setPrettyFlow(true); + + Representer representer = new Representer(options); + representer.getPropertyUtils().setSkipMissingProperties(true); + + yaml = new Yaml(representer, options); + } + + @SuppressWarnings("unchecked") + public void load() { + try { + Files.createDirectories(configPath.getParent()); + + boolean shouldSave = false; + + if (!Files.exists(configPath)) { + save(); + return; + } + + String fileVersion = Files.readAllLines(configPath).stream() + .filter(line -> line.startsWith("Plugin Version:")) + .map(line -> line.replaceAll(".*'(.*?)'.*", "$1").trim()) + .findFirst() + .orElse(null); + + if (fileVersion == null || !fileVersion.equals(CURRENT_VERSION)) { + shouldSave = true; + } + + Map root = yaml.load(Files.newBufferedReader(configPath)); + if (root == null) root = new LinkedHashMap<>(); + + Map general = (Map) root.getOrDefault("general", new LinkedHashMap<>()); + debugEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("debug-messages-enabled", "false"))); + versionCheckEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("version-check-enabled", "true"))); + prefix = String.valueOf(general.getOrDefault("prefix", "&9&l[&3&lServer&9&l]&r ")); + + Map database = (Map) root.getOrDefault("database", new LinkedHashMap<>()); + dbType = String.valueOf(database.getOrDefault("type", "sqlite")); + dbHost = String.valueOf(database.getOrDefault("host", "localhost")); + dbPort = Integer.parseInt(String.valueOf(database.getOrDefault("port", "3306"))); + dbName = String.valueOf(database.getOrDefault("name", "velocitybroadcast")); + dbUser = String.valueOf(database.getOrDefault("user", "vb_user")); + dbPassword = String.valueOf(database.getOrDefault("password", "securepassword")); + + if (shouldSave) { + save(); + } + + } catch (IOException e) { + logger.error("Failed to load VelocityBroadcast config!", e); + } + } + + public void save() { + try { + Files.createDirectories(configPath.getParent()); + + Map general = new LinkedHashMap<>(); + general.put("debug-messages-enabled", debugEnabled); + general.put("version-check-enabled", versionCheckEnabled); + general.put("prefix", prefix); + + Map database = new LinkedHashMap<>(); + database.put("type", dbType); + database.put("host", dbHost); + database.put("port", dbPort); + database.put("name", dbName); + database.put("user", dbUser); + database.put("password", dbPassword); + + Map root = new LinkedHashMap<>(); + root.put("general", general); + root.put("database", database); + + try (BufferedWriter writer = Files.newBufferedWriter(configPath)) { + writer.write(VERSION_LINE + "\n\n"); + yaml.dump(root, writer); + } + + } catch (IOException e) { + logger.error("Failed to save VelocityBroadcast config!", e); + } + } + + public void reload() { + load(); + } + + public boolean isDebugEnabled() { + return debugEnabled; + } + + public boolean isVersionCheckEnabled() { + return versionCheckEnabled; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String newPrefix) { + this.prefix = newPrefix; + save(); + } + + public String getDbType() { + return dbType; + } + + public String getDbHost() { + return dbHost; + } + + public int getDbPort() { + return dbPort; + } + + public String getDbName() { + return dbName; + } + + public String getDbUser() { + return dbUser; + } + + public String getDbPassword() { + return dbPassword; + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/LoginListener.java b/src/main/java/com/adzel/velocitybroadcast/LoginListener.java index eb61998..322cda3 100644 --- a/src/main/java/com/adzel/velocitybroadcast/LoginListener.java +++ b/src/main/java/com/adzel/velocitybroadcast/LoginListener.java @@ -1,50 +1,50 @@ -package com.adzel.velocitybroadcast; - -import com.adzel.velocitybroadcast.util.DatabaseManager; -import com.adzel.velocitybroadcast.util.UpdateChecker; -import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.connection.PostLoginEvent; -import com.velocitypowered.api.proxy.Player; -import com.velocitypowered.api.proxy.ProxyServer; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; - -public class LoginListener { - private final ProxyServer server; - private final String currentVersion; - private final UpdateChecker updateChecker; - private final DatabaseManager databaseManager; - - private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); - - public LoginListener(ProxyServer server, String currentVersion, UpdateChecker updateChecker, DatabaseManager databaseManager) { - this.server = server; - this.currentVersion = currentVersion; - this.updateChecker = updateChecker; - this.databaseManager = databaseManager; - } - - @Subscribe - public void onPlayerJoin(PostLoginEvent event) { - Player player = event.getPlayer(); - if (player.hasPermission("vb.admin")) { - // ✅ Log admin join to DB - String serverName = server.getBoundAddress().toString(); // Optional - databaseManager.logAdminJoin(player.getUsername(), serverName); - - // ✅ Notify if update is available - updateChecker.checkForUpdate().thenAccept(latest -> { - if (latest != null && !latest.equalsIgnoreCase(currentVersion)) { - Component message = MINI_MESSAGE.deserialize( - "[VelocityBroadcast] " + - "A new version is available: " + - "" + latest + " " + - "(You are on " + currentVersion + ")" - ); - player.sendMessage(message); - } - }); - } - } -} +package com.adzel.velocitybroadcast; + +import com.adzel.velocitybroadcast.util.DatabaseManager; +import com.adzel.velocitybroadcast.util.UpdateChecker; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.connection.PostLoginEvent; +import com.velocitypowered.api.proxy.Player; +import com.velocitypowered.api.proxy.ProxyServer; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class LoginListener { + private final ProxyServer server; + private final String currentVersion; + private final UpdateChecker updateChecker; + private final DatabaseManager databaseManager; + + private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); + + public LoginListener(ProxyServer server, String currentVersion, UpdateChecker updateChecker, DatabaseManager databaseManager) { + this.server = server; + this.currentVersion = currentVersion; + this.updateChecker = updateChecker; + this.databaseManager = databaseManager; + } + + @Subscribe + public void onPlayerJoin(PostLoginEvent event) { + Player player = event.getPlayer(); + if (player.hasPermission("vb.admin")) { + // ✅ Log admin join to DB + String serverName = server.getBoundAddress().toString(); // Optional + databaseManager.logAdminJoin(player.getUsername(), serverName); + + // ✅ Notify if update is available + updateChecker.checkForUpdate().thenAccept(latest -> { + if (latest != null && !latest.equalsIgnoreCase(currentVersion)) { + Component message = MINI_MESSAGE.deserialize( + "[VelocityBroadcast] " + + "A new version is available: " + + "" + latest + " " + + "(You are on " + currentVersion + ")" + ); + player.sendMessage(message); + } + }); + } + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/PrefixCommand.java b/src/main/java/com/adzel/velocitybroadcast/PrefixCommand.java index 929ec18..78ce8e3 100644 --- a/src/main/java/com/adzel/velocitybroadcast/PrefixCommand.java +++ b/src/main/java/com/adzel/velocitybroadcast/PrefixCommand.java @@ -1,44 +1,44 @@ -package com.adzel.velocitybroadcast; - -import java.util.List; - -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.SimpleCommand; - -import net.kyori.adventure.text.minimessage.MiniMessage; - -public class PrefixCommand implements SimpleCommand { - - private final VelocityBroadcast plugin; - - public PrefixCommand(VelocityBroadcast plugin) { - this.plugin = plugin; - } - - @Override - public void execute(Invocation invocation) { - CommandSource source = invocation.source(); - List args = List.of(invocation.arguments()); - - if (!source.hasPermission("vb.admin")) { - source.sendMessage(MiniMessage.miniMessage().deserialize("You don't have permission to change the broadcast prefix.")); - return; - } - - if (args.isEmpty()) { - source.sendMessage(MiniMessage.miniMessage().deserialize("Usage: /vb prefix ")); - return; - } - - String newPrefix = String.join(" ", args); - plugin.getConfigHandler().setPrefix(newPrefix); - - source.sendMessage(MiniMessage.miniMessage().deserialize( - "Broadcast prefix updated to: " + newPrefix + "" - )); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); - } - } -} +package com.adzel.velocitybroadcast; + +import java.util.List; + +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; + +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class PrefixCommand implements SimpleCommand { + + private final VelocityBroadcast plugin; + + public PrefixCommand(VelocityBroadcast plugin) { + this.plugin = plugin; + } + + @Override + public void execute(Invocation invocation) { + CommandSource source = invocation.source(); + List args = List.of(invocation.arguments()); + + if (!source.hasPermission("vb.admin")) { + source.sendMessage(MiniMessage.miniMessage().deserialize("You don't have permission to change the broadcast prefix.")); + return; + } + + if (args.isEmpty()) { + source.sendMessage(MiniMessage.miniMessage().deserialize("Usage: /vb prefix ")); + return; + } + + String newPrefix = String.join(" ", args); + plugin.getConfigHandler().setPrefix(newPrefix); + + source.sendMessage(MiniMessage.miniMessage().deserialize( + "Broadcast prefix updated to: " + newPrefix + "" + )); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); + } + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/ReloadCommand.java b/src/main/java/com/adzel/velocitybroadcast/ReloadCommand.java index 06508c8..1e2fb70 100644 --- a/src/main/java/com/adzel/velocitybroadcast/ReloadCommand.java +++ b/src/main/java/com/adzel/velocitybroadcast/ReloadCommand.java @@ -1,33 +1,33 @@ -package com.adzel.velocitybroadcast; - -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.SimpleCommand; -import net.kyori.adventure.text.minimessage.MiniMessage; - -import java.util.List; - -public class ReloadCommand implements SimpleCommand { - - private final VelocityBroadcast plugin; - - public ReloadCommand(VelocityBroadcast plugin) { - this.plugin = plugin; - } - - @Override - public void execute(Invocation invocation) { - CommandSource source = invocation.source(); - - if (!source.hasPermission("vb.admin")) { - source.sendMessage(MiniMessage.miniMessage().deserialize("You don't have permission to reload the config.")); - return; - } - - plugin.getConfigHandler().reload(); - source.sendMessage(MiniMessage.miniMessage().deserialize("VelocityBroadcast config reloaded.")); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); - } - } -} +package com.adzel.velocitybroadcast; + +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; +import net.kyori.adventure.text.minimessage.MiniMessage; + +import java.util.List; + +public class ReloadCommand implements SimpleCommand { + + private final VelocityBroadcast plugin; + + public ReloadCommand(VelocityBroadcast plugin) { + this.plugin = plugin; + } + + @Override + public void execute(Invocation invocation) { + CommandSource source = invocation.source(); + + if (!source.hasPermission("vb.admin")) { + source.sendMessage(MiniMessage.miniMessage().deserialize("You don't have permission to reload the config.")); + return; + } + + plugin.getConfigHandler().reload(); + source.sendMessage(MiniMessage.miniMessage().deserialize("VelocityBroadcast config reloaded.")); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); + } + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/UpdateChecker.java b/src/main/java/com/adzel/velocitybroadcast/UpdateChecker.java index d9b8892..060c5fe 100644 --- a/src/main/java/com/adzel/velocitybroadcast/UpdateChecker.java +++ b/src/main/java/com/adzel/velocitybroadcast/UpdateChecker.java @@ -1,63 +1,63 @@ -package com.adzel.velocitybroadcast.util; - -import com.velocitypowered.api.proxy.ProxyServer; -import net.kyori.adventure.text.Component; -import com.velocitypowered.api.proxy.Player; - -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.concurrent.CompletableFuture; -import java.util.logging.Logger; -import org.json.JSONObject; -import org.json.JSONTokener; - -public class UpdateChecker { - private static final String ENDPOINT = "https://api.github.com/repos/AdzelFirestar/velocitybroadcast-reborn/releases/latest"; - private final String currentVersion; - private final Logger logger; - - public UpdateChecker(String currentVersion, Logger logger) { - this.currentVersion = currentVersion; - this.logger = logger; - } - - public CompletableFuture checkForUpdate() { - return CompletableFuture.supplyAsync(() -> { - try { - HttpURLConnection connection = (HttpURLConnection) new URL(ENDPOINT).openConnection(); - connection.setRequestProperty("Accept", "application/json"); - connection.setConnectTimeout(3000); - connection.setReadTimeout(3000); - - try (InputStreamReader reader = new InputStreamReader(connection.getInputStream())) { - JSONObject json = new JSONObject(new JSONTokener(reader)); - String latestVersion = json.getString("tag_name").trim(); - - if (!latestVersion.equalsIgnoreCase(currentVersion)) { - logger.info("[VelocityBroadcast] Update available: " + latestVersion + " (you are on " + currentVersion + ")"); - return latestVersion; - } else { - logger.info("[VelocityBroadcast] You are running the latest version (" + currentVersion + ")."); - return null; - } - } - } catch (Exception e) { - logger.warning("[VelocityBroadcast] Failed to check for updates: " + e.getMessage()); - return null; - } - }); - } - - public void notifyPlayerIfOutdated(ProxyServer server, String latestVersion) { - if (latestVersion != null && !latestVersion.equalsIgnoreCase(currentVersion)) { - String message = String.format("[VelocityBroadcast] A new version (%s) is available! You are running %s.", latestVersion, currentVersion); - Component component = Component.text(message); - for (Player player : server.getAllPlayers()) { - if (player.hasPermission("vb.admin")) { - player.sendMessage(component); - } - } - } - } -} +package com.adzel.velocitybroadcast.util; + +import com.velocitypowered.api.proxy.ProxyServer; +import net.kyori.adventure.text.Component; +import com.velocitypowered.api.proxy.Player; + +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.concurrent.CompletableFuture; +import java.util.logging.Logger; +import org.json.JSONObject; +import org.json.JSONTokener; + +public class UpdateChecker { + private static final String ENDPOINT = "https://git.addydevelops.site/api/v1/repos/Adzel/Velocity-Broadcast-Reborn/releases/latest"; + private final String currentVersion; + private final Logger logger; + + public UpdateChecker(String currentVersion, Logger logger) { + this.currentVersion = currentVersion; + this.logger = logger; + } + + public CompletableFuture checkForUpdate() { + return CompletableFuture.supplyAsync(() -> { + try { + HttpURLConnection connection = (HttpURLConnection) new URL(ENDPOINT).openConnection(); + connection.setRequestProperty("Accept", "application/json"); + connection.setConnectTimeout(3000); + connection.setReadTimeout(3000); + + try (InputStreamReader reader = new InputStreamReader(connection.getInputStream())) { + JSONObject json = new JSONObject(new JSONTokener(reader)); + String latestVersion = json.getString("tag_name").trim(); + + if (!latestVersion.equalsIgnoreCase(currentVersion)) { + logger.info("[VelocityBroadcast] Update available: " + latestVersion + " (you are on " + currentVersion + ")"); + return latestVersion; + } else { + logger.info("[VelocityBroadcast] You are running the latest version (" + currentVersion + ")."); + return null; + } + } + } catch (Exception e) { + logger.warning("[VelocityBroadcast] Failed to check for updates: " + e.getMessage()); + return null; + } + }); + } + + public void notifyPlayerIfOutdated(ProxyServer server, String latestVersion) { + if (latestVersion != null && !latestVersion.equalsIgnoreCase(currentVersion)) { + String message = String.format("[VelocityBroadcast] A new version (%s) is available! You are running %s.", latestVersion, currentVersion); + Component component = Component.text(message); + for (Player player : server.getAllPlayers()) { + if (player.hasPermission("vb.admin")) { + player.sendMessage(component); + } + } + } + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/VBCommand.java b/src/main/java/com/adzel/velocitybroadcast/VBCommand.java index 617c20b..18b6ae5 100644 --- a/src/main/java/com/adzel/velocitybroadcast/VBCommand.java +++ b/src/main/java/com/adzel/velocitybroadcast/VBCommand.java @@ -1,143 +1,143 @@ -package com.adzel.velocitybroadcast; - -import java.util.List; - -import com.adzel.velocitybroadcast.util.DatabaseManager; -import com.velocitypowered.api.command.CommandSource; -import com.velocitypowered.api.command.SimpleCommand; -import com.velocitypowered.api.proxy.Player; - -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.minimessage.MiniMessage; - -public class VBCommand implements SimpleCommand { - - private final VelocityBroadcast plugin; - private final DatabaseManager databaseManager; - private final MiniMessage mm = MiniMessage.miniMessage(); - - public VBCommand(VelocityBroadcast plugin) { - this.plugin = plugin; - this.databaseManager = plugin.getDatabaseManager(); - } - - @Override - public void execute(Invocation invocation) { - CommandSource source = invocation.source(); - List args = List.of(invocation.arguments()); - - String fullCommand = "/vb" + (args.isEmpty() ? "" : " " + String.join(" ", args)); - String username = (source instanceof Player) ? ((Player) source).getUsername() : "Console"; - - boolean success = true; - - try { - if (args.isEmpty() || args.get(0).equalsIgnoreCase("help")) { - source.sendMessage(parseFormatted("VelocityBroadcast Commands:")); - source.sendMessage(parseFormatted("/vb - Broadcast a message to all players")); - - if (source.hasPermission("vb.admin")) { - source.sendMessage(parseFormatted("/vb prefix - Change the broadcast prefix")); - source.sendMessage(parseFormatted("/vb reload - Reload the plugin config")); - } - - success = false; - return; - } - - String sub = args.get(0).toLowerCase(); - List subArgs = args.subList(1, args.size()); - - switch (sub) { - case "prefix" -> { - if (!source.hasPermission("vb.admin")) { - source.sendMessage(parseFormatted("You don't have permission to change the broadcast prefix.")); - success = false; - return; - } - - if (subArgs.isEmpty()) { - source.sendMessage(parseFormatted("Usage: /vb prefix ")); - success = false; - return; - } - - String newPrefix = String.join(" ", subArgs); - plugin.getConfigHandler().setPrefix(newPrefix); - source.sendMessage(parseFormatted("Prefix updated to: " + newPrefix + "")); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); - } - } - - case "reload" -> { - if (!source.hasPermission("vb.admin")) { - source.sendMessage(parseFormatted("You don't have permission to reload the config.")); - success = false; - return; - } - - plugin.getConfigHandler().reload(); - source.sendMessage(parseFormatted("VelocityBroadcast config reloaded.")); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); - } - } - - default -> { - // Treat as broadcast message - if (!source.hasPermission("vb.broadcast")) { - source.sendMessage(parseFormatted("You don't have permission to broadcast.")); - success = false; - return; - } - - String fullMessage = plugin.getConfigHandler().getPrefix() + String.join(" ", args); - Component broadcast = parseFormatted(fullMessage); - - plugin.getServer().getAllPlayers().forEach(p -> p.sendMessage(broadcast)); - - if (plugin.getConfigHandler().isDebugEnabled()) { - plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); - } - } - } - } catch (Exception e) { - plugin.getLogger().error("Error executing /vb command", e); - source.sendMessage(parseFormatted("An error occurred while executing the command.")); - success = false; - } finally { - // ✅ Log the command usage - databaseManager.logCommand(username, fullCommand, success); - } - } - - private Component parseFormatted(String input) { - String mini = input - .replace("&0", "") - .replace("&1", "") - .replace("&2", "") - .replace("&3", "") - .replace("&4", "") - .replace("&5", "") - .replace("&6", "") - .replace("&7", "") - .replace("&8", "") - .replace("&9", "") - .replace("&a", "") - .replace("&b", "") - .replace("&c", "") - .replace("&d", "") - .replace("&e", "") - .replace("&f", "") - .replace("&l", "") - .replace("&n", "") - .replace("&o", "") - .replace("&m", "") - .replace("&r", ""); - - return mm.deserialize(mini); - } -} +package com.adzel.velocitybroadcast; + +import java.util.List; + +import com.adzel.velocitybroadcast.util.DatabaseManager; +import com.velocitypowered.api.command.CommandSource; +import com.velocitypowered.api.command.SimpleCommand; +import com.velocitypowered.api.proxy.Player; + +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class VBCommand implements SimpleCommand { + + private final VelocityBroadcast plugin; + private final DatabaseManager databaseManager; + private final MiniMessage mm = MiniMessage.miniMessage(); + + public VBCommand(VelocityBroadcast plugin) { + this.plugin = plugin; + this.databaseManager = plugin.getDatabaseManager(); + } + + @Override + public void execute(Invocation invocation) { + CommandSource source = invocation.source(); + List args = List.of(invocation.arguments()); + + String fullCommand = "/vb" + (args.isEmpty() ? "" : " " + String.join(" ", args)); + String username = (source instanceof Player) ? ((Player) source).getUsername() : "Console"; + + boolean success = true; + + try { + if (args.isEmpty() || args.get(0).equalsIgnoreCase("help")) { + source.sendMessage(parseFormatted("VelocityBroadcast Commands:")); + source.sendMessage(parseFormatted("/vb - Broadcast a message to all players")); + + if (source.hasPermission("vb.admin")) { + source.sendMessage(parseFormatted("/vb prefix - Change the broadcast prefix")); + source.sendMessage(parseFormatted("/vb reload - Reload the plugin config")); + } + + success = false; + return; + } + + String sub = args.get(0).toLowerCase(); + List subArgs = args.subList(1, args.size()); + + switch (sub) { + case "prefix" -> { + if (!source.hasPermission("vb.admin")) { + source.sendMessage(parseFormatted("You don't have permission to change the broadcast prefix.")); + success = false; + return; + } + + if (subArgs.isEmpty()) { + source.sendMessage(parseFormatted("Usage: /vb prefix ")); + success = false; + return; + } + + String newPrefix = String.join(" ", subArgs); + plugin.getConfigHandler().setPrefix(newPrefix); + source.sendMessage(parseFormatted("Prefix updated to: " + newPrefix + "")); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); + } + } + + case "reload" -> { + if (!source.hasPermission("vb.admin")) { + source.sendMessage(parseFormatted("You don't have permission to reload the config.")); + success = false; + return; + } + + plugin.getConfigHandler().reload(); + source.sendMessage(parseFormatted("VelocityBroadcast config reloaded.")); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); + } + } + + default -> { + // Treat as broadcast message + if (!source.hasPermission("vb.broadcast")) { + source.sendMessage(parseFormatted("You don't have permission to broadcast.")); + success = false; + return; + } + + String fullMessage = plugin.getConfigHandler().getPrefix() + String.join(" ", args); + Component broadcast = parseFormatted(fullMessage); + + plugin.getServer().getAllPlayers().forEach(p -> p.sendMessage(broadcast)); + + if (plugin.getConfigHandler().isDebugEnabled()) { + plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); + } + } + } + } catch (Exception e) { + plugin.getLogger().error("Error executing /vb command", e); + source.sendMessage(parseFormatted("An error occurred while executing the command.")); + success = false; + } finally { + // ✅ Log the command usage + databaseManager.logCommand(username, fullCommand, success); + } + } + + private Component parseFormatted(String input) { + String mini = input + .replace("&0", "") + .replace("&1", "") + .replace("&2", "") + .replace("&3", "") + .replace("&4", "") + .replace("&5", "") + .replace("&6", "") + .replace("&7", "") + .replace("&8", "") + .replace("&9", "") + .replace("&a", "") + .replace("&b", "") + .replace("&c", "") + .replace("&d", "") + .replace("&e", "") + .replace("&f", "") + .replace("&l", "") + .replace("&n", "") + .replace("&o", "") + .replace("&m", "") + .replace("&r", ""); + + return mm.deserialize(mini); + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/VelocityBroadcast.java b/src/main/java/com/adzel/velocitybroadcast/VelocityBroadcast.java index 32fefb3..17477d1 100644 --- a/src/main/java/com/adzel/velocitybroadcast/VelocityBroadcast.java +++ b/src/main/java/com/adzel/velocitybroadcast/VelocityBroadcast.java @@ -1,123 +1,123 @@ -package com.adzel.velocitybroadcast; - -import java.nio.file.Path; - -import org.slf4j.Logger; - -import com.adzel.velocitybroadcast.util.DatabaseManager; -import com.adzel.velocitybroadcast.util.UpdateChecker; -import com.google.inject.Inject; -import com.velocitypowered.api.event.PostOrder; -import com.velocitypowered.api.event.Subscribe; -import com.velocitypowered.api.event.connection.LoginEvent; -import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; -import com.velocitypowered.api.plugin.Plugin; -import com.velocitypowered.api.plugin.annotation.DataDirectory; -import com.velocitypowered.api.proxy.ProxyServer; - -import net.kyori.adventure.text.minimessage.MiniMessage; -import net.luckperms.api.LuckPerms; -import net.luckperms.api.LuckPermsProvider; - -@Plugin( - id = "velocitybroadcast", - name = "VelocityBroadcast", - version = "0.3.5", - description = "A proxy-wide broadcast plugin for Velocity.", - authors = {"Adzel"} -) -public class VelocityBroadcast { - - public static final String PLUGIN_VERSION = "0.3.5"; - public static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); - - private final ProxyServer server; - private final Logger logger; - private final Path dataDirectory; - - private ConfigHandler config; - private DatabaseManager databaseManager; - private LuckPerms luckPerms; - - @Inject - public VelocityBroadcast(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { - this.server = server; - this.logger = logger; - this.dataDirectory = dataDirectory; - } - - @Subscribe(order = PostOrder.EARLY) - public void onProxyInitialization(ProxyInitializeEvent event) { - // Load config - this.config = new ConfigHandler(dataDirectory.resolve("config.yml"), logger); - config.load(); - - if (config.isDebugEnabled()) { - logger.info("[VelocityBroadcast] Debug mode is enabled."); - } - - // Initialize LuckPerms - try { - this.luckPerms = LuckPermsProvider.get(); - logger.info("[VelocityBroadcast] Successfully hooked into LuckPerms."); - } catch (IllegalStateException e) { - logger.error("[VelocityBroadcast] LuckPerms is not loaded! This plugin requires LuckPerms."); - return; // Prevent plugin from loading if LP is not available - } - - // Initialize database manager - java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger("VelocityBroadcast"); - this.databaseManager = new DatabaseManager(config, jdkLogger, dataDirectory); - databaseManager.initialize(); - - // Check for updates (async) - UpdateChecker updateChecker = new UpdateChecker(PLUGIN_VERSION, jdkLogger); - updateChecker.checkForUpdate().thenAccept(latest -> { - if (latest != null) { - logger.warn("[VelocityBroadcast] A new version is available: " + latest + " (You are on " + PLUGIN_VERSION + ")"); - } else { - logger.info("[VelocityBroadcast] You are running the latest version (" + PLUGIN_VERSION + ")."); - } - }); - - // Register login listener - server.getEventManager().register(this, new LoginListener(server, PLUGIN_VERSION, updateChecker, databaseManager)); - - // Register command - server.getCommandManager().register( - server.getCommandManager().metaBuilder("vb").plugin(this).build(), - new VBCommand(this) - ); - - logger.info("[VelocityBroadcast] Loaded VelocityBroadcast v" + PLUGIN_VERSION); - } - - @Subscribe - public void onLogin(LoginEvent event) { - if (event.getPlayer().hasPermission("vb.admin") && config.isVersionCheckEnabled()) { - event.getPlayer().sendMessage( - MINI_MESSAGE.deserialize("[VelocityBroadcast] You're running version " + PLUGIN_VERSION + ".") - ); - } - } - - public ProxyServer getServer() { - return server; - } - - public Logger getLogger() { - return logger; - } - - public ConfigHandler getConfigHandler() { - return config; - } - - public DatabaseManager getDatabaseManager() { - return databaseManager; - } - - public LuckPerms getLuckPerms() { - return luckPerms; - } -} +package com.adzel.velocitybroadcast; + +import java.nio.file.Path; + +import org.slf4j.Logger; + +import com.adzel.velocitybroadcast.util.DatabaseManager; +import com.adzel.velocitybroadcast.util.UpdateChecker; +import com.google.inject.Inject; +import com.velocitypowered.api.event.PostOrder; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.connection.LoginEvent; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.plugin.annotation.DataDirectory; +import com.velocitypowered.api.proxy.ProxyServer; + +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPermsProvider; + +@Plugin( + id = "velocitybroadcast", + name = "VelocityBroadcast", + version = "0.3.7", + description = "A proxy-wide broadcast plugin for Velocity.", + authors = {"Adzel"} +) +public class VelocityBroadcast { + + public static final String PLUGIN_VERSION = "0.3.7"; + public static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); + + private final ProxyServer server; + private final Logger logger; + private final Path dataDirectory; + + private ConfigHandler config; + private DatabaseManager databaseManager; + private LuckPerms luckPerms; + + @Inject + public VelocityBroadcast(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { + this.server = server; + this.logger = logger; + this.dataDirectory = dataDirectory; + } + + @Subscribe(order = PostOrder.EARLY) + public void onProxyInitialization(ProxyInitializeEvent event) { + // Load config + this.config = new ConfigHandler(dataDirectory.resolve("config.yml"), logger); + config.load(); + + if (config.isDebugEnabled()) { + logger.info("[VelocityBroadcast] Debug mode is enabled."); + } + + // Initialize LuckPerms + try { + this.luckPerms = LuckPermsProvider.get(); + logger.info("[VelocityBroadcast] Successfully hooked into LuckPerms."); + } catch (IllegalStateException e) { + logger.error("[VelocityBroadcast] LuckPerms is not loaded! This plugin requires LuckPerms."); + return; // Prevent plugin from loading if LP is not available + } + + // Initialize database manager + java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger("VelocityBroadcast"); + this.databaseManager = new DatabaseManager(config, jdkLogger, dataDirectory); + databaseManager.initialize(); + + // Check for updates (async) + UpdateChecker updateChecker = new UpdateChecker(PLUGIN_VERSION, jdkLogger); + updateChecker.checkForUpdate().thenAccept(latest -> { + if (latest != null) { + logger.warn("[VelocityBroadcast] A new version is available: " + latest + " (You are on " + PLUGIN_VERSION + ")"); + } else { + logger.info("[VelocityBroadcast] You are running the latest version (" + PLUGIN_VERSION + ")."); + } + }); + + // Register login listener + server.getEventManager().register(this, new LoginListener(server, PLUGIN_VERSION, updateChecker, databaseManager)); + + // Register command + server.getCommandManager().register( + server.getCommandManager().metaBuilder("vb").plugin(this).build(), + new VBCommand(this) + ); + + logger.info("[VelocityBroadcast] Loaded VelocityBroadcast v" + PLUGIN_VERSION); + } + + @Subscribe + public void onLogin(LoginEvent event) { + if (event.getPlayer().hasPermission("vb.admin") && config.isVersionCheckEnabled()) { + event.getPlayer().sendMessage( + MINI_MESSAGE.deserialize("[VelocityBroadcast] You're running version " + PLUGIN_VERSION + ".") + ); + } + } + + public ProxyServer getServer() { + return server; + } + + public Logger getLogger() { + return logger; + } + + public ConfigHandler getConfigHandler() { + return config; + } + + public DatabaseManager getDatabaseManager() { + return databaseManager; + } + + public LuckPerms getLuckPerms() { + return luckPerms; + } +} diff --git a/src/main/java/com/adzel/velocitybroadcast/util/DatabaseManager.java b/src/main/java/com/adzel/velocitybroadcast/util/DatabaseManager.java index dc1a5be..dda75ae 100644 --- a/src/main/java/com/adzel/velocitybroadcast/util/DatabaseManager.java +++ b/src/main/java/com/adzel/velocitybroadcast/util/DatabaseManager.java @@ -1,127 +1,127 @@ -package com.adzel.velocitybroadcast.util; - -import java.nio.file.Path; -import java.sql.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.logging.Logger; - -import com.adzel.velocitybroadcast.ConfigHandler; - -public class DatabaseManager { - private final Logger logger; - private final ConfigHandler config; - private final Path dataDirectory; - private Connection connection; - private final ExecutorService executor = Executors.newSingleThreadExecutor(); - - public DatabaseManager(ConfigHandler config, Logger logger, Path dataDirectory) { - this.config = config; - this.logger = logger; - this.dataDirectory = dataDirectory; - } - - public void initialize() { - try { - if (config.getDbType().equalsIgnoreCase("mysql")) { - Class.forName("com.mysql.cj.jdbc.Driver"); - connection = DriverManager.getConnection( - "jdbc:mysql://" + config.getDbHost() + ":" + config.getDbPort() + "/" + config.getDbName() + "?useSSL=false&autoReconnect=true", - config.getDbUser(), - config.getDbPassword() - ); - } else { - Class.forName("org.sqlite.JDBC"); - Path dbFile = dataDirectory.resolve(config.getDbName() + ".db"); - connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.toAbsolutePath()); - } - - logger.info("[VelocityBroadcast] Connected to " + config.getDbType().toUpperCase() + " database."); - initializeTables(); - - } catch (Exception e) { - logger.warning("[VelocityBroadcast] Failed to connect to database: " + e.getMessage()); - } - } - - private void initializeTables() { - boolean isMySQL = config.getDbType().equalsIgnoreCase("mysql"); - String idSyntax = isMySQL ? "INT AUTO_INCREMENT PRIMARY KEY" : "INTEGER PRIMARY KEY AUTOINCREMENT"; - - String broadcastTable = "CREATE TABLE IF NOT EXISTS vb_broadcast_logs (" + - "id " + idSyntax + "," + - "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + - "sender VARCHAR(64) NOT NULL," + - "message TEXT NOT NULL," + - "source_server VARCHAR(64)" + - ");"; - - String commandTable = "CREATE TABLE IF NOT EXISTS vb_command_logs (" + - "id " + idSyntax + "," + - "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + - "user VARCHAR(64) NOT NULL," + - "command TEXT NOT NULL," + - "success BOOLEAN" + - ");"; - - String joinTable = "CREATE TABLE IF NOT EXISTS vb_admin_joins (" + - "id " + idSyntax + "," + - "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + - "username VARCHAR(64) NOT NULL," + - "server VARCHAR(64)" + - ");"; - - executeUpdate(broadcastTable); - executeUpdate(commandTable); - executeUpdate(joinTable); - } - - public void logBroadcast(String sender, String message, String sourceServer) { - String sql = "INSERT INTO vb_broadcast_logs (sender, message, source_server) VALUES (?, ?, ?)"; - executeAsync(sql, sender, message, sourceServer); - } - - public void logCommand(String user, String command, boolean success) { - String sql = "INSERT INTO vb_command_logs (user, command, success) VALUES (?, ?, ?)"; - executeAsync(sql, user, command, success); - } - - public void logAdminJoin(String username, String serverName) { - String sql = "INSERT INTO vb_admin_joins (username, server) VALUES (?, ?)"; - executeAsync(sql, username, serverName); - } - - private void executeAsync(String sql, Object... params) { - executor.submit(() -> { - try (PreparedStatement stmt = connection.prepareStatement(sql)) { - for (int i = 0; i < params.length; i++) { - stmt.setObject(i + 1, params[i]); - } - stmt.executeUpdate(); - } catch (SQLException e) { - logger.warning("[VelocityBroadcast] Database query failed: " + e.getMessage()); - } - }); - } - - private void executeUpdate(String sql) { - executor.submit(() -> { - try (Statement stmt = connection.createStatement()) { - stmt.executeUpdate(sql); - } catch (SQLException e) { - logger.warning("[VelocityBroadcast] Failed to initialize table: " + e.getMessage()); - } - }); - } - - public void close() { - try { - if (connection != null && !connection.isClosed()) { - connection.close(); - executor.shutdown(); - } - } catch (SQLException e) { - logger.warning("[VelocityBroadcast] Failed to close database: " + e.getMessage()); - } - } -} +package com.adzel.velocitybroadcast.util; + +import java.nio.file.Path; +import java.sql.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.logging.Logger; + +import com.adzel.velocitybroadcast.ConfigHandler; + +public class DatabaseManager { + private final Logger logger; + private final ConfigHandler config; + private final Path dataDirectory; + private Connection connection; + private final ExecutorService executor = Executors.newSingleThreadExecutor(); + + public DatabaseManager(ConfigHandler config, Logger logger, Path dataDirectory) { + this.config = config; + this.logger = logger; + this.dataDirectory = dataDirectory; + } + + public void initialize() { + try { + if (config.getDbType().equalsIgnoreCase("mysql")) { + Class.forName("com.mysql.cj.jdbc.Driver"); + connection = DriverManager.getConnection( + "jdbc:mysql://" + config.getDbHost() + ":" + config.getDbPort() + "/" + config.getDbName() + "?useSSL=false&autoReconnect=true", + config.getDbUser(), + config.getDbPassword() + ); + } else { + Class.forName("org.sqlite.JDBC"); + Path dbFile = dataDirectory.resolve(config.getDbName() + ".db"); + connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.toAbsolutePath()); + } + + logger.info("[VelocityBroadcast] Connected to " + config.getDbType().toUpperCase() + " database."); + initializeTables(); + + } catch (Exception e) { + logger.warning("[VelocityBroadcast] Failed to connect to database: " + e.getMessage()); + } + } + + private void initializeTables() { + boolean isMySQL = config.getDbType().equalsIgnoreCase("mysql"); + String idSyntax = isMySQL ? "INT AUTO_INCREMENT PRIMARY KEY" : "INTEGER PRIMARY KEY AUTOINCREMENT"; + + String broadcastTable = "CREATE TABLE IF NOT EXISTS vb_broadcast_logs (" + + "id " + idSyntax + "," + + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + + "sender VARCHAR(64) NOT NULL," + + "message TEXT NOT NULL," + + "source_server VARCHAR(64)" + + ");"; + + String commandTable = "CREATE TABLE IF NOT EXISTS vb_command_logs (" + + "id " + idSyntax + "," + + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + + "user VARCHAR(64) NOT NULL," + + "command TEXT NOT NULL," + + "success BOOLEAN" + + ");"; + + String joinTable = "CREATE TABLE IF NOT EXISTS vb_admin_joins (" + + "id " + idSyntax + "," + + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + + "username VARCHAR(64) NOT NULL," + + "server VARCHAR(64)" + + ");"; + + executeUpdate(broadcastTable); + executeUpdate(commandTable); + executeUpdate(joinTable); + } + + public void logBroadcast(String sender, String message, String sourceServer) { + String sql = "INSERT INTO vb_broadcast_logs (sender, message, source_server) VALUES (?, ?, ?)"; + executeAsync(sql, sender, message, sourceServer); + } + + public void logCommand(String user, String command, boolean success) { + String sql = "INSERT INTO vb_command_logs (user, command, success) VALUES (?, ?, ?)"; + executeAsync(sql, user, command, success); + } + + public void logAdminJoin(String username, String serverName) { + String sql = "INSERT INTO vb_admin_joins (username, server) VALUES (?, ?)"; + executeAsync(sql, username, serverName); + } + + private void executeAsync(String sql, Object... params) { + executor.submit(() -> { + try (PreparedStatement stmt = connection.prepareStatement(sql)) { + for (int i = 0; i < params.length; i++) { + stmt.setObject(i + 1, params[i]); + } + stmt.executeUpdate(); + } catch (SQLException e) { + logger.warning("[VelocityBroadcast] Database query failed: " + e.getMessage()); + } + }); + } + + private void executeUpdate(String sql) { + executor.submit(() -> { + try (Statement stmt = connection.createStatement()) { + stmt.executeUpdate(sql); + } catch (SQLException e) { + logger.warning("[VelocityBroadcast] Failed to initialize table: " + e.getMessage()); + } + }); + } + + public void close() { + try { + if (connection != null && !connection.isClosed()) { + connection.close(); + executor.shutdown(); + } + } catch (SQLException e) { + logger.warning("[VelocityBroadcast] Failed to close database: " + e.getMessage()); + } + } +} diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 39ee34c..f6d63e2 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,9 +1,9 @@ -{ - "id": "velocitybroadcast", - "name": "VelocityBroadcast", - "version": "0.3.5", - "authors": ["Adzel"], - "main": "com.adzel.velocitybroadcast.VelocityBroadcast", - "description": "A proxy-wide broadcast plugin for Velocity.", - "website": "https://github.com/AdzelFirestar/VelocityBroadcast" +{ + "id": "velocitybroadcast", + "name": "VelocityBroadcast", + "version": "0.3.7", + "authors": ["Adzel"], + "main": "com.adzel.velocitybroadcast.VelocityBroadcast", + "description": "A proxy-wide broadcast plugin for Velocity.", + "website": "https://github.com/AdzelFirestar/VelocityBroadcast" } \ No newline at end of file diff --git a/target/classes/plugin.json b/target/classes/plugin.json index 39ee34c..f6d63e2 100644 --- a/target/classes/plugin.json +++ b/target/classes/plugin.json @@ -1,9 +1,9 @@ -{ - "id": "velocitybroadcast", - "name": "VelocityBroadcast", - "version": "0.3.5", - "authors": ["Adzel"], - "main": "com.adzel.velocitybroadcast.VelocityBroadcast", - "description": "A proxy-wide broadcast plugin for Velocity.", - "website": "https://github.com/AdzelFirestar/VelocityBroadcast" +{ + "id": "velocitybroadcast", + "name": "VelocityBroadcast", + "version": "0.3.7", + "authors": ["Adzel"], + "main": "com.adzel.velocitybroadcast.VelocityBroadcast", + "description": "A proxy-wide broadcast plugin for Velocity.", + "website": "https://github.com/AdzelFirestar/VelocityBroadcast" } \ No newline at end of file diff --git a/target/classes/velocity-plugin.json b/target/classes/velocity-plugin.json index f8cc865..8dc44ae 100644 --- a/target/classes/velocity-plugin.json +++ b/target/classes/velocity-plugin.json @@ -1 +1 @@ -{"id":"velocitybroadcast","name":"VelocityBroadcast","version":"0.3.5","description":"A proxy-wide broadcast plugin for Velocity.","authors":["Adzel"],"dependencies":[],"main":"com.adzel.velocitybroadcast.VelocityBroadcast"} \ No newline at end of file +{"id":"velocitybroadcast","name":"VelocityBroadcast","version":"0.3.7","description":"A proxy-wide broadcast plugin for Velocity.","authors":["Adzel"],"dependencies":[],"main":"com.adzel.velocitybroadcast.VelocityBroadcast"} \ No newline at end of file diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 0434b51..115521c 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,3 +1,3 @@ -artifactId=velocitybroadcast -groupId=com.adzel.velocitybroadcast -version=0.3.5 +artifactId=velocitybroadcast +groupId=com.adzel.velocitybroadcast +version=0.3.7 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index a7f5a7d..abe6263 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -2,7 +2,6 @@ com\adzel\velocitybroadcast\VelocityBroadcast.class com\adzel\velocitybroadcast\VBCommand.class com\adzel\velocitybroadcast\BroadcastCommand.class com\adzel\velocitybroadcast\ConfigHandler.class -com\adzel\velocitybroadcast\UpdateChecker.class com\adzel\velocitybroadcast\ReloadCommand.class velocity-plugin.json com\adzel\velocitybroadcast\util\DatabaseManager.class