Uploading update source code for version 0.3.7

This commit is contained in:
2025-11-13 17:53:54 -08:00
parent d9c89504fb
commit f6d8e26e1d
23 changed files with 1161 additions and 1341 deletions

View File

@@ -1,35 +1,35 @@
--- ---
name: Bug report name: Bug report
about: Your bug reports help us improve the plugin for others about: Your bug reports help us improve the plugin for others
title: "[BUG]" title: "[BUG]"
labels: bug labels: bug
assignees: AdzelFirestar assignees: AdzelFirestar
--- ---
**Describe the bug** **Describe the bug**
Please describe the bug as accurately and concisely as possible. That helps us track where it is coming from. Please describe the bug as accurately and concisely as possible. That helps us track where it is coming from.
**To Reproduce** **To Reproduce**
Steps to reproduce the behavior: Please be as descriptive as possible so I can track where the bug is happening. Steps to reproduce the behavior: Please be as descriptive as possible so I can track where the bug is happening.
1. Go to '...' 1. Go to '...'
2. Click on '....' 2. Click on '....'
3. Scroll down to '....' 3. Scroll down to '....'
4. See error 4. See error
**Expected behavior** **Expected behavior**
A clear and concise description of what you expected to happen. A clear and concise description of what you expected to happen.
**Screenshots** **Screenshots**
If applicable, add screenshots to help explain your problem. This will help us a lot with visualizing the bug/error. 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** **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. 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):** **Server Information (please complete the following information):**
- Velocity Version: - Velocity Version:
- Minecraft version you are running: - Minecraft version you are running:
**Additional context** **Additional context**
Add any other context about the problem here. Add any other context about the problem here.

View File

@@ -1,20 +1,20 @@
--- ---
name: Feature request name: Feature request
about: Request a new feature for Velocity Broadcast Reborn about: Request a new feature for Velocity Broadcast Reborn
title: "[FEATURE REQUEST]" title: "[FEATURE REQUEST]"
labels: feature-request labels: feature-request
assignees: AdzelFirestar assignees: AdzelFirestar
--- ---
**Is your feature request related to a problem? Please describe.** **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 [...] A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like** **Describe the solution you'd like**
A clear and concise description of what you want to happen. A clear and concise description of what you want to happen.
**Describe alternatives you've considered** **Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered. A clear and concise description of any alternative solutions or features you've considered.
**Additional context** **Additional context**
Add any other context or screenshots about the feature request here. Add any other context or screenshots about the feature request here.

View File

@@ -1,15 +1,15 @@
--- ---
name: Feedback and Review name: Feedback and Review
about: Have some general feedback or want to review us through GitHub? You are in about: Have some general feedback or want to review us through GitHub? You are in
the right place the right place
title: "[FEEDBACK/REVIEW]" title: "[FEEDBACK/REVIEW]"
labels: '' labels: ''
assignees: AdzelFirestar assignees: AdzelFirestar
--- ---
**Is this Feedback or a Review?** **Is this Feedback or a Review?**
[Answer Here] [Answer Here]
**Please leave your feedback or review here** **Please leave your feedback or review here**
[Leave your feedback or review on this line] [Leave your feedback or review on this line]

48
.gitignore vendored
View File

@@ -1,24 +1,24 @@
# Compiled class file # Compiled class file
*.class *.class
# Log file # Log file
*.log *.log
# BlueJ files # BlueJ files
*.ctxt *.ctxt
# Mobile Tools for Java (J2ME) # Mobile Tools for Java (J2ME)
.mtj.tmp/ .mtj.tmp/
# Package Files # # Package Files #
*.jar *.jar
*.war *.war
*.nar *.nar
*.ear *.ear
*.zip *.zip
*.tar.gz *.tar.gz
*.rar *.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
replay_pid* replay_pid*

View File

@@ -1,4 +1,4 @@
{ {
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.compile.nullAnalysis.mode": "automatic" "java.compile.nullAnalysis.mode": "automatic"
} }

207
LICENSE
View File

@@ -1,201 +1,22 @@
Apache License Creative Commons Attribution-NonCommercial 4.0 International
Version 2.0, January 2004
http://www.apache.org/licenses/
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, Share — copy and redistribute the material in any medium or format
and distribution as defined by Sections 1 through 9 of this document. Adapt — remix, transform, and build upon the material
"Licensor" shall mean the copyright owner or entity authorized by The licensor cannot revoke these freedoms as long as you follow these license terms:
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all Attribution — You must give appropriate credit, provide a link to the license,
other entities that control, are controlled by, or are under common and indicate if changes were made.
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.
"You" (or "Your") shall mean an individual or Legal Entity NonCommercial — You may not use the material for commercial purposes.
exercising permissions granted by this License. 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, No additional restrictions — You may not apply legal terms or technological
including but not limited to software source code, documentation measures that legally restrict others from doing anything the license permits.
source, and configuration files.
"Object" form shall mean any form resulting from mechanical Full License: https://creativecommons.org/licenses/by-nc/4.0/legalcode
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.

View File

@@ -1,32 +1,32 @@
## VelocityBroadcast Reborn ## 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. 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 # 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! 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. 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 # Dependencies
- The latest stable build of Velocity - The latest stable build of Velocity
- The latest stable build of LuckPerms - 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 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 - A secondary/multiple servers on the network to receive full compatibility
# Setup # Setup
1. Download the latest version from Spigot or the Releases page on the right 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) 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 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) 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)} 4a. lpv user {username} permission set {permission node} true {context (optional)}
4b. lpv group {group} 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" 4c. Or you can do it in GUI mode with the command "lpv editor"
5. Restart your proxy again 5. Restart your proxy again
6. Now the setup is complete, enjoy! 6. Now the setup is complete, enjoy!
# Commands and Permissions # Commands and Permissions
- /vb - When typed on its own will show the help page - No permission needed - /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 - /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 - /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 - /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.*** ***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.***

View File

@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.adzel.velocitybroadcast</groupId> <groupId>com.adzel.velocitybroadcast</groupId>
<artifactId>velocitybroadcast</artifactId> <artifactId>velocitybroadcast</artifactId>
<name>VelocityBroadcast</name> <name>VelocityBroadcast</name>
<version>0.3.5</version> <version>0.3.7</version>
<description>Broadcast plugin for Minecraft Velocity proxy.</description> <description>Broadcast plugin for Minecraft Velocity proxy.</description>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <version>3.10.1</version>
<configuration> <configuration>
<release>17</release> <release>17</release>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version> <version>3.4.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<minimizeJar>false</minimizeJar> <minimizeJar>false</minimizeJar>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories> <repositories>
<repository> <repository>
<id>velocitypowered-repo</id> <id>velocitypowered-repo</id>
<url>https://repo.velocitypowered.com/releases/</url> <url>https://repo.velocitypowered.com/releases/</url>
</repository> </repository>
<repository> <repository>
<id>central</id> <id>central</id>
<url>https://repo.maven.apache.org/maven2</url> <url>https://repo.maven.apache.org/maven2</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.velocitypowered</groupId> <groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId> <artifactId>velocity-api</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.luckperms</groupId> <groupId>net.luckperms</groupId>
<artifactId>api</artifactId> <artifactId>api</artifactId>
<version>5.4</version> <version>5.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
</project> </project>

244
pom.xml
View File

@@ -1,123 +1,123 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.adzel.velocitybroadcast</groupId> <groupId>com.adzel.velocitybroadcast</groupId>
<artifactId>velocitybroadcast</artifactId> <artifactId>velocitybroadcast</artifactId>
<version>0.3.5</version> <version>0.3.7</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>VelocityBroadcast</name> <name>VelocityBroadcast</name>
<description>Broadcast plugin for Minecraft Velocity proxy.</description> <description>Broadcast plugin for Minecraft Velocity proxy.</description>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
<id>velocitypowered-repo</id> <id>velocitypowered-repo</id>
<url>https://repo.velocitypowered.com/releases/</url> <url>https://repo.velocitypowered.com/releases/</url>
</repository> </repository>
<repository> <repository>
<id>central</id> <id>central</id>
<url>https://repo.maven.apache.org/maven2</url> <url>https://repo.maven.apache.org/maven2</url>
</repository> </repository>
</repositories> </repositories>
<dependencies> <dependencies>
<!-- Velocity API --> <!-- Velocity API -->
<dependency> <dependency>
<groupId>com.velocitypowered</groupId> <groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId> <artifactId>velocity-api</artifactId>
<version>3.1.1</version> <version>3.1.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- Adventure API --> <!-- Adventure API -->
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId> <artifactId>adventure-api</artifactId>
<version>4.15.0</version> <version>4.15.0</version>
</dependency> </dependency>
<!-- Adventure MiniMessage --> <!-- Adventure MiniMessage -->
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-text-minimessage</artifactId> <artifactId>adventure-text-minimessage</artifactId>
<version>4.15.0</version> <version>4.15.0</version>
</dependency> </dependency>
<!-- JSON Wrapper --> <!-- JSON Wrapper -->
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>
<artifactId>json</artifactId> <artifactId>json</artifactId>
<version>20240303</version> <version>20240303</version>
</dependency> </dependency>
<!-- SQLite --> <!-- SQLite -->
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.43.2.2</version> <version>3.43.2.2</version>
</dependency> </dependency>
<!-- MySQL Connector --> <!-- MySQL Connector -->
<dependency> <dependency>
<groupId>com.mysql</groupId> <groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId> <artifactId>mysql-connector-j</artifactId>
<version>8.4.0</version> <version>8.4.0</version>
</dependency> </dependency>
<!-- Snake YAML --> <!-- Snake YAML -->
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
<!-- LuckPerms API (Velocity-compatible) --> <!-- LuckPerms API (Velocity-compatible) -->
<dependency> <dependency>
<groupId>net.luckperms</groupId> <groupId>net.luckperms</groupId>
<artifactId>api</artifactId> <artifactId>api</artifactId>
<version>5.4</version> <version>5.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<!-- Java Compiler Plugin --> <!-- Java Compiler Plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version> <version>3.10.1</version>
<configuration> <configuration>
<release>17</release> <release>17</release>
</configuration> </configuration>
</plugin> </plugin>
<!-- Shade Plugin --> <!-- Shade Plugin -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version> <version>3.4.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<minimizeJar>false</minimizeJar> <minimizeJar>false</minimizeJar>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>
<!-- This is a Maven POM file for the VelocityBroadcast plugin. <!-- This is a Maven POM file for the VelocityBroadcast plugin.
It defines the project structure, dependencies, and build configuration. --> It defines the project structure, dependencies, and build configuration. -->

View File

@@ -1,58 +1,58 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import java.util.List; import java.util.List;
import com.adzel.velocitybroadcast.util.DatabaseManager; import com.adzel.velocitybroadcast.util.DatabaseManager;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.command.SimpleCommand;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
public class BroadcastCommand implements SimpleCommand { public class BroadcastCommand implements SimpleCommand {
private final VelocityBroadcast plugin; private final VelocityBroadcast plugin;
private final DatabaseManager databaseManager; private final DatabaseManager databaseManager;
private final MiniMessage mm = MiniMessage.miniMessage(); private final MiniMessage mm = MiniMessage.miniMessage();
public BroadcastCommand(VelocityBroadcast plugin) { public BroadcastCommand(VelocityBroadcast plugin) {
this.plugin = plugin; this.plugin = plugin;
this.databaseManager = plugin.getDatabaseManager(); this.databaseManager = plugin.getDatabaseManager();
} }
@Override @Override
public void execute(Invocation invocation) { public void execute(Invocation invocation) {
CommandSource source = invocation.source(); CommandSource source = invocation.source();
List<String> args = List.of(invocation.arguments()); List<String> args = List.of(invocation.arguments());
if (!source.hasPermission("vb.broadcast")) { if (!source.hasPermission("vb.broadcast")) {
source.sendMessage(mm.deserialize("<red>You don't have permission to use this command.</red>")); source.sendMessage(mm.deserialize("<red>You don't have permission to use this command.</red>"));
return; return;
} }
if (args.isEmpty()) { if (args.isEmpty()) {
source.sendMessage(mm.deserialize("<red>Usage: /vb <message></red>")); source.sendMessage(mm.deserialize("<red>Usage: /vb <message></red>"));
return; return;
} }
String messageRaw = String.join(" ", args); String messageRaw = String.join(" ", args);
String prefix = plugin.getConfigHandler().getPrefix(); String prefix = plugin.getConfigHandler().getPrefix();
String fullMessage = prefix + messageRaw; String fullMessage = prefix + messageRaw;
Component broadcast = mm.deserialize(fullMessage); Component broadcast = mm.deserialize(fullMessage);
plugin.getServer().getAllPlayers().forEach(player -> player.sendMessage(broadcast)); plugin.getServer().getAllPlayers().forEach(player -> player.sendMessage(broadcast));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); plugin.getLogger().info("[Broadcast] Sent: " + fullMessage);
} }
// ✅ Log to the database with proper sender // ✅ Log to the database with proper sender
String sender = (source instanceof Player player) ? player.getUsername() : "Console"; String sender = (source instanceof Player player) ? player.getUsername() : "Console";
String sourceServer = plugin.getServer().getBoundAddress().toString(); String sourceServer = plugin.getServer().getBoundAddress().toString();
databaseManager.logBroadcast(sender, messageRaw, sourceServer); databaseManager.logBroadcast(sender, messageRaw, sourceServer);
// Optional feedback to source // Optional feedback to source
source.sendMessage(mm.deserialize("<green>Broadcast sent.</green>")); source.sendMessage(mm.deserialize("<green>Broadcast sent.</green>"));
} }
} }

View File

@@ -1,172 +1,172 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.representer.Representer; import org.yaml.snakeyaml.representer.Representer;
public class ConfigHandler { public class ConfigHandler {
private final Path configPath; private final Path configPath;
private final Logger logger; private final Logger logger;
private boolean debugEnabled = false; private boolean debugEnabled = false;
private boolean versionCheckEnabled = true; private boolean versionCheckEnabled = true;
private String prefix = "&9&l[&3&lServer&9&l]&r "; private String prefix = "&9&l[&3&lServer&9&l]&r ";
private String dbType = "sqlite"; private String dbType = "sqlite";
private String dbHost = "localhost"; private String dbHost = "localhost";
private int dbPort = 3306; private int dbPort = 3306;
private String dbName = "velocitybroadcast"; private String dbName = "velocitybroadcast";
private String dbUser = "vb_user"; private String dbUser = "vb_user";
private String dbPassword = "securepassword"; private String dbPassword = "securepassword";
private static final String CURRENT_VERSION = VelocityBroadcast.PLUGIN_VERSION; 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 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; private final Yaml yaml;
public ConfigHandler(Path configPath, Logger logger) { public ConfigHandler(Path configPath, Logger logger) {
this.configPath = configPath; this.configPath = configPath;
this.logger = logger; this.logger = logger;
DumperOptions options = new DumperOptions(); DumperOptions options = new DumperOptions();
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
options.setIndent(2); options.setIndent(2);
options.setPrettyFlow(true); options.setPrettyFlow(true);
Representer representer = new Representer(options); Representer representer = new Representer(options);
representer.getPropertyUtils().setSkipMissingProperties(true); representer.getPropertyUtils().setSkipMissingProperties(true);
yaml = new Yaml(representer, options); yaml = new Yaml(representer, options);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void load() { public void load() {
try { try {
Files.createDirectories(configPath.getParent()); Files.createDirectories(configPath.getParent());
boolean shouldSave = false; boolean shouldSave = false;
if (!Files.exists(configPath)) { if (!Files.exists(configPath)) {
save(); save();
return; return;
} }
String fileVersion = Files.readAllLines(configPath).stream() String fileVersion = Files.readAllLines(configPath).stream()
.filter(line -> line.startsWith("Plugin Version:")) .filter(line -> line.startsWith("Plugin Version:"))
.map(line -> line.replaceAll(".*'(.*?)'.*", "$1").trim()) .map(line -> line.replaceAll(".*'(.*?)'.*", "$1").trim())
.findFirst() .findFirst()
.orElse(null); .orElse(null);
if (fileVersion == null || !fileVersion.equals(CURRENT_VERSION)) { if (fileVersion == null || !fileVersion.equals(CURRENT_VERSION)) {
shouldSave = true; shouldSave = true;
} }
Map<String, Object> root = yaml.load(Files.newBufferedReader(configPath)); Map<String, Object> root = yaml.load(Files.newBufferedReader(configPath));
if (root == null) root = new LinkedHashMap<>(); if (root == null) root = new LinkedHashMap<>();
Map<String, Object> general = (Map<String, Object>) root.getOrDefault("general", new LinkedHashMap<>()); Map<String, Object> general = (Map<String, Object>) root.getOrDefault("general", new LinkedHashMap<>());
debugEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("debug-messages-enabled", "false"))); debugEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("debug-messages-enabled", "false")));
versionCheckEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("version-check-enabled", "true"))); versionCheckEnabled = Boolean.parseBoolean(String.valueOf(general.getOrDefault("version-check-enabled", "true")));
prefix = String.valueOf(general.getOrDefault("prefix", "&9&l[&3&lServer&9&l]&r ")); prefix = String.valueOf(general.getOrDefault("prefix", "&9&l[&3&lServer&9&l]&r "));
Map<String, Object> database = (Map<String, Object>) root.getOrDefault("database", new LinkedHashMap<>()); Map<String, Object> database = (Map<String, Object>) root.getOrDefault("database", new LinkedHashMap<>());
dbType = String.valueOf(database.getOrDefault("type", "sqlite")); dbType = String.valueOf(database.getOrDefault("type", "sqlite"));
dbHost = String.valueOf(database.getOrDefault("host", "localhost")); dbHost = String.valueOf(database.getOrDefault("host", "localhost"));
dbPort = Integer.parseInt(String.valueOf(database.getOrDefault("port", "3306"))); dbPort = Integer.parseInt(String.valueOf(database.getOrDefault("port", "3306")));
dbName = String.valueOf(database.getOrDefault("name", "velocitybroadcast")); dbName = String.valueOf(database.getOrDefault("name", "velocitybroadcast"));
dbUser = String.valueOf(database.getOrDefault("user", "vb_user")); dbUser = String.valueOf(database.getOrDefault("user", "vb_user"));
dbPassword = String.valueOf(database.getOrDefault("password", "securepassword")); dbPassword = String.valueOf(database.getOrDefault("password", "securepassword"));
if (shouldSave) { if (shouldSave) {
save(); save();
} }
} catch (IOException e) { } catch (IOException e) {
logger.error("Failed to load VelocityBroadcast config!", e); logger.error("Failed to load VelocityBroadcast config!", e);
} }
} }
public void save() { public void save() {
try { try {
Files.createDirectories(configPath.getParent()); Files.createDirectories(configPath.getParent());
Map<String, Object> general = new LinkedHashMap<>(); Map<String, Object> general = new LinkedHashMap<>();
general.put("debug-messages-enabled", debugEnabled); general.put("debug-messages-enabled", debugEnabled);
general.put("version-check-enabled", versionCheckEnabled); general.put("version-check-enabled", versionCheckEnabled);
general.put("prefix", prefix); general.put("prefix", prefix);
Map<String, Object> database = new LinkedHashMap<>(); Map<String, Object> database = new LinkedHashMap<>();
database.put("type", dbType); database.put("type", dbType);
database.put("host", dbHost); database.put("host", dbHost);
database.put("port", dbPort); database.put("port", dbPort);
database.put("name", dbName); database.put("name", dbName);
database.put("user", dbUser); database.put("user", dbUser);
database.put("password", dbPassword); database.put("password", dbPassword);
Map<String, Object> root = new LinkedHashMap<>(); Map<String, Object> root = new LinkedHashMap<>();
root.put("general", general); root.put("general", general);
root.put("database", database); root.put("database", database);
try (BufferedWriter writer = Files.newBufferedWriter(configPath)) { try (BufferedWriter writer = Files.newBufferedWriter(configPath)) {
writer.write(VERSION_LINE + "\n\n"); writer.write(VERSION_LINE + "\n\n");
yaml.dump(root, writer); yaml.dump(root, writer);
} }
} catch (IOException e) { } catch (IOException e) {
logger.error("Failed to save VelocityBroadcast config!", e); logger.error("Failed to save VelocityBroadcast config!", e);
} }
} }
public void reload() { public void reload() {
load(); load();
} }
public boolean isDebugEnabled() { public boolean isDebugEnabled() {
return debugEnabled; return debugEnabled;
} }
public boolean isVersionCheckEnabled() { public boolean isVersionCheckEnabled() {
return versionCheckEnabled; return versionCheckEnabled;
} }
public String getPrefix() { public String getPrefix() {
return prefix; return prefix;
} }
public void setPrefix(String newPrefix) { public void setPrefix(String newPrefix) {
this.prefix = newPrefix; this.prefix = newPrefix;
save(); save();
} }
public String getDbType() { public String getDbType() {
return dbType; return dbType;
} }
public String getDbHost() { public String getDbHost() {
return dbHost; return dbHost;
} }
public int getDbPort() { public int getDbPort() {
return dbPort; return dbPort;
} }
public String getDbName() { public String getDbName() {
return dbName; return dbName;
} }
public String getDbUser() { public String getDbUser() {
return dbUser; return dbUser;
} }
public String getDbPassword() { public String getDbPassword() {
return dbPassword; return dbPassword;
} }
} }

View File

@@ -1,50 +1,50 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import com.adzel.velocitybroadcast.util.DatabaseManager; import com.adzel.velocitybroadcast.util.DatabaseManager;
import com.adzel.velocitybroadcast.util.UpdateChecker; import com.adzel.velocitybroadcast.util.UpdateChecker;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.event.connection.PostLoginEvent;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
public class LoginListener { public class LoginListener {
private final ProxyServer server; private final ProxyServer server;
private final String currentVersion; private final String currentVersion;
private final UpdateChecker updateChecker; private final UpdateChecker updateChecker;
private final DatabaseManager databaseManager; private final DatabaseManager databaseManager;
private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
public LoginListener(ProxyServer server, String currentVersion, UpdateChecker updateChecker, DatabaseManager databaseManager) { public LoginListener(ProxyServer server, String currentVersion, UpdateChecker updateChecker, DatabaseManager databaseManager) {
this.server = server; this.server = server;
this.currentVersion = currentVersion; this.currentVersion = currentVersion;
this.updateChecker = updateChecker; this.updateChecker = updateChecker;
this.databaseManager = databaseManager; this.databaseManager = databaseManager;
} }
@Subscribe @Subscribe
public void onPlayerJoin(PostLoginEvent event) { public void onPlayerJoin(PostLoginEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player.hasPermission("vb.admin")) { if (player.hasPermission("vb.admin")) {
// ✅ Log admin join to DB // ✅ Log admin join to DB
String serverName = server.getBoundAddress().toString(); // Optional String serverName = server.getBoundAddress().toString(); // Optional
databaseManager.logAdminJoin(player.getUsername(), serverName); databaseManager.logAdminJoin(player.getUsername(), serverName);
// ✅ Notify if update is available // ✅ Notify if update is available
updateChecker.checkForUpdate().thenAccept(latest -> { updateChecker.checkForUpdate().thenAccept(latest -> {
if (latest != null && !latest.equalsIgnoreCase(currentVersion)) { if (latest != null && !latest.equalsIgnoreCase(currentVersion)) {
Component message = MINI_MESSAGE.deserialize( Component message = MINI_MESSAGE.deserialize(
"<bold><gold>[VelocityBroadcast]</gold></bold> " + "<bold><gold>[VelocityBroadcast]</gold></bold> " +
"<gradient:yellow:red>A new version is available: </gradient:yellow:red>" + "<gradient:yellow:red>A new version is available: </gradient:yellow:red>" +
"<bold><green>" + latest + "</green></bold> " + "<bold><green>" + latest + "</green></bold> " +
"<gray>(You are on <red>" + currentVersion + "</red>)</gray>" "<gray>(You are on <red>" + currentVersion + "</red>)</gray>"
); );
player.sendMessage(message); player.sendMessage(message);
} }
}); });
} }
} }
} }

View File

@@ -1,44 +1,44 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import java.util.List; import java.util.List;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.command.SimpleCommand;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
public class PrefixCommand implements SimpleCommand { public class PrefixCommand implements SimpleCommand {
private final VelocityBroadcast plugin; private final VelocityBroadcast plugin;
public PrefixCommand(VelocityBroadcast plugin) { public PrefixCommand(VelocityBroadcast plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
@Override @Override
public void execute(Invocation invocation) { public void execute(Invocation invocation) {
CommandSource source = invocation.source(); CommandSource source = invocation.source();
List<String> args = List.of(invocation.arguments()); List<String> args = List.of(invocation.arguments());
if (!source.hasPermission("vb.admin")) { if (!source.hasPermission("vb.admin")) {
source.sendMessage(MiniMessage.miniMessage().deserialize("<red>You don't have permission to change the broadcast prefix.</red>")); source.sendMessage(MiniMessage.miniMessage().deserialize("<red>You don't have permission to change the broadcast prefix.</red>"));
return; return;
} }
if (args.isEmpty()) { if (args.isEmpty()) {
source.sendMessage(MiniMessage.miniMessage().deserialize("<red>Usage: /vb prefix <newPrefix></red>")); source.sendMessage(MiniMessage.miniMessage().deserialize("<red>Usage: /vb prefix <newPrefix></red>"));
return; return;
} }
String newPrefix = String.join(" ", args); String newPrefix = String.join(" ", args);
plugin.getConfigHandler().setPrefix(newPrefix); plugin.getConfigHandler().setPrefix(newPrefix);
source.sendMessage(MiniMessage.miniMessage().deserialize( source.sendMessage(MiniMessage.miniMessage().deserialize(
"<green>Broadcast prefix updated to:</green> <gray>" + newPrefix + "</gray>" "<green>Broadcast prefix updated to:</green> <gray>" + newPrefix + "</gray>"
)); ));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix);
} }
} }
} }

View File

@@ -1,33 +1,33 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.command.SimpleCommand;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import java.util.List; import java.util.List;
public class ReloadCommand implements SimpleCommand { public class ReloadCommand implements SimpleCommand {
private final VelocityBroadcast plugin; private final VelocityBroadcast plugin;
public ReloadCommand(VelocityBroadcast plugin) { public ReloadCommand(VelocityBroadcast plugin) {
this.plugin = plugin; this.plugin = plugin;
} }
@Override @Override
public void execute(Invocation invocation) { public void execute(Invocation invocation) {
CommandSource source = invocation.source(); CommandSource source = invocation.source();
if (!source.hasPermission("vb.admin")) { if (!source.hasPermission("vb.admin")) {
source.sendMessage(MiniMessage.miniMessage().deserialize("<red>You don't have permission to reload the config.</red>")); source.sendMessage(MiniMessage.miniMessage().deserialize("<red>You don't have permission to reload the config.</red>"));
return; return;
} }
plugin.getConfigHandler().reload(); plugin.getConfigHandler().reload();
source.sendMessage(MiniMessage.miniMessage().deserialize("<green>VelocityBroadcast config reloaded.</green>")); source.sendMessage(MiniMessage.miniMessage().deserialize("<green>VelocityBroadcast config reloaded.</green>"));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); plugin.getLogger().info("[Reload] Config reloaded by " + source.toString());
} }
} }
} }

View File

@@ -1,63 +1,63 @@
package com.adzel.velocitybroadcast.util; package com.adzel.velocitybroadcast.util;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.json.JSONObject; import org.json.JSONObject;
import org.json.JSONTokener; import org.json.JSONTokener;
public class UpdateChecker { public class UpdateChecker {
private static final String ENDPOINT = "https://api.github.com/repos/AdzelFirestar/velocitybroadcast-reborn/releases/latest"; private static final String ENDPOINT = "https://git.addydevelops.site/api/v1/repos/Adzel/Velocity-Broadcast-Reborn/releases/latest";
private final String currentVersion; private final String currentVersion;
private final Logger logger; private final Logger logger;
public UpdateChecker(String currentVersion, Logger logger) { public UpdateChecker(String currentVersion, Logger logger) {
this.currentVersion = currentVersion; this.currentVersion = currentVersion;
this.logger = logger; this.logger = logger;
} }
public CompletableFuture<String> checkForUpdate() { public CompletableFuture<String> checkForUpdate() {
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
try { try {
HttpURLConnection connection = (HttpURLConnection) new URL(ENDPOINT).openConnection(); HttpURLConnection connection = (HttpURLConnection) new URL(ENDPOINT).openConnection();
connection.setRequestProperty("Accept", "application/json"); connection.setRequestProperty("Accept", "application/json");
connection.setConnectTimeout(3000); connection.setConnectTimeout(3000);
connection.setReadTimeout(3000); connection.setReadTimeout(3000);
try (InputStreamReader reader = new InputStreamReader(connection.getInputStream())) { try (InputStreamReader reader = new InputStreamReader(connection.getInputStream())) {
JSONObject json = new JSONObject(new JSONTokener(reader)); JSONObject json = new JSONObject(new JSONTokener(reader));
String latestVersion = json.getString("tag_name").trim(); String latestVersion = json.getString("tag_name").trim();
if (!latestVersion.equalsIgnoreCase(currentVersion)) { if (!latestVersion.equalsIgnoreCase(currentVersion)) {
logger.info("[VelocityBroadcast] Update available: " + latestVersion + " (you are on " + currentVersion + ")"); logger.info("[VelocityBroadcast] Update available: " + latestVersion + " (you are on " + currentVersion + ")");
return latestVersion; return latestVersion;
} else { } else {
logger.info("[VelocityBroadcast] You are running the latest version (" + currentVersion + ")."); logger.info("[VelocityBroadcast] You are running the latest version (" + currentVersion + ").");
return null; return null;
} }
} }
} catch (Exception e) { } catch (Exception e) {
logger.warning("[VelocityBroadcast] Failed to check for updates: " + e.getMessage()); logger.warning("[VelocityBroadcast] Failed to check for updates: " + e.getMessage());
return null; return null;
} }
}); });
} }
public void notifyPlayerIfOutdated(ProxyServer server, String latestVersion) { public void notifyPlayerIfOutdated(ProxyServer server, String latestVersion) {
if (latestVersion != null && !latestVersion.equalsIgnoreCase(currentVersion)) { if (latestVersion != null && !latestVersion.equalsIgnoreCase(currentVersion)) {
String message = String.format("[VelocityBroadcast] A new version (%s) is available! You are running %s.", latestVersion, currentVersion); String message = String.format("[VelocityBroadcast] A new version (%s) is available! You are running %s.", latestVersion, currentVersion);
Component component = Component.text(message); Component component = Component.text(message);
for (Player player : server.getAllPlayers()) { for (Player player : server.getAllPlayers()) {
if (player.hasPermission("vb.admin")) { if (player.hasPermission("vb.admin")) {
player.sendMessage(component); player.sendMessage(component);
} }
} }
} }
} }
} }

View File

@@ -1,143 +1,143 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import java.util.List; import java.util.List;
import com.adzel.velocitybroadcast.util.DatabaseManager; import com.adzel.velocitybroadcast.util.DatabaseManager;
import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.command.SimpleCommand;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
public class VBCommand implements SimpleCommand { public class VBCommand implements SimpleCommand {
private final VelocityBroadcast plugin; private final VelocityBroadcast plugin;
private final DatabaseManager databaseManager; private final DatabaseManager databaseManager;
private final MiniMessage mm = MiniMessage.miniMessage(); private final MiniMessage mm = MiniMessage.miniMessage();
public VBCommand(VelocityBroadcast plugin) { public VBCommand(VelocityBroadcast plugin) {
this.plugin = plugin; this.plugin = plugin;
this.databaseManager = plugin.getDatabaseManager(); this.databaseManager = plugin.getDatabaseManager();
} }
@Override @Override
public void execute(Invocation invocation) { public void execute(Invocation invocation) {
CommandSource source = invocation.source(); CommandSource source = invocation.source();
List<String> args = List.of(invocation.arguments()); List<String> args = List.of(invocation.arguments());
String fullCommand = "/vb" + (args.isEmpty() ? "" : " " + String.join(" ", args)); String fullCommand = "/vb" + (args.isEmpty() ? "" : " " + String.join(" ", args));
String username = (source instanceof Player) ? ((Player) source).getUsername() : "Console"; String username = (source instanceof Player) ? ((Player) source).getUsername() : "Console";
boolean success = true; boolean success = true;
try { try {
if (args.isEmpty() || args.get(0).equalsIgnoreCase("help")) { if (args.isEmpty() || args.get(0).equalsIgnoreCase("help")) {
source.sendMessage(parseFormatted("<gold><bold>VelocityBroadcast Commands:</bold></gold>")); source.sendMessage(parseFormatted("<gold><bold>VelocityBroadcast Commands:</bold></gold>"));
source.sendMessage(parseFormatted("<yellow>/vb <message></yellow> <gray>- Broadcast a message to all players</gray>")); source.sendMessage(parseFormatted("<yellow>/vb <message></yellow> <gray>- Broadcast a message to all players</gray>"));
if (source.hasPermission("vb.admin")) { if (source.hasPermission("vb.admin")) {
source.sendMessage(parseFormatted("<yellow>/vb prefix <newPrefix></yellow> <gray>- Change the broadcast prefix</gray>")); source.sendMessage(parseFormatted("<yellow>/vb prefix <newPrefix></yellow> <gray>- Change the broadcast prefix</gray>"));
source.sendMessage(parseFormatted("<yellow>/vb reload</yellow> <gray>- Reload the plugin config</gray>")); source.sendMessage(parseFormatted("<yellow>/vb reload</yellow> <gray>- Reload the plugin config</gray>"));
} }
success = false; success = false;
return; return;
} }
String sub = args.get(0).toLowerCase(); String sub = args.get(0).toLowerCase();
List<String> subArgs = args.subList(1, args.size()); List<String> subArgs = args.subList(1, args.size());
switch (sub) { switch (sub) {
case "prefix" -> { case "prefix" -> {
if (!source.hasPermission("vb.admin")) { if (!source.hasPermission("vb.admin")) {
source.sendMessage(parseFormatted("<red>You don't have permission to change the broadcast prefix.</red>")); source.sendMessage(parseFormatted("<red>You don't have permission to change the broadcast prefix.</red>"));
success = false; success = false;
return; return;
} }
if (subArgs.isEmpty()) { if (subArgs.isEmpty()) {
source.sendMessage(parseFormatted("<red>Usage: /vb prefix <newPrefix></red>")); source.sendMessage(parseFormatted("<red>Usage: /vb prefix <newPrefix></red>"));
success = false; success = false;
return; return;
} }
String newPrefix = String.join(" ", subArgs); String newPrefix = String.join(" ", subArgs);
plugin.getConfigHandler().setPrefix(newPrefix); plugin.getConfigHandler().setPrefix(newPrefix);
source.sendMessage(parseFormatted("<green>Prefix updated to:</green> <gray>" + newPrefix + "</gray>")); source.sendMessage(parseFormatted("<green>Prefix updated to:</green> <gray>" + newPrefix + "</gray>"));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix); plugin.getLogger().info("[Prefix] Updated prefix to: " + newPrefix);
} }
} }
case "reload" -> { case "reload" -> {
if (!source.hasPermission("vb.admin")) { if (!source.hasPermission("vb.admin")) {
source.sendMessage(parseFormatted("<red>You don't have permission to reload the config.</red>")); source.sendMessage(parseFormatted("<red>You don't have permission to reload the config.</red>"));
success = false; success = false;
return; return;
} }
plugin.getConfigHandler().reload(); plugin.getConfigHandler().reload();
source.sendMessage(parseFormatted("<green>VelocityBroadcast config reloaded.</green>")); source.sendMessage(parseFormatted("<green>VelocityBroadcast config reloaded.</green>"));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Reload] Config reloaded by " + source.toString()); plugin.getLogger().info("[Reload] Config reloaded by " + source.toString());
} }
} }
default -> { default -> {
// Treat as broadcast message // Treat as broadcast message
if (!source.hasPermission("vb.broadcast")) { if (!source.hasPermission("vb.broadcast")) {
source.sendMessage(parseFormatted("<red>You don't have permission to broadcast.</red>")); source.sendMessage(parseFormatted("<red>You don't have permission to broadcast.</red>"));
success = false; success = false;
return; return;
} }
String fullMessage = plugin.getConfigHandler().getPrefix() + String.join(" ", args); String fullMessage = plugin.getConfigHandler().getPrefix() + String.join(" ", args);
Component broadcast = parseFormatted(fullMessage); Component broadcast = parseFormatted(fullMessage);
plugin.getServer().getAllPlayers().forEach(p -> p.sendMessage(broadcast)); plugin.getServer().getAllPlayers().forEach(p -> p.sendMessage(broadcast));
if (plugin.getConfigHandler().isDebugEnabled()) { if (plugin.getConfigHandler().isDebugEnabled()) {
plugin.getLogger().info("[Broadcast] Sent: " + fullMessage); plugin.getLogger().info("[Broadcast] Sent: " + fullMessage);
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().error("Error executing /vb command", e); plugin.getLogger().error("Error executing /vb command", e);
source.sendMessage(parseFormatted("<red>An error occurred while executing the command.</red>")); source.sendMessage(parseFormatted("<red>An error occurred while executing the command.</red>"));
success = false; success = false;
} finally { } finally {
// ✅ Log the command usage // ✅ Log the command usage
databaseManager.logCommand(username, fullCommand, success); databaseManager.logCommand(username, fullCommand, success);
} }
} }
private Component parseFormatted(String input) { private Component parseFormatted(String input) {
String mini = input String mini = input
.replace("&0", "<black>") .replace("&0", "<black>")
.replace("&1", "<dark_blue>") .replace("&1", "<dark_blue>")
.replace("&2", "<dark_green>") .replace("&2", "<dark_green>")
.replace("&3", "<dark_aqua>") .replace("&3", "<dark_aqua>")
.replace("&4", "<dark_red>") .replace("&4", "<dark_red>")
.replace("&5", "<dark_purple>") .replace("&5", "<dark_purple>")
.replace("&6", "<gold>") .replace("&6", "<gold>")
.replace("&7", "<gray>") .replace("&7", "<gray>")
.replace("&8", "<dark_gray>") .replace("&8", "<dark_gray>")
.replace("&9", "<blue>") .replace("&9", "<blue>")
.replace("&a", "<green>") .replace("&a", "<green>")
.replace("&b", "<aqua>") .replace("&b", "<aqua>")
.replace("&c", "<red>") .replace("&c", "<red>")
.replace("&d", "<light_purple>") .replace("&d", "<light_purple>")
.replace("&e", "<yellow>") .replace("&e", "<yellow>")
.replace("&f", "<white>") .replace("&f", "<white>")
.replace("&l", "<bold>") .replace("&l", "<bold>")
.replace("&n", "<underlined>") .replace("&n", "<underlined>")
.replace("&o", "<italic>") .replace("&o", "<italic>")
.replace("&m", "<strikethrough>") .replace("&m", "<strikethrough>")
.replace("&r", "<reset>"); .replace("&r", "<reset>");
return mm.deserialize(mini); return mm.deserialize(mini);
} }
} }

View File

@@ -1,123 +1,123 @@
package com.adzel.velocitybroadcast; package com.adzel.velocitybroadcast;
import java.nio.file.Path; import java.nio.file.Path;
import org.slf4j.Logger; import org.slf4j.Logger;
import com.adzel.velocitybroadcast.util.DatabaseManager; import com.adzel.velocitybroadcast.util.DatabaseManager;
import com.adzel.velocitybroadcast.util.UpdateChecker; import com.adzel.velocitybroadcast.util.UpdateChecker;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.PostOrder;
import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.connection.LoginEvent; import com.velocitypowered.api.event.connection.LoginEvent;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.Plugin;
import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.LuckPermsProvider;
@Plugin( @Plugin(
id = "velocitybroadcast", id = "velocitybroadcast",
name = "VelocityBroadcast", name = "VelocityBroadcast",
version = "0.3.5", version = "0.3.7",
description = "A proxy-wide broadcast plugin for Velocity.", description = "A proxy-wide broadcast plugin for Velocity.",
authors = {"Adzel"} authors = {"Adzel"}
) )
public class VelocityBroadcast { public class VelocityBroadcast {
public static final String PLUGIN_VERSION = "0.3.5"; public static final String PLUGIN_VERSION = "0.3.7";
public static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage(); public static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
private final ProxyServer server; private final ProxyServer server;
private final Logger logger; private final Logger logger;
private final Path dataDirectory; private final Path dataDirectory;
private ConfigHandler config; private ConfigHandler config;
private DatabaseManager databaseManager; private DatabaseManager databaseManager;
private LuckPerms luckPerms; private LuckPerms luckPerms;
@Inject @Inject
public VelocityBroadcast(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { public VelocityBroadcast(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
this.server = server; this.server = server;
this.logger = logger; this.logger = logger;
this.dataDirectory = dataDirectory; this.dataDirectory = dataDirectory;
} }
@Subscribe(order = PostOrder.EARLY) @Subscribe(order = PostOrder.EARLY)
public void onProxyInitialization(ProxyInitializeEvent event) { public void onProxyInitialization(ProxyInitializeEvent event) {
// Load config // Load config
this.config = new ConfigHandler(dataDirectory.resolve("config.yml"), logger); this.config = new ConfigHandler(dataDirectory.resolve("config.yml"), logger);
config.load(); config.load();
if (config.isDebugEnabled()) { if (config.isDebugEnabled()) {
logger.info("[VelocityBroadcast] Debug mode is enabled."); logger.info("[VelocityBroadcast] Debug mode is enabled.");
} }
// Initialize LuckPerms // Initialize LuckPerms
try { try {
this.luckPerms = LuckPermsProvider.get(); this.luckPerms = LuckPermsProvider.get();
logger.info("[VelocityBroadcast] Successfully hooked into LuckPerms."); logger.info("[VelocityBroadcast] Successfully hooked into LuckPerms.");
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
logger.error("[VelocityBroadcast] LuckPerms is not loaded! This plugin requires LuckPerms."); logger.error("[VelocityBroadcast] LuckPerms is not loaded! This plugin requires LuckPerms.");
return; // Prevent plugin from loading if LP is not available return; // Prevent plugin from loading if LP is not available
} }
// Initialize database manager // Initialize database manager
java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger("VelocityBroadcast"); java.util.logging.Logger jdkLogger = java.util.logging.Logger.getLogger("VelocityBroadcast");
this.databaseManager = new DatabaseManager(config, jdkLogger, dataDirectory); this.databaseManager = new DatabaseManager(config, jdkLogger, dataDirectory);
databaseManager.initialize(); databaseManager.initialize();
// Check for updates (async) // Check for updates (async)
UpdateChecker updateChecker = new UpdateChecker(PLUGIN_VERSION, jdkLogger); UpdateChecker updateChecker = new UpdateChecker(PLUGIN_VERSION, jdkLogger);
updateChecker.checkForUpdate().thenAccept(latest -> { updateChecker.checkForUpdate().thenAccept(latest -> {
if (latest != null) { if (latest != null) {
logger.warn("[VelocityBroadcast] A new version is available: " + latest + " (You are on " + PLUGIN_VERSION + ")"); logger.warn("[VelocityBroadcast] A new version is available: " + latest + " (You are on " + PLUGIN_VERSION + ")");
} else { } else {
logger.info("[VelocityBroadcast] You are running the latest version (" + PLUGIN_VERSION + ")."); logger.info("[VelocityBroadcast] You are running the latest version (" + PLUGIN_VERSION + ").");
} }
}); });
// Register login listener // Register login listener
server.getEventManager().register(this, new LoginListener(server, PLUGIN_VERSION, updateChecker, databaseManager)); server.getEventManager().register(this, new LoginListener(server, PLUGIN_VERSION, updateChecker, databaseManager));
// Register command // Register command
server.getCommandManager().register( server.getCommandManager().register(
server.getCommandManager().metaBuilder("vb").plugin(this).build(), server.getCommandManager().metaBuilder("vb").plugin(this).build(),
new VBCommand(this) new VBCommand(this)
); );
logger.info("[VelocityBroadcast] Loaded VelocityBroadcast v" + PLUGIN_VERSION); logger.info("[VelocityBroadcast] Loaded VelocityBroadcast v" + PLUGIN_VERSION);
} }
@Subscribe @Subscribe
public void onLogin(LoginEvent event) { public void onLogin(LoginEvent event) {
if (event.getPlayer().hasPermission("vb.admin") && config.isVersionCheckEnabled()) { if (event.getPlayer().hasPermission("vb.admin") && config.isVersionCheckEnabled()) {
event.getPlayer().sendMessage( event.getPlayer().sendMessage(
MINI_MESSAGE.deserialize("<yellow>[VelocityBroadcast] You're running version " + PLUGIN_VERSION + ".</yellow>") MINI_MESSAGE.deserialize("<yellow>[VelocityBroadcast] You're running version " + PLUGIN_VERSION + ".</yellow>")
); );
} }
} }
public ProxyServer getServer() { public ProxyServer getServer() {
return server; return server;
} }
public Logger getLogger() { public Logger getLogger() {
return logger; return logger;
} }
public ConfigHandler getConfigHandler() { public ConfigHandler getConfigHandler() {
return config; return config;
} }
public DatabaseManager getDatabaseManager() { public DatabaseManager getDatabaseManager() {
return databaseManager; return databaseManager;
} }
public LuckPerms getLuckPerms() { public LuckPerms getLuckPerms() {
return luckPerms; return luckPerms;
} }
} }

View File

@@ -1,127 +1,127 @@
package com.adzel.velocitybroadcast.util; package com.adzel.velocitybroadcast.util;
import java.nio.file.Path; import java.nio.file.Path;
import java.sql.*; import java.sql.*;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.logging.Logger; import java.util.logging.Logger;
import com.adzel.velocitybroadcast.ConfigHandler; import com.adzel.velocitybroadcast.ConfigHandler;
public class DatabaseManager { public class DatabaseManager {
private final Logger logger; private final Logger logger;
private final ConfigHandler config; private final ConfigHandler config;
private final Path dataDirectory; private final Path dataDirectory;
private Connection connection; private Connection connection;
private final ExecutorService executor = Executors.newSingleThreadExecutor(); private final ExecutorService executor = Executors.newSingleThreadExecutor();
public DatabaseManager(ConfigHandler config, Logger logger, Path dataDirectory) { public DatabaseManager(ConfigHandler config, Logger logger, Path dataDirectory) {
this.config = config; this.config = config;
this.logger = logger; this.logger = logger;
this.dataDirectory = dataDirectory; this.dataDirectory = dataDirectory;
} }
public void initialize() { public void initialize() {
try { try {
if (config.getDbType().equalsIgnoreCase("mysql")) { if (config.getDbType().equalsIgnoreCase("mysql")) {
Class.forName("com.mysql.cj.jdbc.Driver"); Class.forName("com.mysql.cj.jdbc.Driver");
connection = DriverManager.getConnection( connection = DriverManager.getConnection(
"jdbc:mysql://" + config.getDbHost() + ":" + config.getDbPort() + "/" + config.getDbName() + "?useSSL=false&autoReconnect=true", "jdbc:mysql://" + config.getDbHost() + ":" + config.getDbPort() + "/" + config.getDbName() + "?useSSL=false&autoReconnect=true",
config.getDbUser(), config.getDbUser(),
config.getDbPassword() config.getDbPassword()
); );
} else { } else {
Class.forName("org.sqlite.JDBC"); Class.forName("org.sqlite.JDBC");
Path dbFile = dataDirectory.resolve(config.getDbName() + ".db"); Path dbFile = dataDirectory.resolve(config.getDbName() + ".db");
connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.toAbsolutePath()); connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.toAbsolutePath());
} }
logger.info("[VelocityBroadcast] Connected to " + config.getDbType().toUpperCase() + " database."); logger.info("[VelocityBroadcast] Connected to " + config.getDbType().toUpperCase() + " database.");
initializeTables(); initializeTables();
} catch (Exception e) { } catch (Exception e) {
logger.warning("[VelocityBroadcast] Failed to connect to database: " + e.getMessage()); logger.warning("[VelocityBroadcast] Failed to connect to database: " + e.getMessage());
} }
} }
private void initializeTables() { private void initializeTables() {
boolean isMySQL = config.getDbType().equalsIgnoreCase("mysql"); boolean isMySQL = config.getDbType().equalsIgnoreCase("mysql");
String idSyntax = isMySQL ? "INT AUTO_INCREMENT PRIMARY KEY" : "INTEGER PRIMARY KEY AUTOINCREMENT"; String idSyntax = isMySQL ? "INT AUTO_INCREMENT PRIMARY KEY" : "INTEGER PRIMARY KEY AUTOINCREMENT";
String broadcastTable = "CREATE TABLE IF NOT EXISTS vb_broadcast_logs (" + String broadcastTable = "CREATE TABLE IF NOT EXISTS vb_broadcast_logs (" +
"id " + idSyntax + "," + "id " + idSyntax + "," +
"timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," +
"sender VARCHAR(64) NOT NULL," + "sender VARCHAR(64) NOT NULL," +
"message TEXT NOT NULL," + "message TEXT NOT NULL," +
"source_server VARCHAR(64)" + "source_server VARCHAR(64)" +
");"; ");";
String commandTable = "CREATE TABLE IF NOT EXISTS vb_command_logs (" + String commandTable = "CREATE TABLE IF NOT EXISTS vb_command_logs (" +
"id " + idSyntax + "," + "id " + idSyntax + "," +
"timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," +
"user VARCHAR(64) NOT NULL," + "user VARCHAR(64) NOT NULL," +
"command TEXT NOT NULL," + "command TEXT NOT NULL," +
"success BOOLEAN" + "success BOOLEAN" +
");"; ");";
String joinTable = "CREATE TABLE IF NOT EXISTS vb_admin_joins (" + String joinTable = "CREATE TABLE IF NOT EXISTS vb_admin_joins (" +
"id " + idSyntax + "," + "id " + idSyntax + "," +
"timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," + "timestamp DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP," +
"username VARCHAR(64) NOT NULL," + "username VARCHAR(64) NOT NULL," +
"server VARCHAR(64)" + "server VARCHAR(64)" +
");"; ");";
executeUpdate(broadcastTable); executeUpdate(broadcastTable);
executeUpdate(commandTable); executeUpdate(commandTable);
executeUpdate(joinTable); executeUpdate(joinTable);
} }
public void logBroadcast(String sender, String message, String sourceServer) { public void logBroadcast(String sender, String message, String sourceServer) {
String sql = "INSERT INTO vb_broadcast_logs (sender, message, source_server) VALUES (?, ?, ?)"; String sql = "INSERT INTO vb_broadcast_logs (sender, message, source_server) VALUES (?, ?, ?)";
executeAsync(sql, sender, message, sourceServer); executeAsync(sql, sender, message, sourceServer);
} }
public void logCommand(String user, String command, boolean success) { public void logCommand(String user, String command, boolean success) {
String sql = "INSERT INTO vb_command_logs (user, command, success) VALUES (?, ?, ?)"; String sql = "INSERT INTO vb_command_logs (user, command, success) VALUES (?, ?, ?)";
executeAsync(sql, user, command, success); executeAsync(sql, user, command, success);
} }
public void logAdminJoin(String username, String serverName) { public void logAdminJoin(String username, String serverName) {
String sql = "INSERT INTO vb_admin_joins (username, server) VALUES (?, ?)"; String sql = "INSERT INTO vb_admin_joins (username, server) VALUES (?, ?)";
executeAsync(sql, username, serverName); executeAsync(sql, username, serverName);
} }
private void executeAsync(String sql, Object... params) { private void executeAsync(String sql, Object... params) {
executor.submit(() -> { executor.submit(() -> {
try (PreparedStatement stmt = connection.prepareStatement(sql)) { try (PreparedStatement stmt = connection.prepareStatement(sql)) {
for (int i = 0; i < params.length; i++) { for (int i = 0; i < params.length; i++) {
stmt.setObject(i + 1, params[i]); stmt.setObject(i + 1, params[i]);
} }
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("[VelocityBroadcast] Database query failed: " + e.getMessage()); logger.warning("[VelocityBroadcast] Database query failed: " + e.getMessage());
} }
}); });
} }
private void executeUpdate(String sql) { private void executeUpdate(String sql) {
executor.submit(() -> { executor.submit(() -> {
try (Statement stmt = connection.createStatement()) { try (Statement stmt = connection.createStatement()) {
stmt.executeUpdate(sql); stmt.executeUpdate(sql);
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("[VelocityBroadcast] Failed to initialize table: " + e.getMessage()); logger.warning("[VelocityBroadcast] Failed to initialize table: " + e.getMessage());
} }
}); });
} }
public void close() { public void close() {
try { try {
if (connection != null && !connection.isClosed()) { if (connection != null && !connection.isClosed()) {
connection.close(); connection.close();
executor.shutdown(); executor.shutdown();
} }
} catch (SQLException e) { } catch (SQLException e) {
logger.warning("[VelocityBroadcast] Failed to close database: " + e.getMessage()); logger.warning("[VelocityBroadcast] Failed to close database: " + e.getMessage());
} }
} }
} }

View File

@@ -1,9 +1,9 @@
{ {
"id": "velocitybroadcast", "id": "velocitybroadcast",
"name": "VelocityBroadcast", "name": "VelocityBroadcast",
"version": "0.3.5", "version": "0.3.7",
"authors": ["Adzel"], "authors": ["Adzel"],
"main": "com.adzel.velocitybroadcast.VelocityBroadcast", "main": "com.adzel.velocitybroadcast.VelocityBroadcast",
"description": "A proxy-wide broadcast plugin for Velocity.", "description": "A proxy-wide broadcast plugin for Velocity.",
"website": "https://github.com/AdzelFirestar/VelocityBroadcast" "website": "https://github.com/AdzelFirestar/VelocityBroadcast"
} }

View File

@@ -1,9 +1,9 @@
{ {
"id": "velocitybroadcast", "id": "velocitybroadcast",
"name": "VelocityBroadcast", "name": "VelocityBroadcast",
"version": "0.3.5", "version": "0.3.7",
"authors": ["Adzel"], "authors": ["Adzel"],
"main": "com.adzel.velocitybroadcast.VelocityBroadcast", "main": "com.adzel.velocitybroadcast.VelocityBroadcast",
"description": "A proxy-wide broadcast plugin for Velocity.", "description": "A proxy-wide broadcast plugin for Velocity.",
"website": "https://github.com/AdzelFirestar/VelocityBroadcast" "website": "https://github.com/AdzelFirestar/VelocityBroadcast"
} }

View File

@@ -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"} {"id":"velocitybroadcast","name":"VelocityBroadcast","version":"0.3.7","description":"A proxy-wide broadcast plugin for Velocity.","authors":["Adzel"],"dependencies":[],"main":"com.adzel.velocitybroadcast.VelocityBroadcast"}

View File

@@ -1,3 +1,3 @@
artifactId=velocitybroadcast artifactId=velocitybroadcast
groupId=com.adzel.velocitybroadcast groupId=com.adzel.velocitybroadcast
version=0.3.5 version=0.3.7

View File

@@ -2,7 +2,6 @@ com\adzel\velocitybroadcast\VelocityBroadcast.class
com\adzel\velocitybroadcast\VBCommand.class com\adzel\velocitybroadcast\VBCommand.class
com\adzel\velocitybroadcast\BroadcastCommand.class com\adzel\velocitybroadcast\BroadcastCommand.class
com\adzel\velocitybroadcast\ConfigHandler.class com\adzel\velocitybroadcast\ConfigHandler.class
com\adzel\velocitybroadcast\UpdateChecker.class
com\adzel\velocitybroadcast\ReloadCommand.class com\adzel\velocitybroadcast\ReloadCommand.class
velocity-plugin.json velocity-plugin.json
com\adzel\velocitybroadcast\util\DatabaseManager.class com\adzel\velocitybroadcast\util\DatabaseManager.class