diff --git a/babric/build.gradle b/babric/build.gradle new file mode 100644 index 0000000..c2f24eb --- /dev/null +++ b/babric/build.gradle @@ -0,0 +1,71 @@ +plugins { + id 'babric-loom' version '1.5-SNAPSHOT' + id 'maven-publish' +} + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +loom { + gluedMinecraftJar() + customMinecraftManifest.set("https://babric.github.io/manifest-polyfill/${minecraft_version}.json") + intermediaryUrl.set("https://maven.glass-launcher.net/babric/babric/intermediary/%1\$s/intermediary-%1\$s-v2.jar") +} + +repositories { + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } +} + +dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "babric:barn:${project.yarn_mappings}:v2" + modImplementation "babric:fabric-loader:${project.loader_version}" + + implementation 'org.slf4j:slf4j-api:1.8.0-beta4' + implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' +} + +processResources { + inputs.property "version", project.version + + filesMatching('fabric.mod.json') { + expand "version": project.version + } +} + +java { + withSourcesJar() + + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 +} + +jar { + from('../LICENSE') { + rename { "${it}_${project.archivesBaseName}" } + } +} + +sourceSets { + main { + java { + srcDirs = [ + '../src/shared', + '../src/fabric-shared', + '../src/rpc-simple', + '../src/babric', + ] + include '**/*.java' + } + resources { + srcDirs = ['../src', '../src/babric'] + include 'fabric.mod.json' + include 'flashii-extensions.mixins.json' + include 'assets/icon.png' + } + } +} diff --git a/babric/gradle.properties b/babric/gradle.properties new file mode 100644 index 0000000..b51da88 --- /dev/null +++ b/babric/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://babric.github.io/develop/ +minecraft_version=b1.7.3 +yarn_mappings=b1.7.3+build.9 +loader_version=0.15.6-babric.2 + +# Mod Properties +mod_version=1.1.0 +maven_group=net.flashii.mcexts +archives_base_name=flashii-extensions-babric diff --git a/babric/gradle/wrapper/gradle-wrapper.jar b/babric/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/babric/gradle/wrapper/gradle-wrapper.jar differ diff --git a/babric/gradle/wrapper/gradle-wrapper.properties b/babric/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a80b22c --- /dev/null +++ b/babric/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/babric/gradlew b/babric/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/babric/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/babric/gradlew.bat b/babric/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/babric/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/babric/settings.gradle b/babric/settings.gradle new file mode 100644 index 0000000..75c7305 --- /dev/null +++ b/babric/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + maven { + name = 'Babric' + url = 'https://maven.glass-launcher.net/babric' + } + mavenCentral() + gradlePluginPortal() + } +} diff --git a/bukkit173/build.gradle b/bukkit173/build.gradle index 5a74073..2c8b7d3 100644 --- a/bukkit173/build.gradle +++ b/bukkit173/build.gradle @@ -17,8 +17,7 @@ tasks.withType(JavaCompile).configureEach { java { withSourcesJar() - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 } sourceSets { @@ -29,10 +28,11 @@ sourceSets { '../src/rpc-simple', '../src/bukkitb173', ] - resources { - srcDirs = ['../src'] - include 'plugin.yml' - } + include '**/*.java' + } + resources { + srcDirs = ['../src/bukkitb173'] + include 'plugin.yml' } } } diff --git a/src/babric/fabric.mod.json b/src/babric/fabric.mod.json new file mode 100644 index 0000000..110a269 --- /dev/null +++ b/src/babric/fabric.mod.json @@ -0,0 +1,24 @@ +{ + "schemaVersion": 1, + "id": "flashii-extensions-babric", + "version": "${version}", + "name": "Flashii Extensions", + "description": "This mod provides extensions for the Flashii.net Minecraft servers.", + "authors": [ + "flashwave" + ], + "contact": { + "homepage": "https://mc.flashii.net/", + "sources": "https://patchii.net/flashii/mcexts" + }, + "license": "BSD-3-Clause-Clear", + "icon": "assets/icon.png", + "environment": "*", + "mixins": [ + "flashii-extensions.mixins.json" + ], + "depends": { + "fabricloader": ">=0.13.3", + "minecraft": "1.0.0-beta.7.3" + } +} diff --git a/src/babric/flashii-extensions.mixins.json b/src/babric/flashii-extensions.mixins.json new file mode 100644 index 0000000..c0ec844 --- /dev/null +++ b/src/babric/flashii-extensions.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "net.flashii.mcexts.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/plugin.yml b/src/bukkitb173/plugin.yml similarity index 100% rename from src/plugin.yml rename to src/bukkitb173/plugin.yml diff --git a/src/fabric/ConfigPath.java b/src/fabric-shared/ConfigPath.java similarity index 100% rename from src/fabric/ConfigPath.java rename to src/fabric-shared/ConfigPath.java diff --git a/src/fabric.mod.json b/src/fabric/fabric.mod.json similarity index 88% rename from src/fabric.mod.json rename to src/fabric/fabric.mod.json index 68f3e44..0202043 100644 --- a/src/fabric.mod.json +++ b/src/fabric/fabric.mod.json @@ -15,10 +15,10 @@ "icon": "assets/icon.png", "environment": "*", "mixins": [ - "fabric.mixins.json" + "flashii-extensions.mixins.json" ], "depends": { - "fabricloader": ">=0.14.22", + "fabricloader": ">=0.15.7", "minecraft": "~1.20.1", "java": ">=17" } diff --git a/src/fabric.mixins.json b/src/fabric/flashii-extensions.mixins.json similarity index 92% rename from src/fabric.mixins.json rename to src/fabric/flashii-extensions.mixins.json index 46b07ae..af2e292 100644 --- a/src/fabric.mixins.json +++ b/src/fabric/flashii-extensions.mixins.json @@ -4,7 +4,6 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "EnvironmentMixin", - "PlayerListHudMixin", "TextureUrlCheckerMixin", "YggdrasilMinecraftSessionServiceMixin" ], diff --git a/src/fabric/mixin/PlayerListHudMixin.java b/src/fabric/mixin/PlayerListHudMixin.java deleted file mode 100644 index ef407fc..0000000 --- a/src/fabric/mixin/PlayerListHudMixin.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.flashii.mcexts.mixin; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.PlayerListHud; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(PlayerListHud.class) -public abstract class PlayerListHudMixin { - @Redirect(method = "render(Lnet/minecraft/client/gui/DrawContext;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreboardObjective;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;isInSingleplayer()Z")) - public boolean redirectIsInSinglePlayer(MinecraftClient client) { - // always enable BL - return true; - } -}