diff --git a/build.gradle b/build.gradle index 7be80013..633978b0 100644 --- a/build.gradle +++ b/build.gradle @@ -182,6 +182,7 @@ dependencies { compileOnly 'curse.maven:mrtjpcore-229002:2735197' compileOnly 'curse.maven:netherchest-268888:2655413' compileOnly 'curse.maven:netherrocks-226140:2628297' + compileOnly 'curse.maven:plustic-376903:4703532' compileOnly 'curse.maven:projectredbase-228702:2745545' compileOnly 'curse.maven:projectredworld-229049:2745551' compileOnly 'curse.maven:quark-243121:2924091' diff --git a/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java b/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java index e8ca8582..3b627499 100644 --- a/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java +++ b/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java @@ -92,6 +92,7 @@ public class UniversalTweaks + "after:netherchest;" + "after:netherrocks;" + "after:nuclearcraft;" + + "after:plustic;" + "after:projectred-exploration;" + "after:quark;" + "after:roost;" diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java index 0ff1d559..f82f57f1 100644 --- a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java +++ b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java @@ -821,6 +821,14 @@ public static class ToolCustomizationCategory }) public float utTConToolRapierDamageCutoff = 13.0f; + @Config.Name("PlusTiC: Katana Attack Damage Cutoff") + @Config.Comment + ({ + "Sets the attack damage cutoff at which diminishing returns start for the PlusTiC katana", + "Default value: 22.0" + }) + public float utTConToolKatanaDamageCutoff = 22.0f; + @Config.Name("Attack Damage Decay Rate") @Config.Comment ({ diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java index 4ae4d2ad..f1907f35 100644 --- a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java +++ b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java @@ -57,6 +57,7 @@ public List getMixinConfigs() "mixins.mods.storagedrawers.client.json", "mixins.mods.tconstruct.json", "mixins.mods.tconstruct.toolcustomization.json", + "mixins.mods.tconstruct.toolcustomization.plustic.json", "mixins.mods.tconstruct.oredictcache.json", "mixins.mods.techreborn.json", "mixins.mods.thaumcraft.dupes.json", @@ -192,6 +193,8 @@ public boolean shouldMixinConfigQueue(String mixinConfig) return Loader.isModLoaded("tconstruct"); case "mixins.mods.tconstruct.toolcustomization.json": return Loader.isModLoaded("tconstruct") && UTConfigMods.TINKERS_CONSTRUCT.utTConToolCustomizationToggle; + case "mixins.mods.tconstruct.toolcustomization.plustic.json": + return Loader.isModLoaded("tconstruct") && Loader.isModLoaded("plustic") && UTConfigMods.TINKERS_CONSTRUCT.utTConToolCustomizationToggle; case "mixins.mods.tconstruct.oredictcache.json": return Loader.isModLoaded("tconstruct") && UTConfigMods.TINKERS_CONSTRUCT.utTConOreDictCacheToggle; case "mixins.mods.tinyprogressions.dupes.json": diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTCleaverMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTCleaverMixin.java index 23462cef..e773fb41 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTCleaverMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTCleaverMixin.java @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import slimeknights.tconstruct.tools.melee.item.Cleaver; +// Courtesy of jchung01 @Mixin(value = Cleaver.class, remap = false) public class UTCleaverMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTLongswordMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTLongswordMixin.java index 08f92155..a5014512 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTLongswordMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTLongswordMixin.java @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import slimeknights.tconstruct.tools.melee.item.LongSword; +// Courtesy of jchung01 @Mixin(value = LongSword.class, remap = false) public class UTLongswordMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTRapierMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTRapierMixin.java index 3260cdbc..113859d8 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTRapierMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTRapierMixin.java @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import slimeknights.tconstruct.tools.melee.item.Rapier; +// Courtesy of jchung01 @Mixin(value = Rapier.class, remap = false) public class UTRapierMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolCoreMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolCoreMixin.java index 3a659ab7..5a9664ab 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolCoreMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolCoreMixin.java @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import slimeknights.tconstruct.library.tools.ToolCore; +// Courtesy of jchung01 @Mixin(value = ToolCore.class, remap = false) public class UTToolCoreMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolHelperMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolHelperMixin.java index 545a13f0..c5d576e1 100644 --- a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolHelperMixin.java +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/mixin/UTToolHelperMixin.java @@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; import slimeknights.tconstruct.library.utils.ToolHelper; +// Courtesy of jchung01 @Mixin(value = ToolHelper.class, remap = false) public class UTToolHelperMixin { diff --git a/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/plustic/mixin/UTToolKatanaMixin.java b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/plustic/mixin/UTToolKatanaMixin.java new file mode 100644 index 00000000..12f11b95 --- /dev/null +++ b/src/main/java/mod/acgaming/universaltweaks/mods/tconstruct/toolcustomization/plustic/mixin/UTToolKatanaMixin.java @@ -0,0 +1,19 @@ +package mod.acgaming.universaltweaks.mods.tconstruct.toolcustomization.plustic.mixin; + +import landmaster.plustic.tools.ToolKatana; +import mod.acgaming.universaltweaks.config.UTConfigMods; +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; + +// Courtesy of jchung01 +@Mixin(value = ToolKatana.class, remap = false) +public class UTToolKatanaMixin +{ + @Inject(method = "damageCutoff", at = @At(value = "RETURN"), cancellable = true) + private void utModifyDamageCutoff(CallbackInfoReturnable cir) + { + cir.setReturnValue(UTConfigMods.TINKERS_CONSTRUCT.TOOL_CUSTOMIZATION.utTConToolKatanaDamageCutoff); + } +} diff --git a/src/main/resources/assets/universaltweaks/lang/en_us.lang b/src/main/resources/assets/universaltweaks/lang/en_us.lang index c1da9f80..9cf547fb 100644 --- a/src/main/resources/assets/universaltweaks/lang/en_us.lang +++ b/src/main/resources/assets/universaltweaks/lang/en_us.lang @@ -72,6 +72,7 @@ cfg.universaltweaks.modintegration.tc.foci.focusmediums=Focus Mediums cfg.universaltweaks.modintegration.tc.foci=Thaumcraft: Foci cfg.universaltweaks.modintegration.tc=Thaumcraft cfg.universaltweaks.modintegration.tcon=Tinkers' Construct +cfg.universaltweaks.modintegration.tcon.toolcustomization=Tool Customization cfg.universaltweaks.modintegration.te=Thermal Expansion cfg.universaltweaks.modintegration.thaumicwonders=Thaumic Wonders cfg.universaltweaks.modintegration.thefarlanders=The Farlanders diff --git a/src/main/resources/mixins.mods.tconstruct.toolcustomization.plustic.json b/src/main/resources/mixins.mods.tconstruct.toolcustomization.plustic.json new file mode 100644 index 00000000..9fa00163 --- /dev/null +++ b/src/main/resources/mixins.mods.tconstruct.toolcustomization.plustic.json @@ -0,0 +1,7 @@ +{ + "package": "mod.acgaming.universaltweaks.mods.tconstruct.toolcustomization.plustic.mixin", + "refmap": "universaltweaks.refmap.json", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": ["UTToolKatanaMixin"] +} \ No newline at end of file