Compare commits

...
94 Commits
Author SHA1 Message Date
NotAlexNoyle 5bd9c51962 Exclude CODEOWNERS from language statistics 2026-10-29 16:19:02 -04:00
NotAlexNoyle b3d2ba55d1 Add CODEOWNERS (one staff approval) 2026-10-29 16:19:02 -04:00
NotAlexNoyle d1d36fa75a Add splegg, buildbattle commands 2026-08-11 14:10:42 -04:00
NotAlexNoyle 8b4cca3bc9 Fix teleporting 2026-07-30 18:16:03 -04:00
NotAlexNoyle c92e752c33 Add spawnback 2026-07-30 15:53:53 -04:00
NotAlexNoyle 5fd3b45fb6 Add admins setting world spawn 2026-07-30 15:39:32 -04:00
NotAlexNoyle 8ad167e00e Add /homes 2026-07-27 10:24:40 -04:00
NotAlexNoyle f203a5d878 Update permissions for NoClip 2026-07-24 12:53:06 -04:00
NotAlexNoyle 27039be7e1 Add GameModeInventories creative mode permission 2026-07-24 12:46:06 -04:00
NotAlexNoyle 751044b085 Add all unfinished plugin commands 2026-07-22 07:24:37 -04:00
NotAlexNoyle 0d4a0e6e37 Add union commands, utilities-og commands to whitelist 2026-07-20 10:15:52 -04:00
NotAlexNoyle 9826b1f2b7 Whitelist areashop 2026-07-17 15:57:39 -04:00
NotAlexNoyle 786ce322ab Whitelist quests 2026-07-17 13:47:51 -04:00
NotAlexNoyle 9a8f722b50 Update permissions 2026-07-16 18:06:57 -04:00
NotAlexNoyle bbfd821fde Update permissions 2026-07-16 17:58:28 -04:00
NotAlexNoyle 0ee698ce4b Proper sudosigns whitelist 2026-07-15 15:40:02 -04:00
NotAlexNoyle 0eeee292c8 Add sudosigns permissions 2026-07-15 15:31:00 -04:00
NotAlexNoyle ae5e3976e7 Add new Spawn-OG commands 2026-07-15 10:23:23 -04:00
NotAlexNoyle d94ddaf26a Whitelist diamondbank-og 2026-07-14 10:15:30 -04:00
NotAlexNoyle 84104be626 Update permissions 2026-06-25 17:36:36 -04:00
NotAlexNoyle 548c9278db Enable imageframe 2026-06-25 17:24:38 -04:00
NotAlexNoyle 5255161106 Fix splegg, the herobrine commands 2026-06-24 11:32:50 -04:00
NotAlexNoyle f21ba94070 Update allowed commands 2026-06-24 08:31:09 -04:00
NotAlexNoyle b4515d69c3 Hide double slash commands from tab suggestions 2026-06-21 21:39:06 -04:00
NotAlexNoyle ddf431a5d6 Drop folia 2026-06-21 21:15:24 -04:00
NotAlexNoyle 9dda0b8477 Fix adventure 2026-06-21 20:59:22 -04:00
NotAlexNoyle becd6cd9fa Import luckperms commands 2026-06-21 20:31:11 -04:00
NotAlexNoyle 92c6b59224 Use live TrueOG Network config file 2026-06-21 08:51:18 -04:00
NotAlexNoyle 520934ead7 Maven -> Gradle 2026-06-19 12:32:43 -04:00
rayzsyt 428ddfb78d Update MiniMessage API 2026-04-28 00:26:07 +02:00
rayzsyt 56bd8be247 Update Version 2026-04-27 23:54:32 +02:00
rayzsyt f7b2aa281e Small change 2026-04-27 23:18:48 +02:00
rayzsyt 0599d504af Fixed that messages were not set automatically in auto-config-updater 2026-04-27 23:18:29 +02:00
rayzsyt 471e0b100f Removed Version enum & simplified some code parts 2026-04-27 22:59:57 +02:00
rayzsyt 52d842b27a Small visual changes to make code more readable 2026-04-27 22:49:28 +02:00
Alihan dfc6ba91eb Merge pull request #26 from gaboss44/feat/mc-26.1-reflection
Reflection class changes
2026-04-27 21:22:51 +02:00
gaboss44 54d59d7b03 Reflection class changes 2026-04-27 13:01:04 -05:00
Alihan a4931199af Merge pull request #24 from MasivoSMP/main
Fix global-thread lag in Folia
2026-03-23 20:23:21 +01:00
Chesvin1 02469e977c Fix globa-thread lag in Folia
Replace backend plugin-message dispatch in BukkitClient from Server.sendPluginMessage(...) (broadcast/fan-out behavior) to single carrier-player dispatch via PATScheduler.execute(..., player).
This keeps plugin messaging on a player/entity scheduler for Folia, reducing redundant per-player sends and feedback amplification that were loading the global scheduler thread under high player counts.
2026-03-22 17:36:04 -03:00
rayzsyt f9386fd3f1 Merge remote-tracking branch 'origin/main' 2026-03-19 19:50:31 +01:00
rayzsyt 242590f3e8 Add 'suppress-exceptions' option 2026-03-19 19:50:12 +01:00
rayzsyt 65c383491e Changed order to filter number last 2026-03-06 19:26:16 +01:00
rayzsyt 0356c2f606 Implemented injection-failed settings 2026-02-27 22:32:49 +01:00
rayzsyt 60067f75d3 Added injection-failed option setting 2026-02-27 22:32:38 +01:00
rayzsyt e896ccb72d Added injection-failed option setting 2026-02-27 22:32:27 +01:00
rayzsyt 6c3dc58cd6 Updated Bungeecord API 2026-02-27 22:32:04 +01:00
rayzsyt 57ada83bfe Corrected wrong information 2026-02-17 03:23:46 +01:00
rayzsyt 8a86f05133 Fixed that proxies would create non-existing command tab-completions 2026-02-17 03:10:57 +01:00
rayzsyt f447cf69d3 Renamed "allow-p2b-packets" -> "allow-p2b-actions" 2026-02-15 00:44:11 +01:00
rayzsyt d06b723adc Reimplemented "Detected Software-API" 2026-02-14 23:46:26 +01:00
rayzsyt f8617cf1b9 Display software name 2026-02-14 23:46:00 +01:00
rayzsyt 8630a6f74c Removed debug message and shorten error message to something more informative 2026-02-14 23:25:30 +01:00
rayzsyt 424d892091 Changed to reveal first and last 2 characters of censored token 2026-02-14 23:18:37 +01:00
rayzsyt 9aaef6e297 Only display censored token instead 2026-02-14 23:10:33 +01:00
rayzsyt e749760136 Added CENSORED_TOKEN 2026-02-14 23:10:25 +01:00
rayzsyt 7f2f3c54ba Fixed color-code overlapping on Bukkit consoles 2026-02-14 22:54:03 +01:00
rayzsyt 24f2c867c6 Added method to reload Client to (un)register the plugin-channels accordingly 2026-02-14 22:28:10 +01:00
rayzsyt e7f3288fb7 Added method to reload Client to (un)register the plugin-channels accordingly 2026-02-14 22:28:05 +01:00
rayzsyt 2221062e98 Fix exception on Craftbukkit servers 2026-02-14 22:26:36 +01:00
rayzsyt 430f5ee9e6 Removed debug message 2026-02-14 22:26:20 +01:00
rayzsyt cd1a7cf312 Removed "Detected Software-API" since it's already in the title 2026-02-14 22:08:00 +01:00
rayzsyt 002cdc64ef Small code cleanup 2026-02-14 22:04:28 +01:00
rayzsyt 3d59686ba4 Small code cleanup 2026-02-14 22:02:01 +01:00
rayzsyt f6c72b9d0e Improved visual representation 2026-02-14 21:21:36 +01:00
rayzsyt d72d419044 Removed unrequired methods 2026-02-14 21:21:24 +01:00
rayzsyt c71a3a4002 Applied changes for new PAT sync-network 2026-02-14 21:21:05 +01:00
rayzsyt 02b70ed324 Applied changes for new PAT sync-network 2026-02-14 21:20:59 +01:00
rayzsyt 01d0a53049 Improved logic & implemented new PAT sync-network 2026-02-14 21:19:10 +01:00
rayzsyt c700ca6abb Removed unused method 2026-02-14 21:17:15 +01:00
rayzsyt d9cba6c010 Added option to toggle P2B packets 2026-02-14 21:16:49 +01:00
rayzsyt a6ed66cf1e Reimplemented PAT sync-network 2026-02-14 21:16:18 +01:00
rayzsyt 4f5b7ad3fb Recoded PAT sync-network 2026-02-14 21:12:03 +01:00
rayzsyt 962ea8b719 Small adjustment 2026-02-14 21:07:17 +01:00
rayzsyt 35e4d0b5aa Add AutoLowerCase for proxy 2026-02-14 20:05:48 +01:00
rayzsyt 497fe5ef98 Added last received alive packet 2026-02-14 20:02:48 +01:00
rayzsyt 0508387db1 Modified 'pat info' message 2026-02-14 19:49:20 +01:00
rayzsyt 1ff7c419ef Add last_alive_response 2026-02-14 19:24:03 +01:00
rayzsyt 612eda685c Modified bpat stats message 2026-02-14 19:17:50 +01:00
rayzsyt 7fc7b571a3 Add AutoLowerCase & Modified bpat stats message 2026-02-14 19:16:00 +01:00
rayzsyt 5cce86bf8d Check if token matches 2026-02-13 18:32:13 +01:00
Alihan Olgun 7621d815ac Code cleanup & Removed unnecessary data sync packets 2026-02-11 21:01:12 +01:00
rayzsyt 81495e3478 Removed unnecessary method implementation for Bukkit-Scheduler 2026-02-08 14:04:12 +01:00
rayzsyt 5c591d3a5b Fixed P2BExecute action in Folia 2026-02-08 13:54:23 +01:00
rayzsyt f1c225b718 Force command execution in main thread 2026-02-08 12:42:15 +01:00
rayzsyt ca7a098cfa Made warning a bit more visual present 2026-02-07 23:53:36 +01:00
rayzsyt b2fbba8455 Made warning a bit more visual present 2026-02-07 23:50:53 +01:00
rayzsyt ae6300c43c Changed parameters for Communicator#sendNotificationPacket method 2026-02-07 23:47:52 +01:00
rayzsyt cb62734da5 Implemented "alert" action and simplified the description 2026-02-07 23:47:18 +01:00
rayzsyt 04a2e4ea54 Add alert action for custom-responses 2026-02-07 23:46:32 +01:00
rayzsyt 2969469605 Replace %server% by server-name from Storage automatically 2026-02-07 23:08:28 +01:00
rayzsyt 25a0f7a742 Implemented P2B packets 2026-02-07 23:08:12 +01:00
rayzsyt d2f6c3336e Updated version 2026-02-07 21:44:01 +01:00
rayzsyt d2c7e00639 Fixed that only Bungeecord commands show up after "bpat reload" 2026-02-07 21:42:13 +01:00
rayzsyt e23fb19c98 Fixed custom-responses actions: execute & console 2026-02-07 21:40:25 +01:00
249 changed files with 17051 additions and 9405 deletions

No files matched your search

+1
View File
@@ -0,0 +1 @@
.gitea/CODEOWNERS linguist-detectable=false
+3
View File
@@ -0,0 +1,3 @@
# Pull requests request review from the eligible staff team(s).
# One approval from either an Admin or Developer satisfies branch protection.
* @trueog/Admins @trueog/Developers
+46
View File
@@ -0,0 +1,46 @@
# 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*
# macOS system files
.DS_Store
# gradle build output files
build/
.gradle/
# eclipse project files
.settings/
.project
.classpath
.checkstyle
bin/
# IntelliJ files
.idea/
.kotlin
*.iml
*.ipr
*.iws
out/
+140
View File
@@ -0,0 +1,140 @@
/* ------------------------------ Plugins ------------------------------ */
plugins {
id("java") // Import Java plugin.
id("java-library") // Import Java Library plugin.
id("com.diffplug.spotless") version "8.1.0" // Import Spotless plugin.
id("com.gradleup.shadow") version "8.3.9" // Import Shadow plugin.
id("checkstyle") // Import Checkstyle plugin.
eclipse
}
/* --------------------------- JDK / Kotlin ---------------------------- */
java {
sourceCompatibility = JavaVersion.VERSION_17 // Compile with JDK 17 compatibility.
toolchain { // Select Java toolchain.
languageVersion.set(JavaLanguageVersion.of(17)) // Use JDK 17.
}
}
/* ----------------------------- Metadata ------------------------------ */
group = "de.rayzs.pat" // Declare bundle identifier.
version = "2.3.2" // Declare plugin version (will be in .jar).
val apiVersion = "1.13" // Declare minecraft server target version.
/* ----------------------------- Resources ----------------------------- */
tasks.named<ProcessResources>("processResources") {
exclude("**/*.txt") // Exclude text files from the jar (matches the original Maven build).
from("LICENSE") { into("/") } // Bundle licenses into jarfiles.
}
/* ---------------------------- Repos ---------------------------------- */
repositories {
mavenCentral() // Import the Maven Central Maven Repository.
gradlePluginPortal() // Import the Gradle Plugin Portal Maven Repository.
maven { url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") } // Spigot.
maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } // Sonatype (BungeeCord).
maven { url = uri("https://repo.papermc.io/repository/maven-public/") } // PaperMC.
maven { url = uri("https://jitpack.io") } // JitPack.
maven { url = uri("https://repo.velocitypowered.com/snapshots/") } // Velocity.
maven { url = uri("https://libraries.minecraft.net/") } // Minecraft Libraries.
maven { url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/") } // PlaceholderAPI.
maven { url = uri("https://repo.viaversion.com") } // ViaVersion.
maven { url = uri("https://repo.william278.net/velocity") } // William278 (Velocity).
maven { url = uri("https://repo.william278.net/papiproxybridge") } // William278 (PAPIProxyBridge).
mavenLocal() // Import the local Maven Repository.
}
/* ---------------------- Java project deps ---------------------------- */
dependencies {
// Platform / API dependencies (provided at runtime, not shaded).
compileOnly("dev.folia:folia-api:1.20.1-R0.1-SNAPSHOT")
compileOnly("org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT")
compileOnly("io.netty:netty-all:4.2.0.Final")
compileOnly("net.md-5:bungeecord-api:1.21-R0.5-SNAPSHOT")
compileOnly("net.md-5:bungeecord-protocol:1.16-R0.4")
compileOnly("com.mojang:authlib:4.0.43")
compileOnly("com.github.ElgarL:groupmanager:3.2")
compileOnly("com.mojang:brigadier:1.1.8")
compileOnly("com.mojang:datafixerupper:6.0.8")
compileOnly("com.mojang:logging:1.1.1")
compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
compileOnly("org.apache.logging.log4j:log4j-core:2.18.0")
compileOnly("io.github.waterfallmc:waterfall-api:1.20-R0.3-SNAPSHOT")
compileOnly("net.william278:papiproxybridge:1.4")
compileOnly("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
compileOnly("com.velocitypowered:velocity-proxy:3.3.0-SNAPSHOT") {
exclude(group = "com.velocitypowered", module = "velocity-proxy-log4j2-plugin")
}
compileOnly("org.sonatype.sisu:sisu-guice:2.1.7")
compileOnly("org.spongepowered:configurate-hocon:4.1.2")
compileOnly("me.clip:placeholderapi:2.11.6")
compileOnly("net.luckperms:api:5.5")
compileOnly("com.viaversion:viaversion-api:5.7.0-SNAPSHOT")
compileOnly("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT")
// Generate velocity-plugin.json from the @Plugin annotation.
annotationProcessor("com.velocitypowered:velocity-api:3.3.0-SNAPSHOT")
// Adventure (shaded into the jar).
implementation("net.kyori:adventure-text-minimessage:4.26.1")
implementation("net.kyori:adventure-api:4.26.1")
implementation("net.kyori:adventure-platform-api:4.4.1")
implementation("net.kyori:adventure-platform-bungeecord:4.4.1")
implementation("net.kyori:adventure-platform-bukkit:4.4.1")
}
/* ---------------------- Reproducible jars ---------------------------- */
tasks.withType<AbstractArchiveTask>().configureEach { // Ensure reproducible .jars
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
}
/* ----------------------------- Shadow -------------------------------- */
tasks.shadowJar {
archiveFileName.set("ProAntiTab.jar") // Match the original Maven finalName.
relocate("net.kyori", "de.rayzs.pat.libs.kyori") // Isolate shaded Adventure from the server's bundled copy.
}
tasks.jar { archiveClassifier.set("part") } // Applies to root jarfile only.
tasks.build { dependsOn(tasks.spotlessApply, tasks.shadowJar) } // Build depends on spotless and shadow.
/* --------------------------- Javac opts ------------------------------- */
tasks.withType<JavaCompile>().configureEach {
options.compilerArgs.add("-parameters") // Enable reflection for java code.
options.isFork = true // Run javac in its own process.
options.compilerArgs.add("-Xlint:deprecation") // Trigger deprecation warning messages.
options.encoding = "UTF-8" // Use UTF-8 file encoding.
}
/* ----------------------------- Auto Formatting ------------------------ */
spotless {
java {
eclipse().configFile("config/formatter/eclipse-java-formatter.xml") // Eclipse java formatting.
leadingTabsToSpaces() // Convert leftover leading tabs to spaces.
removeUnusedImports() // Remove imports that aren't being called.
}
kotlinGradle {
ktfmt().kotlinlangStyle().configure { it.setMaxWidth(120) } // JetBrains Kotlin formatting.
target("build.gradle.kts", "settings.gradle.kts") // Gradle files to format.
}
}
checkstyle {
toolVersion = "10.18.1" // Declare checkstyle version to use.
configFile = file("config/checkstyle/checkstyle.xml") // Point checkstyle to config file.
isIgnoreFailures = true // Don't fail the build if checkstyle does not pass.
isShowViolations = true // Show the violations in any IDE with the checkstyle plugin.
}
tasks.named("compileJava") {
dependsOn("spotlessApply") // Run spotless before compiling with the JDK.
}
tasks.named("spotlessCheck") {
dependsOn("spotlessApply") // Run spotless before checking if spotless ran.
}
+34
View File
@@ -0,0 +1,34 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="Checker">
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
<property name="severity" value="error"/>
</module>
<module name="TreeWalker">
<module name="FinalLocalVariable"/>
<module name="AvoidStarImport"/>
<module name="Indentation">
<property name="severity" value="ignore"/>
</module>
</module>
<module name="RegexpSingleline">
<property name="format" value="\borg\.junit\.jupiter\.api\.Assertions\.fail\s*\(\s*&quot;Not yet implemented&quot;\s*\)\s*;"/>
<property name="message" value="Remove placeholder fail() and implement the test."/>
<property name="ignoreCase" value="true"/>
<property name="severity" value="warning"/>
</module>
<module name="RegexpSingleline">
<property name="format" value="(?&lt;!\w)fail\s*\(\s*&quot;Not yet implemented&quot;\s*\)\s*;"/>
<property name="message" value="Remove placeholder fail() and implement the test."/>
<property name="severity" value="warning"/>
</module>
</module>
+404
View File
@@ -0,0 +1,404 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<profiles version="23">
<profile kind="CodeFormatterProfile" name="TrueOG Network Formatting" version="23">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.join_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="20"/>
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line_on_wrap"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
</profile>
</profiles>
Binary file not shown.
+7
View File
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Vendored Executable
+251
View File
@@ -0,0 +1,251 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
#
# 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
#
# https://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.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
app_path=$0
# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
warn () {
echo "$*"
} >&2
die () {
echo
echo "$*"
echo
exit 1
} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi
# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@"
Vendored
+94
View File
@@ -0,0 +1,94 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
-338
View File
@@ -1,338 +0,0 @@
<?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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.rayzs.pat</groupId>
<artifactId>ProAntiTab</artifactId>
<version>2.3.0</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
<repositories>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>velocity</id>
<url>https://repo.velocitypowered.com/snapshots/</url>
</repository>
<repository>
<id>minecraft-libraries</id>
<name>Minecraft Libraries</name>
<url>https://libraries.minecraft.net/</url>
</repository>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>viaversion-repo</id>
<url>https://repo.viaversion.com</url>
</repository>
<repository>
<id>william278-velocity</id>
<name>William278</name>
<url>https://repo.william278.net/velocity</url>
</repository>
<repository>
<id>william278-papiproxybridge</id>
<name>William278</name>
<url>https://repo.william278.net/papiproxybridge</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>dev.folia</groupId>
<artifactId>folia-api</artifactId>
<version>1.20.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.19-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.2.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-protocol</artifactId>
<version>1.16-R0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>authlib</artifactId>
<version>4.0.43</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.ElgarL</groupId>
<artifactId>groupmanager</artifactId>
<version>3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>brigadier</artifactId>
<version>1.1.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>datafixerupper</artifactId>
<version>6.0.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mojang</groupId>
<artifactId>logging</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-resolver-provider</artifactId>
<version>3.8.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>1.7.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.18.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.github.waterfallmc</groupId>
<artifactId>waterfall-api</artifactId>
<version>1.20-R0.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.william278</groupId>
<artifactId>papiproxybridge</artifactId>
<version>1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId>
<version>3.3.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-proxy</artifactId>
<version>3.3.0-SNAPSHOT</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-proxy-log4j2-plugin</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>2.1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>configurate-hocon</artifactId>
<version>4.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-minimessage</artifactId>
<version>4.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.25.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-api</artifactId>
<version>4.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bungeecord</artifactId>
<version>4.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.4.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.viaversion</groupId>
<artifactId>viaversion-api</artifactId>
<version>5.7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<finalName>IgnoreThisJar</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<excludes>
<exclude>*.txt</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<finalName>ProAntiTab</finalName>
<shadedArtifactAttached>false</shadedArtifactAttached>
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<excludes/>
</artifactSet>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
+1
View File
@@ -0,0 +1 @@
rootProject.name = "ProAntiTab"
@@ -7,18 +7,50 @@ import de.rayzs.pat.utils.Reflection;
public class CustomServerBrand {
public static final String CHANNEL_NAME = Reflection.getMinor() < 13 ? "MC|Brand" : "minecraft:brand";
private static final ServerBrand SERVER_BRAND = Reflection.isVelocityServer() ? new VelocityServerBrand() : Reflection.isProxyServer() ? new BungeeServerBrand() : new BukkitServerBrand();
public static final String CHANNEL_NAME = Reflection.isBefore(1, 13) ? "MC|Brand" : "minecraft:brand";
private static final ServerBrand SERVER_BRAND = Reflection.isVelocityServer() ? new VelocityServerBrand()
: Reflection.isProxyServer() ? new BungeeServerBrand() : new BukkitServerBrand();
public static void initialize() { refreshTask(); }
public static void refreshTask() { SERVER_BRAND.initializeTask(); }
public static void preparePlayer(Object playerObj) { SERVER_BRAND.preparePlayer(playerObj); }
public static void sendBrandToPlayer(Object playerObj) { SERVER_BRAND.send(playerObj); }
public static void initialize() {
public static PacketUtils.BrandManipulate createBrandPacket(Object playerObj) { return SERVER_BRAND.createPacket(playerObj); }
public static boolean isEnabled() { return Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED; }
refreshTask();
}
public static void refreshTask() {
SERVER_BRAND.initializeTask();
}
public static void preparePlayer(Object playerObj) {
SERVER_BRAND.preparePlayer(playerObj);
}
public static void sendBrandToPlayer(Object playerObj) {
SERVER_BRAND.send(playerObj);
}
public static PacketUtils.BrandManipulate createBrandPacket(Object playerObj) {
return SERVER_BRAND.createPacket(playerObj);
}
public static boolean isEnabled() {
return Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED;
}
public static boolean isBrandTag(String tag) {
return tag.equals("MC|Brand") || tag.equals("minecraft:brand");
}
}
@@ -3,8 +3,10 @@ package de.rayzs.pat.api.brand;
import de.rayzs.pat.utils.PacketUtils;
public interface ServerBrand {
void preparePlayer(Object playerObj);
void send(Object playerObj);
PacketUtils.BrandManipulate createPacket(Object playerObj);
void initializeTask();
}
@@ -21,113 +21,159 @@ public class BukkitServerBrand implements ServerBrand {
private static final Server SERVER = Bukkit.getServer();
private static String BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0);
private static PATSchedulerTask TASK;
private static PATSchedulerTask TASK;
private static boolean INITIALIZED = false, NO_PREP_CHANNELS = false;
private static Class<?> brandPayloadClass, clientBoundCustomPacketPayloadPacketClass, customPacketPayloadPacketClass;
private static Class<?> brandPayloadClass, clientBoundCustomPacketPayloadPacketClass,
customPacketPayloadPacketClass;
@Override
public void initializeTask() {
if (Reflection.isWeird()) {
NO_PREP_CHANNELS = Reflection.getMinor() >= 22 || (Reflection.getMinor() == 21 && Reflection.getRelease() >= 7);
NO_PREP_CHANNELS = Reflection.isAtLeast(1, 21, 7);
if (brandPayloadClass == null)
brandPayloadClass = Reflection.getClass("net.minecraft.network.protocol.common.custom.BrandPayload");
if (clientBoundCustomPacketPayloadPacketClass == null)
clientBoundCustomPacketPayloadPacketClass = Reflection.getClass("net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket");
clientBoundCustomPacketPayloadPacketClass = Reflection
.getClass("net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket");
if (customPacketPayloadPacketClass == null)
customPacketPayloadPacketClass = Reflection.getClass("net.minecraft.network.protocol.common.custom.CustomPacketPayload");
customPacketPayloadPacketClass = Reflection
.getClass("net.minecraft.network.protocol.common.custom.CustomPacketPayload");
}
Bukkit.getOnlinePlayers().forEach(this::preparePlayer);
if (!INITIALIZED)
try {
Method method = Reflection.getMethodsByParameterAndName(SERVER.getMessenger(), "addToOutgoing", Plugin.class, String.class).get(0);
Reflection.invokeMethode(method, SERVER.getMessenger(), BukkitLoader.getPlugin(), CustomServerBrand.CHANNEL_NAME);
SERVER.getMessenger().registerOutgoingPluginChannel(BukkitLoader.getPlugin(), CustomServerBrand.CHANNEL_NAME);
Method method = Reflection.getMethodsByParameterAndName(SERVER.getMessenger(), "addToOutgoing",
Plugin.class, String.class).get(0);
Reflection.invokeMethode(method, SERVER.getMessenger(), BukkitLoader.getPlugin(),
CustomServerBrand.CHANNEL_NAME);
SERVER.getMessenger().registerOutgoingPluginChannel(BukkitLoader.getPlugin(),
CustomServerBrand.CHANNEL_NAME);
INITIALIZED = true;
} catch (Exception exception) {
exception.printStackTrace();
}
if(TASK != null && TASK.isActive()) {
if (TASK != null && TASK.isActive()) {
TASK.cancelTask();
TASK = null;
}
if(!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if (!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0) + "§r";
PATScheduler.createAsyncScheduler(() -> {
Bukkit.getOnlinePlayers().forEach(this::send);
}, 1, 1);
} else {
AtomicInteger animationState = new AtomicInteger(0);
TASK = PATScheduler.createAsyncScheduler(() -> {
if (animationState.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
if (animationState
.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
animationState.set(0);
BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get()) + "§r";
Bukkit.getOnlinePlayers().forEach(this::send);
}, 1, Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY);
}
}
@Override
public void preparePlayer(Object playerObj) {
if(!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
Player player = (Player) playerObj;
if (NO_PREP_CHANNELS) {
return;
}
try {
Field channelsField = Reflection.getFieldByName(player.getClass(), "channels");
Set<String> channels = (Set<String>) channelsField.get(player);
channels.add(CustomServerBrand.CHANNEL_NAME);
Reflection.closeAccess(channelsField);
} catch (Exception exception) {
exception.printStackTrace();
}
}
@Override
public void send(Object playerObj) {
if(!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
Player player = (Player) playerObj;
String playerName = player.getName(), displayName = player.getDisplayName(), worldName = player.getWorld().getName(),
customBrand = BRAND.replace("%player%", playerName).replace("%displayname%", displayName).replace("%world%", worldName);
if(!Reflection.isWeird()) {
PacketUtils.BrandManipulate serverBrand = new PacketUtils.BrandManipulate(MessageTranslator.replaceMessage(player, customBrand));
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
Player player = (Player) playerObj;
String playerName = player.getName(), displayName = player.getDisplayName(),
worldName = player.getWorld().getName(), customBrand = BRAND.replace("%player%", playerName)
.replace("%displayname%", displayName).replace("%world%", worldName);
if (!Reflection.isWeird()) {
PacketUtils.BrandManipulate serverBrand = new PacketUtils.BrandManipulate(
MessageTranslator.replaceMessage(player, customBrand));
player.sendPluginMessage(BukkitLoader.getPlugin(), CustomServerBrand.CHANNEL_NAME, serverBrand.getBytes());
return;
}
try {
Channel channel = BukkitPacketAnalyzer.INJECTED_PLAYERS.get(player.getUniqueId());
if(channel == null) return;
Object brandPayloadObj = brandPayloadClass.getDeclaredConstructor(String.class).newInstance(MessageTranslator.replaceMessage(player, customBrand)),
customPacketPayloadPacket = clientBoundCustomPacketPayloadPacketClass.getDeclaredConstructor(customPacketPayloadPacketClass).newInstance(brandPayloadObj);
Channel channel = BukkitPacketAnalyzer.INJECTED_PLAYERS.get(player.getUniqueId());
if (channel == null)
return;
Object brandPayloadObj = brandPayloadClass.getDeclaredConstructor(String.class)
.newInstance(MessageTranslator.replaceMessage(player, customBrand)),
customPacketPayloadPacket = clientBoundCustomPacketPayloadPacketClass
.getDeclaredConstructor(customPacketPayloadPacketClass).newInstance(brandPayloadObj);
channel.pipeline().writeAndFlush(customPacketPayloadPacket);
} catch (Exception exception) {
exception.printStackTrace();
}
}
@Override
public PacketUtils.BrandManipulate createPacket(Object playerObj) {
return null;
}
}
@@ -18,56 +18,85 @@ public class BungeeServerBrand implements ServerBrand {
private static ScheduledTask TASK;
private static String BRAND = Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0);
public BungeeServerBrand() { }
public BungeeServerBrand() {
@Override
public void initializeTask() {
if(TASK != null) TASK.cancel();
if(!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
BRAND = MessageTranslator.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0)) + "§r";
SERVER.getPlayers().forEach(this::send);
} else {
AtomicInteger animationState = new AtomicInteger(0);
TASK = SERVER.getScheduler().schedule(BungeeLoader.getPlugin(), () -> {
if (animationState.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
animationState.set(0);
BRAND = MessageTranslator.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get())) + "§r";
SERVER.getPlayers().forEach(this::send);
}, 1, Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY, TimeUnit.MILLISECONDS);
}
}
@Override
public void preparePlayer(Object playerObj) { }
public void initializeTask() {
if (TASK != null)
TASK.cancel();
if (!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
BRAND = MessageTranslator
.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0)) + "§r";
SERVER.getPlayers().forEach(this::send);
} else {
AtomicInteger animationState = new AtomicInteger(0);
TASK = SERVER.getScheduler().schedule(BungeeLoader.getPlugin(), () -> {
if (animationState
.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
animationState.set(0);
BRAND = MessageTranslator.replaceMessage(
Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get()))
+ "§r";
SERVER.getPlayers().forEach(this::send);
}, 1, Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY, TimeUnit.MILLISECONDS);
}
}
@Override
public void preparePlayer(Object playerObj) {
}
@Override
public void send(Object playerObj) {
if (!(playerObj instanceof ProxiedPlayer) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if (!(playerObj instanceof ProxiedPlayer) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
ProxiedPlayer player = (ProxiedPlayer) playerObj;
String serverName = "", playerName = player.getName(), customBrand;
Server server = player.getServer();
if(server != null) serverName = server.getInfo().getName();
if (server != null)
serverName = server.getInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName);
PacketUtils.BrandManipulate serverBrand = new PacketUtils.BrandManipulate(customBrand);
String brand = player.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand";
String brand = player.getPendingConnection().getVersion() >= ProtocolConstants.MINECRAFT_1_13
? "minecraft:brand"
: "MC|Brand";
player.sendData(brand, serverBrand.getBytes());
}
@Override
public PacketUtils.BrandManipulate createPacket(Object playerObj) {
if (!(playerObj instanceof ProxiedPlayer) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return null;
if (!(playerObj instanceof ProxiedPlayer) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return null;
ProxiedPlayer player = (ProxiedPlayer) playerObj;
String serverName = "", playerName = player.getName(), customBrand;
Server server = player.getServer();
if(server != null) serverName = server.getInfo().getName();
if (server != null)
serverName = server.getInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName);
return new PacketUtils.BrandManipulate(customBrand);
}
}
@@ -24,81 +24,121 @@ public class VelocityServerBrand implements ServerBrand {
@Override
public void initializeTask() {
if(TASK != null) TASK.cancel();
if(!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if (TASK != null)
TASK.cancel();
if(pluginMessagePacketClass == null)
pluginMessagePacketClass = Reflection.getClass("com.velocitypowered.proxy.protocol.packet.PluginMessagePacket");
if (!Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
if(minecraftConnectionClass == null)
if (pluginMessagePacketClass == null)
pluginMessagePacketClass = Reflection
.getClass("com.velocitypowered.proxy.protocol.packet.PluginMessagePacket");
if (minecraftConnectionClass == null)
minecraftConnectionClass = Reflection.getClass("com.velocitypowered.proxy.connection.MinecraftConnection");
if(connectedPlayerConnectionClass == null)
connectedPlayerConnectionClass = Reflection.getClass("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
if (connectedPlayerConnectionClass == null)
connectedPlayerConnectionClass = Reflection
.getClass("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
if(connectionMethod == null)
if (connectionMethod == null)
connectionMethod = Reflection.getMethodByName(connectedPlayerConnectionClass, "getConnection");
if(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
BRAND = MessageTranslator.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0)) + "§r";
if (Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY == -1) {
BRAND = MessageTranslator
.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(0)) + "§r";
SERVER.getAllPlayers().forEach(this::send);
} else {
AtomicInteger animationState = new AtomicInteger(0);
TASK = SERVER.getScheduler().buildTask(VelocityLoader.getInstance(), () -> {
if (animationState.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
if (animationState
.getAndIncrement() >= Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().size() - 1)
animationState.set(0);
BRAND = MessageTranslator.replaceMessage(Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get())) + "§r";
BRAND = MessageTranslator.replaceMessage(
Storage.ConfigSections.Settings.CUSTOM_BRAND.BRANDS.getLines().get(animationState.get()))
+ "§r";
SERVER.getAllPlayers().forEach(this::send);
}).repeat(Storage.ConfigSections.Settings.CUSTOM_BRAND.REPEAT_DELAY, TimeUnit.MILLISECONDS).schedule();
}
}
@Override
public void preparePlayer(Object playerObj) { }
public void preparePlayer(Object playerObj) {
}
@Override
public void send(Object playerObj) {
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return;
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return;
try {
Player player = (Player) playerObj;
Object connectedPlayerObj = connectedPlayerConnectionClass.cast(player),
minecraftConnectionObj = connectionMethod.invoke(connectedPlayerObj);
String serverName = "", playerName = player.getUsername(), customBrand;
Optional<ServerConnection> serverConnection = player.getCurrentServer();
if(serverConnection.isPresent()) serverName = serverConnection.get().getServerInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName).replace("%ping%", String.valueOf(player.getPing()));
if (serverConnection.isPresent())
serverName = serverConnection.get().getServerInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName).replace("%ping%",
String.valueOf(player.getPing()));
PacketUtils.BrandManipulate serverBrand = new PacketUtils.BrandManipulate(customBrand, false);
String brand = player.getProtocolVersion().getProtocol() >= ProtocolConstants.MINECRAFT_1_13 ? "minecraft:brand" : "MC|Brand";
Object pluginMessagePacket = pluginMessagePacketClass.getConstructor(String.class, ByteBuf.class).newInstance(brand, serverBrand.getByteBuf());
Reflection.getMethodsByParameterAndName(minecraftConnectionObj, "write", Object.class).get(0).invoke(minecraftConnectionObj, pluginMessagePacket);
String brand = player.getProtocolVersion().getProtocol() >= ProtocolConstants.MINECRAFT_1_13
? "minecraft:brand"
: "MC|Brand";
Object pluginMessagePacket = pluginMessagePacketClass.getConstructor(String.class, ByteBuf.class)
.newInstance(brand, serverBrand.getByteBuf());
Reflection.getMethodsByParameterAndName(minecraftConnectionObj, "write", Object.class).get(0)
.invoke(minecraftConnectionObj, pluginMessagePacket);
} catch (Exception exception) {
exception.printStackTrace();
}
}
@Override
public PacketUtils.BrandManipulate createPacket(Object playerObj) {
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED) return null;
if (!(playerObj instanceof Player) || !Storage.ConfigSections.Settings.CUSTOM_BRAND.ENABLED)
return null;
try {
Player player = (Player) playerObj;
String serverName = "", playerName = player.getUsername(), customBrand;
Optional<ServerConnection> serverConnection = player.getCurrentServer();
if(serverConnection.isPresent()) serverName = serverConnection.get().getServerInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName).replace("%ping%", String.valueOf(player.getPing()));
if (serverConnection.isPresent())
serverName = serverConnection.get().getServerInfo().getName();
customBrand = BRAND.replace("%player%", playerName).replace("%server%", serverName).replace("%ping%",
String.valueOf(player.getPing()));
return new PacketUtils.BrandManipulate(customBrand, false);
} catch (Exception exception) {
exception.printStackTrace();
}
return null;
}
}
@@ -10,38 +10,51 @@ public abstract class ProCommand {
private final String name;
private final List<String> aliases;
protected boolean proxyOnly = false, serverCommand = false;
protected boolean proxyOnly = false, serverCommand = false;
public ProCommand(String name, String... aliases) {
this.name = name.toLowerCase();
this.aliases = aliases != null && !aliases[0].isBlank() ? Arrays.asList(aliases) : new ArrayList<>();
}
public String getName() {
return name;
}
public boolean isProxyOnly() {
return proxyOnly;
}
public boolean isServerCommand() {
return serverCommand;
}
public List<String> getAliases() {
return aliases;
}
public boolean isCommand(String label) {
String commandName = StringUtils.getFirstArg(label);
if (name.equalsIgnoreCase(commandName))
return true;
return !aliases.isEmpty() && aliases.stream().anyMatch(commandName::equalsIgnoreCase);
}
public abstract boolean execute(CommandSender sender, String[] args);
public abstract List<String> tabComplete(CommandSender sender, String[] args);
}
@@ -6,36 +6,128 @@ import org.bukkit.Bukkit;
public class BackendUpdater {
private BackendUpdater() {
}
private static PATSchedulerTask TASK;
private static boolean CONNECTED = false, WAITING = false;
private static final long SCHEDULER_PERIOD_TIME = 20 * 10;
public static void handle() {
if(isRunning() || !shouldRun() || !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) return;
if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
return;
}
if (isRunning() || !canRun()) {
return;
}
start();
}
public static boolean isRunning() {
return TASK != null && TASK.isActive();
public static void restart() {
stop();
handle();
}
public static void start() {
if(isRunning() || !Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) return;
public static void receivedKeepAlivePacket() {
WAITING = false;
CONNECTED = true;
}
public static boolean isConnected() {
return CONNECTED;
}
private static void start() {
if (isRunning())
return;
TASK = PATScheduler.createScheduler(() -> {
if (shouldRun())
Communicator.sendRequest();
else
if (!canRun()) {
stop();
}, 5, 20);
return;
}
if (CONNECTED) {
if (WAITING) {
disconnect();
Communicator.Backend2Proxy.sendIdentityRequest();
return;
}
WAITING = true;
Communicator.Backend2Proxy.sendKeepAliveRequest();
return;
}
Communicator.Backend2Proxy.sendIdentityRequest();
}, 20, SCHEDULER_PERIOD_TIME);
}
public static void stop() {
if(TASK == null || !TASK.isActive()) return;
TASK.cancelTask();
TASK = null;
disconnect();
if (isRunning()) {
TASK.cancelTask();
TASK = null;
}
}
private static boolean shouldRun() {
int onlinePlayerSize = Bukkit.getOnlinePlayers().size();
return onlinePlayerSize >= 1;
private static void disconnect() {
CONNECTED = false;
WAITING = false;
}
private static boolean isRunning() {
return TASK != null && TASK.isActive();
}
private static boolean canRun() {
if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
return false;
}
final int onlinePlayerSize = Bukkit.getOnlinePlayers().size();
return onlinePlayerSize >= 1;
}
}
@@ -1,6 +1,12 @@
package de.rayzs.pat.api.communication;
import de.rayzs.pat.utils.CommunicationPackets;
public interface Client {
String CHANNEL_NAME = "pat:channel";
void send(Object packet);
void reload();
void send(CommunicationPackets.PATPacket packet);
}
@@ -1,274 +1,439 @@
package de.rayzs.pat.api.communication;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.*;
import java.util.concurrent.TimeUnit;
import de.rayzs.pat.api.communication.client.ClientInfo;
import de.rayzs.pat.api.communication.client.impl.BungeeClientInfo;
import de.rayzs.pat.api.communication.client.impl.VelocityClientInfo;
import de.rayzs.pat.api.communication.impl.BukkitClient;
import de.rayzs.pat.api.communication.impl.BungeeClient;
import de.rayzs.pat.api.communication.impl.VelocityClient;
import de.rayzs.pat.api.event.PATEventHandler;
import de.rayzs.pat.api.storage.Storage;
import de.rayzs.pat.api.storage.blacklist.impl.GeneralBlacklist;
import de.rayzs.pat.api.storage.blacklist.impl.GroupBlacklist;
import de.rayzs.pat.plugin.BukkitLoader;
import de.rayzs.pat.plugin.logger.Logger;
import de.rayzs.pat.utils.CommunicationPackets;
import de.rayzs.pat.utils.ExpireCache;
import de.rayzs.pat.utils.Reflection;
import de.rayzs.pat.utils.group.Group;
import de.rayzs.pat.utils.group.GroupManager;
import de.rayzs.pat.utils.group.TinyGroup;
import de.rayzs.pat.utils.permission.PermissionUtil;
import de.rayzs.pat.utils.sender.CommandSender;
public class Communicator {
private static final Client CLIENT =
Reflection.isVelocityServer() ? new VelocityClient()
: Reflection.isProxyServer() ? new BungeeClient()
: new BukkitClient();
private static Communicator instance = null;
private static final UUID SERVER_ID = UUID.randomUUID();
public static void initialize(final Client client) {
public static final List<ClientInfo> CLIENTS = new ArrayList<>();
if (instance != null) {
public static int SERVER_DATA_SYNC_COUNT = 0;
public static long LAST_DATA_UPDATE = System.currentTimeMillis(),
LAST_SENT_REQUEST = 0,
LAST_BUKKIT_SYNC = System.currentTimeMillis();
Logger.warning("Communicator instance is already initialized!");
return;
}
instance = new Communicator(client);
public static void sendPacket(Object packet) {
if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) return;
CLIENT.send(packet);
}
public static void sendPacket(ClientInfo clientInfo, Object packet) {
if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) return;
clientInfo.sendBytes(CommunicationPackets.convertToBytes(packet));
public static Communicator get() {
return instance;
}
public static void receiveInformation(String serverName, Object packet) {
ClientInfo client = getClientByName(serverName);
public static class Backend2Proxy {
if (packet instanceof CommunicationPackets.RequestPacket requestPacket) {
if (!requestPacket.isToken(Storage.TOKEN))
private Backend2Proxy() {
}
public static void sendIdentityRequest() {
get().send2Proxy(new CommunicationPackets.Backend2Proxy.IdentityRequestPacket(get().getId()));
}
public static void sendKeepAliveRequest() {
get().send2Proxy(new CommunicationPackets.Backend2Proxy.KeepAlivePacket());
}
}
public static class Proxy2Backend {
private Proxy2Backend() {
}
// Update commands for all players
public static void sendUpdateCommand() {
get().send2AllClients(new CommunicationPackets.Proxy2Backend.UpdatePacket(null));
}
// Update commands for a certain player.
public static void sendUpdateCommand(UUID playerId, String serverName) {
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
if (client == null) {
client = Reflection.isVelocityServer()
? new VelocityClientInfo(requestPacket.getServerId(), serverName)
: new BungeeClientInfo(requestPacket.getServerId(), serverName);
clientInfo.send(new CommunicationPackets.Proxy2Backend.UpdatePacket(playerId));
}
public static void sendDataSync() {
Communicator.get().lastSync = System.currentTimeMillis();
Communicator.get().send2AllClients(Communicator.get().constructDataSyncPacket());
}
// Sync data for one server
public static void sendDataSync(String serverName) {
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.send(Communicator.get().constructDataSyncPacket());
}
// Sync data for all registered clients.
public static void sendConsoleMessage(String serverName, String message) {
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.send(new CommunicationPackets.Proxy2Backend.ConsoleMessagePacket(message));
}
public static void sendExecutePlayerCommand(String serverName, UUID playerId, String command) {
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.send(new CommunicationPackets.Proxy2Backend.ExecutePlayerCommandPacket(playerId, command));
}
public static void sendExecuteConsoleCommand(String serverName, String command) {
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.send(new CommunicationPackets.Proxy2Backend.ExecuteConsoleCommandPacket(command));
}
public static void sendNotification(UUID playerId, String serverName, String command) {
if (!Storage.ConfigSections.Settings.FORWARD_CONSOLE_NOTIFICATIONS.ENABLED) {
return;
CLIENTS.add(client);
}
if (!client.compareId(requestPacket.getServerId()))
client.setId(requestPacket.getServerId());
final ClientInfo clientInfo = get().clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.send(new CommunicationPackets.Proxy2Backend.NotificationPacket(playerId, command));
syncData(client.getId());
return;
}
if (packet instanceof CommunicationPackets.NotificationPacket notificationPacket) {
if (!notificationPacket.isToken(Storage.TOKEN) || Reflection.isProxyServer()) {
}
private final Client client;
private final UUID id = UUID.randomUUID();
// Server name, ClientInfo
private final Map<String, ClientInfo> clients = new HashMap<>();
private final ExpireCache<String, ClientInfo> pendingClients = new ExpireCache<>(2, TimeUnit.SECONDS);
private long lastReceivedKeepAliveResponse = System.currentTimeMillis();
private long lastSync = System.currentTimeMillis();
private Communicator(final Client client) {
this.client = client;
}
// BACKEND -> PROXY
public void handleB2PPacket(String serverName, CommunicationPackets.PATPacket incomingPacket) {
if (!incomingPacket.tokenMatches(Storage.TOKEN)) {
return;
}
if (incomingPacket instanceof CommunicationPackets.Backend2Proxy.KeepAlivePacket packet) {
final ClientInfo clientInfo = clients.get(serverName);
if (clientInfo == null)
return;
clientInfo.updateKeepAliveTime();
clientInfo.send(new CommunicationPackets.Proxy2Backend.KeepAliveResponsePacket());
return;
}
if (incomingPacket instanceof CommunicationPackets.Backend2Proxy.IdentityRequestPacket packet) {
final ClientInfo registeredClientInfo = clients.get(serverName);
final boolean exist = registeredClientInfo != null;
final boolean same = exist && registeredClientInfo.getId().equals(packet.serverId());
if (!same) {
final ClientInfo clientInfo = Reflection.isVelocityServer()
? new VelocityClientInfo(packet.serverId(), serverName)
: new BungeeClientInfo(packet.serverId(), serverName);
pendingClients.put(serverName, clientInfo);
clientInfo.send(new CommunicationPackets.Proxy2Backend.IdentityPacket(packet.serverId(), serverName));
} else {
registeredClientInfo.send(new CommunicationPackets.Proxy2Backend.KeepAliveResponsePacket());
registeredClientInfo
.send(new CommunicationPackets.Proxy2Backend.IdentityPacket(packet.serverId(), serverName));
}
BukkitLoader.handleNotificationPacket(notificationPacket);
}
if (packet instanceof CommunicationPackets.UpdateCommandsPacket updateCommandsPacket) {
if (Reflection.isProxyServer())
return;
BukkitLoader.handleUpdateCommandsPacket(updateCommandsPacket);
}
if (packet instanceof CommunicationPackets.ForcePermissionResetPacket permissionResetPacket) {
if (Reflection.isProxyServer())
return;
if (!permissionResetPacket.isToken(Storage.TOKEN))
return;
if (permissionResetPacket.hasTarget())
PermissionUtil.setPlayerPermissions(permissionResetPacket.getTargetUUID());
else
PermissionUtil.reloadPermissions();
return;
}
if (packet instanceof CommunicationPackets.BackendDataPacket backendDataPacket) {
if (!backendDataPacket.isToken(Storage.TOKEN))
return;
if (incomingPacket instanceof CommunicationPackets.Backend2Proxy.IdentityResponsePacket packet) {
Storage.SERVER_NAME = backendDataPacket.getServerName();
return;
}
final ClientInfo clientInfo = pendingClients.get(serverName);
if (packet instanceof CommunicationPackets.FeedbackPacket feedbackPacket) {
if (!feedbackPacket.isToken(Storage.TOKEN))
return;
if (clientInfo != null && clientInfo.getId().equals(packet.serverId())) {
String serverId = feedbackPacket.getServerId();
clientInfo.setId(packet.serverId());
if (client == null) {
client = Reflection.isVelocityServer()
? new VelocityClientInfo(feedbackPacket.getServerId(), serverName)
: new BungeeClientInfo(feedbackPacket.getServerId(), serverName);
pendingClients.remove(serverName);
clients.put(serverName, clientInfo);
clientInfo.send(new CommunicationPackets.Proxy2Backend.KeepAliveResponsePacket());
clientInfo.send(constructDataSyncPacket());
clientInfo.updateSyncTime();
CLIENTS.add(client);
}
if (!client.compareId(feedbackPacket.getServerId()))
client.setId(feedbackPacket.getServerId());
return;
if (client.hasSentFeedback())
}
if (incomingPacket instanceof CommunicationPackets.Backend2Proxy.DataSyncReceivedPacket packet) {
final ClientInfo clientInfo = clients.get(serverName);
if (clientInfo == null)
return;
client.setFeedback(true);
client.syncTime();
SERVER_DATA_SYNC_COUNT++;
clientInfo.updateSyncTime();
CommunicationPackets.BackendDataPacket backendDataPacket = new CommunicationPackets.BackendDataPacket(Storage.TOKEN, serverId, serverName);
sendPacket(client, backendDataPacket);
return;
}
if (packet instanceof CommunicationPackets.PacketBundle packetBundle) {
if (!packetBundle.isToken(Storage.TOKEN) || !packetBundle.isId(SERVER_ID.toString()))
return;
Storage.USE_VELOCITY = packetBundle.isVelocity();
LAST_BUKKIT_SYNC = System.currentTimeMillis();
BukkitLoader.synchronize(packetBundle);
}
}
public static void syncData() {
syncData(null);
}
// PROXY -> BACKEND
public void handleP2BPacket(CommunicationPackets.PATPacket incomingPacket) {
if (!incomingPacket.tokenMatches(Storage.TOKEN)) {
public static void syncData(String serverId) {
if (!Reflection.isProxyServer() || Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED)
return;
LAST_DATA_UPDATE = System.currentTimeMillis();
ClientInfo clientInfo;
}
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.KeepAliveResponsePacket packet) {
lastReceivedKeepAliveResponse = System.currentTimeMillis();
BackendUpdater.receivedKeepAlivePacket();
if(serverId == null) {
SERVER_DATA_SYNC_COUNT = 0;
CLIENTS.forEach(currentClient -> syncData(currentClient.getId()));
return;
} else {
clientInfo = getClientById(serverId);
if (clientInfo != null)
clientInfo.setFeedback(false);
SERVER_DATA_SYNC_COUNT = Math.max(0, SERVER_DATA_SYNC_COUNT -1);
}
CommunicationPackets.CommandsPacket commandsPacket = new CommunicationPackets.CommandsPacket();
CommunicationPackets.GroupsPacket groupsPacket;
CommunicationPackets.PacketBundle bundle;
List<String> commands = new ArrayList<>();
String tempServerName = "";
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.IdentityPacket packet) {
if (clientInfo != null && clientInfo.getName() != null) {
tempServerName = clientInfo.getName();
Storage.SERVER_NAME = packet.serverName();
if (!Storage.Blacklist.isIgnoredServer(tempServerName))
commands.addAll(Storage.Blacklist.getBlacklist().getCommands());
send2Proxy(new CommunicationPackets.Backend2Proxy.IdentityResponsePacket(id));
return;
List<GeneralBlacklist> serverBlacklists = Storage.Blacklist.getServerBlacklists(clientInfo.getName());
serverBlacklists.stream().filter(serverBlacklist ->
serverBlacklist != null && serverBlacklist.getCommands() != null
).forEach(serverBlacklist ->
commands.addAll(serverBlacklist.getCommands())
);
}
final String serverName = tempServerName;
List<TinyGroup> groups = new ArrayList<>();
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.DataSyncPacket packet) {
TinyGroup tinyGroup;
for (Group group : GroupManager.getGroups()) {
if (groups.stream().anyMatch(cTG -> cTG.getGroupName().equals(group.getGroupName())))
continue;
lastSync = System.currentTimeMillis();
tinyGroup = new TinyGroup(group.getGroupName(), group.getPriority(), group.getAllCommands(serverName));
for (GroupBlacklist groupBlacklist : group.getAllServerGroupBlacklist(serverName))
tinyGroup.addAll(groupBlacklist.getCommands());
send2Proxy(new CommunicationPackets.Backend2Proxy.DataSyncReceivedPacket());
BukkitLoader.handleDataSyncPacket(packet);
return;
groups.add(tinyGroup);
}
groupsPacket = new CommunicationPackets.GroupsPacket(groups);
commandsPacket.setTurnBlacklistToWhitelist(Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED);
commandsPacket.setCommands(commands);
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.UpdatePacket packet) {
bundle = new CommunicationPackets.PacketBundle(Storage.TOKEN, serverId, commandsPacket, groupsPacket);
clientInfo.sendBytes(CommunicationPackets.convertToBytes(bundle));
BukkitLoader.handleUpdateCommandsPacket(packet);
return;
}
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.NotificationPacket packet) {
BukkitLoader.handleNotificationPacket(packet);
return;
}
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.ConsoleMessagePacket packet) {
BukkitLoader.handleConsoleMessagePacket(packet);
return;
}
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.ExecutePlayerCommandPacket packet) {
BukkitLoader.handlePlayerExecuteCommandPacket(packet);
return;
}
if (incomingPacket instanceof CommunicationPackets.Proxy2Backend.ExecuteConsoleCommandPacket packet) {
BukkitLoader.handleConsoleExecuteCommandPacket(packet);
return;
}
PATEventHandler.callSentSyncEvents(bundle, serverName);
}
public static void sendRequest() {
if(System.currentTimeMillis() - LAST_SENT_REQUEST >= 5000) {
LAST_SENT_REQUEST = System.currentTimeMillis();
sendPacket(new CommunicationPackets.RequestPacket(Storage.TOKEN, SERVER_ID.toString()));
}
}
private void send2Proxy(CommunicationPackets.PATPacket packet) {
public static void sendPermissionReset() {
if (Reflection.isProxyServer()) {
sendPacket(new CommunicationPackets.ForcePermissionResetPacket(Storage.TOKEN));
}
}
public static void sendNotificationPacket(CommandSender targetSender, String displayedCommand) {
if (!Storage.ConfigSections.Settings.FORWARD_CONSOLE_NOTIFICATIONS.ENABLED) {
Logger.warning("Cannot send B2P packet as proxy!");
return;
}
final String serverName = targetSender.getServerName();
client.send(packet);
}
private void send2Client(ClientInfo clientInfo, CommunicationPackets.PATPacket packet) {
if (!Reflection.isProxyServer()) {
Logger.warning("Cannot send P2B packet as backend!");
return;
for (ClientInfo client : CLIENTS) {
if (client.getName().equalsIgnoreCase(serverName)) {
sendPacket(client, new CommunicationPackets.NotificationPacket(Storage.TOKEN, targetSender.getUniqueId(), displayedCommand));
return;
}
}
}
public static void sendUpdateCommand() {
if (Reflection.isProxyServer()) {
sendPacket(new CommunicationPackets.UpdateCommandsPacket(Storage.TOKEN));
if (clientInfo == null || Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
return;
}
clientInfo.send(packet);
}
public static void sendUpdateCommand(UUID targetUUID) {
sendPacket(new CommunicationPackets.UpdateCommandsPacket(Storage.TOKEN, targetUUID));
private void send2AllClients(CommunicationPackets.PATPacket packet) {
if (!Reflection.isProxyServer()) {
Logger.warning("Cannot send P2B packet as backend!");
return;
}
if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
return;
}
getClients().forEach(clientInfo -> {
clientInfo.send(packet);
});
}
public static void sendFeedback() {
sendPacket(new CommunicationPackets.FeedbackPacket(Storage.TOKEN, SERVER_ID.toString()));
private CommunicationPackets.Proxy2Backend.DataSyncPacket constructDataSyncPacket() {
return new CommunicationPackets.Proxy2Backend.DataSyncPacket(
new CommunicationPackets.Proxy2Backend.DataSyncPacket.Messages(
Storage.ConfigSections.Messages.PREFIX.PREFIX),
new CommunicationPackets.Proxy2Backend.DataSyncPacket.AutoLowerCase(
Storage.ConfigSections.Settings.AUTO_LOWERCASE_COMMANDS.ENABLED),
new CommunicationPackets.Proxy2Backend.DataSyncPacket.UnknownCommand(
Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.ENABLED,
Storage.ConfigSections.Settings.CUSTOM_UNKNOWN_COMMAND.MESSAGE));
}
public static Client getClient() {
return CLIENT;
public void reload() {
this.client.reload();
}
public static ClientInfo getClientById(String id) {
return CLIENTS.isEmpty() ? null : CLIENTS.stream().filter(client -> client != null && client.compareId(id)).findFirst().orElse(null);
public UUID getClientId(String serverName) {
final ClientInfo clientInfo = clients.get(serverName);
if (clientInfo == null)
return null;
return clientInfo.getId();
}
public static ClientInfo getClientByName(String name) {
return CLIENTS.isEmpty() ? null : CLIENTS.stream().filter(client -> client != null && client.getName().equalsIgnoreCase(name)).findFirst().orElse(null);
public boolean hasConnectedClients() {
return !clients.isEmpty();
}
public Set<ClientInfo> getClients() {
return new HashSet<>(clients.values());
}
public UUID getId() {
return id;
}
public long getLastReceivedKeepAliveResponse() {
return lastReceivedKeepAliveResponse;
}
public long getLastSync() {
return lastSync;
}
}
@@ -1,58 +1,84 @@
package de.rayzs.pat.api.communication.client;
import de.rayzs.pat.utils.CommunicationPackets;
import de.rayzs.pat.utils.TimeConverter;
import java.util.UUID;
public abstract class ClientInfo {
private String id, name;
private UUID id;
private String serverName;
private boolean sentFeedback = false;
private long syncTime = System.currentTimeMillis();
private long syncTime = System.currentTimeMillis(), keepAliveTime = System.currentTimeMillis();
public ClientInfo(UUID id) {
this.id = id;
public ClientInfo(String serverId) {
this.id = serverId;
}
public ClientInfo(String serverId, String name) {
this.id = serverId;
this.name = name;
public ClientInfo(UUID id, String name) {
this.id = id;
this.serverName = name;
}
public abstract void sendBytes(byte[] bytes);
public abstract void send(CommunicationPackets.PATPacket packet);
public void setServerName(String name) {
this.serverName = name;
public void setName(String name) {
this.name = name;
}
public void setId(String serverId) {
this.id = serverId;
public void setId(UUID id) {
this.id = id;
}
public String getName() {
return name;
public String getServerName() {
return serverName;
}
public boolean compareId(String id) {
return this.id.equals(id);
}
public void updateSyncTime() {
public void syncTime() {
syncTime = System.currentTimeMillis();
}
public String getSyncTime() {
public void updateKeepAliveTime() {
keepAliveTime = System.currentTimeMillis();
}
public boolean isAlive() {
return System.currentTimeMillis() - keepAliveTime > 5000;
}
public String getFormattedSyncTime() {
return TimeConverter.calcAndGetTime(syncTime);
}
public void setFeedback(boolean state) {
this.sentFeedback = state;
public String getFormattedLastReceivedKeepAlivePacketTime() {
return TimeConverter.calcAndGetTime(keepAliveTime);
}
public boolean hasSentFeedback() {
return sentFeedback;
}
public UUID getId() {
public String getId() {
return id;
}
}
@@ -2,34 +2,45 @@ package de.rayzs.pat.api.communication.client.impl;
import de.rayzs.pat.api.communication.client.ClientInfo;
import de.rayzs.pat.api.communication.Client;
import de.rayzs.pat.plugin.BungeeLoader;
import de.rayzs.pat.plugin.logger.Logger;
import de.rayzs.pat.utils.CommunicationPackets;
import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.config.ServerInfo;
import java.util.UUID;
public class BungeeClientInfo extends ClientInfo {
public BungeeClientInfo(String serverId) {
super(serverId);
public BungeeClientInfo(UUID id) {
super(id);
}
public BungeeClientInfo(String serverId, String name) {
super(serverId, name);
public BungeeClientInfo(UUID id, String name) {
super(id, name);
}
@Override
public void sendBytes(byte[] bytes) {
try {
ProxyServer server = BungeeLoader.getPlugin().getProxy();
public void send(CommunicationPackets.PATPacket packet) {
server.getServers().entrySet().stream().filter(entry ->
entry.getKey().equalsIgnoreCase(getName())
).forEach(entry ->
entry.getValue().sendData(Client.CHANNEL_NAME, bytes)
);
final byte[] preparedPacket = CommunicationPackets.preparePacket(packet, getId());
if (preparedPacket == null) {
return;
} catch (NoClassDefFoundError exception) {
Logger.warning("Failed to send data to backend servers! :c");
}
}
}
final ServerInfo serverInfo = ProxyServer.getInstance().getServerInfo(getServerName());
if (serverInfo != null) {
serverInfo.sendData(Client.CHANNEL_NAME, preparedPacket);
}
}
}
@@ -1,25 +1,47 @@
package de.rayzs.pat.api.communication.client.impl;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import de.rayzs.pat.api.communication.impl.VelocityClient;
import de.rayzs.pat.api.communication.client.ClientInfo;
import de.rayzs.pat.plugin.VelocityLoader;
import de.rayzs.pat.utils.CommunicationPackets;
import java.util.Optional;
import java.util.UUID;
public class VelocityClientInfo extends ClientInfo {
public VelocityClientInfo(String serverId) {
super(serverId);
public VelocityClientInfo(UUID id) {
super(id);
}
public VelocityClientInfo(String serverId, String name) {
super(serverId, name);
public VelocityClientInfo(UUID id, String name) {
super(id, name);
}
@Override
public void sendBytes(byte[] bytes) {
VelocityLoader.getServer().getAllServers().stream().filter(server ->
server.getServerInfo().getName().equalsIgnoreCase(getName())
).forEach(server ->
server.sendPluginMessage(VelocityClient.getIdentifier(), bytes)
);
public void send(CommunicationPackets.PATPacket packet) {
final byte[] preparedPacket = CommunicationPackets.preparePacket(packet, getId());
if (preparedPacket == null) {
return;
}
final Optional<RegisteredServer> optServer = VelocityLoader.getServer().getServer(getServerName());
optServer.ifPresent(registeredServer -> {
registeredServer.sendPluginMessage(VelocityClient.getIdentifier(), preparedPacket);
});
}
}
@@ -8,48 +8,135 @@ import de.rayzs.pat.plugin.BukkitLoader;
import de.rayzs.pat.api.communication.*;
import org.bukkit.entity.Player;
import org.bukkit.*;
import java.util.Iterator;
public class BukkitClient implements Client, PluginMessageListener {
private static final Server SERVER = Bukkit.getServer();
private boolean registered = false;
public BukkitClient() {
if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
return;
}
reload();
SERVER.getMessenger().registerIncomingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME, this);
SERVER.getMessenger().registerOutgoingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME);
}
@Override
public void send(Object packet) {
try {
public void reload() {
SERVER.sendPluginMessage(BukkitLoader.getPlugin(), CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
if (!Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
if (registered) {
unregister();
}
return;
} catch (Throwable throwable) {
throwable.printStackTrace();
}
if (!registered) {
register();
}
}
private void register() {
registered = true;
SERVER.getMessenger().registerIncomingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME, this);
SERVER.getMessenger().registerOutgoingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME);
}
private void unregister() {
registered = false;
SERVER.getMessenger().unregisterIncomingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME, this);
SERVER.getMessenger().unregisterOutgoingPluginChannel(BukkitLoader.getPlugin(), CHANNEL_NAME);
}
@Override
public void send(CommunicationPackets.PATPacket packet) {
final byte[] preparedPacket = CommunicationPackets.preparePacket(packet);
if (preparedPacket == null) {
return;
}
final Player carrier = selectCarrier();
if (carrier == null) {
return;
}
PATScheduler.execute(() -> {
if (!carrier.isOnline()) {
return;
}
try {
carrier.sendPluginMessage(BukkitLoader.getPlugin(), CHANNEL_NAME, preparedPacket);
} catch (Exception exception) {
exception.printStackTrace();
}
}, carrier);
}
@Override
public void onPluginMessageReceived(String channel, Player player, byte[] bytes) {
if (!channel.equals(CHANNEL_NAME))
if (!channel.equals(CHANNEL_NAME)) {
return;
try {
Object packetObj = CommunicationPackets.buildFromBytes(bytes);
}
try {
final Object packetObj = CommunicationPackets.readPacket(bytes);
if (!CommunicationPackets.isP2BPacket(packetObj)) {
if (!CommunicationPackets.isPacket(packetObj))
return;
PATScheduler.createScheduler(() -> Communicator.receiveInformation("proxy", packetObj));
}
PATScheduler.createScheduler(
() -> Communicator.get().handleP2BPacket((CommunicationPackets.PATPacket) packetObj));
} catch (Exception exception) {
exception.printStackTrace();
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
private Player selectCarrier() {
final Iterator<? extends Player> iterator = SERVER.getOnlinePlayers().iterator();
return iterator.hasNext() ? iterator.next() : null;
}
}
@@ -11,6 +11,8 @@ import de.rayzs.pat.plugin.BungeeLoader;
import de.rayzs.pat.api.communication.*;
import net.md_5.bungee.api.ProxyServer;
import java.util.UUID;
public class BungeeClient implements Client, Listener {
private static final ProxyServer SERVER = ProxyServer.getInstance();
@@ -18,46 +20,84 @@ public class BungeeClient implements Client, Listener {
public BungeeClient() {
if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
return;
}
SERVER.registerChannel(CHANNEL_NAME);
SERVER.getPluginManager().registerListener(BungeeLoader.getPlugin(), this);
}
@Override
public void send(Object packet) {
public void reload() {
}
@Override
public void send(CommunicationPackets.PATPacket packet) {
final byte[] preparedPacket = CommunicationPackets.preparePacket(packet);
if (preparedPacket == null) {
return;
}
for (ServerInfo serverInfo : ProxyServer.getInstance().getServers().values()) {
try {
serverInfo.sendData(CHANNEL_NAME, CommunicationPackets.convertToBytes(packet));
serverInfo.sendData(CHANNEL_NAME, preparedPacket);
} catch (Exception exception) {
exception.printStackTrace();
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
}
@EventHandler
public void onQueryReceive(PluginMessageEvent event) {
if (!event.getTag().equalsIgnoreCase(CHANNEL_NAME))
if (!event.getTag().equalsIgnoreCase(CHANNEL_NAME)) {
return;
}
final Server server = (Server) event.getSender();
final String serverName = server.getInfo().getName();
final UUID clientId = Communicator.get().getClientId(serverName);
if (!CommunicationPackets.isInitialPacket(event.getData()) && clientId == null) {
return;
}
try {
Object packetObj = CommunicationPackets.buildFromBytes(event.getData());
Object packetObj = CommunicationPackets.readPacket(event.getData(), clientId);
if (!CommunicationPackets.isB2PPacket(packetObj)) {
if (!CommunicationPackets.isPacket(packetObj))
return;
Server server = (Server) event.getSender();
Communicator.receiveInformation(server.getInfo().getName(), packetObj);
}
Communicator.get().handleB2PPacket(serverName, (CommunicationPackets.PATPacket) packetObj);
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
}
@@ -9,6 +9,7 @@ import com.velocitypowered.api.event.Subscribe;
import de.rayzs.pat.plugin.VelocityLoader;
import de.rayzs.pat.api.communication.*;
import com.velocitypowered.api.proxy.*;
import java.util.UUID;
public class VelocityClient implements Client {
@@ -18,43 +19,83 @@ public class VelocityClient implements Client {
public VelocityClient() {
if (Storage.ConfigSections.Settings.DISABLE_SYNC.DISABLED) {
return;
}
SERVER.getChannelRegistrar().register(IDENTIFIER);
SERVER.getEventManager().register(VelocityLoader.getInstance(), this);
}
@Override
public void send(Object packet) {
public void reload() {
}
@Override
public void send(CommunicationPackets.PATPacket packet) {
final byte[] preparedPacket = CommunicationPackets.preparePacket(packet);
if (preparedPacket == null) {
return;
}
for (RegisteredServer registeredServer : SERVER.getAllServers()) {
try {
registeredServer.sendPluginMessage(IDENTIFIER, CommunicationPackets.convertToBytes(packet));
registeredServer.sendPluginMessage(IDENTIFIER, preparedPacket);
} catch (Exception exception) {
exception.printStackTrace();
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
}
@Subscribe
public void onQueryReceive(PluginMessageEvent event) {
if (event.getIdentifier() != IDENTIFIER)
if (event.getIdentifier() != IDENTIFIER) {
return;
Object packetObj = CommunicationPackets.buildFromBytes(event.getData());
}
final ServerConnection server = (ServerConnection) event.getSource();
final String serverName = server.getServerInfo().getName();
final UUID clientId = Communicator.get().getClientId(serverName);
if (!CommunicationPackets.isInitialPacket(event.getData()) && clientId == null) {
if (!CommunicationPackets.isPacket(packetObj))
return;
ServerConnection server = (ServerConnection) event.getSource();
Communicator.receiveInformation(server.getServerInfo().getName(), packetObj);
}
Object packetObj = CommunicationPackets.readPacket(event.getData(), clientId);
if (!CommunicationPackets.isB2PPacket(packetObj)) {
return;
}
Communicator.get().handleB2PPacket(serverName, (CommunicationPackets.PATPacket) packetObj);
}
public static MinecraftChannelIdentifier getIdentifier() {
return IDENTIFIER;
}
}
@@ -6,19 +6,29 @@ public abstract class PATEvent<T> {
private boolean cancelled = false;
public PATEvent(Object senderObj) {
this.senderObj = senderObj;
}
public abstract void handle(T t);
public void setCancelled(boolean cancelled) {
this.cancelled = cancelled;
}
public Object getSenderObj() {
return senderObj;
}
public boolean isCancelled() {
return cancelled;
}
}
@@ -2,7 +2,6 @@ package de.rayzs.pat.api.event;
import de.rayzs.pat.api.event.events.*;
import de.rayzs.pat.utils.CommunicationPackets;
import de.rayzs.pat.utils.Reflection;
import java.util.*;
@@ -10,191 +9,303 @@ public class PATEventHandler {
private static List<PATEvent> EVENTS = new ArrayList<>();
public static ExecuteCommandEvent callExecuteCommandEvents(Object senderObj, String command, boolean blocked, boolean notify) {
public static ExecuteCommandEvent callExecuteCommandEvents(Object senderObj, String command, boolean blocked,
boolean notify)
{
ExecuteCommandEvent event = EmptyEvent.createEmptyExecuteCommandEvent(senderObj, command, blocked, notify);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof ExecuteCommandEvent) {
if (patEvent instanceof ExecuteCommandEvent) {
ExecuteCommandEvent executeCommandEvent = (ExecuteCommandEvent) patEvent;
executeCommandEvent.handle(event);
}
}
return event;
}
public static FilteredSuggestionEvent callFilteredSuggestionEvents(Object senderObj, List<String> suggestions) {
FilteredSuggestionEvent event = EmptyEvent.createEmptyFilteredSuggestionEvent(senderObj, suggestions);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof FilteredSuggestionEvent) {
if (patEvent instanceof FilteredSuggestionEvent) {
FilteredSuggestionEvent filteredSuggestion = (FilteredSuggestionEvent) patEvent;
filteredSuggestion.handle(event);
}
}
return event;
}
public static FilteredTabCompletionEvent callFilteredTabCompletionEvents(Object senderObj, String cursor, List<String> completion) {
public static FilteredTabCompletionEvent callFilteredTabCompletionEvents(Object senderObj, String cursor,
List<String> completion)
{
FilteredTabCompletionEvent event = EmptyEvent.createEmptyFilteredTabCompletion(senderObj, cursor, completion);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof FilteredTabCompletionEvent) {
if (patEvent instanceof FilteredTabCompletionEvent) {
FilteredTabCompletionEvent filteredTabCompletion = (FilteredTabCompletionEvent) patEvent;
filteredTabCompletion.handle(event);
}
}
return event;
}
public static ServerPlayersChangeEvent callServerPlayersChangeEvents(Object senderObj, ServerPlayersChangeEvent.Type type) {
public static ServerPlayersChangeEvent callServerPlayersChangeEvents(Object senderObj,
ServerPlayersChangeEvent.Type type)
{
ServerPlayersChangeEvent event = EmptyEvent.createEmptyServerPlayersChangeEvent(senderObj, type);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof ServerPlayersChangeEvent) {
if (patEvent instanceof ServerPlayersChangeEvent) {
ServerPlayersChangeEvent serverPlayersChangeEvent = (ServerPlayersChangeEvent) patEvent;
serverPlayersChangeEvent.handle(event);
}
}
return event;
}
public static UpdatePluginEvent callUpdatePluginEvents() {
UpdatePluginEvent event = EmptyEvent.createEmptyUpdatePluginEvent();
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof UpdatePluginEvent) {
if (patEvent instanceof UpdatePluginEvent) {
UpdatePluginEvent updatePluginEvent = (UpdatePluginEvent) patEvent;
updatePluginEvent.handle(event);
}
}
return event;
}
public static UpdatePlayerCommandsEvent callUpdatePlayerCommandsEvents(Object playerObj, List<String> commands, boolean serverBased) {
UpdatePlayerCommandsEvent event = EmptyEvent.createEmptyUpdatePlayerCommandsEvent(playerObj, commands, serverBased);
public static UpdatePlayerCommandsEvent callUpdatePlayerCommandsEvents(Object playerObj, List<String> commands,
boolean serverBased)
{
UpdatePlayerCommandsEvent event = EmptyEvent.createEmptyUpdatePlayerCommandsEvent(playerObj, commands,
serverBased);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof UpdatePlayerCommandsEvent) {
if (patEvent instanceof UpdatePlayerCommandsEvent) {
UpdatePlayerCommandsEvent updatePlayerCommandsEvent = (UpdatePlayerCommandsEvent) patEvent;
updatePlayerCommandsEvent.handle(event);
}
}
return event;
}
public static SentSyncEvent callSentSyncEvents(CommunicationPackets.PacketBundle packetBundle, String serverName) {
SentSyncEvent event = EmptyEvent.createEmptySentSyncEvent(packetBundle, serverName);
public static SentSyncEvent callSentSyncEvents(CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket,
String serverName)
{
SentSyncEvent event = EmptyEvent.createEmptySentSyncEvent(dataSyncPacket, serverName);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof SentSyncEvent) {
if (patEvent instanceof SentSyncEvent) {
SentSyncEvent sentSyncEvent = (SentSyncEvent) patEvent;
sentSyncEvent.handle(event);
}
}
return event;
}
public static ReceiveSyncEvent callReceiveSyncEvents(CommunicationPackets.PacketBundle packetBundle) {
ReceiveSyncEvent event = EmptyEvent.createEmptyReceiveSyncEvent(packetBundle);
public static ReceiveSyncEvent callReceiveSyncEvents(
CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket)
{
ReceiveSyncEvent event = EmptyEvent.createEmptyReceiveSyncEvent(dataSyncPacket);
for (PATEvent patEvent : EVENTS) {
if(patEvent instanceof ReceiveSyncEvent) {
if (patEvent instanceof ReceiveSyncEvent) {
ReceiveSyncEvent proxySyncEvent = (ReceiveSyncEvent) patEvent;
proxySyncEvent.handle(event);
}
}
return event;
}
public static void register(PATEvent event) {
EVENTS.add(event);
}
public static void unregister(PATEvent event) {
EVENTS.remove(event);
}
public static class EmptyEvent {
public static ServerPlayersChangeEvent createEmptyServerPlayersChangeEvent(Object senderObj, ServerPlayersChangeEvent.Type type) {
public static ServerPlayersChangeEvent createEmptyServerPlayersChangeEvent(Object senderObj,
ServerPlayersChangeEvent.Type type)
{
return new ServerPlayersChangeEvent(senderObj, type) {
@Override
public void handle(ServerPlayersChangeEvent event) {
}
};
}
public static SentSyncEvent createEmptySentSyncEvent(CommunicationPackets.PacketBundle packetBundle, String serverName) {
return new SentSyncEvent(null, packetBundle, serverName) {
public static SentSyncEvent createEmptySentSyncEvent(
CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket, String serverName)
{
return new SentSyncEvent(null, dataSyncPacket, serverName) {
@Override
public void handle(SentSyncEvent event) {
}
};
}
public static ReceiveSyncEvent createEmptyReceiveSyncEvent(CommunicationPackets.PacketBundle packetBundle) {
return new ReceiveSyncEvent(null, packetBundle) {
public static ReceiveSyncEvent createEmptyReceiveSyncEvent(
CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket)
{
return new ReceiveSyncEvent(null, dataSyncPacket) {
@Override
public void handle(ReceiveSyncEvent event) {
}
};
}
public static UpdatePlayerCommandsEvent createEmptyUpdatePlayerCommandsEvent(Object playerObj, List<String> commands, boolean serverBased) {
public static UpdatePlayerCommandsEvent createEmptyUpdatePlayerCommandsEvent(Object playerObj,
List<String> commands, boolean serverBased)
{
return new UpdatePlayerCommandsEvent(playerObj, commands, serverBased) {
@Override
public void handle(UpdatePlayerCommandsEvent event) {
}
};
}
public static UpdatePluginEvent createEmptyUpdatePluginEvent() {
return new UpdatePluginEvent(null) {
@Override
public void handle(UpdatePluginEvent event) {
}
};
}
public static ExecuteCommandEvent createEmptyExecuteCommandEvent(Object senderObj, String command, boolean blocked, boolean notify) {
public static ExecuteCommandEvent createEmptyExecuteCommandEvent(Object senderObj, String command,
boolean blocked, boolean notify)
{
return new ExecuteCommandEvent(senderObj, command, blocked, notify) {
@Override
public void handle(ExecuteCommandEvent event) {
}
};
}
public static FilteredSuggestionEvent createEmptyFilteredSuggestionEvent(Object senderObj, List<String> suggestions) {
public static FilteredSuggestionEvent createEmptyFilteredSuggestionEvent(Object senderObj,
List<String> suggestions)
{
return new FilteredSuggestionEvent(senderObj, suggestions) {
@Override
public void handle(FilteredSuggestionEvent event) {
}
};
}
public static FilteredTabCompletionEvent createEmptyFilteredTabCompletion(Object senderObj, String cursor, List<String> completion) {
public static FilteredTabCompletionEvent createEmptyFilteredTabCompletion(Object senderObj, String cursor,
List<String> completion)
{
return new FilteredTabCompletionEvent(senderObj, cursor, completion) {
@Override
public void handle(FilteredTabCompletionEvent event) {
}
};
}
}
}
@@ -8,36 +8,51 @@ public abstract class ExecuteCommandEvent extends PATEvent<ExecuteCommandEvent>
private boolean blocked, notify;
public ExecuteCommandEvent() {
super(null);
this.blocked = false;
this.notify = false;
this.command = null;
}
public ExecuteCommandEvent(Object senderObj, String command, boolean blocked, boolean notify) {
super(senderObj);
this.blocked = blocked;
this.command = command;
this.notify = notify;
}
public void setDoesNotify(boolean notify) {
this.notify = notify;
}
public String getCommand() {
return command;
}
public boolean isBlocked() {
return blocked;
}
public boolean doesNotify() {
return notify;
}
public void setBlocked(boolean blocked) {
this.blocked = blocked;
}
}
@@ -8,20 +8,29 @@ public abstract class FilteredSuggestionEvent extends PATEvent<FilteredSuggestio
private List<String> suggestions;
public FilteredSuggestionEvent() {
super(null);
this.suggestions = null;
}
public FilteredSuggestionEvent(Object senderObj, List<String> suggestions) {
super(senderObj);
this.suggestions = suggestions;
}
public List<String> getSuggestions() {
return suggestions;
}
public void setSuggestions(List<String> suggestions) {
this.suggestions = suggestions;
}
}
@@ -9,28 +9,39 @@ public abstract class FilteredTabCompletionEvent extends PATEvent<FilteredTabCom
private List<String> completion;
public FilteredTabCompletionEvent() {
super(null);
this.cursor = null;
this.completion = null;
}
public FilteredTabCompletionEvent(Object senderObj, String cursor, List<String> completion) {
super(senderObj);
this.cursor = cursor;
this.completion = completion;
}
public abstract void handle(FilteredTabCompletionEvent event);
public String getCursor() {
return cursor;
}
public List<String> getCompletion() {
return completion;
}
public void setCompletion(List<String> completion) {
this.completion = completion;
}
}
@@ -5,19 +5,26 @@ import de.rayzs.pat.api.event.PATEvent;
public abstract class ReceiveSyncEvent extends PATEvent<ReceiveSyncEvent> {
private final CommunicationPackets.PacketBundle packetBundle;
private final CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket;
public ReceiveSyncEvent() {
super(null);
this.packetBundle = null;
this.dataSyncPacket = null;
}
public ReceiveSyncEvent(Object senderObj, CommunicationPackets.PacketBundle packetBundle) {
public ReceiveSyncEvent(Object senderObj, CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket) {
super(senderObj);
this.packetBundle = packetBundle;
this.dataSyncPacket = dataSyncPacket;
}
public CommunicationPackets.PacketBundle getPacketBundle() {
return packetBundle;
public CommunicationPackets.Proxy2Backend.DataSyncPacket getDataSyncPacket() {
return dataSyncPacket;
}
}
@@ -5,26 +5,37 @@ import de.rayzs.pat.api.event.PATEvent;
public abstract class SentSyncEvent extends PATEvent<SentSyncEvent> {
private final CommunicationPackets.PacketBundle packetBundle;
private final CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket;
private final String serverName;
public SentSyncEvent() {
super(null);
this.packetBundle = null;
this.dataSyncPacket = null;
this.serverName = null;
}
public SentSyncEvent(Object senderObj, CommunicationPackets.PacketBundle packetBundle, String serverName) {
public SentSyncEvent(Object senderObj, CommunicationPackets.Proxy2Backend.DataSyncPacket dataSyncPacket,
String serverName)
{
super(senderObj);
this.packetBundle = packetBundle;
this.dataSyncPacket = dataSyncPacket;
this.serverName = serverName;
}
public String getServerName() {
return serverName;
}
public CommunicationPackets.PacketBundle getPacketBundle() {
return packetBundle;
public CommunicationPackets.Proxy2Backend.DataSyncPacket getDataSyncPacket() {
return dataSyncPacket;
}
}
@@ -7,14 +7,21 @@ public abstract class ServerPlayersChangeEvent extends PATEvent<ServerPlayersCha
private final Type type;
public ServerPlayersChangeEvent(Object senderObj, Type type) {
super(senderObj);
this.type = type;
}
public ServerPlayersChangeEvent() {
super(null);
this.type = Type.UNKNOWN;
}
public enum Type {
JOINED, LEFT, UNKNOWN
}
public enum Type { JOINED, LEFT, UNKNOWN }
}
@@ -9,20 +9,29 @@ public abstract class UpdatePlayerCommandsEvent extends PATEvent<UpdatePlayerCom
private boolean serverBased;
public UpdatePlayerCommandsEvent() {
super(null);;
}
public UpdatePlayerCommandsEvent(Object senderObj, List<String> commands, boolean serverBased) {
super(senderObj);
this.commands = commands;
this.serverBased = serverBased;
}
public List<String> getCommands() {
return commands;
}
public boolean isServerBased() {
return serverBased;
}
}
@@ -5,10 +5,15 @@ import de.rayzs.pat.api.event.PATEvent;
public abstract class UpdatePluginEvent extends PATEvent<UpdatePluginEvent> {
public UpdatePluginEvent() {
super(null);;
}
public UpdatePluginEvent(Object senderObj) {
super(senderObj);
}
}
@@ -10,34 +10,49 @@ public abstract class ExecuteCommandEvent extends Event implements Cancellable {
private boolean blocked;
public ExecuteCommandEvent() {
this.blocked = false;
this.command = null;
}
public ExecuteCommandEvent(Player player, String command, boolean blocked) {
this.blocked = blocked;
this.command = command;
}
public String getCommand() {
return command;
}
public boolean isBlocked() {
return blocked;
}
public void setBlocked(boolean blocked) {
this.blocked = blocked;
}
@Override
public boolean isCancelled() {
return blocked;
}
@Override
public void setCancelled(boolean cancel) {
this.blocked = cancel;
}
}
@@ -9,18 +9,27 @@ public abstract class FilteredSuggestionEvent extends Event {
private List<String> suggestions;
public FilteredSuggestionEvent() {
this.suggestions = null;
}
public FilteredSuggestionEvent(Player player, List<String> suggestions) {
this.suggestions = suggestions;
}
public List<String> getSuggestions() {
return suggestions;
}
public void setSuggestions(List<String> suggestions) {
this.suggestions = suggestions;
}
}
@@ -10,26 +10,37 @@ public abstract class FilteredTabCompletionEvent extends Event {
private List<String> completion;
public FilteredTabCompletionEvent() {
this.cursor = null;
this.completion = null;
}
public FilteredTabCompletionEvent(Player player, String cursor, List<String> completion) {
this.cursor = cursor;
this.completion = completion;
}
public abstract void handle(FilteredTabCompletionEvent event);
public String getCursor() {
return cursor;
}
public List<String> getCompletion() {
return completion;
}
public void setCompletion(List<String> completion) {
this.completion = completion;
}
}
@@ -23,21 +23,27 @@ public class BukkitPacketAnalyzer {
private static final String HANDLER_NAME = "pat-bukkit-handler", PIPELINE_NAME = "packet_handler";
private static final BukkitPacketHandler PACKET_HANDLER = Reflection.getMinor() >= 16 ? new ModernPacketHandler() : new LegacyPacketHandler();
private static final BukkitPacketHandler PACKET_HANDLER = Reflection.isAtLeast(1, 16) ? new ModernPacketHandler()
: new LegacyPacketHandler();
private static final BukkitPacketHandler COMMANDS_NODE_HANDLER = new ModernCommandsNodeHandler();
private static final HashMap<Player, String> PLAYER_INPUT_CACHE = new HashMap<>();
public static void injectAll() {
Bukkit.getOnlinePlayers().forEach(BukkitPacketAnalyzer::inject);
}
public static void uninjectAll() {
BukkitPacketAnalyzer.INJECTED_PLAYERS.keySet().forEach(BukkitPacketAnalyzer::uninject);
BukkitPacketAnalyzer.INJECTED_PLAYERS.clear();
}
public static void sendPacket(UUID uuid, Object object) {
Channel channel = INJECTED_PLAYERS.get(uuid);
if (channel == null)
@@ -45,79 +51,107 @@ public class BukkitPacketAnalyzer {
SENT_PACKET.put(uuid, object);
channel.pipeline().writeAndFlush(object);
}
public static boolean inject(Player player) {
if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
return true;
try {
Channel channel = Reflection.getPlayerChannel(player);
if (channel == null) {
return false;
}
if (channel.pipeline().names().contains(BukkitPacketAnalyzer.HANDLER_NAME))
uninject(channel);
channel.pipeline().addBefore(BukkitPacketAnalyzer.PIPELINE_NAME, BukkitPacketAnalyzer.HANDLER_NAME, new PacketDecoder(player));
channel.pipeline().addBefore(BukkitPacketAnalyzer.PIPELINE_NAME, BukkitPacketAnalyzer.HANDLER_NAME,
new PacketDecoder(player));
BukkitPacketAnalyzer.INJECTED_PLAYERS.put(player.getUniqueId(), channel);
} catch (IndexOutOfBoundsException indexOutOfBoundsException) {
Reflection.toggleInjectionMethod();
Logger.info("Injection failed. Switching to secondary injection method.");
} catch (IndexOutOfBoundsException indexOutOfBoundsException) {
Reflection.toggleInjectionMethod();
boolean success = inject(player);
if (success) {
Logger.info("Secondary injection method was successful.");
} else {
Logger.warning("Secondary injection method failed!");
if (!success) {
Logger.warning(
"Both injection methods failed! Please report this back to me on my Discord! (https://www.rayzs.de/discord)");
}
return success;
} catch (Exception exception) {
exception.printStackTrace();
if (!Storage.ConfigSections.Settings.INJECTION_FAILED.SUPPRESS_EXCEPTIONS) {
exception.printStackTrace();
}
return false;
}
return true;
}
public static void uninject(UUID uuid) {
if (Storage.SEND_CONSOLE_NOTIFICATION)
return;
if (BukkitPacketAnalyzer.INJECTED_PLAYERS.containsKey(uuid)) {
Channel channel = BukkitPacketAnalyzer.INJECTED_PLAYERS.get(uuid);
uninject(channel);
}
}
public static void uninject(Channel channel) {
if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
return;
if (channel != null) {
channel.eventLoop().submit(() -> {
ChannelPipeline pipeline = channel.pipeline();
if (pipeline.names().contains(BukkitPacketAnalyzer.HANDLER_NAME))
pipeline.remove(BukkitPacketAnalyzer.HANDLER_NAME);
});
}
}
public static String getPlayerInput(Player player) {
String input = PLAYER_INPUT_CACHE.get(player);
PLAYER_INPUT_CACHE.remove(player);
return input;
}
public static void insertPlayerInput(Player player, String text) {
PLAYER_INPUT_CACHE.put(player, text);
}
private static class PacketDecoder extends ChannelDuplexHandler {
@@ -126,70 +160,98 @@ public class BukkitPacketAnalyzer {
private final CommandSender sender;
private PacketDecoder(Player player) {
this.player = player;
this.sender = CommandSenderHandler.from(player);
}
@Override
public void channelRead(ChannelHandlerContext channel, Object packetObj) {
try {
if (packetObj.getClass() == null || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
super.channelRead(channel, packetObj);
return;
}
String packetName = packetObj.getClass().getSimpleName();
if (!packetName.equals("PacketPlayInTabComplete") && !packetName.equals("ServerboundCommandSuggestionPacket")) {
if (!packetName.equals("PacketPlayInTabComplete")
&& !packetName.equals("ServerboundCommandSuggestionPacket"))
{
super.channelRead(channel, packetObj);
return;
}
if (!PermissionUtil.hasBypassPermission(sender)) {
if (!PACKET_HANDLER.handleIncomingPacket(player, sender, packetObj))
return;
}
super.channelRead(channel, packetObj);
} catch (Throwable exception) { exception.printStackTrace(); }
} catch (Throwable exception) {
exception.printStackTrace();
}
}
@Override
public void write(ChannelHandlerContext channel, Object packetObj, ChannelPromise promise) {
try {
if(packetObj.getClass() == null || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
if (packetObj.getClass() == null || Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
super.write(channel, packetObj, promise);
return;
}
final String packetName = packetObj.getClass().getSimpleName();
final boolean isCommandsPacket = packetName.equals("ClientboundCommandsPacket");
final boolean isTabCompletePacket = packetName.equals("PacketPlayOutTabComplete") || packetName.equals("ClientboundCommandSuggestionsPacket");
final boolean isTabCompletePacket = packetName.equals("PacketPlayOutTabComplete")
|| packetName.equals("ClientboundCommandSuggestionsPacket");
if (!isCommandsPacket && !isTabCompletePacket || PermissionUtil.hasBypassPermission(sender)) {
super.write(channel, packetObj, promise);
return;
}
if (isCommandsPacket) {
COMMANDS_NODE_HANDLER.handleOutgoingPacket(player, sender, packetObj);
super.write(channel, packetObj, promise);
return;
}
UUID uuid = player.getUniqueId();
Object sentPacketObj = SENT_PACKET.get(uuid);
if (sentPacketObj != null) {
if (sentPacketObj == packetObj) {
SENT_PACKET.remove(uuid);
super.write(channel, sentPacketObj, promise);
return;
}
}
if (!PACKET_HANDLER.handleOutgoingPacket(player, sender, packetObj))
@@ -198,8 +260,13 @@ public class BukkitPacketAnalyzer {
super.write(channel, packetObj, promise);
} catch (Throwable exception) {
exception.printStackTrace();
}
}
}
}
@@ -4,6 +4,8 @@ import de.rayzs.pat.utils.sender.CommandSender;
import org.bukkit.entity.Player;
public interface BukkitPacketHandler {
boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception;
boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception;
}
@@ -23,23 +23,31 @@ public class LegacyPacketHandler implements BukkitPacketHandler {
@Override
public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String", Reflection.SearchOption.ENDS);
if(stringField == null) {
Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String",
Reflection.SearchOption.ENDS);
if (stringField == null) {
Logger.warning("Failed PacketAnalyze process! (#1)");
return false;
}
String text = (String) stringField.get(packetObj);
BukkitPacketAnalyzer.insertPlayerInput(player, text);
return true;
}
@Override
public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
final String rawInput = BukkitPacketAnalyzer.getPlayerInput(player);
if(rawInput == null) {
if (rawInput == null) {
return false;
}
final List<Group> groups = GroupManager.getPlayerGroups(sender);
@@ -48,7 +56,9 @@ public class LegacyPacketHandler implements BukkitPacketHandler {
boolean cancelsBeforeHand = false;
if (!input.startsWith("/")) {
return true;
}
input = input.substring(1);
@@ -57,23 +67,33 @@ public class LegacyPacketHandler implements BukkitPacketHandler {
final boolean spaces = input.contains(" ");
if (Storage.ConfigSections.Settings.BLOCK_NAMESPACE_COMMANDS.isCommand(input) && !doesBypassNamespace) {
cancelsBeforeHand = true;
}
if (!cancelsBeforeHand && !input.isEmpty()) {
cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, StringUtils.getFirstArg(input));
}
if (!cancelsBeforeHand) {
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(input) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(input);
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isCommand(input)
|| Storage.ConfigSections.Settings.CUSTOM_VERSION.isCommand(input);
}
for (Field field : Reflection.getFields(packetObj)) {
field.setAccessible(true);
Object result = field.get(packetObj);
if (!(result instanceof String[])) {
continue;
}
String[] tR = (String[]) result;
@@ -82,37 +102,57 @@ public class LegacyPacketHandler implements BukkitPacketHandler {
if (spaces) {
if (cancelsBeforeHand) {
suggestions.clear();
field.set(packetObj, suggestions.toArray(new String[0]));
return true;
}
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, new ArrayList<>(suggestions));
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler
.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, new ArrayList<>(suggestions));
if (filteredTabCompletionEvent.isCancelled()) {
suggestions.clear();
} else {
suggestions.removeIf(s -> !filteredTabCompletionEvent.getCompletion().contains(s));
}
} else {
suggestions.removeIf(s -> {
String cpy = s;
if (cpy.startsWith("/")) {
cpy = cpy.substring(1);
}
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(cpy) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(cpy)) {
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(cpy)
|| Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(cpy))
{
return false;
}
return !Storage.Blacklist.canPlayerAccessTab(sender, groups, cpy);
});
}
field.set(packetObj, suggestions.toArray(new String[0]));
}
return true;
}
}
@@ -5,18 +5,24 @@ import de.rayzs.pat.plugin.subarguments.SubArguments;
import de.rayzs.pat.utils.node.BukkitCommandNodeHelper;
import de.rayzs.pat.utils.sender.CommandSender;
import org.bukkit.entity.Player;
public class ModernCommandsNodeHandler implements BukkitPacketHandler {
public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
// Ignored
return true;
}
@Override
public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
final BukkitCommandNodeHelper helper = new BukkitCommandNodeHelper(packetObj);
SubArguments.handleCommandNode(player.getUniqueId(), helper);
return true;
}
}
@@ -19,7 +19,6 @@ import de.rayzs.pat.api.event.events.FilteredTabCompletionEvent;
import de.rayzs.pat.api.netty.bukkit.BukkitPacketAnalyzer;
import de.rayzs.pat.api.netty.bukkit.BukkitPacketHandler;
import de.rayzs.pat.api.storage.Storage;
import de.rayzs.pat.plugin.BukkitLoader;
import de.rayzs.pat.plugin.logger.Logger;
import de.rayzs.pat.utils.Reflection;
import de.rayzs.pat.utils.StringUtils;
@@ -32,42 +31,49 @@ public class ModernPacketHandler implements BukkitPacketHandler {
@Override
public boolean handleIncomingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String", Reflection.SearchOption.ENDS);
if(stringField == null) {
Field stringField = Reflection.getFirstFieldByType(packetObj.getClass(), "String",
Reflection.SearchOption.ENDS);
if (stringField == null) {
Logger.warning("Failed PacketAnalyze process! (#1)");
return false;
}
String text = (String) stringField.get(packetObj);
if (!text.isBlank() && text.charAt(0) != '/') text = '/' + text;
if (!text.isBlank() && text.charAt(0) != '/')
text = '/' + text;
if (Storage.ConfigSections.Settings.PATCH_EXPLOITS.isMalicious(text)) {
MessageTranslator.send(
Bukkit.getConsoleSender(),
Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%", player.getName())
);
PATScheduler.createScheduler(() ->
player.kickPlayer(
StringUtils.replace(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get(), "&", "§")
)
);
MessageTranslator.send(Bukkit.getConsoleSender(),
Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%",
player.getName()));
PATScheduler.createScheduler(() -> player.kickPlayer(
StringUtils.replace(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get(), "&", "§")));
return false;
}
BukkitPacketAnalyzer.insertPlayerInput(player, text);
return true;
}
@Override
public boolean handleOutgoingPacket(Player player, CommandSender sender, Object packetObj) throws Exception {
Object suggestionObj;
String rawInput = BukkitPacketAnalyzer.getPlayerInput(player), input = rawInput;
if(input == null) {
if (input == null) {
return false;
}
final List<Group> groups = GroupManager.getPlayerGroups(sender);
@@ -76,128 +82,173 @@ public class ModernPacketHandler implements BukkitPacketHandler {
cancelsBeforeHand = false;
int spaces = 0;
if(input.startsWith("/") || is121Packet) {
if (input.startsWith("/") || is121Packet) {
input = input.replace("/", "");
if(input.contains(" ")) {
if (input.contains(" ")) {
String[] split = input.split(" ");
spaces = split.length;
if(spaces > 0) input = split[0];
if (spaces > 0)
input = split[0];
}
cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, input);
if (!cancelsBeforeHand)
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(input) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(input);
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(input)
|| Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(input);
}
if (is121Packet || Reflection.isFoliaServer() && packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete")) {
try {
Field suggestionsField = Reflection.getFieldsByTypeNormal(packetObj.getClass(), "List", Reflection.SearchOption.ENDS).get(0);
List<?> suggestionsTmp = (List<?>) suggestionsField.get(packetObj),
suggestions = new ArrayList<>(suggestionsTmp);
if (is121Packet || Reflection.isFoliaServer()
&& packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete"))
{
List<Field> intFields = Reflection.getFieldsByTypeNormal(packetObj.getClass(), "int", Reflection.SearchOption.ENDS);
int id = (int) intFields.get(0).get(packetObj),
start = (int) intFields.get(1).get(packetObj),
try {
Field suggestionsField = Reflection
.getFieldsByTypeNormal(packetObj.getClass(), "List", Reflection.SearchOption.ENDS).get(0);
List<?> suggestionsTmp = (List<?>) suggestionsField.get(packetObj),
suggestions = new ArrayList<>(suggestionsTmp);
List<Field> intFields = Reflection.getFieldsByTypeNormal(packetObj.getClass(), "int",
Reflection.SearchOption.ENDS);
int id = (int) intFields.get(0).get(packetObj), start = (int) intFields.get(1).get(packetObj),
length = (int) intFields.get(2).get(packetObj);
Class<?> clientboundCommandSuggestionsPacketClass = Class.forName("net.minecraft.network.protocol.game." + (packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete") ? "PacketPlayOutTabComplete" : "ClientboundCommandSuggestionsPacket"));
Class<?> clientboundCommandSuggestionsPacketClass = Class.forName("net.minecraft.network.protocol.game."
+ (packetObj.getClass().getSimpleName().equals("PacketPlayOutTabComplete")
? "PacketPlayOutTabComplete"
: "ClientboundCommandSuggestionsPacket"));
if ((input.isEmpty() || cancelsBeforeHand) && Reflection.isWeird())
return false;
if (spaces >= 1 && cancelsBeforeHand || !BukkitLoader.isLoaded()) {
if (spaces >= 1 && cancelsBeforeHand) {
suggestions.clear();
return true;
}
if (spaces == 0) {
suggestions.removeIf(suggestion -> {
String command = getSuggestionFromEntry(suggestion);
return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command);
});
return true;
} else {
List<String> suggestionsAsString = new ArrayList<>();
for (Object suggestion : suggestions)
suggestionsAsString.add(getSuggestionFromEntry(suggestion));
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
if (filteredTabCompletionEvent.isCancelled()) suggestions.clear();
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler
.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
if (filteredTabCompletionEvent.isCancelled())
suggestions.clear();
for (int i = 0; i < suggestions.size(); i++) {
Object csO = suggestions.get(i);
String suggestionAsString = getSuggestionFromEntry(csO);
if (!filteredTabCompletionEvent.getCompletion().contains(suggestionAsString))
suggestions.remove(csO);
}
suggestions.removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion().contains(getSuggestionFromEntry(suggestion)));
suggestions.removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion()
.contains(getSuggestionFromEntry(suggestion)));
}
if(!suggestions.isEmpty()) {
if (!suggestions.isEmpty()) {
Object clientboundCommandSuggestionsPacketObj = clientboundCommandSuggestionsPacketClass
.getConstructor(int.class, int.class, int.class, List.class)
.newInstance(id, start, length, suggestions);
BukkitPacketAnalyzer.sendPacket(player.getUniqueId(), clientboundCommandSuggestionsPacketObj);
}
return false;
} catch (Throwable throwable) {
throwable.printStackTrace();
}
return !cancelsBeforeHand;
}
if (Reflection.isBefore(1, 17)) {
if (Reflection.getMinor() < 17) {
Field suggestionsField = Reflection.getFieldsByType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS).get(0);
if (suggestionsField == null) return false;
Field suggestionsField = Reflection
.getFieldsByType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS).get(0);
if (suggestionsField == null)
return false;
suggestionObj = suggestionsField.get(packetObj);
} else {
List<Method> methods = Reflection.getMethodsByReturnType(packetObj.getClass(), "Suggestions", Reflection.SearchOption.ENDS);
if (methods.isEmpty()) return false;
} else {
List<Method> methods = Reflection.getMethodsByReturnType(packetObj.getClass(), "Suggestions",
Reflection.SearchOption.ENDS);
if (methods.isEmpty())
return false;
Method suggestionsMethod = methods.get(0);
if (suggestionsMethod == null)
return false;
suggestionObj = suggestionsMethod.invoke(packetObj);
}
Suggestions suggestions = (Suggestions) suggestionObj;
if((input.isEmpty() || cancelsBeforeHand) && Reflection.isWeird()) {
if ((input.isEmpty() || cancelsBeforeHand) && Reflection.isWeird()) {
return false;
}
if(spaces >= 1 && cancelsBeforeHand || !BukkitLoader.isLoaded()) {
if (spaces >= 1 && cancelsBeforeHand) {
suggestions.getList().clear();
return true;
}
if(spaces == 0) {
if (spaces == 0) {
suggestions.getList().removeIf(suggestion -> {
String command = suggestion.getText();
return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command);
});
return true;
} else {
List<String> suggestionsAsString = new ArrayList<>();
for (Suggestion suggestion : suggestions.getList())
suggestionsAsString.add(suggestion.getText());
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler
.callFilteredTabCompletionEvents(player.getUniqueId(), rawInput, suggestionsAsString);
if (modifiable) {
@@ -206,42 +257,60 @@ public class ModernPacketHandler implements BukkitPacketHandler {
if (filteredTabCompletionEvent.isCancelled())
suggestions.getList().clear();
else
suggestions.getList().removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion().contains(suggestion.getText()));
suggestions.getList().removeIf(suggestion -> !filteredTabCompletionEvent.getCompletion()
.contains(suggestion.getText()));
return !suggestions.getList().isEmpty();
} catch (UnsupportedOperationException exception) {
modifiable = false;
}
}
return handleUnmodifiableTabCompletion(player, packetObj, suggestions, filteredTabCompletionEvent);
}
}
private boolean handleUnmodifiableTabCompletion(Player player, Object packetObj, Suggestions suggestions, FilteredTabCompletionEvent filteredTabCompletionEvent) {
private boolean handleUnmodifiableTabCompletion(Player player, Object packetObj, Suggestions suggestions,
FilteredTabCompletionEvent filteredTabCompletionEvent)
{
List<Suggestion> filteredSuggestionsList = new ArrayList<>();
if (!filteredTabCompletionEvent.isCancelled())
for (Suggestion suggestion : suggestions.getList()) {
if (filteredTabCompletionEvent.getCompletion().contains(suggestion.getText())) {
filteredSuggestionsList.add(suggestion);
}
}
Suggestions filteredSuggestions = new Suggestions(suggestions.getRange(), filteredSuggestionsList);
try {
int val = -1;
Method method = Reflection.getMethodByName(packetObj.getClass(), "e");
if (method != null) {
val = (int) method.invoke(packetObj);
}
if (val == -1) {
Logger.warning("Failed to read packet input!");
return false;
}
Object packet = Reflection.getConstructor(packetObj.getClass(), int.class, Suggestions.class)
@@ -250,25 +319,37 @@ public class ModernPacketHandler implements BukkitPacketHandler {
BukkitPacketAnalyzer.sendPacket(player.getUniqueId(), packet);
} catch (Exception exception) {
exception.printStackTrace();
}
return false;
}
private String getSuggestionFromEntry(Object suggestionObj) {
try {
List<Field> fields = Reflection.getFieldsByTypeNormal(suggestionObj.getClass(), "String", Reflection.SearchOption.ENDS);
if(fields.isEmpty()) return "";
List<Field> fields = Reflection.getFieldsByTypeNormal(suggestionObj.getClass(), "String",
Reflection.SearchOption.ENDS);
if (fields.isEmpty())
return "";
Field field = fields.get(0);
String result = (String) field.get(suggestionObj);
field.setAccessible(false);
return result;
} catch (Throwable throwable) {
throwable.printStackTrace();
}
return "";
}
}
@@ -9,6 +9,7 @@ import com.mojang.brigadier.tree.CommandNode;
import com.mojang.brigadier.tree.RootCommandNode;
import de.rayzs.pat.api.brand.CustomServerBrand;
import de.rayzs.pat.api.communication.Communicator;
import de.rayzs.pat.api.storage.Storage;
import de.rayzs.pat.plugin.logger.Logger;
import de.rayzs.pat.plugin.subarguments.SubArguments;
@@ -47,37 +48,52 @@ public class BungeePacketAnalyzer {
private static List<String> PROXY_COMMANDS;
static {
ProxyCommandNodeHelper.setDefaultSuggestionProvider(Commands.SuggestionRegistry.ASK_SERVER);
loadProxyCommands();
}
public static void loadProxyCommands() {
PROXY_COMMANDS = ProxyServer.getInstance().getPluginManager().getCommands().stream().map(entry -> {
String key = entry.getKey();
return key.startsWith("/") ? key.substring(1) : key;
}).toList();
}
public static void injectAll() {
ProxyServer.getInstance().getPlayers().forEach(BungeePacketAnalyzer::inject);
}
public static void uninjectAll() {
BungeePacketAnalyzer.INJECTED_PLAYERS.keySet().forEach(BungeePacketAnalyzer::uninject);
BungeePacketAnalyzer.INJECTED_PLAYERS.clear();
}
public static void setPluginCommands() {
if(!PLUGIN_COMMANDS.isEmpty()) return;
ProxyServer.getInstance().getPluginManager().getCommands().stream().filter(entry -> !PLUGIN_COMMANDS.contains(entry.getKey())).forEach(entry -> PLUGIN_COMMANDS.add(entry.getKey()));
if (!PLUGIN_COMMANDS.isEmpty())
return;
ProxyServer.getInstance().getPluginManager().getCommands().stream()
.filter(entry -> !PLUGIN_COMMANDS.contains(entry.getKey()))
.forEach(entry -> PLUGIN_COMMANDS.add(entry.getKey()));
}
public static boolean inject(ProxiedPlayer player) {
if(channelWrapperClass == null)
if (channelWrapperClass == null)
channelWrapperClass = Reflection.getClass("net.md_5.bungee.netty.ChannelWrapper");
if(serverConnectionClass == null)
if (serverConnectionClass == null)
serverConnectionClass = Reflection.getClass("net.md_5.bungee.ServerConnection");
Object channelWrapperObj;
@@ -85,13 +101,17 @@ public class BungeePacketAnalyzer {
Channel channel;
try {
channelField = Reflection.getFieldByName(serverConnectionClass, "ch");
channelWrapperObj = channelField.get(player.getServer());
channel = (Channel) Reflection.getFieldsByType(channelWrapperClass, "Channel", Reflection.SearchOption.ENDS).get(0).get(channelWrapperObj);
channel = (Channel) Reflection.getFieldsByType(channelWrapperClass, "Channel", Reflection.SearchOption.ENDS)
.get(0).get(channelWrapperObj);
if (channel == null) {
if(channel == null) {
Logger.warning("Failed to inject " + player.getName() + "! Channel is null.");
return false;
}
channelField.setAccessible(false);
@@ -99,50 +119,72 @@ public class BungeePacketAnalyzer {
if (channel.pipeline().names().contains(BungeePacketAnalyzer.HANDLER_NAME))
uninject(player);
channel.pipeline().addAfter(BungeePacketAnalyzer.PIPELINE_NAME, BungeePacketAnalyzer.HANDLER_NAME, new PacketDecoder(player));
channel.pipeline().addAfter(BungeePacketAnalyzer.PIPELINE_NAME, BungeePacketAnalyzer.HANDLER_NAME,
new PacketDecoder(player));
BungeePacketAnalyzer.INJECTED_PLAYERS.put(player, channel);
} catch (Throwable throwable) {
throwable.printStackTrace();
} catch (Exception exception) {
if (!Storage.ConfigSections.Settings.INJECTION_FAILED.SUPPRESS_EXCEPTIONS) {
exception.printStackTrace();
}
return false;
}
return true;
}
public static void uninject(ProxiedPlayer player) {
BungeePacketAnalyzer.PLAYER_INPUT_CACHE.remove(player.getUniqueId());
BungeePacketAnalyzer.PLAYER_MODIFIED.remove(player);
if(BungeePacketAnalyzer.INJECTED_PLAYERS.containsKey(player)) {
if (BungeePacketAnalyzer.INJECTED_PLAYERS.containsKey(player)) {
Channel channel = BungeePacketAnalyzer.INJECTED_PLAYERS.get(player);
if(channel != null) {
if (channel != null) {
BungeePacketAnalyzer.INJECTED_PLAYERS.remove(player);
channel.eventLoop().submit(() -> {
ChannelPipeline pipeline = channel.pipeline();
if (pipeline.names().contains(BungeePacketAnalyzer.HANDLER_NAME))
pipeline.remove(BungeePacketAnalyzer.HANDLER_NAME);
});
}
}
}
public static void setPlayerInput(ProxiedPlayer player, String input) {
PLAYER_INPUT_CACHE.putIgnoreIfContains(player.getUniqueId(), input);
}
public static String getPlayerInput(ProxiedPlayer player) {
String input = PLAYER_INPUT_CACHE.get(player.getUniqueId());
PLAYER_INPUT_CACHE.remove(player.getUniqueId());
return input;
}
private static void modifyCommands(ProxiedPlayer player, CommandSender sender, Commands commands) {
String serverName = sender.getServerName();
final boolean ignore = PermissionUtil.hasBypassPermission(sender) || Storage.Blacklist.isDisabledServer(serverName);
final boolean ignore = PermissionUtil.hasBypassPermission(sender)
|| Storage.Blacklist.isDisabledServer(serverName);
ProxyCommandNodeHelper helper = new ProxyCommandNodeHelper<CommandNode>(commands.getRoot());
@@ -152,31 +194,44 @@ public class BungeePacketAnalyzer {
List<String> playerCommands = new ArrayList<>();
if (!ignore) {
final List<Group> groups = GroupManager.getPlayerGroups(sender);
final Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
if (!cache.containsKey(serverName)) {
cache.put(serverName, new CommandsCache());
}
final CommandsCache commandsCache = cache.get(serverName);
commandsCache.handleCommands(commandsAsString, serverName);
final List<String> tmpPlayerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
final List<String> tmpPlayerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups,
serverName);
if (commands.getRoot().getChildren().size() != 0) {
helper.removeIf(str -> !tmpPlayerCommands.contains(str));
}
if (Storage.ConfigSections.Settings.CUSTOM_VERSION.ALWAYS_TAB_COMPLETABLE) {
Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines().forEach(input -> helper.add(input, false));
Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines()
.forEach(input -> helper.add(input, false));
}
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.ALWAYS_TAB_COMPLETABLE) {
Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines().forEach(input -> helper.add(input, false));
Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines()
.forEach(input -> helper.add(input, false));
}
playerCommands = tmpPlayerCommands;
}
for (Map.Entry<String, Command> command : ProxyServer.getInstance().getPluginManager().getCommands()) {
@@ -188,39 +243,62 @@ public class BungeePacketAnalyzer {
continue;
if (!command.getValue().hasPermission(player)) {
continue;
}
String commandName = command.getKey();
commandName = commandName.startsWith("/") ? commandName.substring(1) : commandName;
if (!ignore) {
boolean tabablePluginCommand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(commandName);
boolean tabableVersionCommand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(commandName);
boolean tabablePluginCommand = Storage.ConfigSections.Settings.CUSTOM_PLUGIN
.isTabCompletable(commandName);
boolean tabableVersionCommand = Storage.ConfigSections.Settings.CUSTOM_VERSION
.isTabCompletable(commandName);
if (!tabablePluginCommand && !tabableVersionCommand && !playerCommands.contains(commandName)) {
continue;
}
}
CommandNode dummy = ProxyCommandNodeHelper.createDummyCommandNode(command.getKey());
commands.getRoot().addChild(dummy);
}
for (String command : PROXY_COMMANDS) {
if (ignore || playerCommands.contains(command)) {
helper.add(command, true);
}
}
if (!ignore) {
SubArguments.handleCommandNode(player.getUniqueId(), helper);
}
}
public static void sendCommandsPacket() {
if (!Communicator.get().hasConnectedClients()) {
return;
}
for (ProxiedPlayer player : ProxyServer.getInstance().getPlayers()) {
if (player.getPendingConnection().getVersion() < 754)
continue;
@@ -231,7 +309,9 @@ public class BungeePacketAnalyzer {
modifyCommands(player, sender, packet);
player.unsafe().sendPacket(packet);
}
}
private static class PacketDecoder extends MessageToMessageDecoder<PacketWrapper> {
@@ -240,23 +320,30 @@ public class BungeePacketAnalyzer {
private final CommandSender sender;
private PacketDecoder(ProxiedPlayer player) {
this.player = player;
this.sender = CommandSenderHandler.from(player);
}
@Override
protected void decode(ChannelHandlerContext channelHandlerContext, PacketWrapper wrapper, List<Object> list) {
if (wrapper.packet == null) {
list.add(wrapper);
return;
}
if (wrapper.packet instanceof PluginMessage) {
PluginMessage pluginMessage = (PluginMessage) wrapper.packet;
if(CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessage.getTag()))
if (CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessage.getTag()))
return;
} else if (wrapper.packet instanceof Commands) {
Commands response = (Commands) wrapper.packet;
modifyCommands(player, sender, response);
@@ -264,92 +351,91 @@ public class BungeePacketAnalyzer {
return;
/*
} else if (wrapper.packet instanceof TabCompleteResponse) {
TabCompleteResponse response = (TabCompleteResponse) wrapper.packet;
String serverName = player.getServer().getInfo().getName();
System.out.println("damn");
if (!Storage.Blacklist.isDisabledServer(serverName) && player.getPendingConnection().getVersion() < 754) {
if (!PermissionUtil.hasBypassPermission(player)) {
System.out.println("Further!");
System.out.println("Got: " + PLAYER_INPUT_CACHE.get(player.getUniqueId()));
if (!PLAYER_INPUT_CACHE.contains(player.getUniqueId()))
return;
boolean cancelsBeforeHand = false;
String rawPlayerInput = PLAYER_INPUT_CACHE.get(player.getUniqueId());
int spaces = rawPlayerInput.contains(" ") ? rawPlayerInput.split(" ").length : 0;
String playerInput = StringUtils.getFirstArg(rawPlayerInput),
server = player.getServer().getInfo().getName();
System.out.println("NETTY -> " + playerInput);
if (!playerInput.equals("/")) {
cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(player, StringUtils.replaceFirst(playerInput, "/", ""), server);
if (!cancelsBeforeHand)
cancelsBeforeHand = !Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", "")) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""));
}
final String cursor = playerInput;
if (cursor.startsWith("/")) {
if (spaces == 0) {
List<String> suggestions = new ArrayList<>(response.getCommands());
if (Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) {
setPluginCommands();
Storage.Blacklist.getServerBlacklists(server).forEach(blacklist -> blacklist.getCommands().stream().filter(command -> !suggestions.contains("/" + command)).forEach(command -> {
if (BungeePacketAnalyzer.PLUGIN_COMMANDS.contains(command))
suggestions.add("/" + command);
}));
BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command -> !suggestions.contains(command)).forEach(command -> {
if (command.startsWith("/"))
command = StringUtils.replaceFirst(command, "/", "");
if (Storage.Blacklist.canPlayerAccessTab(player, command, server)) {
suggestions.add("/" + command);
}
});
suggestions.stream().filter(suggestion -> suggestion.startsWith(cursor) && !response.getCommands().contains(suggestion)).forEach(command -> response.getCommands().add(command));
} else {
BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command -> !suggestions.contains(command)).forEach(suggestions::add);
suggestions.removeIf(command -> {
if (command.startsWith("/"))
command = StringUtils.replaceFirst(command, "/", "");
return !Storage.Blacklist.canPlayerAccessTab(player, command, server);
});
response.getCommands().clear();
suggestions.forEach(command -> response.getCommands().add(command));
}
if (response.getCommands().isEmpty())
return;
} else {
if (cancelsBeforeHand)
return;
}
player.unsafe().sendPacket(new TabCompleteResponse(response.getCommands()));
}
}
}*/
* } else if (wrapper.packet instanceof TabCompleteResponse) {
* TabCompleteResponse response = (TabCompleteResponse) wrapper.packet; String
* serverName = player.getServer().getInfo().getName();
*
* System.out.println("damn");
*
* if (!Storage.Blacklist.isDisabledServer(serverName) &&
* player.getPendingConnection().getVersion() < 754) { if
* (!PermissionUtil.hasBypassPermission(player)) {
*
* System.out.println("Further!"); System.out.println("Got: " +
* PLAYER_INPUT_CACHE.get(player.getUniqueId()));
*
* if (!PLAYER_INPUT_CACHE.contains(player.getUniqueId())) return;
*
* boolean cancelsBeforeHand = false;
*
* String rawPlayerInput = PLAYER_INPUT_CACHE.get(player.getUniqueId()); int
* spaces = rawPlayerInput.contains(" ") ? rawPlayerInput.split(" ").length : 0;
*
* String playerInput = StringUtils.getFirstArg(rawPlayerInput), server =
* player.getServer().getInfo().getName();
*
* System.out.println("NETTY -> " + playerInput);
*
* if (!playerInput.equals("/")) { cancelsBeforeHand =
* !Storage.Blacklist.canPlayerAccessTab(player,
* StringUtils.replaceFirst(playerInput, "/", ""), server);
*
* if (!cancelsBeforeHand) cancelsBeforeHand =
* !Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(StringUtils.
* replaceFirst(playerInput, "/", "")) ||
* Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(StringUtils.
* replaceFirst(playerInput, "/", "")); }
*
* final String cursor = playerInput;
*
* if (cursor.startsWith("/")) { if (spaces == 0) { List<String> suggestions =
* new ArrayList<>(response.getCommands());
*
* if (Storage.ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED) {
* setPluginCommands();
*
* Storage.Blacklist.getServerBlacklists(server).forEach(blacklist ->
* blacklist.getCommands().stream().filter(command -> !suggestions.contains("/"
* + command)).forEach(command -> { if
* (BungeePacketAnalyzer.PLUGIN_COMMANDS.contains(command)) suggestions.add("/"
* + command); }));
*
* BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command ->
* !suggestions.contains(command)).forEach(command -> { if
* (command.startsWith("/")) command = StringUtils.replaceFirst(command, "/",
* "");
*
* if (Storage.Blacklist.canPlayerAccessTab(player, command, server)) {
* suggestions.add("/" + command); } });
*
* suggestions.stream().filter(suggestion -> suggestion.startsWith(cursor) &&
* !response.getCommands().contains(suggestion)).forEach(command ->
* response.getCommands().add(command));
*
* } else { BungeePacketAnalyzer.PLUGIN_COMMANDS.stream().filter(command ->
* !suggestions.contains(command)).forEach(suggestions::add);
*
* suggestions.removeIf(command -> { if (command.startsWith("/")) command =
* StringUtils.replaceFirst(command, "/", "");
*
* return !Storage.Blacklist.canPlayerAccessTab(player, command, server); });
*
* response.getCommands().clear(); suggestions.forEach(command ->
* response.getCommands().add(command)); }
*
* if (response.getCommands().isEmpty()) return;
*
* } else { if (cancelsBeforeHand) return; }
*
* player.unsafe().sendPacket(new TabCompleteResponse(response.getCommands()));
* } } }
*/
}
list.add(wrapper);
}
}
}
@@ -45,26 +45,35 @@ public class VelocityPacketAnalyzer {
private static boolean FAILED = false;
static {
try {
final String name = "minecraft:ask_server";
final Object availableCommandsPacket = AvailableCommandsPacket.class.newInstance();
final Class<?> packetInstanceObjClass = availableCommandsPacket.getClass();
for (Class<?> clazz : packetInstanceObjClass.getClasses()) {
if (clazz.getSimpleName().equals("ProtocolSuggestionProvider")) {
final Object suggestionProviderObj = clazz.getConstructor(String.class).newInstance(name);
final SuggestionProvider<?> suggestionProvider = (SuggestionProvider<?>) suggestionProviderObj;
ProxyCommandNodeHelper.setDefaultSuggestionProvider(suggestionProvider);
break;
}
}
} catch (Exception exception) {
exception.printStackTrace();
FAILED = true;
}
}
public static final ConcurrentHashMap<Player, Channel> INJECTED_PLAYERS = new ConcurrentHashMap<>();
@@ -75,133 +84,187 @@ public class VelocityPacketAnalyzer {
private static Class<?> minecraftConnectionClass, connectedPlayerConnectionClass, signedChatCommandPacketClass;
public static void injectAll() {
VelocityLoader.getServer().getAllPlayers().forEach(VelocityPacketAnalyzer::inject);
}
public static void uninjectAll() {
VelocityPacketAnalyzer.INJECTED_PLAYERS.keySet().forEach(VelocityPacketAnalyzer::uninject);
VelocityPacketAnalyzer.INJECTED_PLAYERS.clear();
}
public static boolean isInjected(Player player) {
return INJECTED_PLAYERS.containsKey(player);
}
public static boolean inject(Player player) {
if(connectedPlayerConnectionClass == null)
connectedPlayerConnectionClass = Reflection.getClass("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
if (connectedPlayerConnectionClass == null)
connectedPlayerConnectionClass = Reflection
.getClass("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
if(minecraftConnectionClass == null)
if (minecraftConnectionClass == null)
minecraftConnectionClass = Reflection.getClass("com.velocitypowered.proxy.connection.MinecraftConnection");
Channel channel;
try {
Object connectedPlayerObj = connectedPlayerConnectionClass.cast(player),
minecraftConnectionObj = Reflection.getMethodsByName(connectedPlayerConnectionClass, "getConnection").get(0).invoke(connectedPlayerObj);
channel = (Channel) Reflection.getMethodsByName(minecraftConnectionClass, "getChannel").get(0).invoke(minecraftConnectionObj);
Object connectedPlayerObj = connectedPlayerConnectionClass.cast(player), minecraftConnectionObj = Reflection
.getMethodsByName(connectedPlayerConnectionClass, "getConnection").get(0)
.invoke(connectedPlayerObj);
channel = (Channel) Reflection.getMethodsByName(minecraftConnectionClass, "getChannel").get(0)
.invoke(minecraftConnectionObj);
if (channel == null) {
Logger.warning("Failed to inject " + player.getUsername() + "! Channel is null.");
return false;
}
if (channel.pipeline().names().contains(VelocityPacketAnalyzer.PIPELINE_NAME))
uninject(player);
channel.pipeline().addBefore(VelocityPacketAnalyzer.HANDLER_NAME, VelocityPacketAnalyzer.PIPELINE_NAME, new PacketDecoder(player));
channel.pipeline().addBefore(VelocityPacketAnalyzer.HANDLER_NAME, VelocityPacketAnalyzer.PIPELINE_NAME,
new PacketDecoder(player));
VelocityPacketAnalyzer.INJECTED_PLAYERS.put(player, channel);
} catch (NoSuchElementException e) {
Logger.warning("Failed to find 'handler' inside player pipeline! (name=" + player.getUsername() + ", uuid=" + player.getUniqueId() + ", version=" + player.getProtocolVersion() + ", brand=" + player.getClientBrand() + " )");
Logger.warning("Failed to find 'handler' inside player pipeline! (name=" + player.getUsername() + ", uuid="
+ player.getUniqueId() + ", version=" + player.getProtocolVersion() + ", brand="
+ player.getClientBrand() + " )");
return false;
} catch (Throwable throwable) {
throwable.printStackTrace();
} catch (Exception exception) {
if (!Storage.ConfigSections.Settings.INJECTION_FAILED.SUPPRESS_EXCEPTIONS) {
exception.printStackTrace();
}
return false;
}
return true;
}
public static void uninject(Player player) {
VelocityPacketAnalyzer.PLAYER_INPUT_CACHE.remove(player);
if(VelocityPacketAnalyzer.INJECTED_PLAYERS.containsKey(player)) {
if (VelocityPacketAnalyzer.INJECTED_PLAYERS.containsKey(player)) {
Channel channel = VelocityPacketAnalyzer.INJECTED_PLAYERS.get(player);
if(channel != null) {
if (channel != null) {
VelocityPacketAnalyzer.INJECTED_PLAYERS.remove(player);
channel.eventLoop().submit(() -> {
ChannelPipeline pipeline = channel.pipeline();
if (pipeline.names().contains(VelocityPacketAnalyzer.PIPELINE_NAME)) pipeline.remove(VelocityPacketAnalyzer.PIPELINE_NAME);
if (pipeline.names().contains(VelocityPacketAnalyzer.PIPELINE_NAME))
pipeline.remove(VelocityPacketAnalyzer.PIPELINE_NAME);
});
}
}
}
public static String getPlayerInput(Player player) {
String input = PLAYER_INPUT_CACHE.get(player);
PLAYER_INPUT_CACHE.remove(player);
return input;
}
public static void insertPlayerInput(Player player, String text) {
PLAYER_INPUT_CACHE.put(player, text.toLowerCase());
}
private static void modifyCommands(Player player, CommandSender sender, AvailableCommandsPacket commands) {
if (commands.getRootNode().getChildren().size() == 1
&& player.getProtocolVersion().getProtocol() > 340
if (commands.getRootNode().getChildren().size() == 1 && player.getProtocolVersion().getProtocol() > 340
&& commands.getRootNode().getChild("args") != null
&& commands.getRootNode().getChild("args").getChildren().isEmpty()) {
&& commands.getRootNode().getChild("args").getChildren().isEmpty())
{
return;
}
}
String serverName = sender.getServerName();
final boolean ignore = PermissionUtil.hasBypassPermission(sender) || Storage.Blacklist.isDisabledServer(serverName);
final boolean ignore = PermissionUtil.hasBypassPermission(sender)
|| Storage.Blacklist.isDisabledServer(serverName);
final ProxyCommandNodeHelper<CommandSource> helper = new ProxyCommandNodeHelper<>(commands.getRootNode());
final List<String> commandsAsString = new ArrayList<>();
commandsAsString.addAll(helper.getChildrenNames());
if (ignore) {
return;
}
final List<Group> groups = GroupManager.getPlayerGroups(sender);
final Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
if (!cache.containsKey(serverName)) {
cache.put(serverName, new CommandsCache());
}
final CommandsCache commandsCache = cache.get(serverName);
commandsCache.handleCommands(commandsAsString, serverName);
final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups,
serverName);
helper.removeIf(str -> {
if (str.equals("args")) {
return false;
}
return !playerCommands.contains(str);
});
if (Storage.ConfigSections.Settings.CUSTOM_VERSION.ALWAYS_TAB_COMPLETABLE) {
Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines().forEach(input -> helper.add(input, false));
Storage.ConfigSections.Settings.CUSTOM_VERSION.COMMANDS.getLines()
.forEach(input -> helper.add(input, false));
}
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.ALWAYS_TAB_COMPLETABLE) {
Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines().forEach(input -> helper.add(input, false));
Storage.ConfigSections.Settings.CUSTOM_PLUGIN.COMMANDS.getLines()
.forEach(input -> helper.add(input, false));
}
SubArguments.handleCommandNode(player.getUniqueId(), helper);
}
private static class PacketDecoder extends ChannelDuplexHandler {
@@ -210,15 +273,20 @@ public class VelocityPacketAnalyzer {
private final CommandSender sender;
private PacketDecoder(Player player) {
this.player = player;
this.sender = CommandSenderHandler.from(player);
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
if (!(msg instanceof MinecraftPacket)) {
super.channelRead(ctx, msg);
return;
}
MinecraftPacket packet = (MinecraftPacket) msg;
@@ -226,8 +294,10 @@ public class VelocityPacketAnalyzer {
if (packet.getClass().getSimpleName().equals("SignedChatCommand")) {
try {
if (signedChatCommandPacketClass == null)
signedChatCommandPacketClass = Class.forName("com.velocitypowered.proxy.crypto.SignedChatCommand");
signedChatCommandPacketClass = Class
.forName("com.velocitypowered.proxy.crypto.SignedChatCommand");
Object signedChatCommandPacket = signedChatCommandPacketClass.cast(packet);
Field commandField = signedChatCommandPacket.getClass().getField("command");
@@ -237,43 +307,70 @@ public class VelocityPacketAnalyzer {
return;
} catch (Exception exception) {
exception.printStackTrace();
}
}
if (packet instanceof UnsignedPlayerCommandPacket unsignedPlayerCommandPacket) {
if (!VelocityBlockCommandListener.handleCommand(player, unsignedPlayerCommandPacket.getCommand()).getResult().isAllowed())
if (!VelocityBlockCommandListener.handleCommand(player, unsignedPlayerCommandPacket.getCommand())
.getResult().isAllowed())
return;
}
if (packet instanceof TabCompleteRequestPacket request) {
if (request.getCommand() != null) {
if (Storage.ConfigSections.Settings.PATCH_EXPLOITS.isMalicious(request.getCommand())) {
MessageTranslator.send(VelocityLoader.getServer().getConsoleCommandSource(), Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%", player.getUsername()));
player.disconnect(LegacyComponentSerializer.legacyAmpersand().deserialize(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get()));
MessageTranslator.send(VelocityLoader.getServer().getConsoleCommandSource(),
Storage.ConfigSections.Settings.PATCH_EXPLOITS.ALERT_MESSAGE.get().replace("%player%",
player.getUsername()));
player.disconnect(LegacyComponentSerializer.legacyAmpersand()
.deserialize(Storage.ConfigSections.Settings.PATCH_EXPLOITS.KICK_MESSAGE.get()));
} else {
insertPlayerInput(player, request.getCommand());
super.channelRead(ctx, msg);
}
}
} else super.channelRead(ctx, msg);
} else
super.channelRead(ctx, msg);
}
@Override
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
if (!(msg instanceof MinecraftPacket)) {
super.write(ctx, msg, promise);
return;
}
MinecraftPacket packet = (MinecraftPacket) msg;
if (packet instanceof PluginMessagePacket pluginMessagePacket) {
if(CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessagePacket.getChannel()) && !player.getCurrentServer().isPresent()) {
if (CustomServerBrand.isEnabled() && CustomServerBrand.isBrandTag(pluginMessagePacket.getChannel())
&& !player.getCurrentServer().isPresent())
{
PacketUtils.BrandManipulate brandManipulatePacket = CustomServerBrand.createBrandPacket(player);
super.write(ctx, new PluginMessagePacket(pluginMessagePacket.getChannel(), brandManipulatePacket.getByteBuf()), promise);
super.write(ctx, new PluginMessagePacket(pluginMessagePacket.getChannel(),
brandManipulatePacket.getByteBuf()), promise);
return;
}
} else if (packet instanceof TabCompleteResponsePacket response) {
@@ -281,65 +378,102 @@ public class VelocityPacketAnalyzer {
String serverName = player.getCurrentServer().get().getServer().getServerInfo().getName();
if (Storage.Blacklist.isDisabledServer(serverName)) {
super.write(ctx, msg, promise);
return;
}
if (!PermissionUtil.hasBypassPermission(sender) && player.getCurrentServer().isPresent()) {
final List<Group> groups = GroupManager.getPlayerGroups(sender);
boolean cancelsBeforeHand = false;
String playerInput = getPlayerInput(player), rawPlayerInput = playerInput, server = player.getCurrentServer().get().getServerInfo().getName();
String playerInput = getPlayerInput(player), rawPlayerInput = playerInput,
server = player.getCurrentServer().get().getServerInfo().getName();
int spaces = 0;
if (playerInput.contains(" ")) {
String[] split = playerInput.split(" ");
spaces = split.length;
if (spaces > 0) playerInput = split[0];
if (spaces > 0)
playerInput = split[0];
}
if (!playerInput.equals("/")) {
cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups, StringUtils.replaceFirst(playerInput, "/", ""), server);
cancelsBeforeHand = !Storage.Blacklist.canPlayerAccessTab(sender, groups,
StringUtils.replaceFirst(playerInput, "/", ""), server);
if (!cancelsBeforeHand)
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", "")) || Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""));
cancelsBeforeHand = Storage.ConfigSections.Settings.CUSTOM_VERSION
.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""))
|| Storage.ConfigSections.Settings.CUSTOM_PLUGIN
.isTabCompletable(StringUtils.replaceFirst(playerInput, "/", ""));
}
final String cursor = playerInput;
if (!cursor.startsWith("/") && spaces < 2 && player.getProtocolVersion().getProtocol() >= 754) {
return;
}
if (cursor.startsWith("/")) {
if (spaces == 0) {
response.getOffers().removeIf(offer -> {
String command = offer.getText();
if (command.startsWith("/")) command = StringUtils.replaceFirst(command, "/", "");
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command)) {
if (spaces == 0) {
response.getOffers().removeIf(offer -> {
String command = offer.getText();
if (command.startsWith("/"))
command = StringUtils.replaceFirst(command, "/", "");
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command)
|| Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command))
{
return false;
}
return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command, player.getCurrentServer().get().getServerInfo().getName());
return !Storage.Blacklist.canPlayerAccessTab(sender, groups, command,
player.getCurrentServer().get().getServerInfo().getName());
});
} else {
if (cancelsBeforeHand) return;
if (cancelsBeforeHand)
return;
List<String> suggestionsAsString = new ArrayList<>();
response.getOffers().forEach(offer -> suggestionsAsString.add(offer.getText()));
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler.callFilteredTabCompletionEvents(player.getUniqueId(), rawPlayerInput, suggestionsAsString);
FilteredTabCompletionEvent filteredTabCompletionEvent = PATEventHandler
.callFilteredTabCompletionEvents(player.getUniqueId(), rawPlayerInput,
suggestionsAsString);
if (filteredTabCompletionEvent.isCancelled()) {
return;
}
response.getOffers().removeIf(offer -> !filteredTabCompletionEvent.getCompletion().contains(offer.getText()));
response.getOffers().removeIf(
offer -> !filteredTabCompletionEvent.getCompletion().contains(offer.getText()));
if (response.getOffers().isEmpty())
return;
if (response.getOffers().isEmpty()) return;
}
}
}
} else if (packet instanceof AvailableCommandsPacket commands) {
@@ -347,28 +481,33 @@ public class VelocityPacketAnalyzer {
if (player.getCurrentServer().isPresent()) {
if (!FAILED) {
modifyCommands(player, sender, commands);
super.write(ctx, msg, promise);
return;
}
if (!PermissionUtil.hasBypassPermission(player)) {
super.write(ctx, msg, promise);
return;
}
final String serverName = player.getCurrentServer().get().getServer().getServerInfo().getName();
if (Storage.Blacklist.isDisabledServer(serverName)) {
super.write(ctx, msg, promise);
return;
}
final List<Group> groups = GroupManager.getPlayerGroups(sender);
if(!commands.getRootNode().getChildren().isEmpty()) {
if (!commands.getRootNode().getChildren().isEmpty()) {
Map<String, CommandsCache> cache = Storage.getLoader().getCommandsCacheMap();
if (!cache.containsKey(serverName))
@@ -377,40 +516,59 @@ public class VelocityPacketAnalyzer {
CommandsCache commandsCache = cache.get(serverName);
List<String> commandsAsString = new ArrayList<>();
commands.getRootNode().getChildren().stream().filter(command -> command != null && command.getName() != null).forEach(command -> commandsAsString.add(command.getName()));
commands.getRootNode().getChildren().stream()
.filter(command -> command != null && command.getName() != null)
.forEach(command -> commandsAsString.add(command.getName()));
commandsCache.handleCommands(commandsAsString, serverName);
if (PermissionUtil.hasBypassPermission(player)) return;
if (PermissionUtil.hasBypassPermission(player))
return;
final boolean newer = player.getProtocolVersion().getProtocol() > 340;
final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender, groups, serverName);
final List<String> playerCommands = commandsCache.getPlayerCommands(commandsAsString, sender,
groups, serverName);
if (commands.getRootNode().getChildren().size() == 1 && newer
&& commands.getRootNode().getChild("args") != null
&& commands.getRootNode().getChild("args").getChildren().isEmpty()) {
&& commands.getRootNode().getChild("args").getChildren().isEmpty())
{
super.write(ctx, msg, promise);
return;
}
commands.getRootNode().getChildren().removeIf(command -> {
if (command == null || command.getName() == null)
return true;
if (command.getName().equals("args"))
return false;
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command.getName()) || Storage.ConfigSections.Settings.CUSTOM_VERSION.isTabCompletable(command.getName())) {
if (Storage.ConfigSections.Settings.CUSTOM_PLUGIN.isTabCompletable(command.getName())
|| Storage.ConfigSections.Settings.CUSTOM_VERSION
.isTabCompletable(command.getName()))
{
return false;
}
return !playerCommands.contains(command.getName());
});
}
}
}
super.write(ctx, msg, promise);
}
}
}
@@ -60,73 +60,95 @@ public class Storage {
public static final List<UUID> NOTIFY_PLAYERS = new ArrayList<>();
public static String TOKEN = "", SERVER_NAME = null, CURRENT_VERSION = "", NEWER_VERSION = "";
public static String TOKEN = "", CENSORED_TOKEN = "", SERVER_NAME = null, CURRENT_VERSION = "", NEWER_VERSION = "";
public static boolean OUTDATED = false, SEND_CONSOLE_NOTIFICATION = true;
public static Object PLUGIN_OBJECT;
public static boolean USE_PLACEHOLDERAPI = false, USE_PAPIPROXYBRIDGE = false, USE_VIAVERSION = false, USE_VELOCITY = false, USE_SIMPLECLOUD;
public static long LAST_SYNC = System.currentTimeMillis();
public static ExpireCache<UUID, String> TEMP_PLAYER_SERVER_CACHE = new ExpireCache<>(1, TimeUnit.SECONDS);
public static boolean USE_PLACEHOLDERAPI = false, USE_PAPIPROXYBRIDGE = false, USE_VIAVERSION = false;
private final static ExpireCache<UUID, String> TEMP_PLAYER_SERVER_CACHE = new ExpireCache<>(1, TimeUnit.SECONDS);
private static PermissionPlugin PERMISSION_PLUGIN = PermissionPlugin.NONE;
public static void initialize(PluginLoader loader, String currentVersion) {
LOADER = loader;
CURRENT_VERSION = currentVersion;
}
public static void setPermissionPlugin(PermissionPlugin permissionPlugin) {
if (PERMISSION_PLUGIN == PermissionPlugin.LUCKPERMS) {
return;
}
PERMISSION_PLUGIN = permissionPlugin;
}
public static void broadcastPermissionsPluginNotice() {
if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
return;
}
Logger.warning("No known permissions plugin found, so some features may be disabled.");
Logger.warning("Read more about it here: https://rayzs.de/products/proantitab/nkppf");
}
public static PermissionPlugin getPermissionPlugin() {
return PERMISSION_PLUGIN;
}
public static void loadAll(boolean loadBlacklist) {
loadConfig();
loadToken();
if (TOKEN != null && !TOKEN.isEmpty()) {
int tokenLength = TOKEN.length(), cutIndex = Math.max(1, tokenLength - 3);
String censoredTokenDisplay = "*".repeat(cutIndex) + TOKEN.substring(cutIndex);
Logger.info("Token found! (" + censoredTokenDisplay + ")");
int tokenLength = TOKEN.length(), cutIndex = Math.max(1, tokenLength - 2);
CENSORED_TOKEN = TOKEN.charAt(0) + "*".repeat(cutIndex) + TOKEN.substring(cutIndex);
Logger.info("Token found! (" + CENSORED_TOKEN + ")");
}
if (loadBlacklist) Blacklist.loadAll();
if (loadBlacklist)
Blacklist.loadAll();
PATEventHandler.callUpdatePluginEvents();
}
public static void loadToken() {
Files.TOKEN.reload();
boolean invalidEnv = false;
if (Reflection.isProxyServer()) {
boolean loadFromEnv = (Boolean) Files.TOKEN.getOrSet("load-from-env.enabled", false);
String envVariable = (String) Files.TOKEN.getOrSet("load-from-env.name", "PAT_TOKEN");
if (loadFromEnv) {
Logger.info("Looking up token from environment variable: " + envVariable);
TOKEN = System.getenv(envVariable);
if (TOKEN != null) {
return;
} else invalidEnv = true;
} else
invalidEnv = true;
}
TOKEN = (String) Files.TOKEN.getOrSet("token", UUID.randomUUID().toString());
@@ -135,21 +157,28 @@ public class Storage {
Logger.warning("Environment variable not found! Using default Token from the token.yml instead.");
return;
}
if (!ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) {
return;
}
boolean loadFromEnv = ConfigSections.Settings.HANDLE_THROUGH_PROXY.LOAD_FROM_ENV;
String envVariable = ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENV_NAME;
if (loadFromEnv) {
TOKEN = System.getenv(envVariable);
if (TOKEN != null) {
return;
} else invalidEnv = true;
} else
invalidEnv = true;
}
@@ -157,18 +186,22 @@ public class Storage {
if (invalidEnv)
Logger.warning("Environment variable not found! Using default Token from the config.yml instead.");
}
public static void loadConfig() {
ConfigSections.Settings.initialize();
ConfigSections.Messages.initialize();
ConfigSections.SECTIONS.forEach(ConfigStorage::load);
if (USE_PLACEHOLDERAPI)
ConfigSections.PLACEHOLDERS.forEach(PlaceholderStorage::load);
}
public static void reload() {
boolean proxy = Reflection.isProxyServer();
boolean backend = Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED && !proxy;
@@ -180,20 +213,33 @@ public class Storage {
GroupManager.initialize();
if (!proxy) {
BackendUpdater.stop();
BackendUpdater.start();
Communicator.get().reload();
BackendUpdater.restart();
}
if (!backend) {
Storage.handleChange();
}
if (proxy) {
Communicator.Proxy2Backend.sendDataSync();
}
ConfigUpdater.broadcastMissingParts();
Storage.getLoader().handleReload();
}
public static void handleChange() {
handleChange(null);
}
public static void handleChange(String server) {
@@ -207,30 +253,34 @@ public class Storage {
Storage.Blacklist.clearServerBlacklists(server);
Storage.Blacklist.loadCachedServerBlacklists(server);
List<String> associatedServers = getServers()
.stream()
.filter(s -> !s.equals(server) && isServer(server, s))
.toList();
List<String> associatedServers = getServers().stream()
.filter(s -> !s.equals(server) && isServer(server, s)).toList();
associatedServers.forEach(s -> {
Storage.Blacklist.clearServerBlacklists(s);
Storage.Blacklist.loadCachedServerBlacklists(s);
});
if (isVelocity) {
associatedServers.forEach(s -> {
List<UUID> playerIds = Storage.getLoader().getPlayerIdsByServer(s);
List<String> commands = new ArrayList<>(SubArguments.getServerCommands(s));
playerIds.forEach(playerId -> {
List<String> playerCommands = new ArrayList<>(commands);
playerCommands.addAll(SubArguments.getGroupCommands(playerId, s));
PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, true);
});
});
}
} else {
@@ -238,105 +288,152 @@ public class Storage {
Storage.Blacklist.Experimental.forceCacheReset();
if (isVelocity) {
List<UUID> playerIds = Storage.getLoader().getPlayerIds();
playerIds.forEach(playerId -> {
List<String> playerCommands = new ArrayList<>(SubArguments.getServerCommands(playerId));
playerCommands.addAll(SubArguments.getGroupCommands(playerId));
PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, false);
});
}
}
GroupManager.clearServerGroupBlacklists();
Communicator.syncData();
Storage.getLoader().updateCommandCache();
Communicator.sendPermissionReset();
if (!Reflection.isVelocityServer()) {
BungeePacketAnalyzer.sendCommandsPacket();
Communicator.sendUpdateCommand();
}
Communicator.Proxy2Backend.sendUpdateCommand();
return;
}
getLoader().handleReload();
PermissionUtil.reloadPermissions();
if (Reflection.getMinor() < 13) {
if (Reflection.isBefore(1, 13)) {
final List<UUID> playerIds = Storage.getLoader().getPlayerIds();
final List<String> commands = new ArrayList<>(Blacklist.BLACKLIST.getCommands());
playerIds.forEach(playerId -> {
List<String> playerCommands = new ArrayList<>(commands);
playerCommands.addAll(SubArguments.getGroupCommands(playerId));
PATEventHandler.callUpdatePlayerCommandsEvents(playerId, playerCommands, true);
});
} else {
BukkitAntiTabListener.handleTabCompletion();
}
}
public static void tempCachePlayerToServer(UUID playerId, String server) {
TEMP_PLAYER_SERVER_CACHE.put(playerId, server);
}
public static void getTempCachedPlayerToServer(UUID playerId, String server) {
TEMP_PLAYER_SERVER_CACHE.put(playerId, server);
}
public static String getCachedPlayerServername(UUID playerId) {
return TEMP_PLAYER_SERVER_CACHE.get(playerId);
}
// Quickly updates all player subarguments.
public static void quickSubArgumentUpdate(UUID uuid) {
List<String> playerCommands = new ArrayList<>(SubArguments.getServerCommands(uuid));
playerCommands.addAll(SubArguments.getGroupCommands(uuid));
PATEventHandler.callUpdatePlayerCommandsEvents(uuid, playerCommands, false);
}
public static PluginLoader getLoader() {
return LOADER;
}
public static List<String> getServers() {
return getServers(false);
}
public static List<String> getServers(boolean includingServerSpecifics) {
List<String> servers = LOADER.getServerNames();
if(includingServerSpecifics) {
if (includingServerSpecifics) {
servers.addAll(Blacklist.getBlacklists().stream().map(Map.Entry::getKey).toList());
}
return servers;
}
public static boolean isServer(String targetServers, List<String> servers) {
for (String originServer : servers)
if(isServer(originServer, targetServers))
if (isServer(originServer, targetServers))
return true;
return false;
}
public static boolean isServer(String originServer, String targetServer) {
originServer = originServer.toLowerCase();
targetServer = targetServer.toLowerCase();
if (originServer.endsWith("*")) {
originServer = originServer.substring(0, originServer.length() - 2);
return targetServer.startsWith(originServer);
}
return originServer.equalsIgnoreCase(targetServer);
}
public static class Files {
public static final ConfigurationBuilder
CONFIGURATION = Configurator.get("config"),
STORAGE = Configurator.get("storage"),
PLACEHOLDERS = Configurator.get("placeholders"),
CUSTOM_RESPONSES = Configurator.get("custom-responses"),
TOKEN = Configurator.get("token");
public static void initialize() {}
public static final ConfigurationBuilder CONFIGURATION = Configurator.get("config"),
STORAGE = Configurator.get("storage"), PLACEHOLDERS = Configurator.get("placeholders"),
CUSTOM_RESPONSES = Configurator.get("custom-responses"), TOKEN = Configurator.get("token");
public static void initialize() {
}
}
public static class ConfigSections {
@@ -349,7 +446,9 @@ public class Storage {
public static AllowGroupOverrulingSection ALLOW_GROUP_OVERRULING = new AllowGroupOverrulingSection();
public static AutoLowercaseCommandsSection AUTO_LOWERCASE_COMMANDS = new AutoLowercaseCommandsSection();
public static BlockNamespaceCommandsSection BLOCK_NAMESPACE_COMMANDS = new BlockNamespaceCommandsSection();
public static BlockSlashCommandsSection BLOCK_SLASH_COMMANDS = new BlockSlashCommandsSection();
public static HandleThroughProxySection HANDLE_THROUGH_PROXY = new HandleThroughProxySection();
public static InjectionFailedSection INJECTION_FAILED = new InjectionFailedSection();
public static PatchExploitSection PATCH_EXPLOITS = new PatchExploitSection();
public static CustomBrandSection CUSTOM_BRAND = new CustomBrandSection();
public static CancelCommandSection CANCEL_COMMAND = new CancelCommandSection();
@@ -366,7 +465,10 @@ public class Storage {
public static UpdateSection UPDATE = new UpdateSection();
public static void initialize() {}
public static void initialize() {
}
}
public static class Messages {
@@ -389,7 +491,10 @@ public class Storage {
public static StatsSection STATS = new StatsSection();
public static UpdatePermissionsSection UPDATE_PERMISSIONS = new UpdatePermissionsSection();
public static void initialize() {}
public static void initialize() {
}
}
public static class Placeholders {
@@ -418,34 +523,49 @@ public class Storage {
public static ListSortedCommandsPlaceholder LIST_SORTED_COMMANDS = new ListSortedCommandsPlaceholder();
public static ListSizeCommandsPlaceholder LIST_SIZE_COMMANDS = new ListSizeCommandsPlaceholder();
public static void initialize() {}
public static void initialize() {
}
public static String findAndReplace(Player player, String request) {
String result = null, param = "";
if(USE_PLACEHOLDERAPI) {
if (USE_PLACEHOLDERAPI) {
for (PlaceholderStorage storage : PLACEHOLDERS) {
if (!storage.getRequest().startsWith(request)) continue;
if (!storage.getRequest().startsWith(request))
continue;
if (storage.getRequest().endsWith("group_") && request.contains("group_"))
param = request.split("group_")[1];
result = storage.onRequest(player, param);
if (result == null) continue;
else result = result.replace("\\n", "\n");
if (result == null)
continue;
else
result = result.replace("\\n", "\n");
break;
}
// Second time because of nested placeholders
if (result != null && result.contains("%")) {
result = PlaceholderReplacer.replace(player, result);
}
}
return result;
}
}
}
public static class Blacklist {
@@ -453,33 +573,41 @@ public class Storage {
public static class Experimental {
public static void forceCacheReset() {
for (Object o : CACHED_SERVER_BLACKLIST.getCache().asMap().keySet()) {
String s = (String) o;
clearServerBlacklists(s);
loadCachedServerBlacklists(s);
}
}
}
public enum BlockType {
CHAT("[CMD]"),
TAB("[TAB]"),
NEGATE("!"),
CHAT("[CMD]"), TAB("[TAB]"), NEGATE("!"),
BOTH("");
private final String text;
BlockType(String text) {
this.text = text;
}
@Override
public String toString() {
return this.text;
}
}
private static final BlockType[] BLOCK_TYPES = BlockType.values();
@@ -491,41 +619,49 @@ public class Storage {
// General server-specific list (e.g: server-*)
private static final HashMap<String, GeneralBlacklist> SERVER_BLACKLISTS = new HashMap<>();
// Temporary list for all servers (e.g: server-1)
private static final ExpireCache<String, List<GeneralBlacklist>> CACHED_SERVER_BLACKLIST = new ExpireCache<>(1, TimeUnit.HOURS);
private static final ExpireCache<String, List<GeneralBlacklist>> CACHED_SERVER_BLACKLIST = new ExpireCache<>(1,
TimeUnit.HOURS);
public static void loadAll() {
CACHED_SERVER_BLACKLIST.clear();
SERVER_BLACKLISTS.clear();
BLACKLIST.load();
if(!Reflection.isProxyServer())
if (!Reflection.isProxyServer())
return;
IGNORED_SERVERS.load();
DISABLED_SERVERS.load();
BLACKLIST.getConfig().getKeys("global.servers", true).forEach(key -> {
GeneralBlacklist blacklist = BlacklistCreator.createGeneralBlacklist(key);
blacklist.load();
SERVER_BLACKLISTS.put(key, blacklist);
});
getServers().forEach(Blacklist::loadCachedServerBlacklists);
}
private static void loadCachedServerBlacklists(String server) {
List<GeneralBlacklist> blacklists = SERVER_BLACKLISTS.entrySet().stream()
.filter(entry ->
isServer(entry.getKey(), server)
).map(Map.Entry::getValue).toList();
.filter(entry -> isServer(entry.getKey(), server)).map(Map.Entry::getValue).toList();
CACHED_SERVER_BLACKLIST.put(server, blacklists);
}
public static GeneralBlacklist getServerBlacklist(String server) {
GeneralBlacklist blacklist = SERVER_BLACKLISTS.get(server);
if(blacklist != null) {
if (blacklist != null) {
return blacklist;
}
blacklist = BlacklistCreator.createGeneralBlacklist(server);
@@ -533,112 +669,171 @@ public class Storage {
SERVER_BLACKLISTS.put(server, blacklist);
return blacklist;
}
public static Set<Map.Entry<String, GeneralBlacklist>> getBlacklists() {
return SERVER_BLACKLISTS.entrySet();
}
public static GeneralBlacklist getBlacklist() {
return BLACKLIST;
}
public static List<GeneralBlacklist> getServerBlacklists(String server) {
if (!CACHED_SERVER_BLACKLIST.contains(server)) {
loadCachedServerBlacklists(server);
}
return CACHED_SERVER_BLACKLIST.get(server);
}
public static void clearServerBlacklists(String server) {
CACHED_SERVER_BLACKLIST.remove(server);
}
public static boolean isDisabledServer(String server) {
return DISABLED_SERVERS.isListed(server);
}
public static boolean isIgnoredServer(String server) {
return IGNORED_SERVERS.isListed(server);
}
public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command, BlockType type) {
public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command,
BlockType type)
{
return canPlayerAccess(sender, groups, command, type, null);
}
public static boolean canPlayerAccessChat(CommandSender sender, List<Group> groups, String command) {
return canPlayerAccess(sender, groups, command, BlockType.CHAT, null);
}
public static boolean canPlayerAccessChat(CommandSender sender, List<Group> groups, String command,
String server)
{
public static boolean canPlayerAccessChat(CommandSender sender, List<Group> groups, String command, String server) {
return canPlayerAccess(sender, groups, command, BlockType.CHAT, server);
}
public static boolean canPlayerAccessTab(CommandSender sender, List<Group> groups, String command) {
return canPlayerAccess(sender, groups, command, BlockType.TAB, null);
}
public static boolean canPlayerAccessTab(CommandSender sender, List<Group> groups, String command, String server) {
public static boolean canPlayerAccessTab(CommandSender sender, List<Group> groups, String command,
String server)
{
return canPlayerAccess(sender, groups, command, BlockType.TAB, server);
}
public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command, BlockType type, String server) {
public static boolean canPlayerAccess(CommandSender sender, List<Group> groups, String command, BlockType type,
String server)
{
final boolean allowGroupOverruling = ConfigSections.Settings.ALLOW_GROUP_OVERRULING.ENABLED;
final boolean blocked = isBlocked(command, type, server);
if (allowGroupOverruling) {
GroupManager.AccessResult groupResult = GroupManager.canAccessCommand(groups, command, type, server);
if (groupResult == GroupManager.AccessResult.NEGATED) {
return false;
}
if (!blocked) {
return true;
}
if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
if (PermissionUtil.hasBypassPermission(sender, command)) {
return true;
}
}
return groupResult.asBoolean();
}
if (!blocked) {
return true;
}
if (Storage.getPermissionPlugin() != PermissionPlugin.NONE) {
if (PermissionUtil.hasBypassPermission(sender, command)) {
return true;
}
}
return GroupManager.canAccessCommand(groups, command, type, server).asBoolean();
}
public static boolean isBlockedChat(String command) {
return isBlocked(command, BlockType.CHAT, null);
}
public static boolean isBlockedTab(String command) {
return isBlocked(command, BlockType.TAB, null);
}
public static boolean isBlockedChat(String command, String server) {
return isBlocked(command, BlockType.CHAT, server);
}
public static boolean isBlockedTab(String command, String server) {
return isBlocked(command, BlockType.TAB, server);
}
public static boolean isBlocked(String command, BlockType type) {
return isBlocked(command, type, null);
}
public static boolean isBlocked(String command, BlockType type, String server) {
@@ -646,18 +841,21 @@ public class Storage {
BlockType negation = BlockType.NEGATE;
String negatedCommand = negation + command;
boolean all = isListed("*", type, server),
listed = isListed(command, type, server),
boolean all = isListed("*", type, server), listed = isListed(command, type, server),
negatedListed = isListed(negatedCommand, type, server),
turn = ConfigSections.Settings.TURN_BLACKLIST_TO_WHITELIST.ENABLED;
if (all) {
// Only listens to negated commands
if (negatedListed) {
return turn;
}
return !turn;
}
return turn != listed;
@@ -665,8 +863,11 @@ public class Storage {
}
private static boolean isListed(String unmodifiedCommand, BlockType type, String server) {
if (server != null && isDisabledServer(server)) {
return false;
}
boolean listed = false;
@@ -674,16 +875,21 @@ public class Storage {
String command = type.toString() + unmodifiedCommand;
if (server == null || !isIgnoredServer(server)) {
listed = BLACKLIST.isListed(command, false);
}
if (server == null) {
if (!listed && type != BlockType.BOTH) {
return isListed(unmodifiedCommand, BlockType.BOTH, null);
}
return listed;
}
List<GeneralBlacklist> blacklists = new ArrayList<>(getServerBlacklists(server));
@@ -691,25 +897,35 @@ public class Storage {
blacklists.add(BLACKLIST);
for (GeneralBlacklist blacklist : blacklists) {
if (listed) {
break;
}
listed = blacklist.isListed(command, false);
}
if (!listed && type != BlockType.BOTH) {
return isListed(unmodifiedCommand, BlockType.BOTH, server);
}
return listed;
}
public static class BlockTypeFetcher {
public static boolean isNegated(String command) {
if (command.isEmpty()) {
return false;
}
boolean negated = command.charAt(0) == '!';
@@ -718,42 +934,58 @@ public class Storage {
negated = command.charAt(5) == '!';
return negated;
}
public static BlockType getType(String command) {
for (BlockType blockType : BLOCK_TYPES) {
if (!command.startsWith(blockType.toString()))
continue;
return blockType;
}
return null;
}
public static String modify(String command) {
BlockType type = getType(command);
return modify(command, type);
}
public static String modify(String command, BlockType type) {
if (type == null || type == BlockType.BOTH || command.length() <= type.toString().length() || !command.startsWith(type.toString()))
if (type == null || type == BlockType.BOTH || command.length() <= type.toString().length()
|| !command.startsWith(type.toString()))
return command;
return command.substring(type.toString().length());
}
// Remove all BlockType elements from String
public static String cleanse(String command) {
BlockType type = getType(command);
if (type == null || type == BlockType.BOTH) {
return command;
}
return modify(command, type);
}
}
}
}
@@ -9,31 +9,47 @@ public abstract class StorageTemplate implements Serializable {
private final ConfigurationBuilder configuration;
public StorageTemplate(ConfigurationBuilder configuration, String navigatePath) {
this.navigatePath = navigatePath;
this.configuration = configuration;
this.load();
}
public StorageTemplate setIfEmpty(String target, Object obj) {
configuration.getOrSet(target, obj);
return this;
}
public StorageTemplate set(String target, Object obj) {
configuration.setAndSave(target, obj);
return this;
}
public Object get(String target, Object obj) {
configuration.getOrSet(target, obj);
return this;
}
public ConfigurationBuilder getConfig() {
return configuration;
}
public String getNavigatePath() {
return navigatePath;
}
public String getNavigatePath() { return navigatePath; }
public abstract void save();
public abstract void load();
}
@@ -6,31 +6,44 @@ import de.rayzs.pat.api.storage.Storage;
public class BlacklistCreator {
public static GeneralBlacklist createGeneralBlacklist() {
return new GeneralBlacklist("commands");
}
public static GeneralBlacklist createGeneralBlacklist(String server) {
return new GeneralBlacklist("servers." + server + ".commands");
}
public static GroupBlacklist createGroupBlacklist(String group) {
return new GroupBlacklist(group, "commands");
}
public static GroupBlacklist createGroupBlacklist(String group, String server, boolean ignoreExist) {
if (!exist(group, server) && !ignoreExist)
return null;
return new GroupBlacklist(group, "servers." + server + ".commands");
}
public static boolean exist(String server) {
Object obj = Storage.Blacklist.getBlacklist().getConfig().get("global.servers." + server);
return obj != null;
}
public static boolean exist(String group, String server) {
Object obj = Storage.Blacklist.getBlacklist().getConfig().get("groups." + group + ".servers." + server);
return obj != null;
}
}
@@ -6,55 +6,80 @@ import java.util.List;
public class GeneralBlacklist extends BlacklistStorage {
public GeneralBlacklist(String navigatePath) { super("global." + navigatePath); }
public GeneralBlacklist(String navigatePath) {
super("global." + navigatePath);
}
@Override
public List<String> getCommands() {
return super.getCommands();
}
@Override
public BlacklistStorage add(String command) {
return super.add(command);
}
@Override
public BlacklistStorage remove(String command) {
return super.remove(command);
}
@Override
public BlacklistStorage clear() {
return super.clear();
}
@Override
public StorageTemplate setIfEmpty(String target, Object obj) {
return super.setIfEmpty(target, obj);
}
@Override
public StorageTemplate set(String target, Object obj) {
return super.set(target, obj);
}
@Override
public void setList(List<String> commands) {
super.setList(commands);
}
@Override
public Object get(String target, Object obj) {
return super.get(target, obj);
}
@Override
public void save() {
super.save();
}
@Override
public void load() {
super.load();
}
}
@@ -5,36 +5,51 @@ import de.rayzs.pat.api.storage.storages.IgnoredServersStorage;
public class GeneralIgnoredServers extends IgnoredServersStorage {
public GeneralIgnoredServers() {
super("global.ignored-servers");
}
@Override
public IgnoredServersStorage add(String server) {
return super.add(server);
}
@Override
public IgnoredServersStorage remove(String server) {
return super.remove(server);
}
@Override
public boolean isListed(String server) {
return super.isListed(server);
}
@Override
public boolean isListEmpty() {
return super.isListEmpty();
}
@Override
public void load() {
super.load();
}
@Override
public void save() {
super.save();
}
}
@@ -6,53 +6,80 @@ import java.util.List;
public class GroupBlacklist extends BlacklistStorage {
public GroupBlacklist(String group, String navigatePath) { super("groups." + group + "." + navigatePath); }
public GroupBlacklist(String group, String navigatePath) {
super("groups." + group + "." + navigatePath);
}
@Override
public List<String> getCommands() {
return super.getCommands();
}
@Override
public BlacklistStorage add(String command) {
return super.add(command);
}
@Override
public BlacklistStorage remove(String command) { return super.remove(command); }
public BlacklistStorage remove(String command) {
return super.remove(command);
}
@Override
public BlacklistStorage clear() {
return super.clear();
}
@Override
public StorageTemplate setIfEmpty(String target, Object obj) {
return super.setIfEmpty(target, obj);
}
@Override
public StorageTemplate set(String target, Object obj) {
return super.set(target, obj);
}
@Override
public void setList(List<String> commands) {
super.setList(commands);
}
@Override
public Object get(String target, Object obj) {
return super.get(target, obj);
}
@Override
public void save() {
super.save();
}
@Override
public void load() {
super.load();
}
}
@@ -16,36 +16,56 @@ public class BlacklistSection extends ConfigStorage {
public String REMOVE_SERVER_SUCCESS, REMOVE_SERVER_FAILED;
public BlacklistSection() {
super("blacklist");
}
@Override
public void load() {
super.load();
CLEAR = new ConfigSectionHelper<String>(this, "clear", "&aList has been cleared!").getOrSet();
CLEAR_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation", "&4Warning! &7This command will &cclear the entire list&7! &7Repeat the &esame command &7to confirm this action.").getOrSet();
CLEAR_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation",
"&4Warning! &7This command will &cclear the entire list&7! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message", "&7Listed commands (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message",
"&7Listed commands (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, &f").getOrSet();
ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success", "&aSuccessfully added %command% into the list!").getOrSet();
ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed", "&c%command% is already in the list!").getOrSet();
ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success",
"&aSuccessfully added %command% into the list!").getOrSet();
ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed", "&c%command% is already in the list!")
.getOrSet();
REMOVE_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success", "&aSuccessfully removed %command% from the list!").getOrSet();
REMOVE_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success",
"&aSuccessfully removed %command% from the list!").getOrSet();
REMOVE_FAILED = new ConfigSectionHelper<String>(this, "remove.failed", "&c%command% is not listed!").getOrSet();
if(!Reflection.isProxyServer()) return;
if (!Reflection.isProxyServer())
return;
CLEAR_SERVER = new ConfigSectionHelper<String>(this, "clear-server", "&aList has been cleared!").getOrSet();
CLEAR_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation-server", "&4Warning! &7This command will &cclear the entire list of this server&7! &7Repeat the &esame command &7to confirm this action.").getOrSet();
CLEAR_SERVER_NOT_FOUND = new ConfigSectionHelper<String>(this, "clear-server-not-found", "&cThe server %server% does not have any commands!").getOrSet();
CLEAR_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation-server",
"&4Warning! &7This command will &cclear the entire list of this server&7! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
CLEAR_SERVER_NOT_FOUND = new ConfigSectionHelper<String>(this, "clear-server-not-found",
"&cThe server %server% does not have any commands!").getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server", "&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server",
"&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, &f").getOrSet();
ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server", "&aSuccessfully added %command% into the list of %server%!").getOrSet();
ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server", "&c%command% is already in the list of %server%!").getOrSet();
ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server",
"&aSuccessfully added %command% into the list of %server%!").getOrSet();
ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server",
"&c%command% is already in the list of %server%!").getOrSet();
REMOVE_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success-server",
"&aSuccessfully removed %command% from the list of %server%!").getOrSet();
REMOVE_SERVER_FAILED = new ConfigSectionHelper<String>(this, "remove.failed-server",
"&c%command% is not the list of %server%!").getOrSet();
REMOVE_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success-server", "&aSuccessfully removed %command% from the list of %server%!").getOrSet();
REMOVE_SERVER_FAILED = new ConfigSectionHelper<String>(this, "remove.failed-server", "&c%command% is not the list of %server%!").getOrSet();
}
}
@@ -8,12 +8,18 @@ public class CommandFailedSection extends ConfigStorage {
public String MESSAGE;
public CommandFailedSection() {
super("command-failed");
}
@Override
public void load() {
super.load();
MESSAGE = new ConfigSectionHelper<String>(this, null, "&cFailed to execute this command! Use \"/pat\" to see all available commands.").getOrSet();
MESSAGE = new ConfigSectionHelper<String>(this, null,
"&cFailed to execute this command! Use \"/pat\" to see all available commands.").getOrSet();
}
}
@@ -9,17 +9,23 @@ public class ConvertSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE;
public ConvertSection() {
super("convert");
}
public String INVALID_CONVERTER, SUCCESS;
@Override
public void load() {
super.load();
INVALID_CONVERTER = new ConfigSectionHelper<String>(this, "converter-not-found", "&cConverter or necessary files could not be found!").getOrSet();
SUCCESS = new ConfigSectionHelper<String>(this, "success", "&aSuccessfully converted &e%converter% &ainto the PAT storage.yml!").getOrSet();
INVALID_CONVERTER = new ConfigSectionHelper<String>(this, "converter-not-found",
"&cConverter or necessary files could not be found!").getOrSet();
SUCCESS = new ConfigSectionHelper<String>(this, "success",
"&aSuccessfully converted &e%converter% &ainto the PAT storage.yml!").getOrSet();
}
}
@@ -10,22 +10,31 @@ public class ExtractSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE;
public ExtractSection() {
super("extract");
}
public String USAGE, PLUGIN_NOT_FOUND, SUCCESS;
@Override
public void load() {
super.load();
if (Reflection.isProxyServer()) {
return;
}
USAGE = new ConfigSectionHelper<String>(this, "usage", "&7Usage: &f/pat extract (plugin) <option> &7or &f(group) <option>").getOrSet();
PLUGIN_NOT_FOUND = new ConfigSectionHelper<String>(this, "plugin-not-found", "&cPlugin %plugin% not found!").getOrSet();
SUCCESS = new ConfigSectionHelper<String>(this, "success", "&aSuccessfully extracted &e%amount% &anew commands from %plugin%!").getOrSet();
USAGE = new ConfigSectionHelper<String>(this, "usage",
"&7Usage: &f/pat extract (plugin) <option> &7or &f(group) <option>").getOrSet();
PLUGIN_NOT_FOUND = new ConfigSectionHelper<String>(this, "plugin-not-found", "&cPlugin %plugin% not found!")
.getOrSet();
SUCCESS = new ConfigSectionHelper<String>(this, "success",
"&aSuccessfully extracted &e%amount% &anew commands from %plugin%!").getOrSet();
}
}
@@ -6,7 +6,8 @@ import de.rayzs.pat.utils.Reflection;
public class GroupSection extends ConfigStorage {
public String CREATE, ALREADY_EXIST, DOES_NOT_EXIST, DELETE, DELETE_CONFIRM, CREATE_SERVER, ALREADY_SERVER_EXIST, DOES_NOT_EXIST_SERVER, DELETE_SERVER, DELETE_SERVER_CONFIRM;
public String CREATE, ALREADY_EXIST, DOES_NOT_EXIST, DELETE, DELETE_CONFIRM, CREATE_SERVER, ALREADY_SERVER_EXIST,
DOES_NOT_EXIST_SERVER, DELETE_SERVER, DELETE_SERVER_CONFIRM;
public String CLEAR, CLEAR_CONFIRM, CLEAR_SERVER, CLEAR_SERVER_CONFIRM;
public String PRIORITY_SUCCESS, PRIORITY_FAILED;
@@ -21,62 +22,99 @@ public class GroupSection extends ConfigStorage {
public String REMOVE_SERVER_SUCCESS, REMOVE_SERVER_FAILED;
public GroupSection() {
super("group");
}
@Override
public void load() {
super.load();
CREATE = new ConfigSectionHelper<String>(this, "create", "&aGroup %group% has been created!").getOrSet();
ALREADY_EXIST = new ConfigSectionHelper<String>(this, "already-exist", "&cGroup %group% already exist!").getOrSet();
DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "does-not-exist", "&cGroup %group% does not exist!").getOrSet();
ALREADY_EXIST = new ConfigSectionHelper<String>(this, "already-exist", "&cGroup %group% already exist!")
.getOrSet();
DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "does-not-exist", "&cGroup %group% does not exist!")
.getOrSet();
DELETE = new ConfigSectionHelper<String>(this, "delete", "&cGroup %group% has been deleted!").getOrSet();
DELETE_CONFIRM = new ConfigSectionHelper<String>(this, "delete-confirmation", "&4Warning! &7This command will &cdelete the group with the whole list&7 of this group! &7Repeat the &esame command &7to confirm this action.").getOrSet();
DELETE_CONFIRM = new ConfigSectionHelper<String>(this, "delete-confirmation",
"&4Warning! &7This command will &cdelete the group with the whole list&7 of this group! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
CLEAR = new ConfigSectionHelper<String>(this, "clear", "&aList of group %group% has been cleared!").getOrSet();
CLEAR_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation", "&4Warning! &7This command will &cclear the entire list&7 of this group! &7Repeat the &esame command &7to confirm this action.").getOrSet();
CLEAR_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation",
"&4Warning! &7This command will &cclear the entire list&7 of this group! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
PRIORITY_SUCCESS = new ConfigSectionHelper<String>(this, "priority.success", "&aSuccessfully set the priority of group &e%group% &ato &e%priority%&a!").getOrSet();
PRIORITY_FAILED = new ConfigSectionHelper<String>(this, "priority.failed", "&cInvalid priority! Please choose a number which is greater than 0.").getOrSet();
PRIORITY_SUCCESS = new ConfigSectionHelper<String>(this, "priority.success",
"&aSuccessfully set the priority of group &e%group% &ato &e%priority%&a!").getOrSet();
PRIORITY_FAILED = new ConfigSectionHelper<String>(this, "priority.failed",
"&cInvalid priority! Please choose a number which is greater than 0.").getOrSet();
LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message", "&7Listed commands of group %group% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_MESSAGE = new ConfigSectionHelper<String>(this, "list.message",
"&7Listed commands of group %group% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter", "&7, &f").getOrSet();
LIST_PRIORITY_MESSAGE = new ConfigSectionHelper<String>(this, "list-priorities.message", "&7List of all group priorities (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_PRIORITY_MESSAGE = new ConfigSectionHelper<String>(this, "list-priorities.message",
"&7List of all group priorities (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_PRIORITY_SPLITTER = new ConfigSectionHelper<String>(this, "list-priorities.splitter", "\\n").getOrSet();
LIST_PRIORITY_GROUPS = new ConfigSectionHelper<String>(this, "list-priorities.group", "&8- &e%priority%&8: &e%group%").getOrSet();
LIST_PRIORITY_GROUPS = new ConfigSectionHelper<String>(this, "list-priorities.group",
"&8- &e%priority%&8: &e%group%").getOrSet();
LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message", "&7All groups (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message",
"&7All groups (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter", "&7, &f").getOrSet();
ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success", "&aSuccessfully added %command% into the list of group %group%!").getOrSet();
ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed", "&c%command% is already in the list of group %group%!").getOrSet();
ADD_SUCCESS = new ConfigSectionHelper<String>(this, "add.success",
"&aSuccessfully added %command% into the list of group %group%!").getOrSet();
ADD_FAILED = new ConfigSectionHelper<String>(this, "add.failed",
"&c%command% is already in the list of group %group%!").getOrSet();
REMOVE_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success", "&aSuccessfully removed %command% from the list of group %group%!").getOrSet();
REMOVE_FAILED = new ConfigSectionHelper<String>(this, "remove.failed", "&c%command% is not listed in the group %group%!").getOrSet();
if(!Reflection.isProxyServer()) return;
REMOVE_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success",
"&aSuccessfully removed %command% from the list of group %group%!").getOrSet();
REMOVE_FAILED = new ConfigSectionHelper<String>(this, "remove.failed",
"&c%command% is not listed in the group %group%!").getOrSet();
if (!Reflection.isProxyServer())
return;
CREATE_SERVER = new ConfigSectionHelper<String>(this, "create-server", "&aGroup %group% for %server% has been created!").getOrSet();
ALREADY_SERVER_EXIST = new ConfigSectionHelper<String>(this, "already-exist-server", "&cGroup %group% for %server% already exist!").getOrSet();
DOES_NOT_EXIST_SERVER = new ConfigSectionHelper<String>(this, "does-not-exist-server", "&cGroup %group% of %server% does not exist!").getOrSet();
DELETE_SERVER = new ConfigSectionHelper<String>(this, "delete-server", "&cGroup %group% of %server% has been deleted!").getOrSet();
DELETE_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "delete-confirmation-server", "&4Warning! &7This command will &cdelete the group of the server %server% with the whole list&7 of this group! &7Repeat the &esame command &7to confirm this action.").getOrSet();
CREATE_SERVER = new ConfigSectionHelper<String>(this, "create-server",
"&aGroup %group% for %server% has been created!").getOrSet();
ALREADY_SERVER_EXIST = new ConfigSectionHelper<String>(this, "already-exist-server",
"&cGroup %group% for %server% already exist!").getOrSet();
DOES_NOT_EXIST_SERVER = new ConfigSectionHelper<String>(this, "does-not-exist-server",
"&cGroup %group% of %server% does not exist!").getOrSet();
DELETE_SERVER = new ConfigSectionHelper<String>(this, "delete-server",
"&cGroup %group% of %server% has been deleted!").getOrSet();
DELETE_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "delete-confirmation-server",
"&4Warning! &7This command will &cdelete the group of the server %server% with the whole list&7 of this group! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
CLEAR_SERVER = new ConfigSectionHelper<String>(this, "clear-server", "&aList of group %group% from %server% has been cleared!").getOrSet();
CLEAR_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation-server", "&4Warning! &7This command will &cclear the entire list&7 of this group for %server%! &7Repeat the &esame command &7to confirm this action.").getOrSet();
CLEAR_SERVER = new ConfigSectionHelper<String>(this, "clear-server",
"&aList of group %group% from %server% has been cleared!").getOrSet();
CLEAR_SERVER_CONFIRM = new ConfigSectionHelper<String>(this, "clear-confirmation-server",
"&4Warning! &7This command will &cclear the entire list&7 of this group for %server%! &7Repeat the &esame command &7to confirm this action.")
.getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server", "&7Listed commands of group %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.message-server",
"&7Listed commands of group %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.splitter-server", "&7, &f").getOrSet();
LIST_GROUP_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message-server", "&7All groups from %server% (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_GROUP_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter-server", "&7, &f").getOrSet();
LIST_GROUP_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list-groups.message-server",
"&7All groups from %server% (&f%size%&7)&8: &f%groups%").getOrSet();
LIST_GROUP_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list-groups.splitter-server", "&7, &f")
.getOrSet();
ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server", "&aSuccessfully added %command% into the list of group %group% for %server%!").getOrSet();
ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server", "&c%command% is already in the list of group %group% of %server%!").getOrSet();
ADD_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "add.success-server",
"&aSuccessfully added %command% into the list of group %group% for %server%!").getOrSet();
ADD_SERVER_FAILED = new ConfigSectionHelper<String>(this, "add.failed-server",
"&c%command% is already in the list of group %group% of %server%!").getOrSet();
REMOVE_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success-server", "&aSuccessfully removed %command% from the list of group %group% from %server%!").getOrSet();
REMOVE_SERVER_FAILED = new ConfigSectionHelper<String>(this, "remove.failed-server", "&c%command% is not listed in the group %group% of %server%!").getOrSet();
REMOVE_SERVER_SUCCESS = new ConfigSectionHelper<String>(this, "remove.success-server",
"&aSuccessfully removed %command% from the list of group %group% from %server%!").getOrSet();
REMOVE_SERVER_FAILED = new ConfigSectionHelper<String>(this, "remove.failed-server",
"&c%command% is not listed in the group %group% of %server%!").getOrSet();
}
}
@@ -10,56 +10,44 @@ public class HelpSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE;
public HelpSection() {
super("help");
}
@Override
public void load() {
super.load();
MESSAGE = new MultipleMessagesHelper(this, null, Reflection.isProxyServer() ?
Arrays.asList(
"&7Available commands are: &f/%label%&7..."
, "&7Format: &8<optional> (required)"
, "&f reload &7to reload the plugin"
, "&f notify &7to get alerted"
, "&f info &7to get a few information"
, "&f postdebug &7to post the PAT logs"
, "&f update <player> &7to update player(s) permissions"
, "&f perms <player> &7to check a player's permissions"
, "&f extract (plugin) &7to extract all plugin commands"
, "&f convert (plugin) &7converts into a PAT storage.yml"
, "&f creategroup (group) &7Create a group"
, "&f deletegroup (group) &7Delete a group"
, "&f setpriority (group) (priority) &7to set the priority"
, "&f list &8(optional: group) &7to see all listed commands"
, "&f listgroups &7List all groups"
, "&f listpriorities &7to list all group priorities"
, "&f add/rem (command) &8<group> &7to manage the list"
, "&f clear &8<group> &7to clear the list")
:
Arrays.asList(
"&7Available commands are: &f/%label%&7..."
, "&7Format: &8<optional> (required)"
, "&f reload &7to reload the plugin"
, "&f notify &7to get alerted"
, "&f info &7to get a few information"
, "&f postdebug &7to post the PAT logs"
, "&f update <player> &7to update player(s) permissions"
, "&f perms <player> &7to check a player's permissions"
, "&f extract (plugin) &7to extract all plugin commands"
, "&f creategroup (group) &7Create a group"
, "&f deletegroup (group) &7Delete a group"
, "&f setpriority (group) (priority) &7to set the priority"
, "&f list &8<group> &7to see all listed commands"
, "&f listgroups &8<server> &7List all groups"
, "&f listpriorities &7to list all group priorities"
, "&f add/rem (command) &8<group> &7to manage the list"
, "&f clear &8<group> &7to clear the list"
, "&7 For a specific server:"
, "&f serv list (server) &8<group>"
, "&f serv add/rem (server) (command) &8<group>"
, "&f serv clear (server) &8<group>"
));
MESSAGE = new MultipleMessagesHelper(this, null, Reflection.isProxyServer() ? Arrays.asList(
"&7Available commands are: &f/%label%&7...", "&7Format: &8<optional> (required)",
"&f reload &7to reload the plugin", "&f notify &7to get alerted",
"&f info &7to get a few information", "&f postdebug &7to post the PAT logs",
"&f update <player> &7to update player(s) permissions",
"&f perms <player> &7to check a player's permissions",
"&f extract (plugin) &7to extract all plugin commands",
"&f convert (plugin) &7converts into a PAT storage.yml", "&f creategroup (group) &7Create a group",
"&f deletegroup (group) &7Delete a group", "&f setpriority (group) (priority) &7to set the priority",
"&f list &8(optional: group) &7to see all listed commands", "&f listgroups &7List all groups",
"&f listpriorities &7to list all group priorities",
"&f add/rem (command) &8<group> &7to manage the list", "&f clear &8<group> &7to clear the list")
: Arrays.asList("&7Available commands are: &f/%label%&7...", "&7Format: &8<optional> (required)",
"&f reload &7to reload the plugin", "&f notify &7to get alerted",
"&f info &7to get a few information", "&f postdebug &7to post the PAT logs",
"&f update <player> &7to update player(s) permissions",
"&f perms <player> &7to check a player's permissions",
"&f extract (plugin) &7to extract all plugin commands",
"&f creategroup (group) &7Create a group", "&f deletegroup (group) &7Delete a group",
"&f setpriority (group) (priority) &7to set the priority",
"&f list &8<group> &7to see all listed commands",
"&f listgroups &8<server> &7List all groups",
"&f listpriorities &7to list all group priorities",
"&f add/rem (command) &8<group> &7to manage the list",
"&f clear &8<group> &7to clear the list", "&7 For a specific server:",
"&f serv list (server) &8<group>", "&f serv add/rem (server) (command) &8<group>",
"&f serv clear (server) &8<group>"));
}
}
@@ -1,36 +1,46 @@
package de.rayzs.pat.api.storage.config.messages;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.Reflection;
import de.rayzs.pat.utils.configuration.helper.*;
import java.util.Arrays;
public class InfoSection extends ConfigStorage {
public String VERSION_OUTDATED, VERSION_UPDATED, SYNC_TIME, SYNC_DISABLED;
public String VERSION_OUTDATED, VERSION_UPDATED, SYNC_TIME, SYNC_DISABLED, SYNC_WAITING;
public MultipleMessagesHelper MESSAGE;
public InfoSection() {
super("info");
}
@Override
public void load() {
super.load();
VERSION_UPDATED = new ConfigSectionHelper<String>(this, "version.updated", "&aLatest version").getOrSet();
VERSION_OUTDATED = new ConfigSectionHelper<String>(this, "version.outdated", "&cOutdated (%newest_version%)").getOrSet();
VERSION_OUTDATED = new ConfigSectionHelper<String>(this, "version.outdated", "&cOutdated (%newest_version%)")
.getOrSet();
SYNC_TIME = new ConfigSectionHelper<String>(this, "proxy-sync.time", "&e%time%").getOrSet();
if (!Reflection.isProxyServer()) {
SYNC_WAITING = new ConfigSectionHelper<String>(this, "proxy-sync.waiting",
"&cWaiting to establish connection...").getOrSet();
}
SYNC_DISABLED = new ConfigSectionHelper<String>(this, "proxy-sync.disabled", "&cDisabled").getOrSet();
MESSAGE = new MultipleMessagesHelper(this, "message",
Arrays.asList(
"&7Necessary information about &fPAT&8:"
, "&7 Version: &e%current_version%"
, "&7 Status: %version_status%"
, "&7 Last sync with proxy: &e%sync_time%"
, "&7 Proxy sync-token: &e%token%"
, "&7 Proxy-received server name: &e%sync_server_name%"
)
);
Arrays.asList("&7Necessary information about &fPAT&8:", "&7 Version: &e%current_version%",
"&7 Status: %version_status%", "&7 Last sync with proxy: &e%sync_time%",
"&7 Last received alive packet: %last_alive_response%", "&7 Proxy sync-token: &e%token%",
"&7 Proxy-received server name: &e%sync_server_name%"));
}
}
@@ -8,12 +8,19 @@ public class NoPermissionSection extends ConfigStorage {
public String MESSAGE;
public NoPermissionSection() {
super("no-permissions");
}
@Override
public void load() {
super.load();
MESSAGE = new ConfigSectionHelper<String>(this, null, "&cYou are not allowed to execute this command! Missing permission: &4proantitab.%permission%").getOrSet();
MESSAGE = new ConfigSectionHelper<String>(this, null,
"&cYou are not allowed to execute this command! Missing permission: &4proantitab.%permission%")
.getOrSet();
}
}
@@ -11,14 +11,22 @@ public class NotificationSection extends ConfigStorage {
public MultipleMessagesHelper ALERT;
public NotificationSection() {
super("notification");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<String>(this, "enabled", "&aEnabled notifications").getOrSet();
DISABLED = new ConfigSectionHelper<String>(this, "disabled", "&cDisabled notifications").getOrSet();
ALERT = new MultipleMessagesHelper(this, "alert", Collections.singletonList("&8[&4ALERT&8] &c%player% &8(&7" + (Reflection.isProxyServer() ? "server: &e%server%" : "world: &e%world%") + "&8) &ctried to execute the following blocked command: &4%command%"));
ALERT = new MultipleMessagesHelper(this, "alert",
Collections.singletonList("&8[&4ALERT&8] &c%player% &8(&7"
+ (Reflection.isProxyServer() ? "server: &e%server%" : "world: &e%world%")
+ "&8) &ctried to execute the following blocked command: &4%command%"));
}
}
@@ -9,13 +9,20 @@ public class OnlyForProxySection extends ConfigStorage {
public String MESSAGE;
public OnlyForProxySection() {
super("only-for-proxy");
}
@Override
public void load() {
super.load();
if(Reflection.isProxyServer()) return;
MESSAGE = new ConfigSectionHelper<String>(this, null, "&cThis command works on Bungeecord/Velocity servers only!").getOrSet();
if (Reflection.isProxyServer())
return;
MESSAGE = new ConfigSectionHelper<String>(this, null,
"&cThis command works on Bungeecord/Velocity servers only!").getOrSet();
}
}
@@ -8,14 +8,22 @@ public class PermsCheckSection extends ConfigStorage {
public String MESSAGE, PLAYER_MISSING, PLAYER_NOT_ONLINE;
public PermsCheckSection() {
super("perms-check");
}
@Override
public void load() {
super.load();
MESSAGE = new ConfigSectionHelper<String>(this, "message", "&7All of &e%player%'s &7PAT-related permission: &e%permissions%").getOrSet();
PLAYER_MISSING = new ConfigSectionHelper<String>(this, "player-is-missing", "&cPlease specify the player whose permission you want to check.").getOrSet();
PLAYER_NOT_ONLINE = new ConfigSectionHelper<String>(this, "player-not-online", "&c%player% is not online!").getOrSet();
MESSAGE = new ConfigSectionHelper<String>(this, "message",
"&7All of &e%player%'s &7PAT-related permission: &e%permissions%").getOrSet();
PLAYER_MISSING = new ConfigSectionHelper<String>(this, "player-is-missing",
"&cPlease specify the player whose permission you want to check.").getOrSet();
PLAYER_NOT_ONLINE = new ConfigSectionHelper<String>(this, "player-not-online", "&c%player% is not online!")
.getOrSet();
}
}
@@ -8,13 +8,20 @@ public class PostDebugSection extends ConfigStorage {
public String SUCCESS, FAILED;
public PostDebugSection() {
super("post-debug");
}
@Override
public void load() {
super.load();
SUCCESS = new ConfigSectionHelper<String>(this, "success", "&aSuccessfully uploaded debug logs: &e%link% &8(<click:open_url:%link%><gray>CLICK</click>&8)").getOrSet();
SUCCESS = new ConfigSectionHelper<String>(this, "success",
"&aSuccessfully uploaded debug logs: &e%link% &8(<click:open_url:%link%><gray>CLICK</click>&8)")
.getOrSet();
FAILED = new ConfigSectionHelper<String>(this, "failed", "&cFailed to upload debug logs!").getOrSet();
}
}
@@ -8,12 +8,17 @@ public class PrefixSection extends ConfigStorage {
public String PREFIX;
public PrefixSection() {
super("prefix");
}
@Override
public void load() {
super.load();
PREFIX = new ConfigSectionHelper<String>(this, null, "&8[&4ProAntiTab&8]").getOrSet();
}
}
@@ -8,13 +8,19 @@ public class ReloadSection extends ConfigStorage {
public String LOADING, DONE;
public ReloadSection() {
super("reload");
}
@Override
public void load() {
super.load();
LOADING = new ConfigSectionHelper<String>(this, "loading", "&eReloading all configuration files...").getOrSet();
DONE = new ConfigSectionHelper<String>(this, "done", "&aSuccessfully reloaded all configuration files!").getOrSet();
DONE = new ConfigSectionHelper<String>(this, "done", "&aSuccessfully reloaded all configuration files!")
.getOrSet();
}
}
@@ -10,21 +10,31 @@ public class ServerListSection extends ConfigStorage {
public String LIST_SERVER_MESSAGE, LIST_SERVER_SPLITTER, LIST_GROUP_MESSAGE, LIST_GROUP_SPLITTER;
public ServerListSection() {
super("server-list");
}
@Override
public void load() {
super.load();
if(!Reflection.isProxyServer()) return;
if (!Reflection.isProxyServer())
return;
SERVER_DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "server-not-found", "&cThe server %server% does not have any commands!").getOrSet();
GROUP_DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "group-does-not-exist", "&cGroup %group% does not exist for %server%!").getOrSet();
SERVER_DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "server-not-found",
"&cThe server %server% does not have any commands!").getOrSet();
GROUP_DOES_NOT_EXIST = new ConfigSectionHelper<String>(this, "group-does-not-exist",
"&cGroup %group% does not exist for %server%!").getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.server.message", "&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_MESSAGE = new ConfigSectionHelper<String>(this, "list.server.message",
"&7Listed commands of %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_SERVER_SPLITTER = new ConfigSectionHelper<String>(this, "list.server.splitter", "&7, &f").getOrSet();
LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list.group.message", "&7Listed commands of %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_GROUP_MESSAGE = new ConfigSectionHelper<String>(this, "list.group.message",
"&7Listed commands of %group% from %server% (&f%size%&7)&8: &f%commands%").getOrSet();
LIST_GROUP_SPLITTER = new ConfigSectionHelper<String>(this, "list.group.splitter", "&7, &f").getOrSet();
}
}
@@ -12,19 +12,31 @@ public class StatsSection extends ConfigStorage {
public MultipleMessagesHelper STATISTIC;
public StatsSection() {
super("stats");
}
@Override
public void load() {
super.load();
if(!Reflection.isProxyServer()) return;
if (!Reflection.isProxyServer()) {
return;
}
NO_SERVER = new ConfigSectionHelper<String>(this, "no-server", "&cNone!").getOrSet();
SPLITTER = new ConfigSectionHelper<String>(this, "message.splitter", "&7, ").getOrSet();
SERVER = new ConfigSectionHelper<String>(this, "message.server", "&f%servername% &8(%updated%)").getOrSet();
STATISTIC = new MultipleMessagesHelper(this, "message.statistic", Arrays.asList(
"&7Last sync sent to &f%server_count% &7servers. &8&o(%last_sync_time% ago)",
"&7Sent to servers: &f%servers%"
));
SERVER = new ConfigSectionHelper<String>(this, "message.server",
"&f%servername% &8(&a%last_alive_response% &8/ &2%updated%&8)").getOrSet();
STATISTIC = new MultipleMessagesHelper(this, "message.statistic",
Arrays.asList("&7Format: &eserver (last alive packet / last sync packet)",
"&7Last sync sent to &f%server_count% &7server(s) &e%last_sync_time% &7ago:",
"&7Sent to servers: &f%servers%"));
}
}
@@ -8,14 +8,21 @@ public class UpdatePermissionsSection extends ConfigStorage {
public String UPDATE_ALL, UPDATE_SPECIFIC, PLAYER_NOT_ONLINE;
public UpdatePermissionsSection() {
super("update-permissions");
}
@Override
public void load() {
super.load();
UPDATE_ALL = new ConfigSectionHelper<String>(this, "all-players", "&aUpdated permissions!").getOrSet();
UPDATE_SPECIFIC = new ConfigSectionHelper<String>(this, "specific-player", "&aUpdated %target%'s permissions!").getOrSet();
PLAYER_NOT_ONLINE = new ConfigSectionHelper<String>(this, "player-not-online", "&c%target% is not online!").getOrSet();
UPDATE_SPECIFIC = new ConfigSectionHelper<String>(this, "specific-player", "&aUpdated %target%'s permissions!")
.getOrSet();
PLAYER_NOT_ONLINE = new ConfigSectionHelper<String>(this, "player-not-online", "&c%target% is not online!")
.getOrSet();
}
}
@@ -8,12 +8,17 @@ public class AllowGroupOverrulingSection extends ConfigStorage {
public boolean ENABLED;
public AllowGroupOverrulingSection() {
super("allow-group-overruling");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -1,7 +1,6 @@
package de.rayzs.pat.api.storage.config.settings;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.Reflection;
import de.rayzs.pat.utils.StringUtils;
import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
@@ -10,22 +9,27 @@ public class AutoLowercaseCommandsSection extends ConfigStorage {
public boolean ENABLED;
public AutoLowercaseCommandsSection() {
super("auto-lowercase-commands");
}
@Override
public void load() {
super.load();
if (Reflection.isProxyServer())
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
}
public boolean isCommand(String command) {
if(!ENABLED) return false;
if (!ENABLED)
return false;
return !StringUtils.isLowercased(command);
}
}
@@ -2,21 +2,23 @@ package de.rayzs.pat.api.storage.config.settings;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
import de.rayzs.pat.utils.configuration.helper.MultipleMessagesHelper;
import java.util.Collections;
public class BaseCommandCaseSensitiveSection extends ConfigStorage {
public boolean ENABLED;
public BaseCommandCaseSensitiveSection() {
super("base-command-case-sensitive");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, null, true).getOrSet();
}
}
@@ -10,29 +10,42 @@ public class BlockNamespaceCommandsSection extends ConfigStorage {
public boolean ENABLED, ALWAYS_BLOCK_COMMAND;
public BlockNamespaceCommandsSection() {
super("block-namespace-commands");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
ALWAYS_BLOCK_COMMAND = new ConfigSectionHelper<Boolean>(this, "always-block-command", true).getOrSet();
}
public boolean doesAlwaysBlock(String command) {
return ALWAYS_BLOCK_COMMAND && isCommand(command);
}
public boolean isCommand(String command) {
if (!ENABLED) {
return false;
}
return StringUtils.getFirstArg(command).contains(":");
}
public boolean doesBypass(CommandSender sender) {
return !ENABLED || sender.hasPermission("namespace");
}
}
@@ -0,0 +1,45 @@
package de.rayzs.pat.api.storage.config.settings;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.StringUtils;
import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
import de.rayzs.pat.utils.permission.PermissionUtil;
import de.rayzs.pat.utils.sender.CommandSender;
public class BlockSlashCommandsSection extends ConfigStorage {
public boolean ENABLED;
public BlockSlashCommandsSection() {
super("block-slash-commands");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", false).getOrSet();
}
public boolean isCommand(String command) {
if (!ENABLED) {
return false;
}
return StringUtils.getFirstArg(command).contains("/");
}
public boolean doesBypass(CommandSender sender) {
return !ENABLED || PermissionUtil.hasPermission(sender, "slash");
}
}
@@ -10,14 +10,21 @@ public class CancelCommandSection extends ConfigStorage {
public MultipleMessagesHelper BASE_COMMAND_RESPONSE, SUB_COMMAND_RESPONSE;
public CancelCommandSection() {
super("cancel-blocked-commands");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
BASE_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "base-command-message", Collections.singletonList("&cThe command %command% is blocked!"));
SUB_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "sub-command-message", Collections.singletonList("&cThis sub-argument is blocked!"));
BASE_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "base-command-message",
Collections.singletonList("&cThe command %command% is blocked!"));
SUB_COMMAND_RESPONSE = new MultipleMessagesHelper(this, "sub-command-message",
Collections.singletonList("&cThis sub-argument is blocked!"));
}
}
@@ -11,28 +11,23 @@ public class CustomBrandSection extends ConfigStorage {
public MultipleMessagesHelper BRANDS;
public CustomBrandSection() {
super("custom-server-brand");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", false).getOrSet();
REPEAT_DELAY = new ConfigSectionHelper<Integer>(this, "repeat-delay", 3).getOrSet();
BRANDS = new MultipleMessagesHelper(this, "brands", Arrays.asList(
"&f&lP&froAntiTab |",
"&fP&lr&foAntiTab /",
"&fPr&lo&fAntiTab -",
"&fPro&lA&fntiTab |",
"&fProA&ln&ftiTab \\",
"&fProAn&lt&fiTab |",
"&fProAnt&li&fTab /",
"&fProAnti&lT&fab -",
"&fProAnti&lT&fab \\",
"&fProAntiT&la&fb |",
"&fProAntiTa&lb&f /",
"&fProAntiTab -",
"&fProAntiTab \\"
));
BRANDS = new MultipleMessagesHelper(this, "brands",
Arrays.asList("&f&lP&froAntiTab |", "&fP&lr&foAntiTab /", "&fPr&lo&fAntiTab -", "&fPro&lA&fntiTab |",
"&fProA&ln&ftiTab \\", "&fProAn&lt&fiTab |", "&fProAnt&li&fTab /", "&fProAnti&lT&fab -",
"&fProAnti&lT&fab \\", "&fProAntiT&la&fb |", "&fProAntiTa&lb&f /", "&fProAntiTab -",
"&fProAntiTab \\"));
}
}
@@ -11,33 +11,46 @@ public class CustomPluginsSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE, COMMANDS;
public CustomPluginsSection() {
super("custom-plugins");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
ALWAYS_TAB_COMPLETABLE = new ConfigSectionHelper<Boolean>(this, "always-tab-completable", false).getOrSet();
COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("pl", "plugins"));
MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&fPlugins (0):"));
}
public boolean isTabCompletable(String command) {
if (!isCommand(command))
return false;
return ALWAYS_TAB_COMPLETABLE;
}
public boolean isCommand(String command) {
if(!ENABLED) return false;
if (!ENABLED)
return false;
command = StringUtils.getFirstArg(command);
for (String currentCommand : COMMANDS.getLines()) {
if (currentCommand.equalsIgnoreCase(command))
return true;
}
return false;
}
}
@@ -18,36 +18,43 @@ public class CustomProtocolPingSection extends ConfigStorage {
public int EXTEND_COUNT;
public CustomProtocolPingSection() {
super("custom-protocol-ping");
}
@Override
public void load() {
super.load();
if (!Reflection.isProxyServer() && (!Reflection.isPaper() || Reflection.getMinor() < 12))
if (!Reflection.isProxyServer() && (!Reflection.isPaper() || Reflection.isBefore(1, 12)))
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
ALWAYS_SHOW = new ConfigSectionHelper<Boolean>(this, "always-show", Reflection.isProxyServer() || Reflection.isPaper()).getOrSet();
ALWAYS_SHOW = new ConfigSectionHelper<Boolean>(this, "always-show",
Reflection.isProxyServer() || Reflection.isPaper()).getOrSet();
USE_EXTEND_AS_MAX_COUNT = new ConfigSectionHelper<Boolean>(this, "use-as-maxplayers", false).getOrSet();
PROTOCOL = new ConfigSectionHelper<String>(this, "protocol", "&f&lProAntiTab &7(&a%online%&7/&c%max%&7)").getOrSet();
PROTOCOL = new ConfigSectionHelper<String>(this, "protocol", "&f&lProAntiTab &7(&a%online%&7/&c%max%&7)")
.getOrSet();
EXTEND_COUNT = new ConfigSectionHelper<Integer>(this, "extend-online-count", 1).getOrSet();
HIDE_PLAYERS = new ConfigSectionHelper<Boolean>(this, "hide-players", true).getOrSet();
USE_CUSTOM_PLAYERLIST = new ConfigSectionHelper<Boolean>(this, "custom-playerlist.enabled", false).getOrSet();
PLAYERLIST = new MultipleMessagesHelper(this, "custom-playerlist.list", Arrays.asList(
"&8> &7Online players: &f%online%&7/&c%max%",
"&8> &7Using &fProAntiTab"
));
PLAYERLIST = new MultipleMessagesHelper(this, "custom-playerlist.list",
Arrays.asList("&8> &7Online players: &f%online%&7/&c%max%", "&8> &7Using &fProAntiTab"));
if (HIDE_PLAYERS && USE_CUSTOM_PLAYERLIST) {
Logger.warning("You can't use both 'hide-players' and 'custom-playerlist' at the same time! (Section: custom-protocol-ping)");
Logger.warning(
"You can't use both 'hide-players' and 'custom-playerlist' at the same time! (Section: custom-protocol-ping)");
Logger.warning("You gotta choose what feature from those two you want to use.");
Logger.warning("In order to avoid any problems, the 'custom-playerlist' feature has been temporarily disabled.");
Logger.warning(
"In order to avoid any problems, the 'custom-playerlist' feature has been temporarily disabled.");
}
}
}
@@ -11,15 +11,22 @@ public class CustomUnknownCommandSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE;
public CustomUnknownCommandSection() {
super("custom-unknown-command");
}
@Override
public void load() {
super.load();
if(Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED) return;
if (Storage.ConfigSections.Settings.HANDLE_THROUGH_PROXY.ENABLED)
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&cThis command does not exist!"));
MESSAGE = new MultipleMessagesHelper(this, "message",
Collections.singletonList("&cThis command does not exist!"));
}
}
@@ -11,33 +11,48 @@ public class CustomVersionSection extends ConfigStorage {
public MultipleMessagesHelper MESSAGE, COMMANDS;
public CustomVersionSection() {
super("custom-version");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
ALWAYS_TAB_COMPLETABLE = new ConfigSectionHelper<Boolean>(this, "always-tab-completable", false).getOrSet();
COMMANDS = new MultipleMessagesHelper(this, "commands", Arrays.asList("icanhasbukkit", "about", "ver", "version"));
MESSAGE = new MultipleMessagesHelper(this, "message", Collections.singletonList("&fThis server is running CraftBukkit version git-NasaSpigot-294 (MC: X)"));
COMMANDS = new MultipleMessagesHelper(this, "commands",
Arrays.asList("icanhasbukkit", "about", "ver", "version"));
MESSAGE = new MultipleMessagesHelper(this, "message",
Collections.singletonList("&fThis server is running CraftBukkit version git-NasaSpigot-294 (MC: X)"));
}
public boolean isTabCompletable(String command) {
if (!isCommand(command))
return false;
return ALWAYS_TAB_COMPLETABLE;
}
public boolean isCommand(String command) {
if(!ENABLED) return false;
if (!ENABLED)
return false;
command = StringUtils.getFirstArg(command);
for (String currentCommand : COMMANDS.getLines()) {
if (currentCommand.equalsIgnoreCase(command))
return true;
}
return false;
}
}
@@ -9,14 +9,20 @@ public class DisableSyncSection extends ConfigStorage {
public boolean DISABLED;
public DisableSyncSection() {
super("disable-sync");
}
@Override
public void load() {
super.load();
if(!Reflection.isProxyServer()) return;
if (!Reflection.isProxyServer())
return;
DISABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -9,14 +9,20 @@ public class ForwardConsoleNotificationAlertsSection extends ConfigStorage {
public boolean ENABLED;
public ForwardConsoleNotificationAlertsSection() {
super("forward-console-notification-alerts");
}
@Override
public void load() {
super.load();
if(!Reflection.isProxyServer()) return;
if (!Reflection.isProxyServer())
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -6,7 +6,7 @@ import de.rayzs.pat.utils.Reflection;
public class HandleThroughProxySection extends ConfigStorage {
public boolean ENABLED;
public boolean ENABLED, ALLOW_P2B_ACTIONS;
public boolean LOAD_FROM_ENV;
public String ENV_NAME;
@@ -14,18 +14,26 @@ public class HandleThroughProxySection extends ConfigStorage {
public String TOKEN;
public HandleThroughProxySection() {
super("handle-through-proxy");
}
@Override
public void load() {
super.load();
if(Reflection.isProxyServer()) return;
if (Reflection.isProxyServer())
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", false).getOrSet();
TOKEN = new ConfigSectionHelper<String>(this, "token", "insert-token-of-proxy-here").getOrSet();
ALLOW_P2B_ACTIONS = new ConfigSectionHelper<Boolean>(this, "allow-p2b-actions", false).getOrSet();
LOAD_FROM_ENV = new ConfigSectionHelper<Boolean>(this, "load-from-env.enabled", false).getOrSet();
ENV_NAME = new ConfigSectionHelper<String>(this, "load-from-env.name", "PAT_TOKEN").getOrSet();
}
}
@@ -0,0 +1,30 @@
package de.rayzs.pat.api.storage.config.settings;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
public class InjectionFailedSection extends ConfigStorage {
public boolean ENABLED, SUPPRESS_EXCEPTIONS;
public String KICK_MESSAGE, CONSOLE_MESSAGE;
public InjectionFailedSection() {
super("injection-failed");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "kick-on-failure", true).getOrSet();
SUPPRESS_EXCEPTIONS = new ConfigSectionHelper<Boolean>(this, "suppress-exceptions", false).getOrSet();
KICK_MESSAGE = new ConfigSectionHelper<String>(this, "kick-message",
"&cInjection process failed! Please reconnect.").getOrSet();
CONSOLE_MESSAGE = new ConfigSectionHelper<String>(this, "console-message",
"&cInjection process failed! (%player%)").getOrSet();
}
}
@@ -3,7 +3,6 @@ package de.rayzs.pat.api.storage.config.settings;
import de.rayzs.pat.api.storage.storages.ConfigStorage;
import de.rayzs.pat.utils.configuration.helper.*;
import de.rayzs.pat.utils.StringUtils;
import java.util.Collections;
public class PatchExploitSection extends ConfigStorage {
@@ -11,22 +10,30 @@ public class PatchExploitSection extends ConfigStorage {
public ConfigSectionHelper<String> ALERT_MESSAGE, KICK_MESSAGE;
public PatchExploitSection() {
super("patch-exploits");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
ALERT_MESSAGE = new ConfigSectionHelper<>(this, "alert-message", "%prefix% &4%player% &ctried to crash/lag the server.");
ALERT_MESSAGE = new ConfigSectionHelper<>(this, "alert-message",
"%prefix% &4%player% &ctried to crash/lag the server.");
KICK_MESSAGE = new ConfigSectionHelper(this, "kick-message", "&cFailed to read packet! Please reconnect.");
}
public boolean isMalicious(String text) {
if(!ENABLED) return false;
return text.length() > 256
|| text.contains("nbt")
if (!ENABLED)
return false;
return text.length() > 256 || text.contains("nbt")
&& (StringUtils.countMatches('[', text) > 15 || StringUtils.countMatches('{', text) > 25);
}
}
@@ -8,12 +8,17 @@ public class TurnBlacklistToWhitelistSection extends ConfigStorage {
public boolean ENABLED;
public TurnBlacklistToWhitelistSection() {
super("turn-blacklist-to-whitelist");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -9,16 +9,21 @@ public class UpdateGroupsPerServerSection extends ConfigStorage {
public boolean ENABLED = false;
public UpdateGroupsPerServerSection() {
super("update-groups-per-server");
}
@Override
public void load() {
super.load();
if (!Reflection.isProxyServer())
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -9,16 +9,21 @@ public class UpdateGroupsPerWorldSection extends ConfigStorage {
public boolean ENABLED;
public UpdateGroupsPerWorldSection() {
super("update-groups-per-world");
}
@Override
public void load() {
super.load();
if (Reflection.isProxyServer())
return;
ENABLED = new ConfigSectionHelper<Boolean>(this, null, false).getOrSet();
}
}
@@ -11,20 +11,26 @@ public class UpdateSection extends ConfigStorage {
public MultipleMessagesHelper OUTDATED, UPDATED;
public UpdateSection() {
super("updater");
}
@Override
public void load() {
super.load();
ENABLED = new ConfigSectionHelper<Boolean>(this, "enabled", true).getOrSet();
PERIOD = new ConfigSectionHelper<Integer>(this, "period", 10000).getOrSet();
AUTO_UPDATE_CONFIG = new ConfigSectionHelper<Boolean>(this, "auto-update-config", true).getOrSet();
UPDATED = new MultipleMessagesHelper(this, "updated", Collections.singletonList("&aYou are using the newest version! ^^"));
OUTDATED = new MultipleMessagesHelper(this, "outdated", Arrays.asList(
"&8[&4ProAntiTab&8] &cThere is a new version available! (%newest_version%)",
"&8[&4ProAntiTab&8] &cYou are still using the %current_version%.",
"&8[&4ProAntiTab&8] &cGet the newest version here:",
"&8[&4ProAntiTab&8] &ehttps://www.rayzs.de/products/proantitab/page"));
UPDATED = new MultipleMessagesHelper(this, "updated",
Collections.singletonList("&aYou are using the newest version! ^^"));
OUTDATED = new MultipleMessagesHelper(this, "outdated",
Arrays.asList("&8[&4ProAntiTab&8] &cThere is a new version available! (%newest_version%)",
"&8[&4ProAntiTab&8] &cYou are still using the %current_version%.",
"&8[&4ProAntiTab&8] &cGet the newest version here:",
"&8[&4ProAntiTab&8] &ehttps://www.rayzs.de/products/proantitab/page"));
}
}
@@ -4,23 +4,31 @@ import de.rayzs.pat.utils.configuration.helper.ConfigSectionHelper;
import de.rayzs.pat.api.storage.storages.PlaceholderStorage;
import de.rayzs.pat.api.storage.Storage;
import de.rayzs.pat.utils.StringUtils;
import de.rayzs.pat.utils.group.GroupManager;
import org.bukkit.entity.Player;
public class ListCommandsPlaceholder extends PlaceholderStorage {
public ListCommandsPlaceholder() { super("list_commands"); }
public ListCommandsPlaceholder() {
super("list_commands");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
return StringUtils.getStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -8,18 +8,27 @@ import org.bukkit.entity.Player;
public class ListReversedCommandsPlaceholder extends PlaceholderStorage {
public ListReversedCommandsPlaceholder() { super("list_reversed_commands"); }
public ListReversedCommandsPlaceholder() {
super("list_reversed_commands");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
return StringUtils.getReversedStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -6,15 +6,24 @@ import org.bukkit.entity.Player;
public class ListSizeCommandsPlaceholder extends PlaceholderStorage {
public ListSizeCommandsPlaceholder() { super("list_size_commands"); }
public ListSizeCommandsPlaceholder() {
super("list_size_commands");
}
@Override
public String onRequest(Player player, String param) {
return String.valueOf(Storage.Blacklist.getBlacklist().getCommands().size());
}
@Override
public void load() {
super.load();
}
}
@@ -8,18 +8,27 @@ import org.bukkit.entity.Player;
public class ListSortedCommandsPlaceholder extends PlaceholderStorage {
public ListSortedCommandsPlaceholder() { super("list_sorted_commands"); }
public ListSortedCommandsPlaceholder() {
super("list_sorted_commands");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
return StringUtils.getSortedStringList(Storage.Blacklist.getBlacklist().getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -8,21 +8,31 @@ import org.bukkit.entity.Player;
public class ListGroupCommandsPlaceholder extends PlaceholderStorage {
public ListGroupCommandsPlaceholder() { super("list_commands_group_"); }
public ListGroupCommandsPlaceholder() {
super("list_commands_group_");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
Group group = GroupManager.getGroupByName(param);
if(group == null) return null;
if (group == null)
return null;
return StringUtils.getStringList(group.getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -8,21 +8,31 @@ import org.bukkit.entity.Player;
public class ListGroupReversedCommandsPlaceholder extends PlaceholderStorage {
public ListGroupReversedCommandsPlaceholder() { super("list_reversed_commands_group_"); }
public ListGroupReversedCommandsPlaceholder() {
super("list_reversed_commands_group_");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
Group group = GroupManager.getGroupByName(param);
if(group == null) return null;
if (group == null)
return null;
return StringUtils.getReversedStringList(group.getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -6,17 +6,27 @@ import org.bukkit.entity.Player;
public class ListGroupSizeCommandsPlaceholder extends PlaceholderStorage {
public ListGroupSizeCommandsPlaceholder() { super("list_size_commands_group_"); }
public ListGroupSizeCommandsPlaceholder() {
super("list_size_commands_group_");
}
@Override
public String onRequest(Player player, String param) {
Group group = GroupManager.getGroupByName(param);
if(group == null) return null;
if (group == null)
return null;
return String.valueOf(group.getCommands().size());
}
@Override
public void load() {
super.load();
}
}
@@ -8,21 +8,31 @@ import org.bukkit.entity.Player;
public class ListGroupSortedCommandsPlaceholder extends PlaceholderStorage {
public ListGroupSortedCommandsPlaceholder() { super("list_sorted_commands_group_"); }
public ListGroupSortedCommandsPlaceholder() {
super("list_sorted_commands_group_");
}
public String SPLITTER;
@Override
public String onRequest(Player player, String param) {
Group group = GroupManager.getGroupByName(param);
if(group == null) return null;
if (group == null)
return null;
return StringUtils.getSortedStringList(group.getCommands(), SPLITTER);
}
@Override
public void load() {
super.load();
SPLITTER = new ConfigSectionHelper<String>(this, "splitter", "&7, &e").getOrSet();
}
}
@@ -6,10 +6,17 @@ import org.bukkit.entity.Player;
public class GeneralCurrentVersionPlaceholder extends PlaceholderStorage {
public GeneralCurrentVersionPlaceholder() { super("general_version_current"); }
public GeneralCurrentVersionPlaceholder() {
super("general_version_current");
}
@Override
public String onRequest(Player player, String param) {
return Storage.CURRENT_VERSION;
}
}
@@ -6,10 +6,17 @@ import org.bukkit.entity.Player;
public class GeneralNewestVersionPlaceholder extends PlaceholderStorage {
public GeneralNewestVersionPlaceholder() { super("general_version_newest"); }
public GeneralNewestVersionPlaceholder() {
super("general_version_newest");
}
@Override
public String onRequest(Player player, String param) {
return Storage.NEWER_VERSION;
}
}
Loaded 100 of 249 files, more files were not shown because too many files have changed in this diff. Show more