Update for 1.18
This commit is contained in:
parent
aa9a7de4e6
commit
dcf0fd81fb
GPG Key ID:
E76429612C2929F4
103
build.gradle
103
build.gradle
|
|
@ -1,101 +1,10 @@
|
|||
plugins {
|
||||
id 'fabric-loom' version '0.5-SNAPSHOT'
|
||||
id 'maven-publish'
|
||||
}
|
||||
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
|
||||
archivesBaseName = project.archives_base_name
|
||||
version = project.mod_version
|
||||
group = project.maven_group
|
||||
|
||||
repositories {
|
||||
//maven { url = 'http://maven.fabricmc.net/'; name = "Fabric" }
|
||||
//maven { url = 'https://dl.bintray.com/ladysnake/libs'; name = "PAL" }
|
||||
//maven { url = 'https://minecraft.curseforge.com/api/maven'; name = "CurseForge" }
|
||||
//maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Cotton" }
|
||||
//maven { url = 'https://maven.jamieswhiteshirt.com/libs-release/'; name = "EntityReachAttribute" }
|
||||
//maven { url = 'https://jitpack.io'; name = "Trinkets" }
|
||||
//maven { url = 'https://maven.siphalor.de'; name = "NBT Crafting" }
|
||||
//maven { url = 'https://minecraft.guntram.de/maven/'; name = "CrowdinTranslate" }
|
||||
jcenter() //NotEnoughCrashes and cloth
|
||||
}
|
||||
|
||||
apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
|
||||
|
||||
dependencies {
|
||||
//to change the versions see the gradle.properties file
|
||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
||||
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
|
||||
include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
|
||||
include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
|
||||
include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
|
||||
modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
|
||||
|
||||
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
||||
|
||||
modCompile "me.sargunvohra.mcmods:autoconfig1u:3.2.2"
|
||||
include "me.sargunvohra.mcmods:autoconfig1u:3.2.2"
|
||||
modApi ("me.shedaniel.cloth:config-2:4.8.2") {
|
||||
exclude group: "io.github.prospector"
|
||||
exclude group: "net.fabricmc.fabric-api"
|
||||
}
|
||||
include ("me.shedaniel.cloth:config-2:4.8.1") {
|
||||
exclude group: "io.github.prospector"
|
||||
exclude group: "net.fabricmc.fabric-api"
|
||||
}
|
||||
|
||||
modCompile("io.github.prospector:modmenu:1.14.6+build.31") {
|
||||
transitive = false;
|
||||
}
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property "version", project.version
|
||||
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
include "fabric.mod.json"
|
||||
expand "version": project.version
|
||||
}
|
||||
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude "fabric.mod.json"
|
||||
}
|
||||
}
|
||||
|
||||
// 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"
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
jar {
|
||||
from "LICENSE"
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// select the repositories you want to publish to
|
||||
repositories {
|
||||
// uncomment to publish to the local maven
|
||||
// mavenLocal()
|
||||
}
|
||||
modImplementation "com.terraformersmc:modmenu:3.0.0"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
# Done to increase the memory available to gradle.
|
||||
org.gradle.jvmargs=-Xmx1G
|
||||
# Fabric Properties
|
||||
# check these on https://modmuss50.me/fabric.html
|
||||
minecraft_version=1.16.4
|
||||
yarn_mappings=1.16.4+build.9
|
||||
loader_version=0.11.0
|
||||
# Mod Properties
|
||||
mod_version=1.1
|
||||
# https://fabricmc.net/versions.html
|
||||
minecraft_version=1.18.1
|
||||
yarn_mappings=build.12
|
||||
loader_version=0.12.12
|
||||
|
||||
maven_group=io.gitlab.jfronny
|
||||
archives_base_name=combit
|
||||
# Dependencies
|
||||
# check this on https://modmuss50.me/fabric.html
|
||||
fabric_version=0.29.3+1.16
|
||||
|
||||
fabric_version=0.45.0+1.18
|
||||
jfapi_version=2.2.0
|
||||
Binary file not shown.
|
|
@ -1,5 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
|
|
@ -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" "$@"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
|
@ -54,7 +54,7 @@ goto fail
|
|||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
|
|
@ -64,21 +64,6 @@ echo location of your Java installation.
|
|||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
|
|
@ -86,7 +71,7 @@ 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 %CMD_LINE_ARGS%
|
||||
"%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
|
||||
|
|
|
|||
|
|
@ -1,12 +1,8 @@
|
|||
package io.gitlab.jfronny.combit;
|
||||
|
||||
import io.gitlab.jfronny.combit.config.Cfg;
|
||||
import io.gitlab.jfronny.combit.config.Invulnerability;
|
||||
import io.gitlab.jfronny.combit.nodami.EntityHurtCallback;
|
||||
import io.gitlab.jfronny.combit.nodami.EntityKnockbackCallback;
|
||||
import io.gitlab.jfronny.combit.nodami.PlayerAttackCallback;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
|
||||
import io.gitlab.jfronny.combit.events.EntityHurtEvent;
|
||||
import io.gitlab.jfronny.combit.events.EntityKnockbackEvent;
|
||||
import io.gitlab.jfronny.combit.events.PlayerAttackEvent;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityType;
|
||||
|
|
@ -22,12 +18,9 @@ public class Combit implements ModInitializer {
|
|||
private static final UUID debugUUID = new UUID(0L, 0L);
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
Invulnerability invulnerability = getCfg().invulnerability;
|
||||
EntityHurtCallback.EVENT.register((entity, source, amount) -> {
|
||||
if (entity.getEntityWorld().isClient) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
if (invulnerability.debug && entity instanceof PlayerEntity) {
|
||||
EntityHurtEvent.EVENT.register((entity, source, amount) -> {
|
||||
if (entity.getEntityWorld().isClient) return ActionResult.PASS;
|
||||
if (CombitConfig.debug && entity instanceof PlayerEntity) {
|
||||
String debugSource;
|
||||
Entity trueSource = source.getAttacker();
|
||||
if (trueSource == null || EntityType.getId(trueSource.getType()) == null) {
|
||||
|
|
@ -38,82 +31,27 @@ public class Combit implements ModInitializer {
|
|||
String message = String.format("Type of damage received: %s\nAmount: %.3f\nTrue Source (mob id): %s\n",
|
||||
source.getName(), amount, debugSource);
|
||||
entity.sendSystemMessage(new LiteralText(message), debugUUID);
|
||||
|
||||
}
|
||||
if (invulnerability.excludePlayers && entity instanceof PlayerEntity) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
if (invulnerability.excludeAllMobs && !(entity instanceof PlayerEntity)) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
/*for (String id : NodamiConfig.dmgReceiveExcludedEntities) {
|
||||
Identifier loc = EntityType.getId(entity.getType());
|
||||
if (loc == null)
|
||||
break;
|
||||
int starIndex = id.indexOf('*');
|
||||
if (starIndex != -1) {
|
||||
if (loc.toString().indexOf(id.substring(0, starIndex)) != -1) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
} else if (loc.toString().equals(id)) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
}*/
|
||||
|
||||
if (isEntityPass(getId(entity), invulnerability.dmgReceiveExcludedEntities))
|
||||
return ActionResult.PASS;
|
||||
if (CombitConfig.excludePlayers && entity instanceof PlayerEntity) return ActionResult.PASS;
|
||||
if (CombitConfig.excludeAllMobs && !(entity instanceof PlayerEntity)) return ActionResult.PASS;
|
||||
if (idMatches(getId(entity), CombitConfig.targetEntityWhitelist)) return ActionResult.PASS;
|
||||
if (idMatches(source.getName(), CombitConfig.damageSourceWhitelist)) return ActionResult.PASS;
|
||||
|
||||
// May have more DoTs missing in this list
|
||||
// Not anymore (/s)
|
||||
// Damage SOURCES that needs to be put in check
|
||||
if (isEntityPass(source.getName(), invulnerability.damageSrcWhitelist))
|
||||
return ActionResult.PASS;
|
||||
/*for (String dmgType : NodamiConfig.damageSrcWhitelist) {
|
||||
if (source.getName().equals(dmgType)) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
}*/
|
||||
|
||||
// THINGS, MOBS that needs to apply i-frames when attacking
|
||||
Entity attacker = source.getAttacker();
|
||||
//if (attacker != null) {
|
||||
if (attacker != null && isEntityPass(getId(attacker), invulnerability.attackExcludedEntities))
|
||||
if (attacker != null && idMatches(getId(attacker), CombitConfig.attackerWhitelist))
|
||||
return ActionResult.PASS;
|
||||
/*for (String id : NodamiConfig.attackExcludedEntities) {
|
||||
Identifier loc = EntityType.getId(attacker.getType());
|
||||
if (loc == null)
|
||||
break;
|
||||
int starIndex = id.indexOf('*');
|
||||
if (starIndex != -1) {
|
||||
if (loc.toString().indexOf(id.substring(0, starIndex)) != -1) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
} else if (loc.toString().equals(id)) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
}*/
|
||||
//}
|
||||
|
||||
entity.timeUntilRegen = invulnerability.iFrameInterval;
|
||||
entity.timeUntilRegen = CombitConfig.iFrameInterval;
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
// Knockback module part 1
|
||||
EntityKnockbackCallback.EVENT.register((entity, amp, dx, dz) -> {
|
||||
EntityKnockbackEvent.EVENT.register((entity, amp, dx, dz) -> {
|
||||
if (entity.getEntityWorld().isClient) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
/*if (entity.getEntityWorld().isClient) {
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
if (source != null) {
|
||||
// IT'S ONLY MAGIC
|
||||
if (source instanceof PlayerEntity && ((PlayerEntity) source).hurtTime == -1) {
|
||||
((PlayerEntity) source).hurtTime = 0;
|
||||
return ActionResult.FAIL;
|
||||
}
|
||||
}
|
||||
return ActionResult.PASS;*/
|
||||
|
||||
if (entity.handSwinging) {
|
||||
entity.handSwinging = false;
|
||||
return ActionResult.FAIL;
|
||||
|
|
@ -122,30 +60,22 @@ public class Combit implements ModInitializer {
|
|||
});
|
||||
|
||||
// Attack + knockback cancel module
|
||||
PlayerAttackCallback.EVENT.register((player, target) -> {
|
||||
if (player.getEntityWorld().isClient) {
|
||||
PlayerAttackEvent.EVENT.register((player, target) -> {
|
||||
if (player.getEntityWorld().isClient)
|
||||
return ActionResult.PASS;
|
||||
}
|
||||
|
||||
if (invulnerability.debug) {
|
||||
String message = String.format("Entity attacked: %s",
|
||||
EntityType.getId(target.getType()));
|
||||
player.sendMessage(new LiteralText(message), false);
|
||||
}
|
||||
if (CombitConfig.debug)
|
||||
player.sendMessage(new LiteralText(
|
||||
String.format("Entity attacked: %s", EntityType.getId(target.getType()))
|
||||
), false);
|
||||
|
||||
float str = player.getAttackCooldownProgress(0);
|
||||
if (str <= invulnerability.attackCancelThreshold) {
|
||||
if (str <= CombitConfig.attackCancelThreshold)
|
||||
return ActionResult.FAIL;
|
||||
}
|
||||
if (str <= invulnerability.knockbackCancelThreshold) {
|
||||
// Don't worry, it's only magic
|
||||
//player.hurtTime = -1;
|
||||
if (target instanceof LivingEntity)
|
||||
((LivingEntity)target).handSwinging = true;
|
||||
}
|
||||
if (str <= CombitConfig.knockbackCancelThreshold && target instanceof LivingEntity le)
|
||||
le.handSwinging = true;
|
||||
|
||||
return ActionResult.PASS;
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -153,30 +83,17 @@ public class Combit implements ModInitializer {
|
|||
return EntityType.getId(entity.getType()).toString();
|
||||
}
|
||||
|
||||
private boolean isEntityPass(String oId, Set<String> ids) {
|
||||
for (String id : ids) {
|
||||
private boolean idMatches(String entityId, Set<String> matches) {
|
||||
for (String id : matches) {
|
||||
int starIndex = id.indexOf('*');
|
||||
if (starIndex != -1) {
|
||||
if (oId.contains(id.substring(0, starIndex))) {
|
||||
return true;
|
||||
}
|
||||
} else if (oId.equals(id)) {
|
||||
return true;
|
||||
} else if (("minecraft:" + oId).equals(id)) {
|
||||
return true;
|
||||
} else if (oId.equals("minecraft:" + id)) {
|
||||
return true;
|
||||
if (entityId.contains(id.substring(0, starIndex))) return true;
|
||||
} else {
|
||||
if (entityId.equals(id)) return true;
|
||||
if (("minecraft:" + entityId).equals(id)) return true;
|
||||
if (entityId.equals("minecraft:" + id)) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static Cfg cfg = null;
|
||||
public static Cfg getCfg() {
|
||||
if (cfg == null) {
|
||||
AutoConfig.register(Cfg.class, JanksonConfigSerializer::new);
|
||||
cfg = AutoConfig.getConfigHolder(Cfg.class).getConfig();
|
||||
}
|
||||
return cfg;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
package io.gitlab.jfronny.combit;
|
||||
|
||||
import io.gitlab.jfronny.libjf.config.api.Entry;
|
||||
import io.gitlab.jfronny.libjf.config.api.JfConfig;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
public class CombitConfig implements JfConfig {
|
||||
// Invulnerability
|
||||
@Entry(min = 0) public static Integer iFrameInterval = 0;
|
||||
@Entry(max = 1) public static Double attackCancelThreshold = 0.1;
|
||||
@Entry(max = 1) public static Double knockbackCancelThreshold = 0.75;
|
||||
@Entry public static HashSet<String> attackerWhitelist = null;
|
||||
@Entry public static HashSet<String> damageSourceWhitelist = null;
|
||||
@Entry public static HashSet<String> targetEntityWhitelist = null;
|
||||
@Entry public static Boolean excludeAllMobs = false;
|
||||
@Entry public static Boolean excludePlayers = false;
|
||||
// Fluff
|
||||
@Entry public static Double cooldownProgressOverride = 0.8;
|
||||
@Entry public static Double cooldownProgressPerTickOverride = Double.MIN_VALUE;
|
||||
@Entry public static Double weaponAttackDamageFactor = 0.6;
|
||||
@Entry public static Double axeAttackDamageFactor = 0.5;
|
||||
@Entry public static Boolean debug = FabricLoader.getInstance().isDevelopmentEnvironment();
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
package io.gitlab.jfronny.combit;
|
||||
|
||||
import io.gitlab.jfronny.libjf.config.api.ConfigHolder;
|
||||
import io.gitlab.jfronny.libjf.unsafe.UltraEarlyInit;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
public class CombitConfigValidator implements UltraEarlyInit {
|
||||
@Override
|
||||
public void init() {
|
||||
boolean changed = false;
|
||||
if (CombitConfig.attackerWhitelist == null) {
|
||||
changed = true;
|
||||
CombitConfig.attackerWhitelist = new HashSet<>();
|
||||
CombitConfig.attackerWhitelist.add("minecraft:slime");
|
||||
CombitConfig.attackerWhitelist.add("tconstruct:blueslime");
|
||||
CombitConfig.attackerWhitelist.add("thaumcraft:thaumslime");
|
||||
}
|
||||
if (CombitConfig.targetEntityWhitelist == null) {
|
||||
changed = true;
|
||||
CombitConfig.targetEntityWhitelist = new HashSet<>();
|
||||
}
|
||||
if (CombitConfig.damageSourceWhitelist == null) {
|
||||
changed = true;
|
||||
CombitConfig.damageSourceWhitelist = new HashSet<>();
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.IN_FIRE.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.LIGHTNING_BOLT.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.LAVA.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.HOT_FLOOR.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.IN_WALL.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.CACTUS.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.OUT_OF_WORLD.getName());
|
||||
CombitConfig.damageSourceWhitelist.add(DamageSource.SWEET_BERRY_BUSH.getName());
|
||||
}
|
||||
if (changed) {
|
||||
ConfigHolder.getInstance().getRegistered().get("combit").write();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
package io.gitlab.jfronny.combit;
|
||||
|
||||
public interface MiningToolItemExt {
|
||||
void setDamage(float damage);
|
||||
float getDamage();
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package io.gitlab.jfronny.combit.client;
|
||||
|
||||
import io.github.prospector.modmenu.api.ConfigScreenFactory;
|
||||
import io.github.prospector.modmenu.api.ModMenuApi;
|
||||
import io.gitlab.jfronny.combit.config.Cfg;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.api.EnvType;
|
||||
import net.fabricmc.api.Environment;
|
||||
|
||||
@Environment(EnvType.CLIENT)
|
||||
public class ModMenuClient implements ModMenuApi {
|
||||
@Override
|
||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
||||
return screen -> AutoConfig.getConfigScreen(Cfg.class, screen).get();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
package io.gitlab.jfronny.combit.config;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.RequiresRestart;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
|
||||
|
||||
public class AttackDelay {
|
||||
public boolean enable = true;
|
||||
@Comment("Between -0.1 (disable) and 1")
|
||||
public float cooldownProgressOverride = 0.8f;
|
||||
@Comment("Between -0.1 (disable) and 1")
|
||||
public float cooldownProgressPerTickOverride = Float.MIN_VALUE;
|
||||
@Comment("Between 0 and 2")
|
||||
@RequiresRestart
|
||||
public float axeAttackDamageFactor = 0.5f;
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
package io.gitlab.jfronny.combit.config;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Category;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.TransitiveObject;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
@Config(name = "Combit")
|
||||
public class Cfg implements ConfigData {
|
||||
@Comment(value = "Allows modifying/removing the attack delay and related things")
|
||||
@Category("attackDelay")
|
||||
@TransitiveObject
|
||||
public AttackDelay attackDelay = new AttackDelay();
|
||||
@Comment(value = "Allows disabling invulnerability frames")
|
||||
@Category("invulnerability")
|
||||
@TransitiveObject
|
||||
public Invulnerability invulnerability = new Invulnerability();
|
||||
|
||||
@Override
|
||||
public void validatePostLoad() throws ValidationException {
|
||||
if (attackDelay == null)
|
||||
attackDelay = new AttackDelay();
|
||||
if (invulnerability == null)
|
||||
invulnerability = new Invulnerability();
|
||||
|
||||
if (attackDelay.cooldownProgressOverride < 0)
|
||||
attackDelay.cooldownProgressOverride = -0.1f;
|
||||
if (attackDelay.cooldownProgressOverride > 1)
|
||||
attackDelay.cooldownProgressOverride = 1;
|
||||
if (attackDelay.cooldownProgressPerTickOverride < 0)
|
||||
attackDelay.cooldownProgressPerTickOverride = -0.1f;
|
||||
if (attackDelay.cooldownProgressPerTickOverride > 1)
|
||||
attackDelay.cooldownProgressPerTickOverride = 1;
|
||||
if (attackDelay.axeAttackDamageFactor < 0)
|
||||
attackDelay.axeAttackDamageFactor = 0;
|
||||
if (attackDelay.axeAttackDamageFactor > 2)
|
||||
attackDelay.axeAttackDamageFactor = 2;
|
||||
|
||||
|
||||
if (invulnerability.attackCancelThreshold < 0)
|
||||
invulnerability.attackCancelThreshold = -0.1f;
|
||||
if (invulnerability.attackCancelThreshold > 1)
|
||||
invulnerability.attackCancelThreshold = 1;
|
||||
if (invulnerability.knockbackCancelThreshold < 0)
|
||||
invulnerability.knockbackCancelThreshold = -0.1f;
|
||||
if (invulnerability.knockbackCancelThreshold > 1)
|
||||
invulnerability.knockbackCancelThreshold = 1;
|
||||
|
||||
if (invulnerability.attackExcludedEntities == null) {
|
||||
invulnerability.attackExcludedEntities = new HashSet<>();
|
||||
invulnerability.attackExcludedEntities.add("minecraft:slime");
|
||||
invulnerability.attackExcludedEntities.add("tconstruct:blueslime");
|
||||
invulnerability.attackExcludedEntities.add("thaumcraft:thaumslime");
|
||||
}
|
||||
if (invulnerability.dmgReceiveExcludedEntities == null) {
|
||||
invulnerability.dmgReceiveExcludedEntities = new HashSet<>();
|
||||
}
|
||||
if (invulnerability.damageSrcWhitelist == null) {
|
||||
invulnerability.damageSrcWhitelist = new HashSet<>();
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.IN_FIRE.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.LIGHTNING_BOLT.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.LAVA.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.HOT_FLOOR.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.IN_WALL.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.CACTUS.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.OUT_OF_WORLD.getName());
|
||||
invulnerability.damageSrcWhitelist.add(DamageSource.SWEET_BERRY_BUSH.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
package io.gitlab.jfronny.combit.config;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry.Gui.Excluded;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
public class Invulnerability {
|
||||
public boolean enable = true;
|
||||
public int iFrameInterval = 0;
|
||||
public boolean debug = FabricLoader.getInstance().isDevelopmentEnvironment();
|
||||
@Comment("Between -0.1 (disable) and 1")
|
||||
public float attackCancelThreshold = 0.1f;
|
||||
@Comment("Between -0.1 (disable) and 1")
|
||||
public float knockbackCancelThreshold = 0.75f;
|
||||
@Excluded
|
||||
public HashSet<String> attackExcludedEntities = null;
|
||||
@Excluded
|
||||
public HashSet<String> damageSrcWhitelist = null;
|
||||
@Excluded
|
||||
public HashSet<String> dmgReceiveExcludedEntities = null;
|
||||
public boolean excludeAllMobs = false;
|
||||
public boolean excludePlayers = false;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
package io.gitlab.jfronny.combit.events;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
|
@ -6,10 +6,10 @@ import net.minecraft.entity.LivingEntity;
|
|||
import net.minecraft.entity.damage.DamageSource;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
public interface EntityHurtCallback {
|
||||
Event<EntityHurtCallback> EVENT = EventFactory.createArrayBacked(EntityHurtCallback.class,
|
||||
public interface EntityHurtEvent {
|
||||
Event<EntityHurtEvent> EVENT = EventFactory.createArrayBacked(EntityHurtEvent.class,
|
||||
(listeners) -> (entity, source, amount) -> {
|
||||
for (EntityHurtCallback event : listeners) {
|
||||
for (EntityHurtEvent event : listeners) {
|
||||
ActionResult result = event.hurtEntity(entity, source, amount);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
|
|
@ -1,15 +1,14 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
package io.gitlab.jfronny.combit.events;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
public interface EntityKnockbackCallback {
|
||||
Event<EntityKnockbackCallback> EVENT = EventFactory.createArrayBacked(EntityKnockbackCallback.class,
|
||||
public interface EntityKnockbackEvent {
|
||||
Event<EntityKnockbackEvent> EVENT = EventFactory.createArrayBacked(EntityKnockbackEvent.class,
|
||||
(listeners) -> (entity, amp, dx, dz) -> {
|
||||
for (EntityKnockbackCallback event : listeners) {
|
||||
for (EntityKnockbackEvent event : listeners) {
|
||||
ActionResult result = event.takeKnockback(entity, amp, dx, dz);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
|
|
@ -19,5 +18,5 @@ public interface EntityKnockbackCallback {
|
|||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult takeKnockback(LivingEntity entity, float amp, double dx, double dz);
|
||||
ActionResult takeKnockback(LivingEntity entity, double amp, double dx, double dz);
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
package io.gitlab.jfronny.combit.events;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
|
|
@ -6,10 +6,10 @@ import net.minecraft.entity.Entity;
|
|||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
public interface PlayerAttackCallback {
|
||||
Event<PlayerAttackCallback> EVENT = EventFactory.createArrayBacked(PlayerAttackCallback.class,
|
||||
public interface PlayerAttackEvent {
|
||||
Event<PlayerAttackEvent> EVENT = EventFactory.createArrayBacked(PlayerAttackEvent.class,
|
||||
(listeners) -> (player, target) -> {
|
||||
for (PlayerAttackCallback event : listeners) {
|
||||
for (PlayerAttackEvent event : listeners) {
|
||||
ActionResult result = event.attackEntity(player, target);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
package io.gitlab.jfronny.combit.mixin;
|
||||
|
||||
import com.google.common.collect.ImmutableMultimap;
|
||||
import io.gitlab.jfronny.combit.Combit;
|
||||
import io.gitlab.jfronny.combit.MiningToolItemExt;
|
||||
import io.gitlab.jfronny.combit.config.AttackDelay;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.attribute.EntityAttribute;
|
||||
import net.minecraft.entity.attribute.EntityAttributeModifier;
|
||||
import net.minecraft.entity.attribute.EntityAttributes;
|
||||
import net.minecraft.item.*;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyArg;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Mixin(AxeItem.class)
|
||||
public class AxeItemMixin {
|
||||
@Inject(at = @At("RETURN"), method = "<init>(Lnet/minecraft/item/ToolMaterial;FFLnet/minecraft/item/Item$Settings;)V")
|
||||
private void afterInit(ToolMaterial material, float attackDamage, float attackSpeed, Item.Settings settings, CallbackInfo info) {
|
||||
MiningToolItemExt t = (MiningToolItemExt)this;
|
||||
|
||||
float damage2 = t.getDamage() * Combit.getCfg().attackDelay.axeAttackDamageFactor;
|
||||
//hard-coded values
|
||||
if (material == ToolMaterials.WOOD || material == ToolMaterials.GOLD) damage2 = 2;
|
||||
else if (material == ToolMaterials.STONE) damage2 = 3;
|
||||
else if (material == ToolMaterials.IRON) damage2 = 4;
|
||||
else if (material == ToolMaterials.DIAMOND) damage2 = 5;
|
||||
else if (material == ToolMaterials.NETHERITE) damage2 = 6;
|
||||
|
||||
AttackDelay attackDelay = Combit.getCfg().attackDelay;
|
||||
if (attackDelay.enable && attackDelay.axeAttackDamageFactor >= 0) {
|
||||
t.setDamage(damage2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
package io.gitlab.jfronny.combit.mixin;
|
||||
|
||||
import io.gitlab.jfronny.combit.Combit;
|
||||
import io.gitlab.jfronny.combit.config.AttackDelay;
|
||||
import io.gitlab.jfronny.combit.CombitConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.options.AttackIndicator;
|
||||
import net.minecraft.client.option.AttackIndicator;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
|
@ -16,22 +15,20 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||
@Mixin(InGameHud.class)
|
||||
public class InGameHudMixin {
|
||||
@Shadow @Final private MinecraftClient client;
|
||||
private AttackIndicator combit_a;
|
||||
private AttackIndicator combit$attackIndicator;
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "renderCrosshair(Lnet/minecraft/client/util/math/MatrixStack;)V")
|
||||
private void renderCrosshair(MatrixStack matrices, CallbackInfo info) {
|
||||
AttackDelay attackDelay = Combit.getCfg().attackDelay;
|
||||
if (attackDelay.enable && attackDelay.cooldownProgressOverride >= 0) {
|
||||
combit_a = this.client.options.attackIndicator;
|
||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||
combit$attackIndicator = this.client.options.attackIndicator;
|
||||
this.client.options.attackIndicator = AttackIndicator.OFF;
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("RETURN"), method = "renderCrosshair(Lnet/minecraft/client/util/math/MatrixStack;)V")
|
||||
private void renderCrosshairPost(MatrixStack matrices, CallbackInfo info) {
|
||||
AttackDelay attackDelay = Combit.getCfg().attackDelay;
|
||||
if (attackDelay.enable && attackDelay.cooldownProgressOverride >= 0) {
|
||||
this.client.options.attackIndicator = combit_a;
|
||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||
this.client.options.attackIndicator = combit$attackIndicator;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
package io.gitlab.jfronny.combit.mixin;
|
||||
|
||||
import io.gitlab.jfronny.combit.Combit;
|
||||
import io.gitlab.jfronny.combit.config.Invulnerability;
|
||||
import io.gitlab.jfronny.combit.nodami.EntityHurtCallback;
|
||||
import io.gitlab.jfronny.combit.nodami.EntityKnockbackCallback;
|
||||
import net.minecraft.entity.Entity;
|
||||
import io.gitlab.jfronny.combit.events.EntityHurtEvent;
|
||||
import io.gitlab.jfronny.combit.events.EntityKnockbackEvent;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
|
@ -17,23 +13,18 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|||
@Mixin(LivingEntity.class)
|
||||
public class LivingEntityMixin {
|
||||
@Inject(at = @At("TAIL"), method = "applyDamage", cancellable = true)
|
||||
private void onEntityHurt(final DamageSource source, final float amount, CallbackInfo info) {
|
||||
if (Combit.getCfg().invulnerability.enable) {
|
||||
ActionResult result = EntityHurtCallback.EVENT.invoker().hurtEntity((LivingEntity) (Object) this, source,
|
||||
amount);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
private void onEntityHurt(final DamageSource source, final float amount, CallbackInfo ci) {
|
||||
ActionResult result = EntityHurtEvent.EVENT.invoker().hurtEntity((LivingEntity) (Object) this, source, amount);
|
||||
if (result == ActionResult.FAIL) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "takeKnockback", cancellable = true)
|
||||
private void onTakingKnockback(float amp, double dx, double dz, CallbackInfo info) {
|
||||
if (Combit.getCfg().invulnerability.enable) {
|
||||
ActionResult result = EntityKnockbackCallback.EVENT.invoker().takeKnockback((LivingEntity) (Object) this, amp, dx, dz);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
private void onTakingKnockback(double strength, double x, double z, CallbackInfo ci) {
|
||||
ActionResult result = EntityKnockbackEvent.EVENT.invoker().takeKnockback((LivingEntity) (Object) this, strength, x, z);
|
||||
if (result == ActionResult.FAIL) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,20 +2,22 @@ package io.gitlab.jfronny.combit.mixin;
|
|||
|
||||
import com.google.common.collect.ImmutableMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import io.gitlab.jfronny.combit.MiningToolItemExt;
|
||||
import io.gitlab.jfronny.combit.CombitConfig;
|
||||
import net.minecraft.entity.attribute.EntityAttribute;
|
||||
import net.minecraft.entity.attribute.EntityAttributeModifier;
|
||||
import net.minecraft.entity.attribute.EntityAttributes;
|
||||
import net.minecraft.item.MiningToolItem;
|
||||
import net.minecraft.item.ToolItem;
|
||||
import net.minecraft.item.ToolMaterial;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.tag.Tag;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Mutable;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(MiningToolItem.class)
|
||||
public abstract class MiningToolItemMixin extends ToolItem implements MiningToolItemExt {
|
||||
public abstract class MiningToolItemMixin extends ToolItem {
|
||||
@Mutable
|
||||
@Shadow @Final private Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
|
||||
|
||||
|
|
@ -26,25 +28,23 @@ public abstract class MiningToolItemMixin extends ToolItem implements MiningTool
|
|||
super(material, settings);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDamage(float damage) {
|
||||
this.attackDamage = damage;
|
||||
ImmutableMultimap.Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();
|
||||
builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE,
|
||||
new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID,
|
||||
"Tool modifier",
|
||||
this.attackDamage,
|
||||
EntityAttributeModifier.Operation.ADDITION));
|
||||
this.attributeModifiers.forEach((k, v) -> {
|
||||
if (!k.getTranslationKey().equals(EntityAttributes.GENERIC_ATTACK_DAMAGE.getTranslationKey())) {
|
||||
builder.put(k, v);
|
||||
}
|
||||
});
|
||||
this.attributeModifiers = builder.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getDamage() {
|
||||
return attackDamage;
|
||||
@Inject(at = @At("RETURN"), method = "<init>(FFLnet/minecraft/item/ToolMaterial;Lnet/minecraft/tag/Tag;Lnet/minecraft/item/Item$Settings;)V")
|
||||
private void modifyAttackDamage(float attackDamage, float attackSpeed, ToolMaterial material, Tag effectiveBlocks, Settings settings, CallbackInfo ci) {
|
||||
double factor = ((MiningToolItem)(Object)this) instanceof AxeItem ? CombitConfig.axeAttackDamageFactor : CombitConfig.weaponAttackDamageFactor;
|
||||
if (factor >= 0) {
|
||||
this.attackDamage *= factor;
|
||||
ImmutableMultimap.Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();
|
||||
builder.put(EntityAttributes.GENERIC_ATTACK_DAMAGE,
|
||||
new EntityAttributeModifier(ATTACK_DAMAGE_MODIFIER_ID,
|
||||
"Tool modifier",
|
||||
this.attackDamage,
|
||||
EntityAttributeModifier.Operation.ADDITION));
|
||||
this.attributeModifiers.forEach((k, v) -> {
|
||||
if (!k.getTranslationKey().equals(EntityAttributes.GENERIC_ATTACK_DAMAGE.getTranslationKey())) {
|
||||
builder.put(k, v);
|
||||
}
|
||||
});
|
||||
this.attributeModifiers = builder.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
package io.gitlab.jfronny.combit.mixin;
|
||||
|
||||
import io.gitlab.jfronny.combit.Combit;
|
||||
import io.gitlab.jfronny.combit.config.AttackDelay;
|
||||
import io.gitlab.jfronny.combit.config.Invulnerability;
|
||||
import io.gitlab.jfronny.combit.nodami.EntityHurtCallback;
|
||||
import io.gitlab.jfronny.combit.nodami.PlayerAttackCallback;
|
||||
import io.gitlab.jfronny.combit.CombitConfig;
|
||||
import io.gitlab.jfronny.combit.events.EntityHurtEvent;
|
||||
import io.gitlab.jfronny.combit.events.PlayerAttackEvent;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.damage.DamageSource;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
|
|
@ -19,38 +17,31 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||
public class PlayerEntityMixin {
|
||||
@Inject(at = @At("TAIL"), method = "applyDamage(Lnet/minecraft/entity/damage/DamageSource;F)V", cancellable = true)
|
||||
private void onEntityHurt(final DamageSource source, final float amount, CallbackInfo info) {
|
||||
if (Combit.getCfg().invulnerability.enable) {
|
||||
ActionResult result = EntityHurtCallback.EVENT.invoker().hurtEntity((PlayerEntity) (Object) this, source,
|
||||
amount);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
ActionResult result = EntityHurtEvent.EVENT.invoker().hurtEntity((PlayerEntity) (Object) this, source, amount);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "attack(Lnet/minecraft/entity/Entity;)V", cancellable = true)
|
||||
private void onPlayerAttack(final Entity target, CallbackInfo info) {
|
||||
if (Combit.getCfg().invulnerability.enable) {
|
||||
ActionResult result = PlayerAttackCallback.EVENT.invoker().attackEntity((PlayerEntity) (Object) this, target);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
ActionResult result = PlayerAttackEvent.EVENT.invoker().attackEntity((PlayerEntity) (Object) this, target);
|
||||
if (result == ActionResult.FAIL) {
|
||||
info.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "getAttackCooldownProgress(F)F", cancellable = true)
|
||||
public void getAttackCooldownProgress(float baseTime, CallbackInfoReturnable<Float> info) {
|
||||
AttackDelay attackDelay = Combit.getCfg().attackDelay;
|
||||
if (attackDelay.enable && attackDelay.cooldownProgressOverride >= 0) {
|
||||
info.setReturnValue(attackDelay.cooldownProgressOverride);
|
||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||
info.setReturnValue(CombitConfig.cooldownProgressOverride.floatValue());
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "getAttackCooldownProgressPerTick()F", cancellable = true)
|
||||
public void getAttackCooldownProgressPerTick(CallbackInfoReturnable<Float> info) {
|
||||
AttackDelay attackDelay = Combit.getCfg().attackDelay;
|
||||
if (attackDelay.enable && attackDelay.cooldownProgressPerTickOverride >= 0) {
|
||||
info.setReturnValue(attackDelay.cooldownProgressPerTickOverride);
|
||||
if (CombitConfig.cooldownProgressPerTickOverride >= 0) {
|
||||
info.setReturnValue(CombitConfig.cooldownProgressPerTickOverride.floatValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,31 @@
|
|||
{
|
||||
"text.autoconfig.Combit.title": "ComBit",
|
||||
"text.autoconfig.Combit.category.attackDelay": "Attack Delay",
|
||||
"text.autoconfig.Combit.option.attackDelay.enable": "Enable",
|
||||
"text.autoconfig.Combit.option.attackDelay.cooldownProgressOverride": "Cooldown Progress Override",
|
||||
"text.autoconfig.Combit.option.attackDelay.cooldownProgressPerTickOverride": "Cooldown Progress per Tick Override",
|
||||
"text.autoconfig.Combit.option.attackDelay.axeAttackDamageFactor": "Axe Damage Factor",
|
||||
"text.autoconfig.Combit.category.invulnerability": "Invulnerability",
|
||||
"text.autoconfig.Combit.option.invulnerability.enable": "Enable",
|
||||
"text.autoconfig.Combit.option.invulnerability.iFrameInterval": "I-Frame Interval",
|
||||
"text.autoconfig.Combit.option.invulnerability.debug": "Debug",
|
||||
"text.autoconfig.Combit.option.invulnerability.attackCancelThreshold": "Attack Cancel Threshold",
|
||||
"text.autoconfig.Combit.option.invulnerability.knockbackCancelThreshold": "Knockback Cancel Threshold",
|
||||
"text.autoconfig.Combit.option.invulnerability.excludeAllMobs": "Exclude all Mobs",
|
||||
"text.autoconfig.Combit.option.invulnerability.excludePlayers": "Exclude Players"
|
||||
"combit.jfconfig.title": "ComBit",
|
||||
|
||||
"combit.jfconfig.iFrameInterval": "I-Frame Interval",
|
||||
"combit.jfconfig.iFrameInterval.tooltip": "Length of I-Frames",
|
||||
"combit.jfconfig.attackCancelThreshold": "Attack Cancel Threshold",
|
||||
"combit.jfconfig.attackCancelThreshold.tooltip": "Minimum cooldown for attacks",
|
||||
"combit.jfconfig.knockbackCancelThreshold": "Knockback Cancel Threshold",
|
||||
"combit.jfconfig.knockbackCancelThreshold.tooltip": "Minimum cooldown progress for knockback",
|
||||
"combit.jfconfig.attackerWhitelist": "Attacker Whitelist",
|
||||
"combit.jfconfig.attackerWhitelist.tooltip": "Attackers which should still create I-Frames (configure in JSON)",
|
||||
"combit.jfconfig.damageSourceWhitelist": "Damage Source Whitelist",
|
||||
"combit.jfconfig.damageSourceWhitelist.tooltip": "Damage sources which should still create I-Frames (configure in JSON)",
|
||||
"combit.jfconfig.targetEntityWhitelist": "Target Entity Whitelist",
|
||||
"combit.jfconfig.targetEntityWhitelist.tooltip": "Entities which should still receive I-Frames (configure in JSON)",
|
||||
"combit.jfconfig.excludeAllMobs": "Exclude all Mobs",
|
||||
"combit.jfconfig.excludeAllMobs.tooltip": "Still apply I-Frames to mobs",
|
||||
"combit.jfconfig.excludePlayers": "Exclude Players",
|
||||
"combit.jfconfig.excludePlayers.tooltip": "Still apply I-Frames to players",
|
||||
|
||||
"combit.jfconfig.cooldownProgressOverride": "Cooldown Progress Override",
|
||||
"combit.jfconfig.cooldownProgressOverride.tooltip": "Always set the cooldown of items to this value (negative to disable override)",
|
||||
"combit.jfconfig.cooldownProgressPerTickOverride": "Cooldown Progress/Tick Override",
|
||||
"combit.jfconfig.cooldownProgressPerTickOverride.tooltip": "Always set the cooldown change per tick of items Override (negative to disable override)",
|
||||
"combit.jfconfig.weaponAttackDamageFactor": "Weapon Attack Damage Factor",
|
||||
"combit.jfconfig.weaponAttackDamageFactor.tooltip": "Factor to multiply to the attack damage of weapons except axes",
|
||||
"combit.jfconfig.axeAttackDamageFactor": "Axe Attack Damage Factor",
|
||||
"combit.jfconfig.axeAttackDamageFactor.tooltip": "Factor to multiply to the attack damage of axes",
|
||||
"combit.jfconfig.debug": "Debug",
|
||||
"combit.jfconfig.debug.tooltip": "Enable Debug Logging"
|
||||
}
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
"package": "io.gitlab.jfronny.combit.mixin",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"mixins": [
|
||||
"AxeItemMixin",
|
||||
"LivingEntityMixin",
|
||||
"MiningToolItemMixin",
|
||||
"PlayerEntityMixin"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"schemaVersion": 1,
|
||||
"id": "combit",
|
||||
"version": "${version}",
|
||||
"name": "Combit",
|
||||
"name": "ComBit",
|
||||
"description": "Removes delays in combat",
|
||||
"authors": [
|
||||
"JFronny"
|
||||
|
|
@ -12,19 +12,23 @@
|
|||
"icon": "assets/combit/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"modmenu": [
|
||||
"io.gitlab.jfronny.combit.client.ModMenuClient"
|
||||
],
|
||||
"main": [
|
||||
"io.gitlab.jfronny.combit.Combit"
|
||||
],
|
||||
"libjf:config": [
|
||||
"io.gitlab.jfronny.combit.CombitConfig"
|
||||
],
|
||||
"libjf:early": [
|
||||
"io.gitlab.jfronny.combit.CombitConfigValidator"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"combit.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.10.5+build.213",
|
||||
"fabric": "*",
|
||||
"minecraft": "*"
|
||||
"fabricloader": ">=0.12.12",
|
||||
"minecraft": "*",
|
||||
"libjf-unsafe-v0": ">=2.2.0",
|
||||
"libjf-config-v0": ">=2.2.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue