diff --git a/bukkit-common/src/main/java/net/badlion/bukkitapi/cosmetics/CosmeticManager.java b/bukkit-common/src/main/java/net/badlion/bukkitapi/cosmetics/CosmeticManager.java index 437863c..a23faab 100644 --- a/bukkit-common/src/main/java/net/badlion/bukkitapi/cosmetics/CosmeticManager.java +++ b/bukkit-common/src/main/java/net/badlion/bukkitapi/cosmetics/CosmeticManager.java @@ -1,6 +1,5 @@ package net.badlion.bukkitapi.cosmetics; -import com.google.gson.JsonArray; import com.google.gson.JsonObject; import net.badlion.modapicommon.AbstractBadlionApi; import net.badlion.modapicommon.utility.AbstractCosmeticManager; @@ -53,20 +52,4 @@ public void onPlayerJoin(Player player) { } } } - - private JsonObject getDisabledCosmeticsData(UUID uuid, boolean disabled, String... cosmeticTypes) { - final JsonObject data = new JsonObject(); - final JsonArray array = new JsonArray(); - - for (String cosmeticType : cosmeticTypes) { - array.add(cosmeticType); - } - - data.addProperty("type", "disable_cosmetics"); - data.add("cosmeticTypes", array); - data.addProperty("disable", disabled); - data.addProperty("uuid", uuid.toString()); - - return data; - } } diff --git a/fabric/.gitignore b/fabric/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/fabric/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..a988c13 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,81 @@ +plugins { + id 'fabric-loom' version '1.0-SNAPSHOT' + id 'maven-publish' + id 'com.github.johnrengelman.shadow' version '7.1.2' +} + +version = project.mod_version +group = project.maven_group + +repositories { + mavenLocal() +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + shadow(implementation("net.badlion:modapi-common:2.1.1")) +} + +shadowJar { + configurations = [project.configurations.shadow] + archiveClassifier.set("dev") +} + +remapJar { + dependsOn(shadowJar) + inputFile = tasks.shadowJar.archiveFile +} + +processResources { + inputs.property "version", project.version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +def targetJavaVersion = 17 +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release = targetJavaVersion + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + archivesBaseName = project.archives_base_name + withSourcesJar() +} + +jar { + archiveClassifier.set("dev") +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 0000000..2ee7c46 --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.19.2 +yarn_mappings=1.19.2+build.28 +loader_version=0.14.10 +# Mod Properties +mod_version=1.19.2 +maven_group=net.badlion +archives_base_name=badlion-modapi-fabric +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.64.0+1.19.2 diff --git a/fabric/gradle/wrapper/gradle-wrapper.jar b/fabric/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/fabric/gradle/wrapper/gradle-wrapper.jar differ diff --git a/fabric/gradle/wrapper/gradle-wrapper.properties b/fabric/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..aa991fc --- /dev/null +++ b/fabric/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/fabric/gradlew b/fabric/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/fabric/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# 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 +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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +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 + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + 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 +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +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 + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# 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. +# + +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/fabric/gradlew.bat b/fabric/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/fabric/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/fabric/settings.gradle b/fabric/settings.gradle new file mode 100644 index 0000000..c32416a --- /dev/null +++ b/fabric/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/FabricBadlionPlugin.java b/fabric/src/main/java/net/badlion/fabricapi/FabricBadlionPlugin.java new file mode 100644 index 0000000..2c1623a --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/FabricBadlionPlugin.java @@ -0,0 +1,132 @@ +package net.badlion.fabricapi; + +import net.badlion.fabricapi.cosmetics.CosmeticManager; +import net.badlion.fabricapi.events.PlayerJoinEvent; +import net.badlion.fabricapi.survival.SurvivalManager; +import net.badlion.fabricapi.waypoints.WaypointsManager; +import net.badlion.modapicommon.AbstractBadlionApi; +import net.badlion.modapicommon.Config; +import net.fabricmc.api.DedicatedServerModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.Identifier; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Reader; + +@Environment(EnvType.SERVER) +public class FabricBadlionPlugin extends AbstractBadlionApi implements DedicatedServerModInitializer { + + private static final Logger LOGGER = LogManager.getLogger(FabricBadlionPlugin.class); + private Identifier identifier; + private MinecraftServer server; + + private Config config; + + private File dataFolder; + + private FabricPluginMessageSender messageSender; + + @Override + public void onInitializeServer() { + this.identifier = new Identifier("badlion:modapi"); + this.dataFolder = new File("mods", "BadlionClientModAPI"); + if (!this.dataFolder.exists()) { + if (!this.dataFolder.mkdir()) { + LOGGER.error("Failed to create plugin directory"); + return; + } + } + + try { + this.loadConfig(new File(this.dataFolder, "config.json")); + } catch (IOException e) { + LOGGER.error("Failed to loading Badlion plugin", e); + return; + } + + + PlayerJoinEvent.EVENT.register(new PlayerListener(this)); + + ServerLifecycleEvents.SERVER_STARTED.register(server -> { + this.server = server; + this.messageSender = new FabricPluginMessageSender(this, server); + }); + + ServerLifecycleEvents.SERVER_STOPPED.register(server -> { + this.saveConfig(this.config, new File(this.dataFolder, "config.json")); + }); + + this.setWaypointManager(new WaypointsManager(this)); + this.setCosmeticManager(new CosmeticManager()); + this.setSurvivalManager(new SurvivalManager()); + + this.getWaypointManager().loadWaypoints(); + LOGGER.info("Successfully loaded Badlion Mod Api"); + } + + @Override + public void loadConfig(File file) throws IOException { + try (Reader reader = new FileReader(file)) { + this.config = AbstractBadlionApi.GSON_NON_PRETTY.fromJson(reader, Config.class); + + } catch (FileNotFoundException ex) { + LOGGER.info("No Config Found: Saving default..."); + + final Config config = new Config(); + this.saveConfig(config, new File(this.dataFolder, "config.json")); + + this.config = config; + } + } + + @Override + public void saveConfig(Config config, File file) { + try (FileWriter writer = new FileWriter(file)) { + AbstractBadlionApi.GSON_PRETTY.toJson(config, writer); + + } catch (Exception ex) { + LOGGER.warn("Failed to save config: " + ex.getMessage(), ex); + } + } + + @Override + public Config getBadlionConfig() { + return this.config; + } + + @Override + public FabricPluginMessageSender getPluginMessageSender() { + return this.messageSender; + } + + @Override + public CosmeticManager getCosmeticManager() { + return (CosmeticManager) super.getCosmeticManager(); + } + + @Override + public WaypointsManager getWaypointManager() { + return (WaypointsManager) super.getWaypointManager(); + } + + public Identifier identifier() { + return this.identifier; + } + + public MinecraftServer getServer() { + return this.server; + } + + public File dataFolder() { + return dataFolder; + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/FabricPluginMessageSender.java b/fabric/src/main/java/net/badlion/fabricapi/FabricPluginMessageSender.java new file mode 100644 index 0000000..a686c03 --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/FabricPluginMessageSender.java @@ -0,0 +1,65 @@ +package net.badlion.fabricapi; + +import net.badlion.modapicommon.AbstractPluginMessageSender; +import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; +import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.UUID; + +public class FabricPluginMessageSender extends AbstractPluginMessageSender { + + private static final Logger LOGGER = LogManager.getLogger(FabricPluginMessageSender.class); + private final FabricBadlionPlugin plugin; + private final MinecraftServer server; + + public FabricPluginMessageSender(FabricBadlionPlugin fabricBadlionPlugin, MinecraftServer server) { + this.plugin = fabricBadlionPlugin; + this.server = server; + } + + @Override + public void sendPluginMessage(byte[] data) { + MinecraftServer server = this.server; + if (server == null) { + LOGGER.error("Badlion Mod api Failed to get server"); + return; + } + + PacketByteBuf packetByteBuf = PacketByteBufs.create(); + packetByteBuf.writeBytes(data); + + for (ServerPlayerEntity serverPlayerEntity : server.getPlayerManager().getPlayerList()) { + this.sendPluginMessage(serverPlayerEntity, packetByteBuf); + } + } + + private void sendPluginMessage(ServerPlayerEntity player, PacketByteBuf packetByteBuf) { + ServerPlayNetworking.send(player, this.plugin.identifier(), packetByteBuf); + } + + + @Override + public void sendPluginMessage(UUID uuid, byte[] data) { + MinecraftServer server = this.server; + if (server == null) { + LOGGER.error("Badlion Mod api Failed to get server"); + return; + } + + ServerPlayerEntity player = server.getPlayerManager().getPlayer(uuid); + + if (player == null) { + return; + } + + PacketByteBuf packetByteBuf = PacketByteBufs.create(); + packetByteBuf.writeBytes(data); + + ServerPlayNetworking.send(player, this.plugin.identifier(), packetByteBuf); + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/PlayerListener.java b/fabric/src/main/java/net/badlion/fabricapi/PlayerListener.java new file mode 100644 index 0000000..f7edbd5 --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/PlayerListener.java @@ -0,0 +1,38 @@ +package net.badlion.fabricapi; + +import net.badlion.fabricapi.events.PlayerJoinEvent; +import net.badlion.fabricapi.events.PlayerLeaveEvent; +import net.badlion.modapicommon.AbstractBadlionApi; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; + +import java.util.Objects; + +public class PlayerListener implements PlayerJoinEvent, PlayerLeaveEvent { + private final FabricBadlionPlugin plugin; + + public PlayerListener(FabricBadlionPlugin fabricBadlionPlugin) { + this.plugin = fabricBadlionPlugin; + } + + @Override + public void onPlayerJoin(MinecraftServer server, ServerPlayerEntity player) { + if (!Objects.equals(this.plugin.getServer(), server)) { + return; + } + + this.plugin.getPluginMessageSender().sendPluginMessage(player.getUuid(), AbstractBadlionApi.GSON_NON_PRETTY.toJson(this.plugin.getBadlionConfig()).getBytes()); + this.plugin.getCosmeticManager().onPlayerJoin(player); + this.plugin.getWaypointManager().onPlayerJoin(player); + } + + @Override + public void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player) { + if (!Objects.equals(this.plugin.getServer(), server)) { + return; + } + + this.plugin.getCosmeticManager().onPlayerLeave(player); + this.plugin.getWaypointManager().onPlayerLeave(player); + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/cosmetics/CosmeticManager.java b/fabric/src/main/java/net/badlion/fabricapi/cosmetics/CosmeticManager.java new file mode 100644 index 0000000..d5c124b --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/cosmetics/CosmeticManager.java @@ -0,0 +1,55 @@ +package net.badlion.fabricapi.cosmetics; + +import com.google.gson.JsonObject; +import net.badlion.modapicommon.AbstractBadlionApi; +import net.badlion.modapicommon.utility.AbstractCosmeticManager; +import net.minecraft.server.network.ServerPlayerEntity; + +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +public class CosmeticManager extends AbstractCosmeticManager { + + private final Set disabledNametags = Collections.newSetFromMap(new ConcurrentHashMap<>()); + + public CosmeticManager() { + } + + @Override + public void disableNametagCosmetics(UUID uuid) { + if (!this.disabledNametags.add(uuid)) { + return; + } + + JsonObject data = this.getDisabledCosmeticsData(uuid, true, "nametag"); + + AbstractBadlionApi.getInstance().getPluginMessageSender().sendData("cosmetics", data); + } + + @Override + public void enableNametagCosmetics(UUID uuid) { + if (!this.disabledNametags.remove(uuid)) { + return; + } + + JsonObject data = this.getDisabledCosmeticsData(uuid, false, "nametag"); + + AbstractBadlionApi.getInstance().getPluginMessageSender().sendData("cosmetics", data); + } + + public void onPlayerLeave(ServerPlayerEntity player) { + this.enableNametagCosmetics(player.getUuid()); + } + + public void onPlayerJoin(ServerPlayerEntity player) { + if (!this.disabledNametags.isEmpty()) { + for (UUID uuid : this.disabledNametags) { + JsonObject data = this.getDisabledCosmeticsData(uuid, false, "nametag"); + + AbstractBadlionApi.getInstance().getPluginMessageSender().sendData(player.getUuid(), "cosmetics", data); + } + } + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/events/PlayerJoinEvent.java b/fabric/src/main/java/net/badlion/fabricapi/events/PlayerJoinEvent.java new file mode 100644 index 0000000..d4a6e3b --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/events/PlayerJoinEvent.java @@ -0,0 +1,18 @@ +package net.badlion.fabricapi.events; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; + +public interface PlayerJoinEvent { + Event EVENT = EventFactory.createArrayBacked(PlayerJoinEvent.class, + (listeners) -> (server, player) -> { + for (PlayerJoinEvent event : listeners) { + event.onPlayerJoin(server, player); + } + } + ); + + void onPlayerJoin(MinecraftServer server, ServerPlayerEntity player); +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/events/PlayerLeaveEvent.java b/fabric/src/main/java/net/badlion/fabricapi/events/PlayerLeaveEvent.java new file mode 100644 index 0000000..af488ab --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/events/PlayerLeaveEvent.java @@ -0,0 +1,18 @@ +package net.badlion.fabricapi.events; + +import net.fabricmc.fabric.api.event.Event; +import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; + +public interface PlayerLeaveEvent { + Event EVENT = EventFactory.createArrayBacked(PlayerLeaveEvent.class, + (listeners) -> (server, player) -> { + for (PlayerLeaveEvent event : listeners) { + event.onPlayerLeave(server, player); + } + } + ); + + void onPlayerLeave(MinecraftServer server, ServerPlayerEntity player); +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/mixin/MixinPlayerManager.java b/fabric/src/main/java/net/badlion/fabricapi/mixin/MixinPlayerManager.java new file mode 100644 index 0000000..0f3613c --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/mixin/MixinPlayerManager.java @@ -0,0 +1,30 @@ +package net.badlion.fabricapi.mixin; + +import net.badlion.fabricapi.events.PlayerJoinEvent; +import net.badlion.fabricapi.events.PlayerLeaveEvent; +import net.minecraft.network.ClientConnection; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerManager.class) +public abstract class MixinPlayerManager { + @Shadow + public abstract MinecraftServer getServer(); + + @Inject(at = @At("RETURN"), method = "onPlayerConnect") + public void onPlayerConnect(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) { + PlayerJoinEvent.EVENT.invoker().onPlayerJoin(this.getServer(), player); + } + + @Inject(at = @At("HEAD"), method = "remove") + public void remove(ServerPlayerEntity player, CallbackInfo ci) { + PlayerLeaveEvent.EVENT.invoker().onPlayerLeave(this.getServer(), player); + } + +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/survival/SurvivalManager.java b/fabric/src/main/java/net/badlion/fabricapi/survival/SurvivalManager.java new file mode 100644 index 0000000..d71c750 --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/survival/SurvivalManager.java @@ -0,0 +1,38 @@ +package net.badlion.fabricapi.survival; + +import net.badlion.fabricapi.FabricBadlionPlugin; +import net.badlion.modapicommon.survival.AbstractSurvivalManager; +import net.badlion.modapicommon.survival.SurvivalFeature; + +import java.util.Set; + +public class SurvivalManager extends AbstractSurvivalManager { + + public SurvivalManager() { + } + + @Override + public void enableAllFeatures() { + + } + + @Override + public void disableAllFeatures() { + + } + + @Override + public void enableFeature(SurvivalFeature feature) { + + } + + @Override + public void disableFeature(SurvivalFeature feature) { + + } + + @Override + public Set getEnabledFeatures() { + return null; + } +} diff --git a/fabric/src/main/java/net/badlion/fabricapi/waypoints/ConfigWaypoint.java b/fabric/src/main/java/net/badlion/fabricapi/waypoints/ConfigWaypoint.java new file mode 100644 index 0000000..b05db47 --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/waypoints/ConfigWaypoint.java @@ -0,0 +1,24 @@ +package net.badlion.fabricapi.waypoints; + +import net.badlion.modapicommon.utility.AbstractWaypoint; +import net.badlion.modapicommon.utility.Location; + +public class ConfigWaypoint extends AbstractWaypoint { + + public ConfigWaypoint() { + super(new Location("badlionexampleworld", 0, 0, 0), "Example Waypoint", false); + } + + public ConfigWaypoint(Location location, String name, boolean allowToAdd) { + super(location, name, allowToAdd); + } + + public ConfigWaypoint clone() { + return new ConfigWaypoint(this.getLocation(), this.getName(), this.isAllowToAdd()); + } + + @Override + public Class getType() { + return ConfigWaypoint.class; + } +} \ No newline at end of file diff --git a/fabric/src/main/java/net/badlion/fabricapi/waypoints/WaypointsManager.java b/fabric/src/main/java/net/badlion/fabricapi/waypoints/WaypointsManager.java new file mode 100644 index 0000000..6c917e7 --- /dev/null +++ b/fabric/src/main/java/net/badlion/fabricapi/waypoints/WaypointsManager.java @@ -0,0 +1,176 @@ +package net.badlion.fabricapi.waypoints; + +import com.google.common.collect.Queues; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.reflect.TypeToken; +import net.badlion.fabricapi.FabricBadlionPlugin; +import net.badlion.modapicommon.AbstractBadlionApi; +import net.badlion.modapicommon.mods.ModType; +import net.badlion.modapicommon.utility.AbstractWaypoint; +import net.badlion.modapicommon.utility.AbstractWaypointManager; +import net.badlion.modapicommon.utility.Waypoint; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.level.ServerWorldProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.Queue; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +public class WaypointsManager extends AbstractWaypointManager { + private static final Logger LOGGER = LogManager.getLogger(WaypointsManager.class); + private static final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1); + private final FabricBadlionPlugin plugin; + private final ConcurrentHashMap> playerWaypoints = new ConcurrentHashMap<>(); + private final Queue scheduledUpdates = Queues.newConcurrentLinkedQueue(); + private List configWaypoints = new ArrayList<>(); + + public WaypointsManager(FabricBadlionPlugin fabricBadlionPlugin) { + this.plugin = fabricBadlionPlugin; + } + + public void loadWaypoints() { + executorService.scheduleWithFixedDelay(() -> { + if (this.scheduledUpdates.isEmpty()) { + return; + } + + for (int i = 0; i < 25; i++) { + final UUID uuid = this.scheduledUpdates.poll(); + + if (uuid == null) { + continue; + } + + ServerPlayerEntity player = this.plugin.getServer().getPlayerManager().getPlayer(uuid); + + if (player != null) { + this.sendWaypointsToClient(player, player.getWorld()); + } + } + }, 0, 1, TimeUnit.SECONDS); + + + final Path waypointsConfig = this.plugin.dataFolder().toPath().resolve("waypoints.json"); + + if (Files.exists(waypointsConfig)) { + try (BufferedReader reader = Files.newBufferedReader(waypointsConfig, StandardCharsets.UTF_8)) { + this.configWaypoints = AbstractBadlionApi.GSON_PRETTY.fromJson(reader, new TypeToken>() { + }.getType()); + + } catch (IOException e) { + LOGGER.error("Failed to read waypoints from waypoints config", e); + } + + if (this.configWaypoints.size() > 0) { + LOGGER.info("Loaded {} waypoints from config", this.configWaypoints.size()); + } + + } else { + LOGGER.info("Waypoints config does not exist, creating one now. Read our documentation for more information about this!"); + + this.configWaypoints.add(new ConfigWaypoint()); + + try (BufferedWriter writer = Files.newBufferedWriter(waypointsConfig)) { + AbstractBadlionApi.GSON_PRETTY.toJson(this.configWaypoints, new TypeToken>() { + }.getType(), writer); + + } catch (IOException e) { + LOGGER.error("Failed to create waypoints config", e); + } + } + } + + public List getWaypoints(ServerPlayerEntity player, ServerWorld world) { + ServerWorldProperties levelProperties = (ServerWorldProperties) world.getLevelProperties(); + String levelName = levelProperties.getLevelName(); + return this.playerWaypoints.computeIfAbsent(player.getUuid(), k -> new ArrayList<>()) + .stream() + .filter(Objects::nonNull) + .filter(waypoint -> waypoint.getLocation().getWorld() != null && waypoint.getLocation().getWorld().equals(levelName)) + .collect(Collectors.toList()); + } + + public void sendWaypointsToClient(ServerPlayerEntity player, ServerWorld world) { + this.resetWaypoints(player.getUuid()); + + final List waypoints = this.getWaypoints(player, world); + final JsonArray jsonWaypoints = new JsonArray(); + + for (AbstractWaypoint waypoint : waypoints) { + jsonWaypoints.add(AbstractBadlionApi.GSON_NON_PRETTY.toJsonTree(waypoint, waypoint.getType())); + } + + JsonObject data = new JsonObject(); + data.addProperty("action", "add"); + data.add("waypoints", jsonWaypoints); + + this.plugin.getPluginMessageSender().sendModData(player.getUuid(), ModType.WAYPOINTS, data); + + waypoints.forEach(waypoint -> { + if (!waypoint.isSentBefore()) { + waypoint.setSentBefore(true); + } + }); + } + + public void onPlayerJoin(ServerPlayerEntity player) { + if (!this.configWaypoints.isEmpty()) { + // Add all config waypoints to player + this.playerWaypoints.computeIfAbsent(player.getUuid(), k -> new ArrayList<>()).addAll( + this.configWaypoints.stream().map(ConfigWaypoint::clone).toList() + ); + + this.scheduledUpdates.add(player.getUuid()); + } + } + + public void onPlayerLeave(ServerPlayerEntity player) { + this.playerWaypoints.remove(player.getUuid()); + this.scheduledUpdates.remove(player.getUuid()); + } + + @Override + public void addPlayerWaypoint(UUID player, AbstractWaypoint waypoint) { + this.playerWaypoints.computeIfAbsent(player, k -> new ArrayList<>()).add(waypoint); + + if (!this.scheduledUpdates.contains(player)) { + this.scheduledUpdates.add(player); + } + } + + @Override + public void removePlayerWaypoint(UUID player, int id) { + this.playerWaypoints.computeIfAbsent(player, k -> new ArrayList<>()).removeIf(waypoint -> { + if (waypoint instanceof Waypoint) { + boolean removed = ((Waypoint) waypoint).getId() == id; + + if (removed) { + if (!this.scheduledUpdates.contains(player)) { + this.scheduledUpdates.add(player); + } + } + + return removed; + } + + return false; + }); + } +} diff --git a/fabric/src/main/resources/badlion.mixins.json b/fabric/src/main/resources/badlion.mixins.json new file mode 100644 index 0000000..706a04d --- /dev/null +++ b/fabric/src/main/resources/badlion.mixins.json @@ -0,0 +1,14 @@ +{ + "required": false, + "minVersion": "0.8", + "package": "net.badlion.fabricapi.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "MixinPlayerManager" + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..48597ed --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "badlion", + "version": "${version}", + "name": "Badlion", + "description": "Disable Badlion Client mods while Badlion Client users play on your server with this easy to use API.", + "authors": [], + "contact": { + "website": "https://client.badlion.net/", + "repo": "https://github.com/BadlionClient/BadlionClientModAPI" + }, + "license": "MIT", + "icon": "assets/badlion/icon.png", + "environment": "server", + "entrypoints": { + "server": [ + "net.badlion.fabricapi.FabricBadlionPlugin" + ] + }, + "mixins": [ + "badlion.mixins.json" + ], + "depends": { + "fabricloader": ">=0.14.10", + "fabric": "*", + "minecraft": "1.19.2" + } +} diff --git a/modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractCosmeticManager.java b/modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractCosmeticManager.java index 14f1cc3..19c307e 100644 --- a/modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractCosmeticManager.java +++ b/modapi-common/src/main/java/net/badlion/modapicommon/utility/AbstractCosmeticManager.java @@ -1,5 +1,7 @@ package net.badlion.modapicommon.utility; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; import net.badlion.modapicommon.cosmetics.Cosmetics; import java.util.UUID; @@ -23,4 +25,20 @@ public abstract class AbstractCosmeticManager { * @param uuid The player UUID */ public abstract void enableNametagCosmetics(UUID uuid); + + protected JsonObject getDisabledCosmeticsData(UUID uuid, boolean disabled, String... cosmeticTypes) { + final JsonObject data = new JsonObject(); + final JsonArray array = new JsonArray(); + + for (String cosmeticType : cosmeticTypes) { + array.add(cosmeticType); + } + + data.addProperty("type", "disable_cosmetics"); + data.add("cosmeticTypes", array); + data.addProperty("disable", disabled); + data.addProperty("uuid", uuid.toString()); + + return data; + } } diff --git a/readme.md b/readme.md index 9b282f5..32eb226 100644 --- a/readme.md +++ b/readme.md @@ -30,9 +30,9 @@ How to install the Badlion Client Mod API on your server. 1. Clone this repository 2. Compile the plugin(s) you want to use (you only need one per Minecraft network). -2. Place the compiled plugins from the `target` directories into your `plugins` directory on your server. -3. Turn on the BungeeCord or Bukkit server and a default config will be automatically made in `plugins/BadlionClientModAPI/config.json` -4. Edit the config as you see fit and reboot the server after you have finished editing the config (see below for more information). +3. Place the compiled plugins from the `target` directories into your `plugins` directory on your server. +4. Turn on the BungeeCord or Bukkit server and a default config will be automatically made in `plugins/BadlionClientModAPI/config.json` +5. Edit the config as you see fit and reboot the server after you have finished editing the config (see below for more information). ### Example Config