diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a726094..4b24385 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gradle:jdk16 +image: gradle:jdk17 variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false" diff --git a/build.gradle b/build.gradle index 2145fc0..797cbca 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}") - include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}") + include modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}") include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}") modImplementation "com.terraformersmc:modmenu:2.0.3" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..ffed3a2 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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100644 --- 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 -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 - -# 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 - # 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\"" - fi - i=`expr $i + 1` - 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" ;; +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 -# 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, 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. -# 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" +# 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/src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java b/src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java new file mode 100644 index 0000000..21b04fa --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java @@ -0,0 +1,80 @@ +package io.gitlab.jfronny.quickmeth; + +import io.gitlab.jfronny.libjf.unsafe.asm.AsmConfig; +import io.gitlab.jfronny.libjf.unsafe.asm.AsmTransformer; +import io.gitlab.jfronny.libjf.unsafe.asm.patch.Patch; +import io.gitlab.jfronny.libjf.unsafe.asm.patch.PatchUtil; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.MethodInsnNode; +import org.objectweb.asm.tree.MethodNode; + +import java.util.Set; + +public class BytecodeTransformer implements AsmConfig, Patch { + private static final String math = "java/lang/Math"; + private static final String mathUtil = "io/gitlab/jfronny/quickmeth/MathUtil"; + private static final String mathHelper = PatchUtil.getRemappedInternal("net/minecraft/class_3532"); + private static final String mathHelperSin = mapMathHelper("method_15374", "(F)F"); + private static final String mathHelperCos = mapMathHelper("method_15362", "(F)F"); + private static final String mathHelperSqrt = mapMathHelper("method_15355", "(F)F"); + private static final String mathHelperFloor = mapMathHelper("method_15375", "(F)F"); + + private static String mapMathHelper(String method, String descriptor) { + return AsmTransformer.MAPPING_RESOLVER.mapMethodName(AsmTransformer.INTERMEDIARY, mathHelper.replace('/', '.'), method, descriptor); + } + + @Override + public Set skipClasses() { + return null; + } + + @Override + public Set getPatches() { + return Cfg.rewriteMath ? Set.of(this) : Set.of(); + } + + @Override + public void apply(ClassNode klazz) { + if (klazz.name.equals(mathUtil)) return; + for (MethodNode method : klazz.methods) { + for (AbstractInsnNode insn : method.instructions.toArray()) { + if (insn.getOpcode() == Opcodes.INVOKESTATIC) { + MethodInsnNode mIns = (MethodInsnNode) insn; + String insNew = null; + if (Cfg.corruptTrigonometry) { + if (mIns.owner.equals(math)) { + if (mIns.name.equals("sin")) insNew = "sin"; + else if (mIns.name.equals("cos")) insNew = "cos"; + } + else if (mIns.owner.equals(mathHelper)) { + if (mIns.name.equals(mathHelperSin)) insNew = "sin"; + else if (mIns.name.equals(mathHelperCos)) insNew = "cos"; + } + } + if (Cfg.corruptGenericMath) { + if (mIns.owner.equals(math)) { + if (mIns.name.equals("sqrt")) insNew = "sqrt"; + } + else if (mIns.owner.equals(mathHelper)) { + if (mIns.name.equals(mathHelperSqrt)) insNew = "sqrt"; + } + } + if (Cfg.corruptGenericMath2) { + if (mIns.owner.equals(math)) { + if (mIns.name.equals("floor")) insNew = "floor"; + } + else if (mIns.owner.equals(mathHelper)) { + if (mIns.name.equals(mathHelperFloor)) insNew = "floor"; + } + } + if (insNew != null) { + method.instructions.insertBefore(mIns, new MethodInsnNode(Opcodes.INVOKESTATIC, mathUtil, insNew, mIns.desc)); + method.instructions.remove(mIns); + } + } + } + } + } +} diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java b/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java index 8be79f9..de90d01 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java @@ -14,4 +14,6 @@ public class Cfg implements JfConfig { public static Boolean corruptPerlinNoise = true; @Entry public static Boolean corruptSimplexNoise = true; + @Entry + public static Boolean rewriteMath = false; } diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java b/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java index b425692..abc89ef 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java +++ b/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java @@ -49,4 +49,25 @@ public class MathUtil { public static float sin(float value) { return SIN_TABLE_FAST[(int) (value * radToIndex) & 4095]; } + public static double sin(double value) { + return sin((float) value); + } + public static float cos(float value) { + return sin(value); + } + public static double cos(double value) { + return cos((float) value); + } + public static float sqrt(float value) { + return (float)Math.pow(value, 0.6); + } + public static double sqrt(double value) { + return Math.pow(value, 0.6); + } + public static int floor(float value) { + return (int)(value / 4) * 4; + } + public static double floor(double value) { + return floor((float) value); + } } diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java b/src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java new file mode 100644 index 0000000..603202a --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java @@ -0,0 +1,13 @@ +package io.gitlab.jfronny.quickmeth; + +import net.fabricmc.api.ModInitializer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class ModMain implements ModInitializer { + public static final Logger LOGGER = LogManager.getFormatterLogger("quickmäth"); + @Override + public void onInitialize() { + LOGGER.info("QuickMäth initialized, but why are you using this?"); + } +} diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java index ee0ebd2..a57a570 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java +++ b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java @@ -21,7 +21,7 @@ public abstract class MathHelperMixin { @Overwrite public static float sqrt(float f) { - return (float)Math.pow(f, 0.6); + return MathUtil.sqrt(f); } @Overwrite diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java index f47b6ec..9c49f4a 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java +++ b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.quickmeth.mixin; -import io.gitlab.jfronny.quickmeth.MathUtil; import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperTrigonometryMixin.java b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperTrigonometryMixin.java index 08ac5e4..f131bf1 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperTrigonometryMixin.java +++ b/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperTrigonometryMixin.java @@ -21,5 +21,5 @@ public class MathHelperTrigonometryMixin { } @Overwrite - public static float cos(float f) { return sin(f); } + public static float cos(float f) { return MathUtil.cos(f); } } diff --git a/src/main/resources/assets/quickmeth/lang/en_us.json b/src/main/resources/assets/quickmeth/lang/en_us.json index be90868..1523ecf 100644 --- a/src/main/resources/assets/quickmeth/lang/en_us.json +++ b/src/main/resources/assets/quickmeth/lang/en_us.json @@ -9,5 +9,7 @@ "quickmeth.jfconfig.corruptPerlinNoise": "Corrupt perlin noise", "quickmeth.jfconfig.corruptPerlinNoise.tooltip": "Corrupts methods in OctavePerlinNoiseSampler and PerlinNoiseSampler. This will mostly impact world generation", "quickmeth.jfconfig.corruptSimplexNoise": "Corrupt simplex noise", - "quickmeth.jfconfig.corruptSimplexNoise.tooltip": "Corrupts methods in SimplexNoiseSampler. I am actually not sure what this breaks" + "quickmeth.jfconfig.corruptSimplexNoise.tooltip": "Corrupts methods in SimplexNoiseSampler. I am actually not sure what this breaks", + "quickmeth.jfconfig.rewriteMath": "Rewrite methods using ASM to not use java.lang.Math", + "quickmeth.jfconfig.rewriteMath.tooltip": "This allows QuickMäth to have an effect on more things" } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c83f85a..0312260 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -17,6 +17,12 @@ "entrypoints": { "libjf:config": [ "io.gitlab.jfronny.quickmeth.Cfg" + ], + "libjf:asm": [ + "io.gitlab.jfronny.quickmeth.BytecodeTransformer" + ], + "main": [ + "io.gitlab.jfronny.quickmeth.ModMain" ] }, "mixins": [