diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09cd281 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e66a8a9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2021 Evan Steinkerchner (Roundaround). + +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. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e21885b --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# Roundaround's Enchantment Compatibility + + + + + +Make many mutually-exclusive enchantments compatible. + +## Download + +TBD + +## License + +This mod is available under the MIT license. Please see the LICENSE file for more info. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..89a514e --- /dev/null +++ b/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'fabric-loom' version '0.12-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_17 +targetCompatibility = JavaVersion.VERSION_17 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + maven { + name = "ModMenu" + url = "https://maven.terraformersmc.com/releases/" + } + maven { + name = 'Roundaround Maven' + allowInsecureProtocol = true + url = "https://maven.rnda.dev/releases" + } +} + +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}" + + // Test using real account + modImplementation "com.ptsmods:devlogin:2.1" + + // ModMenu integration + modCompileOnly "com.terraformersmc:modmenu:${project.mod_menu_version}" + + // RoundaLib for config screen + modImplementation "me.roundaround:roundalib:${project.roundalib_version}" + include "me.roundaround:roundalib:${project.roundalib_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = "UTF-8" + it.options.release = 17 +} + +java { + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archives_base_name}"} + } +} + +tasks.publish.dependsOn build +publishing { + publications { + mavenJava(MavenPublication) { + artifactId project.archives_base_name + version = project.mod_version + "+" + project.minecraft_version + + artifact(remapJar) { + builtBy remapJar + } + } + } + repositories { + maven { + allowInsecureProtocol = true + url = "https://maven.rnda.dev/releases" + credentials { + username = selfHostedMavenUser + password = selfHostedMavenPass + } + authentication { + basic(BasicAuthentication) + } + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..da31bbf --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties +minecraft_version=1.18.2 +yarn_mappings=1.18.2+build.3 +loader_version=0.14.6 + +# Mod Properties +mod_version = 1.0.0 +maven_group = me.roundaround +archives_base_name = enchantmentcompat + +# Dependencies +fabric_version=0.53.0+1.18.2 +mod_menu_version=3.2.2 +roundalib_version=0.1.8+1.18.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a917089 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu May 26 00:27:06 EDT 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/EnchantmentCompatMod.java b/src/main/java/me/roundaround/enchantmentcompat/EnchantmentCompatMod.java new file mode 100644 index 0000000..872db51 --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/EnchantmentCompatMod.java @@ -0,0 +1,18 @@ +package me.roundaround.enchantmentcompat; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import me.roundaround.enchantmentcompat.config.EnchantmentCompatConfig; +import net.fabricmc.api.ModInitializer; + +public final class EnchantmentCompatMod implements ModInitializer { + public static final String MOD_ID = "enchantmentcompat"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + public static final EnchantmentCompatConfig CONFIG = new EnchantmentCompatConfig(); + + @Override + public void onInitialize() { + CONFIG.init(); + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/compat/modmenu/ModMenuImpl.java b/src/main/java/me/roundaround/enchantmentcompat/compat/modmenu/ModMenuImpl.java new file mode 100644 index 0000000..ab90183 --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/compat/modmenu/ModMenuImpl.java @@ -0,0 +1,13 @@ +package me.roundaround.enchantmentcompat.compat.modmenu; + +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import me.roundaround.roundalib.config.gui.ConfigScreen; + +public class ModMenuImpl implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return (screen) -> new ConfigScreen(screen, EnchantmentCompatMod.CONFIG); + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/config/EnchantmentCompatConfig.java b/src/main/java/me/roundaround/enchantmentcompat/config/EnchantmentCompatConfig.java new file mode 100644 index 0000000..b26cc79 --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/config/EnchantmentCompatConfig.java @@ -0,0 +1,47 @@ +package me.roundaround.enchantmentcompat.config; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import me.roundaround.roundalib.config.ModConfig; +import me.roundaround.roundalib.config.option.BooleanConfigOption; + +public class EnchantmentCompatConfig extends ModConfig { + public final BooleanConfigOption MOD_ENABLED; + public final BooleanConfigOption INFINITY_MENDING; + public final BooleanConfigOption PROTECTION; + public final BooleanConfigOption DAMAGE; + public final BooleanConfigOption MULTISHOT_PIERCING; + + public EnchantmentCompatConfig() { + super(EnchantmentCompatMod.MOD_ID); + + MOD_ENABLED = registerConfigOption( + BooleanConfigOption + .builder("modEnabled", "enchantmentcompat.mod_enabled.label") + .setComment("Simple toggle for the mod! Set to false to disable.") + .build()); + + INFINITY_MENDING = registerConfigOption( + BooleanConfigOption + .builder("infinityMending", "enchantmentcompat.infinity_mending.label") + .setComment("Simple toggle for the mod! Set to false to disable.") + .build()); + + PROTECTION = registerConfigOption( + BooleanConfigOption + .builder("protection", "enchantmentcompat.protection.label") + .setComment("Simple toggle for the mod! Set to false to disable.") + .build()); + + DAMAGE = registerConfigOption( + BooleanConfigOption + .builder("damage", "enchantmentcompat.damage.label") + .setComment("Simple toggle for the mod! Set to false to disable.") + .build()); + + MULTISHOT_PIERCING = registerConfigOption( + BooleanConfigOption + .builder("multishotPiercing", "enchantmentcompat.multishot_piercing.label") + .setComment("Simple toggle for the mod! Set to false to disable.") + .build()); + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/mixin/DamageEnchantmentMixin.java b/src/main/java/me/roundaround/enchantmentcompat/mixin/DamageEnchantmentMixin.java new file mode 100644 index 0000000..caed5ce --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/mixin/DamageEnchantmentMixin.java @@ -0,0 +1,38 @@ +package me.roundaround.enchantmentcompat.mixin; + +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.CallbackInfoReturnable; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import net.minecraft.enchantment.DamageEnchantment; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.entity.EquipmentSlot; + +@Mixin(DamageEnchantment.class) +public abstract class DamageEnchantmentMixin extends Enchantment { + protected DamageEnchantmentMixin(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } + + @Shadow + public int typeIndex; + + @Inject(method = "canAccept", at = @At(value = "HEAD"), cancellable = true) + private void canAccept(Enchantment other, CallbackInfoReturnable info) { + if (!EnchantmentCompatMod.CONFIG.MOD_ENABLED.getValue() + || !EnchantmentCompatMod.CONFIG.DAMAGE.getValue()) { + return; + } + + // TODO: Add option to scale down damage when there are multiple + + if (other instanceof DamageEnchantment) { + // Only adjust for damage + info.setReturnValue(((DamageEnchantment) other).typeIndex != typeIndex); + } + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/mixin/InfinityEnchantmentMixin.java b/src/main/java/me/roundaround/enchantmentcompat/mixin/InfinityEnchantmentMixin.java new file mode 100644 index 0000000..cefe114 --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/mixin/InfinityEnchantmentMixin.java @@ -0,0 +1,33 @@ +package me.roundaround.enchantmentcompat.mixin; + +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.CallbackInfoReturnable; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.enchantment.InfinityEnchantment; +import net.minecraft.enchantment.MendingEnchantment; +import net.minecraft.entity.EquipmentSlot; + +@Mixin(InfinityEnchantment.class) +public abstract class InfinityEnchantmentMixin extends Enchantment { + protected InfinityEnchantmentMixin(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } + + @Inject(method = "canAccept", at = @At(value = "HEAD"), cancellable = true) + private void canAccept(Enchantment other, CallbackInfoReturnable info) { + if (!EnchantmentCompatMod.CONFIG.MOD_ENABLED.getValue() + || !EnchantmentCompatMod.CONFIG.INFINITY_MENDING.getValue()) { + return; + } + + if (other instanceof MendingEnchantment) { + // Only adjust for mending + info.setReturnValue(super.canAccept(other)); + } + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/mixin/MultishotEnchantmentMixin.java b/src/main/java/me/roundaround/enchantmentcompat/mixin/MultishotEnchantmentMixin.java new file mode 100644 index 0000000..1c998a8 --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/mixin/MultishotEnchantmentMixin.java @@ -0,0 +1,33 @@ +package me.roundaround.enchantmentcompat.mixin; + +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.CallbackInfoReturnable; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.enchantment.MultishotEnchantment; +import net.minecraft.enchantment.PiercingEnchantment; +import net.minecraft.entity.EquipmentSlot; + +@Mixin(MultishotEnchantment.class) +public abstract class MultishotEnchantmentMixin extends Enchantment { + protected MultishotEnchantmentMixin(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } + + @Inject(method = "canAccept", at = @At(value = "HEAD"), cancellable = true) + private void canAccept(Enchantment other, CallbackInfoReturnable info) { + if (!EnchantmentCompatMod.CONFIG.MOD_ENABLED.getValue() + || !EnchantmentCompatMod.CONFIG.MULTISHOT_PIERCING.getValue()) { + return; + } + + if (other instanceof PiercingEnchantment) { + // Only adjust for piercing + info.setReturnValue(super.canAccept(other)); + } + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/mixin/PiercingEnchantmentMixin.java b/src/main/java/me/roundaround/enchantmentcompat/mixin/PiercingEnchantmentMixin.java new file mode 100644 index 0000000..1ad4d0a --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/mixin/PiercingEnchantmentMixin.java @@ -0,0 +1,33 @@ +package me.roundaround.enchantmentcompat.mixin; + +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.CallbackInfoReturnable; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.enchantment.MultishotEnchantment; +import net.minecraft.enchantment.PiercingEnchantment; +import net.minecraft.entity.EquipmentSlot; + +@Mixin(PiercingEnchantment.class) +public abstract class PiercingEnchantmentMixin extends Enchantment { + protected PiercingEnchantmentMixin(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } + + @Inject(method = "canAccept", at = @At(value = "HEAD"), cancellable = true) + private void canAccept(Enchantment other, CallbackInfoReturnable info) { + if (!EnchantmentCompatMod.CONFIG.MOD_ENABLED.getValue() + || !EnchantmentCompatMod.CONFIG.MULTISHOT_PIERCING.getValue()) { + return; + } + + if (other instanceof MultishotEnchantment) { + // Only adjust for multishot + info.setReturnValue(super.canAccept(other)); + } + } +} diff --git a/src/main/java/me/roundaround/enchantmentcompat/mixin/ProtectionEnchantmentMixin.java b/src/main/java/me/roundaround/enchantmentcompat/mixin/ProtectionEnchantmentMixin.java new file mode 100644 index 0000000..30ffadf --- /dev/null +++ b/src/main/java/me/roundaround/enchantmentcompat/mixin/ProtectionEnchantmentMixin.java @@ -0,0 +1,39 @@ +package me.roundaround.enchantmentcompat.mixin; + +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.CallbackInfoReturnable; + +import me.roundaround.enchantmentcompat.EnchantmentCompatMod; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.enchantment.PowerEnchantment; +import net.minecraft.enchantment.ProtectionEnchantment; +import net.minecraft.entity.EquipmentSlot; + +@Mixin(PowerEnchantment.class) +public abstract class ProtectionEnchantmentMixin extends Enchantment { + protected ProtectionEnchantmentMixin(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } + + @Shadow + public ProtectionEnchantment.Type protectionType; + + @Inject(method = "canAccept", at = @At(value = "HEAD"), cancellable = true) + private void canAccept(Enchantment other, CallbackInfoReturnable info) { + if (!EnchantmentCompatMod.CONFIG.MOD_ENABLED.getValue() + || !EnchantmentCompatMod.CONFIG.PROTECTION.getValue()) { + return; + } + + // TODO: Add option to scale down protection when there are multiple + + if (other instanceof ProtectionEnchantment) { + // Only adjust for protection + info.setReturnValue(((ProtectionEnchantment) other).protectionType != protectionType); + } + } +} diff --git a/src/main/resources/assets/enchantmentcompat/lang/en_us.json b/src/main/resources/assets/enchantmentcompat/lang/en_us.json new file mode 100644 index 0000000..21525c3 --- /dev/null +++ b/src/main/resources/assets/enchantmentcompat/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "enchantmentcompat.config.title": "Enchantment Compatibility Config", + "enchantmentcompat.mod_enabled.label": "Mod enabled" +} \ No newline at end of file diff --git a/src/main/resources/enchantmentcompat.mixins.json b/src/main/resources/enchantmentcompat.mixins.json new file mode 100644 index 0000000..87b9bc0 --- /dev/null +++ b/src/main/resources/enchantmentcompat.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.roundaround.enchantmentcompat.mixin", + "compatibilityLevel": "JAVA_17", + "client": [ + "DamageEnchantmentMixin", + "InfinityEnchantmentMixin", + "MultishotEnchantmentMixin", + "PiercingEnchantmentMixin", + "ProtectionEnchantmentMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..32b74d1 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,34 @@ +{ + "schemaVersion": 1, + "id": "enchantmentcompat", + "version": "${version}", + "name": "Enchantment Compatibility", + "description": "Make many mutually-exclusive enchantments compatible.", + "authors": [ + "Roundaround" + ], + "contact": { + "homepage": "", + "sources": "" + }, + "license": "MIT", + "icon": "assets/enchantmentcompat/icon.png", + "environment": "client", + "entrypoints": { + "main": [ + "me.roundaround.enchantmentcompat.EnchantmentCompatMod" + ], + "modmenu": [ + "me.roundaround.enchantmentcompat.compat.modmenu.ModMenuImpl" + ] + }, + "mixins": [ + "enchantmentcompat.mixins.json" + ], + "depends": { + "fabricloader": ">=0.13.3", + "minecraft": "1.18.x", + "java": ">=17", + "roundalib": ">=0.1.8" + } +}