Add files
This commit is contained in:
JFronny
commit
014bfc6758
|
|
@ -0,0 +1,118 @@
|
|||
# User-specific stuff
|
||||
.idea/
|
||||
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Compiled class file
|
||||
*.class
|
||||
|
||||
# Log file
|
||||
*.log
|
||||
|
||||
# BlueJ files
|
||||
*.ctxt
|
||||
|
||||
# Package Files #
|
||||
*.jar
|
||||
*.war
|
||||
*.nar
|
||||
*.ear
|
||||
*.zip
|
||||
*.tar.gz
|
||||
*.rar
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
|
||||
*~
|
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||
.fuse_hidden*
|
||||
|
||||
# KDE directory preferences
|
||||
.directory
|
||||
|
||||
# Linux trash folder which might appear on any partition or disk
|
||||
.Trash-*
|
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed
|
||||
.nfs*
|
||||
|
||||
# General
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear in the root of a volume
|
||||
.DocumentRevisions-V100
|
||||
.fseventsd
|
||||
.Spotlight-V100
|
||||
.TemporaryItems
|
||||
.Trashes
|
||||
.VolumeIcon.icns
|
||||
.com.apple.timemachine.donotpresent
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
Thumbs.db:encryptable
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Dump file
|
||||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
||||
# Windows Installer files
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
.gradle
|
||||
build/
|
||||
|
||||
# Ignore Gradle GUI config
|
||||
gradle-app.setting
|
||||
|
||||
# Cache of project
|
||||
.gradletasknamecache
|
||||
|
||||
**/build/
|
||||
|
||||
# Common working directory
|
||||
run/
|
||||
|
||||
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
|
||||
!gradle-wrapper.jar
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
image: gradle:alpine
|
||||
|
||||
variables:
|
||||
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
|
||||
|
||||
before_script:
|
||||
- export GRADLE_USER_HOME=`pwd`/.gradle
|
||||
|
||||
deploy:
|
||||
stage: deploy
|
||||
script: gradle --build-cache assemble
|
||||
artifacts:
|
||||
paths:
|
||||
- build/libs
|
||||
only:
|
||||
- master
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2020 JFronny
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
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
|
||||
}
|
||||
|
||||
|
||||
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}"
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
# 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.3
|
||||
yarn_mappings=1.16.3+build.47
|
||||
loader_version=0.10.5+build.213
|
||||
# Mod Properties
|
||||
mod_version=1.0
|
||||
maven_group=io.gitlab.jfronny
|
||||
archives_base_name=combit
|
||||
# Dependencies
|
||||
# check this on https://modmuss50.me/fabric.html
|
||||
fabric_version=0.24.1+build.412-1.16
|
||||
Binary file not shown.
|
|
@ -0,0 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# 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
|
||||
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"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# 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
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
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
|
||||
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" ;;
|
||||
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"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
@ -0,0 +1,104 @@
|
|||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
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.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
|
||||
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%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="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
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
pluginManagement {
|
||||
repositories {
|
||||
jcenter()
|
||||
maven {
|
||||
name = 'Fabric'
|
||||
url = 'https://maven.fabricmc.net/'
|
||||
}
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,182 @@
|
|||
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 net.fabricmc.api.ModInitializer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.util.ActionResult;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
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) {
|
||||
String debugSource;
|
||||
Entity trueSource = source.getAttacker();
|
||||
if (trueSource == null || EntityType.getId(trueSource.getType()) == null) {
|
||||
debugSource = "null";
|
||||
} else {
|
||||
debugSource = EntityType.getId(trueSource.getType()).toString();
|
||||
}
|
||||
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;
|
||||
|
||||
// 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))
|
||||
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;
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
// Knockback module part 1
|
||||
EntityKnockbackCallback.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;
|
||||
}
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
// Attack + knockback cancel module
|
||||
PlayerAttackCallback.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);
|
||||
}
|
||||
|
||||
float str = player.getAttackCooldownProgress(0);
|
||||
if (str <= invulnerability.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;
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private String getId(Entity entity) {
|
||||
return EntityType.getId(entity.getType()).toString();
|
||||
}
|
||||
|
||||
private boolean isEntityPass(String oId, Set<String> ids) {
|
||||
for (String id : ids) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
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,6 @@
|
|||
package io.gitlab.jfronny.combit;
|
||||
|
||||
public interface MiningToolItemExt {
|
||||
void setDamage(float damage);
|
||||
float getDamage();
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
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();
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
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;
|
||||
|
||||
//TODO modify tool damage to fit pre-1.9
|
||||
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;
|
||||
}
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
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 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("inFire");
|
||||
invulnerability.damageSrcWhitelist.add("lava");
|
||||
invulnerability.damageSrcWhitelist.add("cactus");
|
||||
invulnerability.damageSrcWhitelist.add("lightningBolt");
|
||||
invulnerability.damageSrcWhitelist.add("inWall");
|
||||
invulnerability.damageSrcWhitelist.add("hotFloor");
|
||||
invulnerability.damageSrcWhitelist.add("outOfWorld");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
package io.gitlab.jfronny.combit.mixin;
|
||||
|
||||
import io.gitlab.jfronny.combit.Combit;
|
||||
import io.gitlab.jfronny.combit.config.AttackDelay;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.options.AttackIndicator;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
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(InGameHud.class)
|
||||
public class InGameHudMixin {
|
||||
@Shadow @Final private MinecraftClient client;
|
||||
private AttackIndicator combit_a;
|
||||
|
||||
@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;
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
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 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;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
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 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 org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Mutable;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
@Mixin(MiningToolItem.class)
|
||||
public abstract class MiningToolItemMixin extends ToolItem implements MiningToolItemExt {
|
||||
@Mutable
|
||||
@Shadow @Final private Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
|
||||
|
||||
@Mutable
|
||||
@Shadow @Final private float attackDamage;
|
||||
|
||||
public MiningToolItemMixin(ToolMaterial material, Settings settings) {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
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 net.minecraft.entity.Entity;
|
||||
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;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(PlayerEntity.class)
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
}
|
||||
|
||||
@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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
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,
|
||||
(listeners) -> (entity, source, amount) -> {
|
||||
for (EntityHurtCallback event : listeners) {
|
||||
ActionResult result = event.hurtEntity(entity, source, amount);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult hurtEntity(LivingEntity entity, DamageSource source, float amount);
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
|
||||
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,
|
||||
(listeners) -> (entity, amp, dx, dz) -> {
|
||||
for (EntityKnockbackCallback event : listeners) {
|
||||
ActionResult result = event.takeKnockback(entity, amp, dx, dz);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult takeKnockback(LivingEntity entity, float amp, double dx, double dz);
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
package io.gitlab.jfronny.combit.nodami;
|
||||
|
||||
import net.fabricmc.fabric.api.event.Event;
|
||||
import net.fabricmc.fabric.api.event.EventFactory;
|
||||
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,
|
||||
(listeners) -> (player, target) -> {
|
||||
for (PlayerAttackCallback event : listeners) {
|
||||
ActionResult result = event.attackEntity(player, target);
|
||||
if (result != ActionResult.PASS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResult.PASS;
|
||||
});
|
||||
|
||||
ActionResult attackEntity(PlayerEntity player, Entity target);
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"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"
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "io.gitlab.jfronny.combit.mixin",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"mixins": [
|
||||
"AxeItemMixin",
|
||||
"LivingEntityMixin",
|
||||
"MiningToolItemMixin",
|
||||
"PlayerEntityMixin"
|
||||
],
|
||||
"client": [
|
||||
"InGameHudMixin"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "combit",
|
||||
"version": "${version}",
|
||||
"name": "Combit",
|
||||
"description": "Removes delays in combat",
|
||||
"authors": [
|
||||
"JFronny"
|
||||
],
|
||||
"contact": {},
|
||||
"license": "MIT",
|
||||
"icon": "assets/combit/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
"modmenu": [
|
||||
"io.gitlab.jfronny.combit.client.ModMenuClient"
|
||||
],
|
||||
"main": [
|
||||
"io.gitlab.jfronny.combit.Combit"
|
||||
]
|
||||
},
|
||||
"mixins": [
|
||||
"combit.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.10.5+build.213",
|
||||
"fabric": "*",
|
||||
"minecraft": "*"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue