diff --git a/build.gradle b/build.gradle index e4e925c..fe57246 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.12-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' } @@ -18,6 +18,7 @@ repositories { maven { url 'https://jitpack.io' } maven { url "https://maven.shedaniel.me/" } maven { url "https://maven.jamieswhiteshirt.com/libs-release/" } + maven { url "https://maven.terraformersmc.com/releases/" } } dependencies { @@ -25,10 +26,9 @@ dependencies { 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}" - - // config - modImplementation 'com.github.Draylar.omega-config:omega-config-base:1.0.8-1.17' - include 'com.github.Draylar.omega-config:omega-config-base:1.0.8-1.17' + modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") + } // dev Reach Entity Attributes for testing tools with extended reach (or players) modImplementation "com.jamieswhiteshirt:reach-entity-attributes:${project.rea_version}" @@ -38,47 +38,43 @@ processResources { inputs.property "version", project.version filesMatching("fabric.mod.json") { - expand "version": project.version - } + expand "version": project.version + } } -// ensure that the encoding is set to UTF-8, no matter what the system default is -// this fixes some edge cases with special characters not displaying correctly -// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - options.release = 17 +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 } -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } } // configure the maven publication publishing { publications { - mavenJava(MavenPublication) { - // add all the jars that should be included when publishing to maven - artifact(remapJar) { - builtBy remapJar - } - artifact(sourcesJar) { - builtBy remapSourcesJar - } + create("mavenJava", MavenPublication) { + from components.java } } - // select the repositories you want to publish to + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // uncomment to publish to the local maven - // mavenLocal() + // 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. } -} +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9c30f10..722a38a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.22 -loader_version=0.14.9 +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.1 +loader_version=0.15.11 # Mod Properties mod_version=1.8.0 @@ -14,7 +14,7 @@ archives_base_name=magna # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.63.0+1.19.2 -cloth_config_version=7.0.72 -mod_menu_version=4.0.0 -rea_version=2.3.0 +fabric_version=0.96.11+1.20.4 +cloth_config_version=13.0.121 +mod_menu_version=9.2.0 +rea_version=2.5.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..e644113 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 a19fb3b..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip 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 -zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## 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/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 -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_NAME="Gradle" -APP_BASE_NAME=`basename "$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"' +# 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" +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 +119,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,88 +130,120 @@ 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. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # 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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, 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" +# 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 index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 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. +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 @@ -56,11 +57,11 @@ 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. +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 @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/jitpack.yml b/jitpack.yml index 8baa358..8ac1587 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,5 +1,5 @@ -before_install: - - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh - - source ./install-jdk.sh --feature 17 --license GPL jdk: - - openjdk17 \ No newline at end of file + - openjdk17 +before_install: + - sdk install java 17.0.5-open + - sdk use java 17.0.5-open \ No newline at end of file diff --git a/src/main/java/draylar/magna/Magna.java b/src/main/java/draylar/magna/Magna.java index 2749c06..cc85e51 100644 --- a/src/main/java/draylar/magna/Magna.java +++ b/src/main/java/draylar/magna/Magna.java @@ -1,15 +1,14 @@ package draylar.magna; import draylar.magna.config.MagnaConfig; -import draylar.omegaconfig.OmegaConfig; +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; public class Magna implements ModInitializer { - public static MagnaConfig CONFIG = OmegaConfig.register(MagnaConfig.class); - @Override public void onInitialize() { // Before loading the test suite, ensure: @@ -18,6 +17,7 @@ public void onInitialize() { if(FabricLoader.getInstance().isDevelopmentEnvironment() && FabricLoader.getInstance().isModLoaded("reach-entity-attributes")) { MagnaTest.initialize(); } + AutoConfig.register(MagnaConfig.class, JanksonConfigSerializer::new); } /** diff --git a/src/main/java/draylar/magna/MagnaTest.java b/src/main/java/draylar/magna/MagnaTest.java index 8d1c44f..495f053 100644 --- a/src/main/java/draylar/magna/MagnaTest.java +++ b/src/main/java/draylar/magna/MagnaTest.java @@ -13,10 +13,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterials; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import java.util.List; @@ -30,14 +31,14 @@ public class MagnaTest { public static void initialize() { // Standard Hammer with a tool material of Diamond. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "hammer_test"), new HammerItem(ToolMaterials.DIAMOND, 0, 0, new Item.Settings()) ); // Standard Hammer with a tool material of Diamond and a modified depth. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "depth_test"), new HammerItem(ToolMaterials.DIAMOND, 0, 0, new Item.Settings()) { @@ -50,14 +51,14 @@ public int getDepth(ItemStack stack) { // Standard Excavator with a tool material of Wood. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "excavator_test"), new ExcavatorItem(ToolMaterials.WOOD, 0, 0, new Item.Settings()) ); // Hammer with extended reach. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "reach_test"), new HammerItem(ToolMaterials.WOOD, 0, 0, new Item.Settings()) { @Override @@ -71,7 +72,7 @@ public Multimap getAttributeModifiers( // Hammer with a huge radius and no outline. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "outline_test"), new HammerItem(ToolMaterials.WOOD, 0, 0, new Item.Settings()) { @Override @@ -93,7 +94,7 @@ public int getDepth(ItemStack stack) { // Hammer that only breaks blocks inside its radius with an odd x or (exclusive) z position. Registry.register( - Registry.ITEM, + Registries.ITEM, new Identifier("magna", "custom_breaker_test"), new HammerItem(ToolMaterials.DIAMOND, 0, 0, new Item.Settings()) { private final BlockFinder TEST_FINDER = new BlockFinder() { diff --git a/src/main/java/draylar/magna/api/BlockBreaker.java b/src/main/java/draylar/magna/api/BlockBreaker.java index 5a84d90..9044f5e 100644 --- a/src/main/java/draylar/magna/api/BlockBreaker.java +++ b/src/main/java/draylar/magna/api/BlockBreaker.java @@ -1,6 +1,7 @@ package draylar.magna.api; import draylar.magna.Magna; +import draylar.magna.config.MagnaConfig; import draylar.magna.impl.MagnaPlayerInteractionManagerExtension; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.minecraft.block.Block; @@ -146,7 +147,7 @@ public static void breakInRadius(World world, PlayerEntity player, int radius, i */ private static void dropItems(PlayerEntity player, World world, List stacks, Vec3d pos) { for(ItemStack stack : stacks) { - if (Magna.CONFIG.autoPickup) { + if (MagnaConfig.getInstance().autoPickup) { player.getInventory().insertStack(stack); } @@ -157,7 +158,7 @@ private static void dropItems(PlayerEntity player, World world, List } } - if(!stacks.isEmpty() && Magna.CONFIG.autoPickup) { + if(!stacks.isEmpty() && MagnaConfig.getInstance().autoPickup) { world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.BLOCKS, 0.2F, ((player.getRandom().nextFloat() - player.getRandom().nextFloat()) * 0.7F + 1.0F) * 2.0F); } } diff --git a/src/main/java/draylar/magna/api/MagnaTool.java b/src/main/java/draylar/magna/api/MagnaTool.java index ba386b9..0fe69e1 100644 --- a/src/main/java/draylar/magna/api/MagnaTool.java +++ b/src/main/java/draylar/magna/api/MagnaTool.java @@ -2,6 +2,7 @@ import draylar.magna.Magna; import draylar.magna.api.event.ToolRadiusCallback; +import draylar.magna.config.MagnaConfig; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -156,7 +157,7 @@ default boolean attemptBreak(World world, BlockPos pos, PlayerEntity player, int * @return {@code true} if this {@link MagnaTool} is NOT allowed to break bonus blocks with respect to config/player */ default boolean ignoreRadiusBreak(ItemStack stack, PlayerEntity player) { - return Magna.CONFIG.breakSingleBlockWhenSneaking && player.isSneaking(); + return MagnaConfig.getInstance().breakSingleBlockWhenSneaking && player.isSneaking(); } /** @@ -197,6 +198,6 @@ default BlockFinder getBlockFinder() { * @return {@code true} if this tool can render an extended outline while hovering over a block */ default boolean showExtendedOutline(ItemStack stack, PlayerEntity player) { - return !Magna.CONFIG.disableExtendedHitboxWhileSneaking || !player.isSneaking(); + return !MagnaConfig.getInstance().disableExtendedHitboxWhileSneaking || !player.isSneaking(); } } diff --git a/src/main/java/draylar/magna/api/optional/MagnaOptionals.java b/src/main/java/draylar/magna/api/optional/MagnaOptionals.java index a207beb..98098b2 100644 --- a/src/main/java/draylar/magna/api/optional/MagnaOptionals.java +++ b/src/main/java/draylar/magna/api/optional/MagnaOptionals.java @@ -2,13 +2,15 @@ import draylar.magna.api.event.ToolMiningSpeedMultiplierCallback; import draylar.magna.api.event.ToolRadiusCallback; +import draylar.magna.config.MagnaConfig; import draylar.magna.enchantment.CurseOfGigantismEnchantment; import draylar.magna.item.ExcavatorItem; import draylar.magna.item.HammerItem; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import java.util.ArrayList; import java.util.List; @@ -30,7 +32,7 @@ public class MagnaOptionals { public static void optInForCurse() { if(CURSE_OF_GIGANTISM == null) { CURSE_OF_GIGANTISM = Registry.register( - Registry.ENCHANTMENT, + Registries.ENCHANTMENT, new Identifier("magna", "gigantism_curse"), new CurseOfGigantismEnchantment() ); @@ -38,8 +40,9 @@ public static void optInForCurse() { // setup 80% speed decrease while using the curse ToolMiningSpeedMultiplierCallback.EVENT.register((tool, state, player, currentMultiplier) -> { - if(EnchantmentHelper.getLevel(MagnaOptionals.CURSE_OF_GIGANTISM, tool) > 0) { - return currentMultiplier * 0.2f; + int gigantismLevel = EnchantmentHelper.getLevel(MagnaOptionals.CURSE_OF_GIGANTISM, tool); + if (gigantismLevel > 0) { + return (float) (currentMultiplier * MagnaConfig.getInstance().gigantismSpeedModifier * (1.0F/Math.pow(gigantismLevel,2))); } return currentMultiplier; @@ -47,8 +50,9 @@ public static void optInForCurse() { // setup radius increase while the curse is applied to a tool ToolRadiusCallback.EVENT.register((tool, currentRadius) -> { - if(EnchantmentHelper.getLevel(MagnaOptionals.CURSE_OF_GIGANTISM, tool) > 0) { - return currentRadius + 1; + int gigantismLevel = EnchantmentHelper.getLevel(MagnaOptionals.CURSE_OF_GIGANTISM, tool); + if (gigantismLevel > 0) { + return currentRadius + gigantismLevel; } return currentRadius; diff --git a/src/main/java/draylar/magna/config/MagnaConfig.java b/src/main/java/draylar/magna/config/MagnaConfig.java index 71832e6..2bceb2d 100644 --- a/src/main/java/draylar/magna/config/MagnaConfig.java +++ b/src/main/java/draylar/magna/config/MagnaConfig.java @@ -1,9 +1,13 @@ package draylar.magna.config; -import draylar.omegaconfig.api.Comment; -import draylar.omegaconfig.api.Config; -public class MagnaConfig implements Config { +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; + +@Config(name = "magna") +public class MagnaConfig implements ConfigData { @Comment(value = "Whether an extended hitbox should show air blocks (or other blocks without hitboxes).") public boolean highlightAirBlocks = false; @@ -28,8 +32,16 @@ public class MagnaConfig implements Config { @Comment(value = "If true, dropped items are automatically inserted into the inventory.") public boolean autoPickup = false; - @Override - public String getName() { - return "magna"; + @Comment(value = "If true, curse of gigantism can be applied to items with enchantments that aren't efficiency.") + public boolean gigantismCompatibleWithOtherEnchants = false; + + @Comment(value = "Speed modifier of gigantism curse.") + public float gigantismSpeedModifier = 0.2F; + + @Comment(value = "Max level for curse of gigantism.") + public int gigantismMaxLevel = 1; + + public static MagnaConfig getInstance() { + return AutoConfig.getConfigHolder(MagnaConfig.class).getConfig(); } } \ No newline at end of file diff --git a/src/main/java/draylar/magna/enchantment/CurseOfGigantismEnchantment.java b/src/main/java/draylar/magna/enchantment/CurseOfGigantismEnchantment.java index e21121d..3ec881c 100644 --- a/src/main/java/draylar/magna/enchantment/CurseOfGigantismEnchantment.java +++ b/src/main/java/draylar/magna/enchantment/CurseOfGigantismEnchantment.java @@ -1,7 +1,9 @@ package draylar.magna.enchantment; +import draylar.magna.Magna; import draylar.magna.api.optional.MagnaOptionals; import draylar.magna.api.optional.StackPredicate; +import draylar.magna.config.MagnaConfig; import draylar.magna.item.ExcavatorItem; import draylar.magna.item.HammerItem; import net.minecraft.enchantment.Enchantment; @@ -20,7 +22,7 @@ public CurseOfGigantismEnchantment() { @Override protected boolean canAccept(Enchantment other) { - return other == Enchantments.EFFICIENCY; + return MagnaConfig.getInstance().gigantismCompatibleWithOtherEnchants || (other == Enchantments.EFFICIENCY); } @Override @@ -48,7 +50,7 @@ public int getMaxPower(int level) { @Override public int getMaxLevel() { - return 1; + return MagnaConfig.getInstance().gigantismMaxLevel; } @Override diff --git a/src/main/java/draylar/magna/mixin/ServerPlayerInteractionManagerMixin.java b/src/main/java/draylar/magna/mixin/ServerPlayerInteractionManagerMixin.java index 09effdc..b2af50e 100644 --- a/src/main/java/draylar/magna/mixin/ServerPlayerInteractionManagerMixin.java +++ b/src/main/java/draylar/magna/mixin/ServerPlayerInteractionManagerMixin.java @@ -7,6 +7,7 @@ import net.minecraft.server.network.ServerPlayerInteractionManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; +import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -18,17 +19,12 @@ @Mixin(value = ServerPlayerInteractionManager.class, priority = 1001) public class ServerPlayerInteractionManagerMixin implements MagnaPlayerInteractionManagerExtension { - @Shadow public ServerPlayerEntity player; - @Shadow public ServerWorld world; + @Final @Shadow protected ServerPlayerEntity player; + @Shadow protected ServerWorld world; @Unique private boolean magna_isMining = false; @Inject( - method = "tryBreakBlock", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V" - ), - cancellable = true + method = "tryBreakBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/block/BlockState;"), cancellable = true ) private void tryBreak(BlockPos pos, CallbackInfoReturnable cir) { ItemStack heldStack = player.getMainHandStack(); diff --git a/src/main/java/draylar/magna/mixin/WorldRendererMixin.java b/src/main/java/draylar/magna/mixin/WorldRendererMixin.java index d01ded3..7aa262c 100644 --- a/src/main/java/draylar/magna/mixin/WorldRendererMixin.java +++ b/src/main/java/draylar/magna/mixin/WorldRendererMixin.java @@ -49,7 +49,6 @@ public class WorldRendererMixin { @Inject(at = @At("HEAD"), method = "drawBlockOutline", cancellable = true) private void drawBlockOutline(MatrixStack stack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos blockPos, BlockState blockState, CallbackInfo ci) { - MagnaConfig config = Magna.CONFIG; // ensure player is not null if(this.client.player == null) { @@ -63,7 +62,7 @@ private void drawBlockOutline(MatrixStack stack, VertexConsumer vertexConsumer, // show extended outline if the player is holding a magna tool ItemStack heldStack = this.client.player.getInventory().getMainHandStack(); - if (heldStack.getItem() instanceof MagnaTool tool && config.enableExtendedHitbox) { + if (heldStack.getItem() instanceof MagnaTool tool && MagnaConfig.getInstance().enableExtendedHitbox) { // do not show extended outline if player is sneaking and the config option is enabled if (tool.showExtendedOutline(heldStack, client.player)) { @@ -95,16 +94,16 @@ private void drawBlockOutline(MatrixStack stack, VertexConsumer vertexConsumer, BlockState offsetShape = world.getBlockState(position); // if enableFull3x3 is 'true', all blocks will gain an outline, even if they are air - if (!offsetShape.isAir() || config.highlightAirBlocks) { + if (!offsetShape.isAir() || MagnaConfig.getInstance().highlightAirBlocks) { // if fullBlockHitbox is 'true', all blocks will have a 16x16x16 hitbox regardless of their outline shape - if (!config.fullBlockShapes) { - if (!config.individualBlockOutlines) { + if (!MagnaConfig.getInstance().fullBlockShapes) { + if (!MagnaConfig.getInstance().individualBlockOutlines) { outlineShapes.set(0, VoxelShapes.union(outlineShapes.get(0), offsetShape.getOutlineShape(world, position).offset(diffPos.getX(), diffPos.getY(), diffPos.getZ()))); } else { outlineShapes.add(offsetShape.getOutlineShape(world, position).offset(diffPos.getX(), diffPos.getY(), diffPos.getZ())); } } else { - if (!config.individualBlockOutlines) { + if (!MagnaConfig.getInstance().individualBlockOutlines) { outlineShapes.set(0, VoxelShapes.union(outlineShapes.get(0), VoxelShapes.fullCube().offset(diffPos.getX(), diffPos.getY(), diffPos.getZ()))); } else { outlineShapes.add(VoxelShapes.fullCube().offset(diffPos.getX(), diffPos.getY(), diffPos.getZ())); @@ -152,11 +151,10 @@ private ObjectIterator>> appen private Long2ObjectMap getCurrentExtraBreakingInfos() { assert client.player != null; - MagnaConfig config = Magna.CONFIG; ItemStack heldStack = this.client.player.getInventory().getMainHandStack(); // make sure we should display the outline based on the tool - if (heldStack.getItem() instanceof MagnaTool tool && config.enableAllBlockBreakingAnimation) { + if (heldStack.getItem() instanceof MagnaTool tool && MagnaConfig.getInstance().enableAllBlockBreakingAnimation) { // check if we should display the outline based on config and sneaking if (tool.showExtendedOutline(heldStack, client.player)) {