From b3e7b50b83e0845f305b44ce105881f1291da8e7 Mon Sep 17 00:00:00 2001 From: James Mortemore Date: Sat, 4 Jan 2025 16:42:51 +0000 Subject: [PATCH] feat: added fabric support --- build.gradle.kts | 4 +- buildSrc/build.gradle.kts | 13 +- buildSrc/src/main/kotlin/CommonConfig.kt | 8 +- buildSrc/src/main/kotlin/LibsConfig.kt | 2 +- buildSrc/src/main/kotlin/PlatformConfig.kt | 2 +- .../banmanager/common/BanManagerPlugin.java | 22 +- .../common/commands/CommonCommand.java | 4 + fabric/build.gradle.kts | 141 +++++++ .../banmanager/fabric/BMFabricPlugin.java | 241 ++++++++++++ .../banmanager/fabric/BanManagerEvents.java | 369 ++++++++++++++++++ .../banmanager/fabric/FabricCommand.java | 109 ++++++ .../banmanager/fabric/FabricPlayer.java | 136 +++++++ .../banmanager/fabric/FabricScheduler.java | 112 ++++++ .../banmanager/fabric/FabricSender.java | 60 +++ .../banmanager/fabric/FabricServer.java | 305 +++++++++++++++ .../banmanager/fabric/PluginLogger.java | 29 ++ .../fabric/listeners/BanListener.java | 36 ++ .../fabric/listeners/ChatListener.java | 52 +++ .../fabric/listeners/CommandListener.java | 31 ++ .../fabric/listeners/DiscordListener.java | 100 +++++ .../fabric/listeners/HookListener.java | 107 +++++ .../fabric/listeners/JoinListener.java | 88 +++++ .../fabric/listeners/LeaveListener.java | 19 + .../fabric/listeners/MuteListener.java | 26 ++ .../fabric/listeners/NoteListener.java | 21 + .../fabric/listeners/ReportListener.java | 70 ++++ .../main/resources/assets/banmanager/icon.png | Bin 0 -> 4976 bytes .../src/main/resources/banmanager.mixins.json | 18 + fabric/src/main/resources/config.yml | 1 + fabric/src/main/resources/console.yml | 1 + fabric/src/main/resources/discord.yml | 1 + fabric/src/main/resources/exemptions.yml | 1 + fabric/src/main/resources/fabric.mod.json | 41 ++ fabric/src/main/resources/geoip.yml | 1 + fabric/src/main/resources/messages.yml | 1 + fabric/src/main/resources/plugin.yml | 1 + fabric/src/main/resources/reasons.yml | 1 + fabric/src/main/resources/schedules.yml | 1 + gradle.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++----- settings.gradle.kts | 2 + .../BMVelocityPlugin.java | 1 + 44 files changed, 2312 insertions(+), 127 deletions(-) create mode 100644 fabric/build.gradle.kts create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/BMFabricPlugin.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/FabricCommand.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/FabricPlayer.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/FabricScheduler.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/FabricSender.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/PluginLogger.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/BanListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ChatListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/CommandListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/DiscordListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/JoinListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/LeaveListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/MuteListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/NoteListener.java create mode 100644 fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ReportListener.java create mode 100644 fabric/src/main/resources/assets/banmanager/icon.png create mode 100644 fabric/src/main/resources/banmanager.mixins.json create mode 120000 fabric/src/main/resources/config.yml create mode 120000 fabric/src/main/resources/console.yml create mode 120000 fabric/src/main/resources/discord.yml create mode 120000 fabric/src/main/resources/exemptions.yml create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 120000 fabric/src/main/resources/geoip.yml create mode 120000 fabric/src/main/resources/messages.yml create mode 120000 fabric/src/main/resources/plugin.yml create mode 120000 fabric/src/main/resources/reasons.yml create mode 120000 fabric/src/main/resources/schedules.yml diff --git a/build.gradle.kts b/build.gradle.kts index 066cec15..8d577983 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,8 @@ logger.lifecycle(""" """) plugins { - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" - id("io.freefair.aggregate-javadoc") version "6.3.0" + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" + id("io.freefair.aggregate-javadoc") version "8.11" } nexusPublishing { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d31a4bea..f0c9637f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -10,11 +10,16 @@ repositories { name = "sponge" url = uri("https://repo.spongepowered.org/repository/maven-public/") } + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } } dependencies { implementation(gradleApi()) - implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") - implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0") - implementation("org.spongepowered:spongegradle-plugin-development:2.0.0") -} \ No newline at end of file + implementation("com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:9.0.0-beta4") + implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.5") + implementation("org.spongepowered:spongegradle-plugin-development:2.3.0") + implementation("fabric-loom:fabric-loom.gradle.plugin:1.9-SNAPSHOT") +} diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 85d1314d..c30fb211 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -14,11 +14,11 @@ fun Project.applyCommonConfiguration() { } dependencies { - "compileOnly"("org.projectlombok:lombok:1.18.22") - "annotationProcessor"("org.projectlombok:lombok:1.18.22") + "compileOnly"("org.projectlombok:lombok:1.18.36") + "annotationProcessor"("org.projectlombok:lombok:1.18.36") - "testCompileOnly"("org.projectlombok:lombok:1.18.22") - "testAnnotationProcessor"("org.projectlombok:lombok:1.18.22") + "testCompileOnly"("org.projectlombok:lombok:1.18.36") + "testAnnotationProcessor"("org.projectlombok:lombok:1.18.36") } configurations.all { diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt index 7b652682..46abf337 100644 --- a/buildSrc/src/main/kotlin/LibsConfig.kt +++ b/buildSrc/src/main/kotlin/LibsConfig.kt @@ -25,7 +25,7 @@ fun Project.applyLibrariesConfiguration() { apply(plugin = "java-base") apply(plugin = "maven-publish") apply(plugin = "signing") - apply(plugin = "com.github.johnrengelman.shadow") + apply(plugin = "com.gradleup.shadow") repositories { mavenCentral() diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 67075608..f61ea6a5 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -42,7 +42,7 @@ fun Project.applyPlatformAndCoreConfiguration() { } fun Project.applyShadowConfiguration() { - apply(plugin = "com.github.johnrengelman.shadow") + apply(plugin = "com.gradleup.shadow") tasks.named("shadowJar") { archiveClassifier.set("dist") dependencies { diff --git a/common/src/main/java/me/confuser/banmanager/common/BanManagerPlugin.java b/common/src/main/java/me/confuser/banmanager/common/BanManagerPlugin.java index 35e72ccc..9446ec9b 100644 --- a/common/src/main/java/me/confuser/banmanager/common/BanManagerPlugin.java +++ b/common/src/main/java/me/confuser/banmanager/common/BanManagerPlugin.java @@ -211,17 +211,19 @@ public final void enable() throws Exception { results2.close(); } - try { - metrics.submitStorageType(config.getLocalDb().getStorageType()); - metrics.submitDiscordMode(discordConfig.isHooksEnabled()); - metrics.submitGeoMode(geoIpConfig.isEnabled()); - metrics.submitGlobalMode(config.getGlobalDb().isEnabled()); - metrics.submitOnlineMode(config.isOnlineMode()); - if (storageVersion != null) { - metrics.submitStorageVersion(storageVersion); + if (metrics != null) { + try { + metrics.submitStorageType(config.getLocalDb().getStorageType()); + metrics.submitDiscordMode(discordConfig.isHooksEnabled()); + metrics.submitGeoMode(geoIpConfig.isEnabled()); + metrics.submitGlobalMode(config.getGlobalDb().isEnabled()); + metrics.submitOnlineMode(config.isOnlineMode()); + if (storageVersion != null) { + metrics.submitStorageVersion(storageVersion); + } + } catch (Exception e) { + logger.warning("Failed to submit stats, ignoring"); } - } catch (Exception e) { - logger.warning("Failed to submit stats, ignoring"); } } diff --git a/common/src/main/java/me/confuser/banmanager/common/commands/CommonCommand.java b/common/src/main/java/me/confuser/banmanager/common/commands/CommonCommand.java index d381cd14..839679ec 100644 --- a/common/src/main/java/me/confuser/banmanager/common/commands/CommonCommand.java +++ b/common/src/main/java/me/confuser/banmanager/common/commands/CommonCommand.java @@ -167,6 +167,10 @@ public CommandParser getParser(String[] args) throws NoSuchMethodException, Ille args, start); } + public CommandParser getParser(List args) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException { + return getParser(args.toArray(new String[0])); + } + public List handlePlayerNameTabComplete(CommonSender sender, String[] args) { ArrayList mostLike = new ArrayList<>(); if(args.length == 1) { diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 00000000..e5f65468 --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,141 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.fabricmc.loom.task.RemapJarTask + +plugins { + `java-library` + `maven-publish` + `signing` + `fabric-loom` +} + +applyPlatformAndCoreConfiguration() +applyShadowConfiguration() + +publishing { + publications { + create("mavenJava") { + from(components["java"]) + + pom { + name.set("BanManagerFabric") + description.set("BanManager for Fabric") + url.set("https://github.com/BanManagement/BanManager/") + licenses { + license { + name.set("Creative Commons Attribution-NonCommercial-ShareAlike 2.0 UK: England & Wales") + url.set("https://github.com/BanManagement/BanManager/blob/master/LICENCE") + } + } + developers { + developer { + id.set("confuser") + name.set("James Mortemore") + email.set("jamesmortemore@gmail.com") + } + } + scm { + connection.set("scm:git:git://github.com/BanManagement/BanManager.git") + developerConnection.set("scm:git:ssh://git@github.com/BanManagement/BanManager.git") + url.set("https://github.com/BanManagement/BanManager/") + } + } + } + } +} + +signing { + if (project.findProperty("signingKey")?.toString()?.toBoolean() == true) { + useInMemoryPgpKeys(findProperty("signingKey")?.toString(), findProperty("signingPassword")?.toString()) + + sign(publishing.publications["mavenJava"]) + } +} + +repositories { + maven { + name = "Fabric" + url = uri("https://maven.fabricmc.net/") + } +} + +configurations { + compileClasspath.get().extendsFrom(create("shadeOnly")) +} + +dependencies { + minecraft("com.mojang:minecraft:1.21.4") + mappings("net.fabricmc:yarn:1.21.4+build.1:v2") + modImplementation("net.fabricmc:fabric-loader:0.16.9") + + val modules = listOf( + "fabric-api-base", + "fabric-command-api-v2", + "fabric-events-interaction-v0", + "fabric-lifecycle-events-v1", + "fabric-message-api-v1", + "fabric-networking-api-v1", + "fabric-entity-events-v1" + ) + + modules.forEach { + modImplementation(fabricApi.module(it, "0.111.0+1.21.4")) + } + + modImplementation("me.lucko:fabric-permissions-api:0.3.1") + + api(project(":BanManagerCommon")) +} + +tasks.named("processResources") { + val internalVersion = project.ext["internalVersion"] + + inputs.property("internalVersion", internalVersion) + + filesMatching(listOf("plugin.yml", "fabric.mod.json")) { + expand("internalVersion" to internalVersion, "mainPath" to "me.confuser.banmanager.fabric.BMFabricPlugin") + } +} + +tasks.named("jar") { + val projectVersion = project.version + inputs.property("projectVersion", projectVersion) + manifest { + attributes("Implementation-Version" to projectVersion) + } +} + +tasks.named("shadowJar") { + configurations = listOf(project.configurations["shadeOnly"], project.configurations["runtimeClasspath"]) + + archiveBaseName.set("BanManagerFabric") + archiveClassifier.set("") + archiveVersion.set("") + + dependencies { + include(dependency(":BanManagerCommon")) + include(dependency(":BanManagerLibs")) + } + exclude("GradleStart**") + exclude(".cache"); + exclude("LICENSE*") + exclude("META-INF/services/**") + exclude("META-INF/maven/**") + exclude("org/intellij/**") + exclude("org/jetbrains/**") + exclude("/mappings/*") + + minimize() +} + +tasks.named("remapJar") { + dependsOn(tasks.named("shadowJar")) + + inputFile.set(tasks.named("shadowJar").get().archiveFile) + archiveBaseName.set("BanManagerFabric") + archiveClassifier.set("") + archiveVersion.set("") +} + +tasks.named("assemble").configure { + dependsOn("shadowJar") +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/BMFabricPlugin.java b/fabric/src/main/java/me/confuser/banmanager/fabric/BMFabricPlugin.java new file mode 100644 index 00000000..6b83a4a0 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/BMFabricPlugin.java @@ -0,0 +1,241 @@ +package me.confuser.banmanager.fabric; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.concurrent.TimeUnit; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import lombok.Getter; +import lombok.SneakyThrows; +import me.confuser.banmanager.fabric.listeners.*; +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.commands.CommonCommand; +import me.confuser.banmanager.common.configs.PluginInfo; +import me.confuser.banmanager.common.configuration.ConfigurationSection; +import me.confuser.banmanager.common.configuration.file.YamlConfiguration; +import me.confuser.banmanager.common.runnables.BanSync; +import me.confuser.banmanager.common.runnables.ExpiresSync; +import me.confuser.banmanager.common.runnables.GlobalBanSync; +import me.confuser.banmanager.common.runnables.GlobalIpSync; +import me.confuser.banmanager.common.runnables.GlobalMuteSync; +import me.confuser.banmanager.common.runnables.GlobalNoteSync; +import me.confuser.banmanager.common.runnables.IpRangeSync; +import me.confuser.banmanager.common.runnables.IpSync; +import me.confuser.banmanager.common.runnables.MuteSync; +import me.confuser.banmanager.common.runnables.NameSync; +import me.confuser.banmanager.common.runnables.Purge; +import me.confuser.banmanager.common.runnables.RollbackSync; +import me.confuser.banmanager.common.runnables.Runner; +import me.confuser.banmanager.common.runnables.SaveLastChecked; +import me.confuser.banmanager.common.runnables.WarningSync; +import net.fabricmc.api.DedicatedServerModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.server.MinecraftServer; + +public class BMFabricPlugin implements DedicatedServerModInitializer { + + @Getter + private BanManagerPlugin plugin; + private String[] configs = new String[] { + "config.yml", + "console.yml", + "discord.yml", + "exemptions.yml", + "geoip.yml", + "messages.yml", + "reasons.yml", + "schedules.yml" + }; + private FabricScheduler scheduler; + private PluginInfo pluginInfo; + private FabricServer server; + + @Override + public void onInitializeServer() { + try { + pluginInfo = setupConfigs(); + } catch (IOException e) { + e.printStackTrace(); + return; + } + + this.server = new FabricServer(); + this.scheduler = new FabricScheduler(); + + plugin = new BanManagerPlugin(pluginInfo, new PluginLogger(LogManager.getLogger("BanManager")), getDataFolder(), + scheduler, this.server, null); + + try { + plugin.enable(); + } catch (Exception e) { + this.scheduler.shutdown(); + + plugin.disable(); + e.printStackTrace(); + return; + } + + setupListeners(); + setupCommands(); + setupRunnables(); + + ServerLifecycleEvents.SERVER_STARTING.register(this::onServerStarting); + ServerLifecycleEvents.SERVER_STOPPING.register(this::onServerStopping); + ServerLifecycleEvents.SERVER_STARTED.register(this::onServerStarted); + } + + private void onServerStarting(MinecraftServer server) { + this.scheduler.enable(server); + this.server.enable(plugin, server); + } + + private void onServerStarted(MinecraftServer server) { + plugin.getLogger().info("The following commands are blocked whilst muted:"); + plugin.getConfig().handleBlockedCommands(plugin, plugin.getConfig().getMutedBlacklistCommands()); + + plugin.getLogger().info("The following commands are blocked whilst soft muted:"); + plugin.getConfig().handleBlockedCommands(plugin, plugin.getConfig().getSoftMutedBlacklistCommands()); + } + + private void onServerStopping(MinecraftServer server) { + this.scheduler.shutdown(); + + if (plugin != null) { + plugin.disable(); + } + } + + private void setupCommands() { + for (CommonCommand cmd : plugin.getCommands()) { + new FabricCommand(cmd).register(); + } + + if (plugin.getGlobalConn() != null) { + for (CommonCommand cmd : plugin.getGlobalCommands()) { + new FabricCommand(cmd).register(); + } + } + } + + private File getDataFolder() { + File dataDirectory = FabricLoader.getInstance().getConfigDir().resolve("banmanager").toFile(); + + if (!dataDirectory.exists()) { + dataDirectory.mkdir(); + } + + return dataDirectory; + } + + private PluginInfo setupConfigs() throws IOException { + for (String name : configs) { + File file = new File(getDataFolder(), name); + + if (!file.exists()) { + try (InputStream in = getResourceAsStream(name)) { + Files.copy(in, file.toPath()); + } catch (IOException e) { + e.printStackTrace(); + } + } else { + Reader defConfigStream = new InputStreamReader(getResourceAsStream(file.getName()), StandardCharsets.UTF_8); + + YamlConfiguration conf = YamlConfiguration.loadConfiguration(file); + YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream); + conf.setDefaults(defConfig); + conf.options().copyDefaults(true); + conf.save(file); + } + } + + // Load plugin.yml + PluginInfo pluginInfo = new PluginInfo(); + Reader defConfigStream = new InputStreamReader(getResourceAsStream("plugin.yml"), StandardCharsets.UTF_8); + YamlConfiguration conf = YamlConfiguration.loadConfiguration(defConfigStream); + ConfigurationSection commands = conf.getConfigurationSection("commands"); + + for (String command : commands.getKeys(false)) { + ConfigurationSection cmd = commands.getConfigurationSection(command); + + pluginInfo.setCommand(new PluginInfo.CommandInfo(command, cmd.getString("permission"), cmd.getString("usage"), + cmd.getStringList("aliases"))); + } + + return pluginInfo; + } + + public void setupListeners() { + new JoinListener(plugin); + new LeaveListener(plugin); + new HookListener(plugin); + + if (!plugin.getConfig().getChatPriority().equals("NONE")) { + new ChatListener(plugin); + } + + if (plugin.getConfig().isDisplayNotificationsEnabled()) { + new BanListener(plugin); + new MuteListener(plugin); + new NoteListener(plugin); + new ReportListener(plugin, this.server); + } + + if (plugin.getDiscordConfig().isHooksEnabled()) { + new DiscordListener(plugin); + } + } + + public void setupRunnables() { + Runner syncRunner; + + if (plugin.getGlobalConn() == null) { + syncRunner = new Runner(new BanSync(plugin), new MuteSync(plugin), new IpSync(plugin), new IpRangeSync(plugin), + new ExpiresSync(plugin), + new WarningSync(plugin), new RollbackSync(plugin), new NameSync(plugin)); + } else { + syncRunner = new Runner(new BanSync(plugin), new MuteSync(plugin), new IpSync(plugin), new IpRangeSync(plugin), + new ExpiresSync(plugin), + new WarningSync(plugin), new RollbackSync(plugin), new NameSync(plugin), + new GlobalBanSync(plugin), new GlobalMuteSync(plugin), new GlobalIpSync(plugin), new GlobalNoteSync(plugin)); + } + + plugin.setSyncRunner(syncRunner); + + setupAsyncRunnable(1L, syncRunner); + + /* + * This task should be ran last with a 1L offset as it gets modified + * above. + */ + setupAsyncRunnable((plugin.getSchedulesConfig() + .getSchedule("saveLastChecked")) + 1L, new SaveLastChecked(plugin)); + + // Purge + plugin.getScheduler().runAsync(new Purge(plugin)); + } + + private void setupAsyncRunnable(long length, Runnable runnable) { + if (length <= 0) { + return; + } + + this.scheduler.runAsyncRepeating(runnable, length, length); + } + + @SneakyThrows + private InputStream getResourceAsStream(String resource) { + Class cls = getClass(); + + // returns the ClassLoader object associated with this Class + ClassLoader cLoader = cls.getClassLoader(); + + return cLoader.getResourceAsStream(resource); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java b/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java new file mode 100644 index 00000000..16df0bfe --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/BanManagerEvents.java @@ -0,0 +1,369 @@ +package me.confuser.banmanager.fabric; + +import lombok.Getter; +import lombok.Setter; +import me.confuser.banmanager.common.data.*; +import me.confuser.banmanager.common.util.Message; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; + +public class BanManagerEvents { + + public static final Event PLAYER_BAN_EVENT = EventFactory.createArrayBacked(PlayerBanEvent.class, + (listeners) -> (banData, silent) -> { + for (PlayerBanEvent listener : listeners) { + if (listener.onPlayerBan(banData, silent)) { + return true; + } + } + return false; + }); + + public static final Event PLAYER_BANNED_EVENT = EventFactory.createArrayBacked(PlayerBannedEvent.class, + (listeners) -> (banData, silent) -> { + for (PlayerBannedEvent listener : listeners) { + listener.onPlayerBanned(banData, silent); + } + }); + + public static final Event PLAYER_UNBAN_EVENT = EventFactory.createArrayBacked(PlayerUnbanEvent.class, + (listeners) -> (banData, actor, reason) -> { + for (PlayerUnbanEvent listener : listeners) { + listener.onPlayerUnban(banData, actor, reason); + } + }); + + public static final Event IP_BAN_EVENT = EventFactory.createArrayBacked(IpBanEvent.class, + (listeners) -> (banData, silent) -> { + for (IpBanEvent listener : listeners) { + if (listener.onIpBan(banData, silent)) { + return true; + } + } + return false; + }); + + public static final Event IP_BANNED_EVENT = EventFactory.createArrayBacked(IpBannedEvent.class, + (listeners) -> (banData, silent) -> { + for (IpBannedEvent listener : listeners) { + listener.onIpBanned(banData, silent); + } + }); + + public static final Event IP_UNBAN_EVENT = EventFactory.createArrayBacked(IpUnbanEvent.class, + (listeners) -> (banData, actor, reason) -> { + for (IpUnbanEvent listener : listeners) { + listener.onIpUnban(banData, actor, reason); + } + }); + + public static final Event IP_MUTE_EVENT = EventFactory.createArrayBacked(IpMuteEvent.class, + (listeners) -> (muteData, silent) -> { + for (IpMuteEvent listener : listeners) { + if (listener.onIpMute(muteData, silent)) { + return true; + } + } + return false; + }); + + public static final Event IP_MUTED_EVENT = EventFactory.createArrayBacked(IpMutedEvent.class, + (listeners) -> (muteData, silent) -> { + for (IpMutedEvent listener : listeners) { + listener.onIpMuted(muteData, silent); + } + }); + + public static final Event IP_UNMUTED_EVENT = EventFactory.createArrayBacked(IpUnmutedEvent.class, + (listeners) -> (muteData, actor, reason) -> { + for (IpUnmutedEvent listener : listeners) { + listener.onIpUnmuted(muteData, actor, reason); + } + }); + + public static final Event PLAYER_KICKED_EVENT = EventFactory.createArrayBacked(PlayerKickedEvent.class, + (listeners) -> (kickData, silent) -> { + for (PlayerKickedEvent listener : listeners) { + listener.onPlayerKicked(kickData, silent); + } + }); + + public static final Event PLAYER_NOTE_CREATED_EVENT = EventFactory.createArrayBacked(PlayerNoteCreatedEvent.class, + (listeners) -> (noteData) -> { + for (PlayerNoteCreatedEvent listener : listeners) { + listener.onPlayerNoteCreated(noteData); + } + }); + + public static final Event PLAYER_REPORT_EVENT = EventFactory.createArrayBacked(PlayerReportEvent.class, + (listeners) -> (reportData, silent) -> { + for (PlayerReportEvent listener : listeners) { + if (listener.onPlayerReport(reportData, silent)) { + return true; + } + } + return false; + }); + + public static final Event PLAYER_REPORTED_EVENT = EventFactory.createArrayBacked(PlayerReportedEvent.class, + (listeners) -> (reportData, silent) -> { + for (PlayerReportedEvent listener : listeners) { + listener.onPlayerReported(reportData, silent); + } + }); + + public static final Event PLAYER_REPORT_DELETED_EVENT = EventFactory.createArrayBacked(PlayerReportDeletedEvent.class, + (listeners) -> (reportData) -> { + for (PlayerReportDeletedEvent listener : listeners) { + listener.onPlayerReportDeleted(reportData); + } + }); + + public static final Event NAME_BAN_EVENT = EventFactory.createArrayBacked(NameBanEvent.class, + (listeners) -> (banData, silent) -> { + for (NameBanEvent listener : listeners) { + if (listener.onNameBan(banData, silent)) { + return true; + } + } + return false; + }); + + public static final Event NAME_BANNED_EVENT = EventFactory.createArrayBacked(NameBannedEvent.class, + (listeners) -> (banData, silent) -> { + for (NameBannedEvent listener : listeners) { + listener.onNameBanned(banData, silent); + } + }); + + public static final Event NAME_UNBAN_EVENT = EventFactory.createArrayBacked(NameUnbanEvent.class, + (listeners) -> (banData, actor, reason) -> { + for (NameUnbanEvent listener : listeners) { + listener.onNameUnban(banData, actor, reason); + } + }); + + public static final Event PLAYER_WARN_EVENT = EventFactory.createArrayBacked(PlayerWarnEvent.class, + (listeners) -> (warnData, silent) -> { + for (PlayerWarnEvent listener : listeners) { + if (listener.onPlayerWarn(warnData, silent)) { + return true; + } + } + return false; + }); + + public static final Event PLAYER_WARNED_EVENT = EventFactory.createArrayBacked(PlayerWarnedEvent.class, + (listeners) -> (warnData, silent) -> { + for (PlayerWarnedEvent listener : listeners) { + listener.onPlayerWarned(warnData, silent); + } + }); + + public static final Event IP_RANGE_BAN_EVENT = EventFactory.createArrayBacked(IpRangeBanEvent.class, + (listeners) -> (banData, silent) -> { + for (IpRangeBanEvent listener : listeners) { + if (listener.onIpRangeBan(banData, silent)) { + return true; + } + } + return false; + }); + + public static final Event IP_RANGE_BANNED_EVENT = EventFactory.createArrayBacked(IpRangeBannedEvent.class, + (listeners) -> (banData, silent) -> { + for (IpRangeBannedEvent listener : listeners) { + listener.onIpRangeBanned(banData, silent); + } + }); + + public static final Event IP_RANGE_UNBAN_EVENT = EventFactory.createArrayBacked(IpRangeUnbanEvent.class, + (listeners) -> (banData, actor, reason) -> { + for (IpRangeUnbanEvent listener : listeners) { + listener.onIpRangeUnban(banData, actor, reason); + } + }); + + public static final Event PLAYER_MUTE_EVENT = EventFactory.createArrayBacked(PlayerMuteEvent.class, + (listeners) -> (muteData, silent) -> { + for (PlayerMuteEvent listener : listeners) { + if (listener.onPlayerMute(muteData, silent)) { + return true; + } + } + return false; + }); + + public static final Event PLAYER_MUTED_EVENT = EventFactory.createArrayBacked(PlayerMutedEvent.class, + (listeners) -> (muteData, silent) -> { + for (PlayerMutedEvent listener : listeners) { + listener.onPlayerMuted(muteData, silent); + } + }); + + public static final Event PLAYER_UNMUTE_EVENT = EventFactory.createArrayBacked(PlayerUnmuteEvent.class, + (listeners) -> (muteData, actor, reason) -> { + for (PlayerUnmuteEvent listener : listeners) { + listener.onPlayerUnmute(muteData, actor, reason); + } + }); + + public static final Event PLUGIN_RELOADED_EVENT = EventFactory.createArrayBacked(PluginReloadedEvent.class, + (listeners) -> (actor) -> { + for (PluginReloadedEvent listener : listeners) { + listener.onPluginReloaded(actor); + } + }); + + public static final Event PLAYER_DENIED_EVENT = EventFactory.createArrayBacked(PlayerDeniedEvent.class, + (listeners) -> (player, message) -> { + for (PlayerDeniedEvent listener : listeners) { + listener.onPlayerDenied(player, message); + } + }); + + @FunctionalInterface + public interface PlayerBanEvent { + boolean onPlayerBan(PlayerBanData banData, SilentValue silent); + } + + @FunctionalInterface + public interface PlayerBannedEvent { + void onPlayerBanned(PlayerBanData banData, boolean silent); + } + + @FunctionalInterface + public interface PlayerUnbanEvent { + void onPlayerUnban(PlayerBanData banData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface IpBanEvent { + boolean onIpBan(IpBanData banData, SilentValue silent); + } + + @FunctionalInterface + public interface IpBannedEvent { + void onIpBanned(IpBanData banData, boolean silent); + } + + @FunctionalInterface + public interface IpUnbanEvent { + void onIpUnban(IpBanData banData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface IpMuteEvent { + boolean onIpMute(IpMuteData muteData, SilentValue silent); + } + + @FunctionalInterface + public interface IpMutedEvent { + void onIpMuted(IpMuteData muteData, boolean silent); + } + + @FunctionalInterface + public interface IpUnmutedEvent { + void onIpUnmuted(IpMuteData muteData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface PlayerKickedEvent { + void onPlayerKicked(PlayerKickData kickData, boolean silent); + } + + @FunctionalInterface + public interface PlayerNoteCreatedEvent { + void onPlayerNoteCreated(PlayerNoteData noteData); + } + + @FunctionalInterface + public interface PlayerReportEvent { + boolean onPlayerReport(PlayerReportData reportData, SilentValue silent); + } + + @FunctionalInterface + public interface PlayerReportedEvent { + void onPlayerReported(PlayerReportData reportData, boolean silent); + } + + @FunctionalInterface + public interface PlayerReportDeletedEvent { + void onPlayerReportDeleted(PlayerReportData reportData); + } + + @FunctionalInterface + public interface NameBanEvent { + boolean onNameBan(NameBanData banData, SilentValue silent); + } + + @FunctionalInterface + public interface NameBannedEvent { + void onNameBanned(NameBanData banData, boolean silent); + } + + @FunctionalInterface + public interface NameUnbanEvent { + void onNameUnban(NameBanData banData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface PlayerWarnEvent { + boolean onPlayerWarn(PlayerWarnData warnData, SilentValue silent); + } + + @FunctionalInterface + public interface PlayerWarnedEvent { + void onPlayerWarned(PlayerWarnData warnData, boolean silent); + } + + @FunctionalInterface + public interface IpRangeBanEvent { + boolean onIpRangeBan(IpRangeBanData banData, SilentValue silent); + } + + @FunctionalInterface + public interface IpRangeBannedEvent { + void onIpRangeBanned(IpRangeBanData banData, boolean silent); + } + + @FunctionalInterface + public interface IpRangeUnbanEvent { + void onIpRangeUnban(IpRangeBanData banData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface PlayerMuteEvent { + boolean onPlayerMute(PlayerMuteData muteData, SilentValue silent); + } + + @FunctionalInterface + public interface PlayerMutedEvent { + void onPlayerMuted(PlayerMuteData muteData, boolean silent); + } + + @FunctionalInterface + public interface PlayerUnmuteEvent { + void onPlayerUnmute(PlayerMuteData muteData, PlayerData actor, String reason); + } + + @FunctionalInterface + public interface PluginReloadedEvent { + void onPluginReloaded(PlayerData actor); + } + + @FunctionalInterface + public interface PlayerDeniedEvent { + void onPlayerDenied(PlayerData player, Message message); + } + + public static class SilentValue { + @Getter + @Setter + private boolean silent; + + public SilentValue(boolean silent) { + this.silent = silent; + } + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricCommand.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricCommand.java new file mode 100644 index 00000000..04c26803 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricCommand.java @@ -0,0 +1,109 @@ +package me.confuser.banmanager.fabric; + +import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.suggestion.Suggestions; +import com.mojang.brigadier.suggestion.SuggestionsBuilder; +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.commands.CommonCommand; +import me.confuser.banmanager.common.commands.CommonSender; +import me.lucko.fabric.api.permissions.v0.Permissions; +import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; + +public class FabricCommand { + + private CommonCommand command; + + public FabricCommand(CommonCommand command) { + this.command = command; + } + + public void register() { + CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> { + registerCommand(dispatcher, command.getCommandName()); + + for (String alias : command.getAliases()) { + registerCommand(dispatcher, alias); + } + }); + } + + private void registerCommand(CommandDispatcher dispatcher, String name) { + LiteralArgumentBuilder literal = CommandManager.literal(name) + .requires(source -> Permissions.check(source, command.getPermission(), 2)) + .executes(this::execute) + .then(CommandManager.argument("args", StringArgumentType.greedyString()).executes(this::execute)); + + dispatcher.register(literal); + } + + private int execute(CommandContext context) throws CommandSyntaxException { + ServerCommandSource source = context.getSource(); + CommonSender commonSender = getSender(source); + + int start = context.getRange().getStart(); + String buffer = context.getInput().substring(start); + List args = new LinkedList(Arrays.asList(buffer.split(" "))); + args.remove(0); + + try { + if (Permissions.check(source, command.getPermission(), 2)) { + boolean success = this.command.onCommand(commonSender, this.command.getParser(args)); + + if (!success) { + commonSender.sendMessage(command.getUsage()); + } + + return success ? 1 : 0; + } else { + commonSender.sendMessage("&cYou do not have permission to use this command"); + return 1; + } + } catch (Exception e) { + e.printStackTrace(); + } + + return 0; + } + + private CommonSender getSender(ServerCommandSource source) { + if (source.getEntity() instanceof ServerPlayerEntity) { + return new FabricPlayer((ServerPlayerEntity) source.getEntity(), source.getServer(), BanManagerPlugin.getInstance().getConfig().isOnlineMode()); + } else { + return new FabricSender(BanManagerPlugin.getInstance(), source); + } + } + + private CompletableFuture suggest(CommandContext context, SuggestionsBuilder builder) throws CommandSyntaxException { + if (!this.command.isEnableTabCompletion()) { + return builder.buildFuture(); + } + + ServerCommandSource source = context.getSource(); + CommonSender commonSender = getSender(source); + + String input = context.getInput().substring(context.getInput().indexOf(' ') + 1); + String[] args = input.split(" "); + + List suggestions = this.command.handlePlayerNameTabComplete(commonSender, args); + + for (String suggestion : suggestions) { + builder.suggest(suggestion); + } + + return builder.buildFuture(); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricPlayer.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricPlayer.java new file mode 100644 index 00000000..4ab02388 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricPlayer.java @@ -0,0 +1,136 @@ +package me.confuser.banmanager.fabric; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.sql.SQLException; +import java.util.Collection; +import java.util.Collections; +import java.util.Set; +import java.util.UUID; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.CommonPlayer; +import me.confuser.banmanager.common.CommonWorld; +import me.confuser.banmanager.common.kyori.text.TextComponent; +import me.confuser.banmanager.common.kyori.text.serializer.gson.GsonComponentSerializer; +import me.confuser.banmanager.common.data.PlayerData; +import me.confuser.banmanager.common.util.Message; +import me.confuser.banmanager.common.util.UUIDUtils; +import net.minecraft.network.packet.s2c.play.PositionFlag; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import me.lucko.fabric.api.permissions.v0.Permissions; + +public class FabricPlayer implements CommonPlayer { + private final UUID uuid; + private final boolean onlineMode; + private final ServerPlayerEntity player; + private final MinecraftServer server; + + public FabricPlayer(ServerPlayerEntity player, MinecraftServer server, boolean onlineMode) { + this.player = player; + this.server = server; + this.uuid = player.getUuid(); + this.onlineMode = onlineMode; + } + + public void kick(String message) { + this.player.networkHandler.disconnect(FabricServer.formatMessage(message)); + } + + public void sendMessage(String message) { + if(message.isEmpty()) return; + + if(Message.isJSONMessage(message)) { + sendJSONMessage(message); + } else { + this.player.sendMessage(FabricServer.formatMessage(message)); + } + } + + public void sendMessage(Message message) { + sendMessage(message.toString()); + } + + @Override + public void sendJSONMessage(TextComponent jsonString) { + getPlayer().sendMessage(FabricServer.formatMessage(jsonString)); + } + + @Override + public void sendJSONMessage(String message) { + getPlayer().sendMessage(FabricServer.formatJsonMessage(message)); + } + + public boolean isConsole() { + return false; + } + + public PlayerData getData() { + try { + return BanManagerPlugin.getInstance().getPlayerStorage().queryForId(UUIDUtils.toBytes(getUniqueId())); + } catch (SQLException e) { + e.printStackTrace(); + sendMessage(Message.get("sender.error.exception").toString()); + return null; + } + } + + public boolean isOnlineMode() { + return onlineMode; + } + + public boolean hasPermission(String permission) { + return Permissions.check(getPlayer(), permission); + } + + public String getDisplayName() { + return getPlayer().getDisplayName().toString(); + } + + public String getName() { + return getPlayer().getNameForScoreboard(); + } + + public InetAddress getAddress() { + return ((InetSocketAddress) getPlayer().networkHandler.getConnectionAddress()).getAddress(); + } + + public UUID getUniqueId() { + return getPlayer().getUuid(); + } + + public boolean teleport(CommonWorld world, double x, double y, double z, float pitch, float yaw) { + ServerPlayerEntity player = getPlayer(); + + for (ServerWorld world1 : this.server.getWorlds()) { + if (world1.getRegistryKey().getValue().toString().equals(world.getName())) { + return player.teleport(world1, x, y, z, Collections.emptySet(), yaw, pitch, true); + } + } + + return false; + } + + @Override + public boolean canSee(CommonPlayer player) { + return getPlayer().canSee(this.server.getPlayerManager().getPlayer(player.getUniqueId())); + } + + public boolean isOnline() { + return getPlayer() != null && !getPlayer().isDisconnected(); + } + + private ServerPlayerEntity getPlayer() { + if (player != null) return player; + if (isOnlineMode()) return this.server.getPlayerManager().getPlayer(uuid); + + for (ServerPlayerEntity onlinePlayer : this.server.getPlayerManager().getPlayerList()) { + if (UUIDUtils.createOfflineUUID(onlinePlayer.getName().toString()).equals(uuid)) return onlinePlayer; + } + + return null; + } + +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricScheduler.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricScheduler.java new file mode 100644 index 00000000..c082a42e --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricScheduler.java @@ -0,0 +1,112 @@ +package me.confuser.banmanager.fabric; + +import me.confuser.banmanager.common.CommonScheduler; +import net.minecraft.server.MinecraftServer; + +import java.util.concurrent.Executors; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinWorkerThread; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; + +public class FabricScheduler implements CommonScheduler { + private final ScheduledExecutorService schedulerService; + private final ForkJoinPool executorService; + private MinecraftServer server; + + public FabricScheduler() { + this.schedulerService = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + Thread thread = new Thread(r); + thread.setName("banmanager-scheduler"); + return thread; + } + }); + this.executorService = new ForkJoinPool( + Runtime.getRuntime().availableProcessors(), + pool -> { + ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); + worker.setName("banmanager-worker-" + worker.getPoolIndex()); + return worker; + }, + (t, e) -> e.printStackTrace(), + false + ); + } + + public void enable(MinecraftServer server) { + this.server = server; + } + + @Override + public void runAsync(Runnable task) { + executorService.execute(() -> { + try { + task.run(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + @Override + public void runAsyncLater(Runnable task, long delay) { + schedulerService.schedule(() -> executorService.execute(() -> { + try { + task.run(); + } catch (Exception e) { + e.printStackTrace(); + } + }), delay, TimeUnit.MILLISECONDS); + } + + @Override + public void runSync(Runnable task) { + server.execute(() -> { + try { + task.run(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + } + + @Override + public void runSyncLater(Runnable task, long delay) { + schedulerService.schedule(() -> server.execute(() -> { + try { + task.run(); + } catch (Exception e) { + e.printStackTrace(); + } + }), delay, TimeUnit.MILLISECONDS); + } + + public void runAsyncRepeating(Runnable task, long initialDelay, long period) { + schedulerService.scheduleAtFixedRate(() -> executorService.execute(() -> { + try { + task.run(); + } catch (Exception e) { + e.printStackTrace(); + } + }), initialDelay, period, TimeUnit.MILLISECONDS); + } + + public void shutdown() { + schedulerService.shutdown(); + executorService.shutdown(); + try { + if (!schedulerService.awaitTermination(60, TimeUnit.SECONDS)) { + schedulerService.shutdownNow(); + } + if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) { + executorService.shutdownNow(); + } + } catch (InterruptedException e) { + schedulerService.shutdownNow(); + executorService.shutdownNow(); + } + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricSender.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricSender.java new file mode 100644 index 00000000..82a36936 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricSender.java @@ -0,0 +1,60 @@ +package me.confuser.banmanager.fabric; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.commands.CommonSender; +import me.confuser.banmanager.common.data.PlayerData; +import me.confuser.banmanager.common.util.Message; +import me.confuser.banmanager.common.util.UUIDUtils; +import net.minecraft.server.command.ServerCommandSource; +import me.lucko.fabric.api.permissions.v0.Permissions; + +import java.sql.SQLException; + +public class FabricSender implements CommonSender { + + private BanManagerPlugin plugin; + private ServerCommandSource sender; + + public FabricSender(BanManagerPlugin plugin, ServerCommandSource sender) { + this.plugin = plugin; + this.sender = sender; + } + + @Override + public String getName() { + return sender.getName(); + } + + @Override + public boolean hasPermission(String permission) { + return Permissions.check(sender, permission); + } + + @Override + public void sendMessage(String message) { + sender.sendMessage(FabricServer.formatMessage(message)); + } + + @Override + public void sendMessage(Message message) { + sendMessage(message.toString()); + } + + @Override + public boolean isConsole() { + return !sender.isExecutedByPlayer(); + } + + @Override + public PlayerData getData() { + if (isConsole()) return plugin.getPlayerStorage().getConsole(); + + try { + return plugin.getPlayerStorage().queryForId(UUIDUtils.toBytes((sender.getPlayer().getUuid()))); + } catch (SQLException e) { + e.printStackTrace(); + sendMessage(Message.get("sender.error.exception")); + return null; + } + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java new file mode 100644 index 00000000..81ead18f --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/FabricServer.java @@ -0,0 +1,305 @@ +package me.confuser.banmanager.fabric; + +import java.util.Arrays; +import java.util.UUID; +import java.util.ArrayList; +import java.util.List; + +import com.mojang.serialization.JsonOps; + +import lombok.Getter; + +import com.mojang.brigadier.tree.CommandNode; +import com.mojang.brigadier.tree.LiteralCommandNode; +import com.google.gson.JsonParser; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.CommonExternalCommand; +import me.confuser.banmanager.common.CommonPlayer; +import me.confuser.banmanager.common.CommonServer; +import me.confuser.banmanager.common.CommonWorld; +import me.confuser.banmanager.common.api.events.CommonEvent; +import me.confuser.banmanager.common.commands.CommonSender; +import me.confuser.banmanager.common.data.IpBanData; +import me.confuser.banmanager.common.data.IpMuteData; +import me.confuser.banmanager.common.data.IpRangeBanData; +import me.confuser.banmanager.common.data.NameBanData; +import me.confuser.banmanager.common.data.PlayerBanData; +import me.confuser.banmanager.common.data.PlayerData; +import me.confuser.banmanager.common.data.PlayerKickData; +import me.confuser.banmanager.common.data.PlayerMuteData; +import me.confuser.banmanager.common.data.PlayerNoteData; +import me.confuser.banmanager.common.data.PlayerReportData; +import me.confuser.banmanager.common.data.PlayerWarnData; +import me.confuser.banmanager.common.kyori.text.TextComponent; +import me.confuser.banmanager.common.kyori.text.serializer.gson.GsonComponentSerializer; +import me.confuser.banmanager.common.kyori.text.serializer.legacy.LegacyComponentSerializer; +import com.google.gson.JsonElement; +import me.confuser.banmanager.common.util.Message; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import net.minecraft.text.TextCodecs; +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; + +public class FabricServer implements CommonServer { + + private BanManagerPlugin plugin; + @Getter + private MinecraftServer server; + + public FabricServer() { + } + + public void enable(BanManagerPlugin plugin, MinecraftServer server) { + this.plugin = plugin; + this.server = server; + } + + public CommonPlayer getPlayer(UUID uniqueId) { + ServerPlayerEntity player = this.server.getPlayerManager().getPlayer(uniqueId); + + if (player == null) return null; + + return new FabricPlayer(player, this.server, plugin.getConfig().isOnlineMode()); + } + + public CommonPlayer getPlayer(String name) { + ServerPlayerEntity player = this.server.getPlayerManager().getPlayer(name); + + if (player == null) return null; + + return new FabricPlayer(player, this.server, plugin.getConfig().isOnlineMode()); + } + + public CommonPlayer[] getOnlinePlayers() { + return this.server.getPlayerManager().getPlayerList().stream() + .map(player -> new FabricPlayer(player, this.server, plugin.getConfig().isOnlineMode())) + .filter(player -> player != null && player.isOnline()) + .toArray(CommonPlayer[]::new); + } + + public void broadcast(String message, String permission) { + Arrays.stream(getOnlinePlayers()) + .filter(player -> player.hasPermission(permission)) + .forEach(player -> player.sendMessage(message)); + } + + public void broadcastJSON(TextComponent message, String permission) { + Arrays.stream(getOnlinePlayers()) + .filter(player -> player.hasPermission(permission)) + .forEach(player -> player.sendJSONMessage(message)); + } + + public void broadcast(String message, String permission, CommonSender sender) { + broadcast(message, permission); + + if (!sender.hasPermission(permission)) sender.sendMessage(message); + } + + public CommonSender getConsoleSender() { + return new FabricSender(plugin, this.server.getCommandSource()); + } + + public boolean dispatchCommand(CommonSender consoleSender, String command) { + this.server.getCommandManager().executeWithPrefix(this.server.getCommandSource(), command); + + return true; + } + + public CommonWorld getWorld(String name) { + for (ServerWorld world : this.server.getWorlds()) { + if (world.getRegistryKey().getValue().toString().equals(name)) { + return new CommonWorld(world.getRegistryKey().getValue().toString()); + } + } + + return null; + } + + public CommonEvent callEvent(String name, Object... args) { + CommonEvent commonEvent; + BanManagerEvents.SilentValue silentValue = new BanManagerEvents.SilentValue(true); + + switch (name) { + case "PlayerBanEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.PLAYER_BAN_EVENT.invoker().onPlayerBan((PlayerBanData) args[0], silentValue), silentValue.isSilent()); + break; + case "PlayerBannedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.PLAYER_BANNED_EVENT.invoker().onPlayerBanned((PlayerBanData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "PlayerUnbanEvent": + BanManagerEvents.PLAYER_UNBAN_EVENT.invoker().onPlayerUnban((PlayerBanData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "IpBanEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.IP_BAN_EVENT.invoker().onIpBan((IpBanData) args[0], silentValue), silentValue.isSilent()); + break; + case "IpBannedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.IP_BANNED_EVENT.invoker().onIpBanned((IpBanData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "IpUnbanEvent": + BanManagerEvents.IP_UNBAN_EVENT.invoker().onIpUnban((IpBanData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "IpMuteEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.IP_MUTE_EVENT.invoker().onIpMute((IpMuteData) args[0], silentValue), silentValue.isSilent()); + break; + case "IpMutedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.IP_MUTED_EVENT.invoker().onIpMuted((IpMuteData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "IpUnmutedEvent": + BanManagerEvents.IP_UNMUTED_EVENT.invoker().onIpUnmuted((IpMuteData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "PlayerKickedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.PLAYER_KICKED_EVENT.invoker().onPlayerKicked((PlayerKickData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + + case "PlayerNoteCreatedEvent": + BanManagerEvents.PLAYER_NOTE_CREATED_EVENT.invoker().onPlayerNoteCreated((PlayerNoteData) args[0]); + commonEvent = new CommonEvent(false, false); + break; + + case "PlayerReportEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.PLAYER_REPORT_EVENT.invoker().onPlayerReport((PlayerReportData) args[0], silentValue), silentValue.isSilent()); + break; + case "PlayerReportedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.PLAYER_REPORTED_EVENT.invoker().onPlayerReported((PlayerReportData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "PlayerReportDeletedEvent": + BanManagerEvents.PLAYER_REPORT_DELETED_EVENT.invoker().onPlayerReportDeleted((PlayerReportData) args[0]); + commonEvent = new CommonEvent(false, false); + break; + + case "NameBanEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.NAME_BAN_EVENT.invoker().onNameBan((NameBanData) args[0], silentValue), silentValue.isSilent()); + break; + case "NameBannedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.NAME_BANNED_EVENT.invoker().onNameBanned((NameBanData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "NameUnbanEvent": + BanManagerEvents.NAME_UNBAN_EVENT.invoker().onNameUnban((NameBanData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "PlayerWarnEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.PLAYER_WARN_EVENT.invoker().onPlayerWarn((PlayerWarnData) args[0], silentValue), silentValue.isSilent()); + break; + case "PlayerWarnedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.PLAYER_WARNED_EVENT.invoker().onPlayerWarned((PlayerWarnData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + + case "IpRangeBanEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.IP_RANGE_BAN_EVENT.invoker().onIpRangeBan((IpRangeBanData) args[0], silentValue), silentValue.isSilent()); + break; + case "IpRangeBannedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.IP_RANGE_BANNED_EVENT.invoker().onIpRangeBanned((IpRangeBanData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "IpRangeUnbanEvent": + BanManagerEvents.IP_RANGE_UNBAN_EVENT.invoker().onIpRangeUnban((IpRangeBanData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "PlayerMuteEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + commonEvent = new CommonEvent(!BanManagerEvents.PLAYER_MUTE_EVENT.invoker().onPlayerMute((PlayerMuteData) args[0], silentValue), silentValue.isSilent()); + break; + case "PlayerMutedEvent": + silentValue = new BanManagerEvents.SilentValue((boolean) args[1]); + BanManagerEvents.PLAYER_MUTED_EVENT.invoker().onPlayerMuted((PlayerMuteData) args[0], silentValue.isSilent()); + commonEvent = new CommonEvent(false, silentValue.isSilent()); + break; + case "PlayerUnmuteEvent": + BanManagerEvents.PLAYER_UNMUTE_EVENT.invoker().onPlayerUnmute((PlayerMuteData) args[0], (PlayerData) args[1], (String) args[2]); + commonEvent = new CommonEvent(false, false); + break; + + case "PluginReloadedEvent": + BanManagerEvents.PLUGIN_RELOADED_EVENT.invoker().onPluginReloaded((PlayerData) args[0]); + commonEvent = new CommonEvent(false, false); + break; + + case "PlayerDeniedEvent": + BanManagerEvents.PLAYER_DENIED_EVENT.invoker().onPlayerDenied((PlayerData) args[0], (Message) args[1]); + commonEvent = new CommonEvent(false, false); + break; + + default: + commonEvent = new CommonEvent(false, false); + break; + } + + return commonEvent; + } + + public CommonExternalCommand getPluginCommand(String commandName) { + for (CommandNode commandNode : this.server.getCommandManager().getDispatcher().getRoot().getChildren()) { + if (commandNode.getName().equals(commandName)) { + List redirects = new ArrayList<>(); + + if (commandNode instanceof LiteralCommandNode) { + LiteralCommandNode literalNode = (LiteralCommandNode) commandNode; + CommandNode redirectNode = literalNode.getRedirect(); + + if (redirectNode != null) { + redirects.add(redirectNode.getName()); + } + } + + return new CommonExternalCommand(commandNode.getName(), commandNode.getName(), redirects); + } + } + return null; + } + + public static Text formatMessage(String message) { + return formatMessage(LegacyComponentSerializer.legacy('&').deserialize(message)); + } + + public static Text formatMessage(Message message) { + return formatMessage(message.toString()); + } + + public static Text formatMessage(TextComponent message) { + return TextCodecs.CODEC + .decode(JsonOps.INSTANCE, JsonParser.parseString(GsonComponentSerializer.gson().serialize(message))) + .getOrThrow() + .getFirst(); + } + + public static Text formatJsonMessage(String message) { + return TextCodecs.CODEC + .decode(JsonOps.INSTANCE, JsonParser.parseString(message)) + .getOrThrow() + .getFirst(); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/PluginLogger.java b/fabric/src/main/java/me/confuser/banmanager/fabric/PluginLogger.java new file mode 100644 index 00000000..9e6fd0fc --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/PluginLogger.java @@ -0,0 +1,29 @@ +package me.confuser.banmanager.fabric; + +import org.apache.logging.log4j.Logger; + +import me.confuser.banmanager.common.CommonLogger; + +public class PluginLogger implements CommonLogger { + + private final Logger logger; + + public PluginLogger(Logger logger) { + this.logger = logger; + } + + @Override + public void info(String msg) { + logger.info(msg); + } + + @Override + public void warning(String msg) { + logger.warn(msg); + } + + @Override + public void severe(String msg) { + logger.error(msg); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/BanListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/BanListener.java new file mode 100644 index 00000000..fc5404df --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/BanListener.java @@ -0,0 +1,36 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonBanListener; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.common.data.*; + +public class BanListener { + + private final CommonBanListener listener; + + public BanListener(BanManagerPlugin plugin) { + this.listener = new CommonBanListener(plugin); + + BanManagerEvents.PLAYER_BANNED_EVENT.register(this::notifyOnBan); + BanManagerEvents.IP_BANNED_EVENT.register(this::notifyOnIpBan); + BanManagerEvents.IP_RANGE_BANNED_EVENT.register(this::notifyOnIpRangeBan); + BanManagerEvents.NAME_BANNED_EVENT.register(this::notifyOnNameBan); + } + + private void notifyOnBan(PlayerBanData banData, boolean silent) { + listener.notifyOnBan(banData, silent); + } + + private void notifyOnIpBan(IpBanData banData, boolean silent) { + listener.notifyOnBan(banData, silent); + } + + private void notifyOnIpRangeBan(IpRangeBanData banData, boolean silent) { + listener.notifyOnBan(banData, silent); + } + + private void notifyOnNameBan(NameBanData banData, boolean silent) { + listener.notifyOnBan(banData, silent); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ChatListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ChatListener.java new file mode 100644 index 00000000..088b00b7 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ChatListener.java @@ -0,0 +1,52 @@ +package me.confuser.banmanager.fabric.listeners; + + +import lombok.RequiredArgsConstructor; +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.CommonPlayer; +import me.confuser.banmanager.common.listeners.CommonChatHandler; +import me.confuser.banmanager.common.listeners.CommonChatListener; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.minecraft.network.message.SignedMessage; +import net.minecraft.network.message.MessageType.Parameters; +import net.minecraft.server.network.ServerPlayerEntity; + +public class ChatListener { + private final CommonChatListener listener; + private BanManagerPlugin plugin; + + public ChatListener(BanManagerPlugin plugin) { + this.plugin = plugin; + this.listener = new CommonChatListener(plugin); + + ServerMessageEvents.ALLOW_CHAT_MESSAGE.register((message, sender, params) -> { + if (!sender.isPlayer()) { + return true; + } + + CommonPlayer player = plugin.getServer().getPlayer(sender.getUuid()); + + if (listener.onPlayerChat(player, new ChatHandler(message, sender, params), message.getSignedContent())) { + return false; + } + + if (listener.onIpChat(player, player.getAddress(), new ChatHandler(message, sender, params), message.getSignedContent())) { + return false; + } + + return true; + }); + } + + @RequiredArgsConstructor + private class ChatHandler implements CommonChatHandler { + private final SignedMessage message; + private final ServerPlayerEntity sender; + private final Parameters params; + + @Override + public void handleSoftMute() { + plugin.getLogger().warning("Soft mute not implemented"); + } + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/CommandListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/CommandListener.java new file mode 100644 index 00000000..ac9ce7bb --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/CommandListener.java @@ -0,0 +1,31 @@ +package me.confuser.banmanager.fabric.listeners; + + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.CommonPlayer; +import me.confuser.banmanager.common.listeners.CommonCommandListener; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; + +public class CommandListener { + + private final CommonCommandListener listener; + @SuppressWarnings("unused") + private BanManagerPlugin plugin; + + public CommandListener(BanManagerPlugin plugin) { + this.plugin = plugin; + this.listener = new CommonCommandListener(plugin); + + ServerMessageEvents.ALLOW_COMMAND_MESSAGE.register((message, sender, params) -> { + if (!sender.isExecutedByPlayer()) { + return true; + } + + CommonPlayer player = plugin.getServer().getPlayer(sender.getPlayer().getUuid()); + String[] args = message.getSignedContent().split(" ", 6); + String cmd = args[0].replace("/", "").toLowerCase(); + + return listener.onCommand(player, cmd, args); + }); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/DiscordListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/DiscordListener.java new file mode 100644 index 00000000..0cfa1821 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/DiscordListener.java @@ -0,0 +1,100 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonDiscordListener; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.common.data.*; + +public class DiscordListener { + + private final CommonDiscordListener listener; + + public DiscordListener(BanManagerPlugin plugin) { + this.listener = new CommonDiscordListener(plugin); + + BanManagerEvents.PLAYER_BANNED_EVENT.register(this::notifyOnBan); + BanManagerEvents.PLAYER_MUTED_EVENT.register(this::notifyOnMute); + BanManagerEvents.IP_BANNED_EVENT.register(this::notifyOnBan); + BanManagerEvents.PLAYER_KICKED_EVENT.register(this::notifyOnKick); + BanManagerEvents.PLAYER_WARNED_EVENT.register(this::notifyOnWarn); + BanManagerEvents.PLAYER_UNBAN_EVENT.register(this::notifyOnUnban); + BanManagerEvents.IP_UNBAN_EVENT.register(this::notifyOnUnban); + BanManagerEvents.PLAYER_UNMUTE_EVENT.register(this::notifyOnUnmute); + BanManagerEvents.PLAYER_REPORTED_EVENT.register(this::notifyOnReport); + } + + private void notifyOnBan(PlayerBanData banData, boolean silent) { + Object[] data = listener.notifyOnBan(banData); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void notifyOnMute(PlayerMuteData muteData, boolean silent) { + Object[] data = listener.notifyOnMute(muteData); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void notifyOnBan(IpBanData banData, boolean silent) { + Object[] data = listener.notifyOnBan(banData); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void notifyOnKick(PlayerKickData kickData, boolean silent) { + Object[] data = listener.notifyOnKick(kickData); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void notifyOnWarn(PlayerWarnData warnData, boolean silent) { + Object[] data = listener.notifyOnWarn(warnData); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void notifyOnUnban(PlayerBanData banData, PlayerData actor, String reason) { + Object[] data = listener.notifyOnUnban(banData, actor, reason); + + send(data); + } + + private void notifyOnUnban(IpBanData banData, PlayerData actor, String reason) { + Object[] data = listener.notifyOnUnban(banData, actor, reason); + + send(data); + } + + private void notifyOnUnmute(PlayerMuteData muteData, PlayerData actor, String reason) { + Object[] data = listener.notifyOnUnmute(muteData, actor, reason); + + send(data); + } + + private void notifyOnReport(PlayerReportData reportData, boolean silent) { + Object[] data = listener.notifyOnReport(reportData, reportData.getActor(), reportData.getReason()); + + if (silent && (boolean) data[2]) return; + + send(data); + } + + private void send(Object[] data) { + String url = (String) data[0]; + String payload = (String) data[1]; + + if (url == null || payload == null || url.isEmpty() || payload.isEmpty()) return; + + listener.send(url, payload); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java new file mode 100644 index 00000000..5ce33c4b --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/HookListener.java @@ -0,0 +1,107 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonHooksListener; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.common.data.*; + +public class HookListener { + + private final CommonHooksListener listener; + + public HookListener(BanManagerPlugin plugin) { + this.listener = new CommonHooksListener(plugin); + + BanManagerEvents.PLAYER_BAN_EVENT.register(this::onBan); + BanManagerEvents.PLAYER_BANNED_EVENT.register(this::onBan); + BanManagerEvents.PLAYER_UNBAN_EVENT.register(this::onUnban); + BanManagerEvents.PLAYER_MUTE_EVENT.register(this::onMute); + BanManagerEvents.PLAYER_MUTED_EVENT.register(this::onMute); + BanManagerEvents.PLAYER_UNMUTE_EVENT.register(this::onUnmute); + BanManagerEvents.IP_BAN_EVENT.register(this::onBan); + BanManagerEvents.IP_BANNED_EVENT.register(this::onBan); + BanManagerEvents.IP_UNBAN_EVENT.register(this::onUnban); + BanManagerEvents.IP_RANGE_BAN_EVENT.register(this::onBan); + BanManagerEvents.IP_RANGE_BANNED_EVENT.register(this::onBan); + BanManagerEvents.IP_RANGE_UNBAN_EVENT.register(this::onUnban); + BanManagerEvents.PLAYER_WARN_EVENT.register(this::onWarn); + BanManagerEvents.PLAYER_WARNED_EVENT.register(this::onWarn); + BanManagerEvents.PLAYER_NOTE_CREATED_EVENT.register(this::onNote); + BanManagerEvents.PLAYER_REPORT_EVENT.register(this::onReport); + BanManagerEvents.PLAYER_REPORTED_EVENT.register(this::onReport); + } + + private boolean onBan(PlayerBanData banData, BanManagerEvents.SilentValue silent) { + listener.onBan(banData, silent.isSilent()); + return true; + } + + private void onBan(PlayerBanData banData, boolean silent) { + listener.onBan(banData, silent); + } + + private void onUnban(PlayerBanData banData, PlayerData actor, String reason) { + listener.onUnban(banData, actor, reason); + } + + private boolean onMute(PlayerMuteData muteData, BanManagerEvents.SilentValue silent) { + listener.onMute(muteData, silent.isSilent()); + return true; + } + + private void onMute(PlayerMuteData muteData, boolean silent) { + listener.onMute(muteData, silent); + } + + private void onUnmute(PlayerMuteData muteData, PlayerData actor, String reason) { + listener.onUnmute(muteData, actor, reason); + } + + private boolean onBan(IpBanData banData, BanManagerEvents.SilentValue silent) { + listener.onBan(banData, silent.isSilent()); + return true; + } + + private void onBan(IpBanData banData, boolean silent) { + listener.onBan(banData, silent); + } + + private void onUnban(IpBanData banData, PlayerData actor, String reason) { + listener.onUnban(banData, actor, reason); + } + + private boolean onBan(IpRangeBanData banData, BanManagerEvents.SilentValue silent) { + listener.onBan(banData, silent.isSilent()); + return true; + } + + private void onBan(IpRangeBanData banData, boolean silent) { + listener.onBan(banData, silent); + } + + private void onUnban(IpRangeBanData banData, PlayerData actor, String reason) { + listener.onUnban(banData, actor, reason); + } + + private boolean onWarn(PlayerWarnData warnData, BanManagerEvents.SilentValue silent) { + listener.onWarn(warnData, silent.isSilent()); + return true; + } + + private void onWarn(PlayerWarnData warnData, boolean silent) { + listener.onWarn(warnData, silent); + } + + private void onNote(PlayerNoteData noteData) { + listener.onNote(noteData); + } + + private boolean onReport(PlayerReportData reportData, BanManagerEvents.SilentValue silent) { + listener.onReport(reportData, silent.isSilent()); + return true; + } + + private void onReport(PlayerReportData reportData, boolean silent) { + listener.onReport(reportData, silent); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/JoinListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/JoinListener.java new file mode 100644 index 00000000..7702f737 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/JoinListener.java @@ -0,0 +1,88 @@ +package me.confuser.banmanager.fabric.listeners; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.data.PlayerData; +import me.confuser.banmanager.common.listeners.CommonJoinHandler; +import me.confuser.banmanager.common.listeners.CommonJoinListener; +import me.confuser.banmanager.common.util.IPUtils; +import me.confuser.banmanager.common.util.Message; +import me.confuser.banmanager.fabric.FabricPlayer; +import me.confuser.banmanager.fabric.FabricServer; +import net.fabricmc.fabric.api.networking.v1.ServerLoginConnectionEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerLoginNetworkHandler; +import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.text.Text; + +public class JoinListener { + private final CommonJoinListener listener; + private BanManagerPlugin plugin; + + public JoinListener(BanManagerPlugin plugin) { + this.plugin = plugin; + this.listener = new CommonJoinListener(plugin); + + ServerPlayConnectionEvents.INIT.register((handler, server) -> { + BanJoinHandler banJoinHandler = new BanJoinHandler(plugin, handler); + + listener.banCheck(handler.getPlayer().getUuid(), handler.getPlayer().getName().getString(), + IPUtils.toIPAddress(handler.getPlayer().getIp()), banJoinHandler); + + if (!banJoinHandler.isDenied()) { + listener.onPreJoin(handler.getPlayer().getUuid(), handler.getPlayer().getName().getString(), + IPUtils.toIPAddress(handler.getPlayer().getIp())); + } + }); + + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> { + listener.onJoin( + new FabricPlayer(handler.getPlayer(), handler.getPlayer().getServer(), plugin.getConfig().isOnlineMode())); + + listener.onPlayerLogin( + new FabricPlayer(handler.getPlayer(), handler.getPlayer().getServer(), plugin.getConfig().isOnlineMode()), + new LoginHandler(handler.getPlayer())); + }); + } + + @RequiredArgsConstructor + private class BanJoinHandler implements CommonJoinHandler { + private final BanManagerPlugin plugin; + private final ServerPlayNetworkHandler handler; + @Getter + private boolean isDenied = false; + + @Override + public void handlePlayerDeny(PlayerData player, Message message) { + plugin.getServer().callEvent("PlayerDeniedEvent", player, message); + + handleDeny(message); + } + + @Override + public void handleDeny(Message message) { + isDenied = true; + + handler.disconnect(FabricServer.formatMessage(message)); + } + } + + @RequiredArgsConstructor + private class LoginHandler implements CommonJoinHandler { + private final ServerPlayerEntity player; + + @Override + public void handlePlayerDeny(PlayerData player, Message message) { + handleDeny(message); + } + + @Override + public void handleDeny(Message message) { + player.networkHandler.disconnect(FabricServer.formatMessage(message)); + } + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/LeaveListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/LeaveListener.java new file mode 100644 index 00000000..efca55d2 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/LeaveListener.java @@ -0,0 +1,19 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonLeaveListener; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.minecraft.server.network.ServerPlayerEntity; + +public class LeaveListener { + private final CommonLeaveListener listener; + + public LeaveListener(BanManagerPlugin plugin) { + this.listener = new CommonLeaveListener(plugin); + + ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> { + ServerPlayerEntity player = handler.getPlayer(); + listener.onLeave(player.getUuid(), player.getName().getString()); + }); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/MuteListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/MuteListener.java new file mode 100644 index 00000000..d2d0a31c --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/MuteListener.java @@ -0,0 +1,26 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonMuteListener; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.common.data.*; + +public class MuteListener { + + private final CommonMuteListener listener; + + public MuteListener(BanManagerPlugin plugin) { + this.listener = new CommonMuteListener(plugin); + + BanManagerEvents.PLAYER_MUTED_EVENT.register(this::notifyOnMute); + BanManagerEvents.IP_MUTED_EVENT.register(this::notifyOnIpMute); + } + + private void notifyOnMute(PlayerMuteData muteData, boolean silent) { + listener.notifyOnMute(muteData, silent); + } + + private void notifyOnIpMute(IpMuteData muteData, boolean silent) { + listener.notifyOnMute(muteData, silent); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/NoteListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/NoteListener.java new file mode 100644 index 00000000..eb04b94a --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/NoteListener.java @@ -0,0 +1,21 @@ +package me.confuser.banmanager.fabric.listeners; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.listeners.CommonNoteListener; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.common.data.PlayerNoteData; + +public class NoteListener { + + private final CommonNoteListener listener; + + public NoteListener(BanManagerPlugin plugin) { + this.listener = new CommonNoteListener(plugin); + + BanManagerEvents.PLAYER_NOTE_CREATED_EVENT.register(this::notifyOnNote); + } + + private void notifyOnNote(PlayerNoteData noteData) { + listener.notifyOnNote(noteData); + } +} diff --git a/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ReportListener.java b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ReportListener.java new file mode 100644 index 00000000..a8b35993 --- /dev/null +++ b/fabric/src/main/java/me/confuser/banmanager/fabric/listeners/ReportListener.java @@ -0,0 +1,70 @@ +package me.confuser.banmanager.fabric.listeners; + +import java.sql.SQLException; + +import me.confuser.banmanager.common.BanManagerPlugin; +import me.confuser.banmanager.common.CommonPlayer; +import me.confuser.banmanager.common.listeners.CommonReportListener; +import me.confuser.banmanager.common.util.UUIDUtils; +import me.confuser.banmanager.fabric.BMFabricPlugin; +import me.confuser.banmanager.fabric.BanManagerEvents; +import me.confuser.banmanager.fabric.FabricServer; +import me.confuser.banmanager.fabric.BanManagerEvents.SilentValue; +import net.minecraft.server.network.ServerPlayerEntity; +import me.confuser.banmanager.common.data.*; + +public class ReportListener { + + private final CommonReportListener listener; + private FabricServer server; + private BanManagerPlugin plugin; + + public ReportListener(BanManagerPlugin plugin, FabricServer server) { + this.listener = new CommonReportListener(plugin); + this.plugin = plugin; + this.server = server; + + BanManagerEvents.PLAYER_REPORT_EVENT.register(this::notifyOnReport); + BanManagerEvents.PLAYER_REPORTED_EVENT.register(this::notifyOnReported); + BanManagerEvents.PLAYER_REPORT_DELETED_EVENT.register(this::notifyOnReportDeleted); + } + + private boolean notifyOnReport(PlayerReportData data, SilentValue silent) { + listener.notifyOnReport(data); + + return true; + } + + private void notifyOnReported(PlayerReportData reportData, boolean silent) { + ServerPlayerEntity player = this.server.getServer().getPlayerManager().getPlayer(reportData.getPlayer().getUUID()); + ServerPlayerEntity actor = this.server.getServer().getPlayerManager().getPlayer(reportData.getActor().getUUID()); + + try { + createLocation(reportData, player, reportData.getPlayer()); + } catch (SQLException e) { + e.printStackTrace(); + } + + try { + createLocation(reportData, actor, reportData.getActor()); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + private void notifyOnReportDeleted(PlayerReportData reportData) { + listener.deleteReferences(reportData); + } + + private void createLocation(PlayerReportData report, ServerPlayerEntity player, PlayerData playerData) + throws SQLException { + if (player == null || playerData == null) + return; + + plugin.getPlayerReportLocationStorage() + .create(new PlayerReportLocationData(report, playerData, + player.getWorld().getRegistryKey().getValue().toString(), player.getX(), player.getY(), player + .getZ(), + player.getPitch(), player.getYaw())); + } +} diff --git a/fabric/src/main/resources/assets/banmanager/icon.png b/fabric/src/main/resources/assets/banmanager/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..e068fd5d031dd558218e9b6ac098bd5d6ee34daa GIT binary patch literal 4976 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.9.0", + "fabric-api-base": "*", + "fabric-command-api-v2": "*", + "fabric-events-interaction-v0": "*", + "fabric-lifecycle-events-v1": "*", + "fabric-message-api-v1": "*", + "fabric-networking-api-v1": "*", + "fabric-permissions-api-v0": ">=0.3.1", + "minecraft": ">=1.21" + } +} diff --git a/fabric/src/main/resources/geoip.yml b/fabric/src/main/resources/geoip.yml new file mode 120000 index 00000000..513da3e8 --- /dev/null +++ b/fabric/src/main/resources/geoip.yml @@ -0,0 +1 @@ +../../../../common/src/main/resources/geoip.yml \ No newline at end of file diff --git a/fabric/src/main/resources/messages.yml b/fabric/src/main/resources/messages.yml new file mode 120000 index 00000000..2da3a2d0 --- /dev/null +++ b/fabric/src/main/resources/messages.yml @@ -0,0 +1 @@ +../../../../common/src/main/resources/messages.yml \ No newline at end of file diff --git a/fabric/src/main/resources/plugin.yml b/fabric/src/main/resources/plugin.yml new file mode 120000 index 00000000..f5f9ffb4 --- /dev/null +++ b/fabric/src/main/resources/plugin.yml @@ -0,0 +1 @@ +../../../../common/src/main/resources/plugin.yml \ No newline at end of file diff --git a/fabric/src/main/resources/reasons.yml b/fabric/src/main/resources/reasons.yml new file mode 120000 index 00000000..bc3554b6 --- /dev/null +++ b/fabric/src/main/resources/reasons.yml @@ -0,0 +1 @@ +../../../../common/src/main/resources/reasons.yml \ No newline at end of file diff --git a/fabric/src/main/resources/schedules.yml b/fabric/src/main/resources/schedules.yml new file mode 120000 index 00000000..bfc79950 --- /dev/null +++ b/fabric/src/main/resources/schedules.yml @@ -0,0 +1 @@ +../../../../common/src/main/resources/schedules.yml \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 138fa50c..1de852dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,3 +2,5 @@ group=me.confuser.banmanager version=7.10.0-SNAPSHOT org.gradle.parallel=true description="The defacto plugin for Minecraft to manage punishments and moderate more effectively" + +org.gradle.jvmargs=-Xmx2G diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..d6e308a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/master/subprojects/plugins/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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || 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 @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/settings.gradle.kts b/settings.gradle.kts index 718b82f0..ff07cc40 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,6 +6,7 @@ include(":BanManagerBungee") include(":BanManagerSponge") include(":BanManagerLibs") include(":BanManagerVelocity") +include(":BanManagerFabric") project(":BanManagerCommon").projectDir = file("common") project(":BanManagerBukkit").projectDir = file("bukkit") @@ -13,3 +14,4 @@ project(":BanManagerBungee").projectDir = file("bungee") project(":BanManagerSponge").projectDir = file("sponge") project(":BanManagerLibs").projectDir = file("libs") project(":BanManagerVelocity").projectDir = file("velocity") +project(":BanManagerFabric").projectDir = file("fabric") diff --git a/velocity/src/main/java/me.confuser.banmanager.velocity/BMVelocityPlugin.java b/velocity/src/main/java/me.confuser.banmanager.velocity/BMVelocityPlugin.java index 287251b4..bf9f3153 100644 --- a/velocity/src/main/java/me.confuser.banmanager.velocity/BMVelocityPlugin.java +++ b/velocity/src/main/java/me.confuser.banmanager.velocity/BMVelocityPlugin.java @@ -256,6 +256,7 @@ private void setupAsyncRunnable(long length, Runnable runnable) { server.getScheduler().buildTask(this, runnable).repeat(length, TimeUnit.SECONDS).schedule(); } + @SneakyThrows private InputStream getResourceAsStream(String resource) {