diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37463f1..335dbc5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,6 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# This workflow will build a Java project with Gradle -name: Java CI with Maven +name: Java CI with Gradle on: workflow_dispatch: @@ -12,27 +11,30 @@ on: jobs: build: - + strategy: + matrix: + # Use these Java versions + java: [ + 21 + ] runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.1.0 - - name: Set up JDK 16 - uses: actions/setup-java@v3.6.0 - with: - java-version: '16' - distribution: 'temurin' - - name: Cache - uses: actions/cache@v3.0.11 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Build with Maven - run: mvn -B package --file pom.xml - - name: Upload a Build Artifact - uses: actions/upload-artifact@v3.1.0 - with: - # A file, directory or wildcard pattern that describes what to upload - path: /home/runner/work/BlueMapFloodgate/BlueMapFloodgate/target/* + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4788b4b..aae7989 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,11 @@ *.ipr *.iws -# IntelliJ +# Gradle +.gradle/ +build/ out/ +classes/ # Compiled class file *.class @@ -18,7 +21,6 @@ out/ *.ctxt # Package Files # -*.jar *.war *.nar *.ear diff --git a/README.md b/README.md index 4b4478e..f8003fe 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![GitHub Total Downloads](https://img.shields.io/github/downloads/TechnicJelle/BlueMapFloodgate/total?label=Downloads&color=success "Click here to download the plugin")](https://github.com/TechnicJelle/BlueMapFloodgate/releases/latest) [![Servers using this plugin](https://img.shields.io/bstats/servers/16426?label=Servers)](https://bstats.org/plugin/bukkit/BlueMap%20Floodgate/16426) -A Minecraft Paper plugin and [BlueMap](https://github.com/BlueMap-Minecraft/BlueMap) addon that adds [Geyser/Floodgate](https://github.com/GeyserMC/Floodgate) support: +A Minecraft Paper plugin, Fabric mod, and [BlueMap](https://github.com/BlueMap-Minecraft/BlueMap) addon that adds [Geyser/Floodgate](https://github.com/GeyserMC/Floodgate) support: by default, floodgate players don't have the correct playerhead image on BlueMap. This plugin fixes that. | Without | With | diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a102d06 --- /dev/null +++ b/build.gradle @@ -0,0 +1,5 @@ +plugins { + id 'maven-publish' + + id 'fabric-loom' version '1.6-SNAPSHOT' apply false +} \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..fc3806a --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,61 @@ +apply plugin: 'fabric-loom' + +version = project.mod_version +group = project.maven_group + +base { + archivesName = "${project.archives_base_name}-${project.target_version}" +} + +repositories { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } +} + +loom { + splitEnvironmentSourceSets() + + mods { + "blue-map-floodgate" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + implementation "maven.modrinth:bluemap:${project.bluemap_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +java { + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} \ No newline at end of file diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 0000000..cc0c8b9 --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +mod_version=1.0.0 +maven_group=com.technicjelle.bluemapfloodgate +archives_base_name=blue-map-floodgate + +target_version=1.20-1.20.6 + +# Dependencies + +minecraft_version=1.20.6 +yarn_mappings=1.20.6+build.1 +loader_version=0.15.11 +fabric_version=0.98.0+1.20.6 + +bluemap_version=3.21-fabric-1.20.5 \ No newline at end of file diff --git a/fabric/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java b/fabric/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java new file mode 100644 index 0000000..948a2e8 --- /dev/null +++ b/fabric/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java @@ -0,0 +1,85 @@ +package com.technicjelle.bluemapfloodgate; + +import de.bluecolored.bluemap.api.BlueMapAPI; +import de.bluecolored.bluemap.api.plugin.SkinProvider; +import net.fabricmc.api.ModInitializer; + +import net.fabricmc.loader.api.FabricLoader; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.Optional; +import java.util.UUID; +import java.util.function.Consumer; + +public class BlueMapFloodgate implements ModInitializer { + public static final String MODID = "blue-map-floodgate"; + private static final Logger LOGGER = LoggerFactory.getLogger(MODID); + + @Override + public void onInitialize() { + LOGGER.info("Successfully loaded {} mod!", MODID); + + // this needs to below the LOGGER message, otherwise the game will crash + if (FabricLoader.getInstance().isModLoaded("bluemap")) { + BlueMapAPI.onEnable(this.setSkinProvider); + } + } + + private final Consumer setSkinProvider = blueMapAPI -> { + SkinProvider skinProvider = getSkinProvider(blueMapAPI); + + blueMapAPI.getPlugin().setSkinProvider(skinProvider); + }; + + // TODO convert into an API so the 'paper' and 'fabric' projects can use the same code + + private SkinProvider getSkinProvider(BlueMapAPI blueMapAPI) { + return new SkinProvider() { + private final SkinProvider skinProvider = blueMapAPI.getPlugin().getSkinProvider(); + + @Override + public Optional load(UUID uuid) throws IOException { + if (isFloodgatePlayer(uuid)) { + long xuid = getXUID(uuid); + + @Nullable String textureId = SkinHttpUtils.getTextureIdFromXUID(xuid); + if (textureId == null) { + LOGGER.warn("Texture ID for {} is null!", uuid); + return Optional.empty(); + } + + @Nullable BufferedImage skin = SkinHttpUtils.getSkinTexture(textureId); + + if (skin == null) { + LOGGER.warn("Failed to get the skin for {}", uuid); + return Optional.empty(); + } + + LOGGER.info("Successfully retrieved the skin for {}!", uuid); + return Optional.of(skin); + } else { + return skinProvider.load(uuid); + } + } + }; + } + + /** + * Checks to see if the player connecting the sever is a Floodgate player. + */ + private boolean isFloodgatePlayer(UUID uuid) { + return uuid.version() == 0; + } + + /** + * When provided an {@code uuid}, return the least significant bits which represents + * the {@code xuid}. + */ + private long getXUID(UUID uuid) { + return uuid.getLeastSignificantBits(); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/technicjelle/bluemapfloodgate/SkinHttpUtils.java b/fabric/src/main/java/com/technicjelle/bluemapfloodgate/SkinHttpUtils.java new file mode 100644 index 0000000..5e8ff05 --- /dev/null +++ b/fabric/src/main/java/com/technicjelle/bluemapfloodgate/SkinHttpUtils.java @@ -0,0 +1,83 @@ +package com.technicjelle.bluemapfloodgate; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; + +public class SkinHttpUtils { + private static final Logger LOGGER = LoggerFactory.getLogger(BlueMapFloodgate.MODID + "/SkinHttpUtils"); + + /** + * Get a Bedrock player's skin texture using their XUID. + * + * @param xuid obtained by getting the least significant bits of the UUID. + * @return {@code String texture_id} from https://api.geysermc.org/v2/skin/{xuid}. + */ + public static String getTextureIdFromXUID(long xuid) { + try { + URL url = new URL("https://api.geysermc.org/v2/skin/" + xuid); + + try { + URLConnection request = url.openConnection(); + JsonObject json = JsonParser.parseReader(new InputStreamReader((InputStream) request.getContent())).getAsJsonObject(); + + if (json == null) { + LOGGER.warn("No content received from {}!", url); + return null; + } + + JsonElement texture = json.get("texture_id"); + String textureId = texture.getAsString(); + + if (textureId == null) { + LOGGER.warn("Could not get the texture_id from {}!", url); + return null; + } + + return textureId; + } catch (IOException e) { + LOGGER.warn("Failed to get the texture for {} from {}!", xuid, url); + return null; + } + } catch (MalformedURLException e) { + LOGGER.error("Geyser API URL is malformed", e); + return null; + } + } + + /** + * Retrieve a player's skin from Minecraft's texture servers. + * + * @param textureId obtained from {@link SkinHttpUtils#getTextureIdFromXUID}. + * @return {@code BufferedImage} BlueMap will use to display a player's head + * on the map website. + */ + public static BufferedImage getSkinTexture(String textureId) { + try { + URL url = new URL("https://textures.minecraft.net/texture/" + textureId); + + try { + InputStream stream = url.openStream(); + return ImageIO.read(stream); + } catch (IOException e) { + LOGGER.error("Failed to read input stream from {} url!", url); + } + } catch (MalformedURLException e) { + LOGGER.error("Minecraft textures URL is malformed", e); + return null; + } + + return null; + } +} diff --git a/fabric/src/main/resources/assets/blue-map-floodgate/icon.png b/fabric/src/main/resources/assets/blue-map-floodgate/icon.png new file mode 100644 index 0000000..dd3bb40 Binary files /dev/null and b/fabric/src/main/resources/assets/blue-map-floodgate/icon.png differ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..567c5e2 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,32 @@ +{ + "schemaVersion": 1, + "id": "blue-map-floodgate", + "version": "${version}", + "name": "Blue Map Floodgate", + "description": "Correct the player head image on BlueMap when floodgate players are connected to the server!", + "authors": [ + "TechnicJelle", + "ShadowHunter22" + ], + "contact": { + "sources": "https://github.com/TechnicJelle/BlueMapFloodgate" + }, + "license": "Mozilla Public License 2.0", + "icon": "assets/blue-map-floodgate/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "com.technicjelle.bluemapfloodgate.BlueMapFloodgate" + ] + }, + "depends": { + "fabricloader": ">=0.15.11", + "minecraft": ">=1.20", + "java": ">=17", + "fabric-api": "*", + "bluemap": "*" + }, + "suggests": { + "another-mod": "*" + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d88f2d8 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +maven_group=com.technicjelle.bluemapfloodgate +archives_base_name=bluemapfloodgate \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b82aa23 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$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 + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%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% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/paper/build.gradle b/paper/build.gradle new file mode 100644 index 0000000..1f88dac --- /dev/null +++ b/paper/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'java-library' +} + +version = project.version +group = project.maven_group + +base { + archivesName = "${project.archives_base_name}-paper-${project.paper_project_version}" +} + +repositories { + maven { + url = uri('https://papermc.io/repo/repository/maven-public/') + } + + maven { + url = uri('https://jitpack.io') + } +} + +dependencies { + api "com.github.TechnicJelle:MCUtils:${project.mcutils_version}" + api "com.github.TechnicJelle:UpdateCheckerJava:${project.updatecheckerjava_version}" + api "org.bstats:bstats-bukkit:${project.bukkit_version}" + + api "io.papermc.paper:paper-api:${project.paper_version}" + api "com.github.BlueMap-Minecraft:BlueMapAPI:${project.blue_map_version}" +} + +tasks.withType(JavaCompile).configureEach { + // Minecraft <=1.20.4 uses Java 17 + // Minecraft >=1.20.5 requires Java 21 + it.options.release = 21 +} + +java { + withSourcesJar() + + // Minecraft <=1.20.4 uses Java 17 + // Minecraft >=1.20.5 requires Java 21 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} \ No newline at end of file diff --git a/paper/gradle.properties b/paper/gradle.properties new file mode 100644 index 0000000..5b7e419 --- /dev/null +++ b/paper/gradle.properties @@ -0,0 +1,8 @@ +paper_project_version=3.2 + +blue_map_version=v2.6.1 +paper_version=1.17.1-R0.1-SNAPSHOT +bukkit_version=3.0.2 + +mcutils_version=v1.0 +updatecheckerjava_version=v2.3 diff --git a/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java b/paper/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java similarity index 100% rename from src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java rename to paper/src/main/java/com/technicjelle/bluemapfloodgate/BlueMapFloodgate.java diff --git a/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to paper/src/main/resources/plugin.yml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3586ba7..0000000 --- a/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - 4.0.0 - - com.technicjelle - BlueMapFloodgate - 3.2 - jar - - BlueMapFloodgate - - A Minecraft Paper plugin and BlueMap addon that adds GeyserMC/floodgate support - - 11 - UTF-8 - - https://github.com/TechnicJelle/BlueMapFloodgate - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - org.bstats - com.technicjelle.bluemapfloodgate - - - - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - papermc-repo - https://papermc.io/repo/repository/maven-public/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - jitpack.io - https://jitpack.io - - - - - - com.github.TechnicJelle - UpdateCheckerJava - v2.3 - compile - - - com.github.TechnicJelle - MCUtils - v1.0 - - - io.papermc.paper - paper-api - 1.17.1-R0.1-SNAPSHOT - provided - - - com.github.BlueMap-Minecraft - BlueMapAPI - v2.6.1 - provided - - - org.bstats - bstats-bukkit - 3.0.2 - compile - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c0f07da --- /dev/null +++ b/settings.gradle @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + maven { url = 'https://maven.fabricmc.net/' } + + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = 'BlueMapFloodgate' + +include ('paper', 'fabric')