Add to config, readme

jchung01 · May 28, 2024 · 9990601 · 9990601
1 parent d55f315
commit 9990601
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -329,6 +329,8 @@ All changes are toggleable via config files.
     * **Right Click Harvesting Fix:** Prevents crashing with mods implementing right click crop harvesting
 * **NuclearCraft**
     * **Radiation Environment Map:** Changes the data table of the radiation environment handler to improve tick time
+* **OpenBlocks**
+    * **Last Stand Trigger Fix:** Fixes the Last Stand enchantment triggering too early on pre-mitigation damage (before enchants, potions, etc), instead of on post-mitigation damage.
 * **ProjectRed**
     * **Duplication Fixes:** Fixes various duplication exploits
 * **Quark**

diff --git a/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java b/src/main/java/mod/acgaming/universaltweaks/UniversalTweaks.java
@@ -161,7 +161,7 @@ public void init(FMLInitializationEvent event)
         if (Loader.isModLoaded("elenaidodge2") && UTConfigMods.ELENAI_DODGE_2.utED2ExtinguishingDodgeChance > 0) MinecraftForge.EVENT_BUS.register(new UTED2Burning());
         if (Loader.isModLoaded("elenaidodge2") && UTConfigMods.ELENAI_DODGE_2.utED2SprintingFeatherConsumption > 0) MinecraftForge.EVENT_BUS.register(new UTED2Sprinting());
         if (Loader.isModLoaded("mekanism") && UTConfigMods.MEKANISM.utDuplicationFixesToggle) UTMekanismFixes.fixBinRecipes();
-        if (Loader.isModLoaded("openblocks")) MinecraftForge.EVENT_BUS.register(new UTOpenBlocksEvents());
+        if (Loader.isModLoaded("openblocks") && UTConfigMods.OPEN_BLOCKS.utLastStandFixToggle) MinecraftForge.EVENT_BUS.register(new UTOpenBlocksEvents());
         if (Loader.isModLoaded("projectred-exploration") && UTConfigMods.PROJECTRED.utDuplicationFixesToggle) MinecraftForge.EVENT_BUS.register(new UTProjectRedWorldEvents());
         // Unregister reason: disable beta warning.
         if (Loader.isModLoaded("railcraft") && UTConfigMods.RAILCRAFT.utNoBetaWarningToggle && UTReflectionUtil.isClassLoaded("mods.railcraft.common.core.BetaMessageTickHandler"))

diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigMods.java
@@ -143,6 +143,10 @@ public class UTConfigMods
     @Config.Name("NuclearCraft")
     public static final NuclearCraftCategory NUCLEARCRAFT = new NuclearCraftCategory();
 
+    @Config.LangKey("cfg.universaltweaks.modintegration.openblocks")
+    @Config.Name("OpenBlocks")
+    public static final OpenBlocksCategory OPEN_BLOCKS = new OpenBlocksCategory();
+
     @Config.LangKey("cfg.universaltweaks.modintegration.projectred")
     @Config.Name("ProjectRed")
     public static final ProjectRedCategory PROJECTRED = new ProjectRedCategory();
@@ -614,6 +618,18 @@ public enum EnumMaps
         }
     }
 
+    public static class OpenBlocksCategory
+    {
+        @Config.RequiresMcRestart
+        @Config.Name("Last Stand Trigger Fix")
+        @Config.Comment
+            ({
+                "Fixes the Last Stand enchantment triggering too early on pre-mitigation damage (before enchants, potions, etc)",
+                "instead of on post-mitigation damage."
+            })
+        public boolean utLastStandFixToggle = true;
+    }
+
     public static class ProjectRedCategory
     {
         @Config.RequiresMcRestart

diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java
@@ -75,7 +75,7 @@ public class UTMixinLoader implements ILateMixinLoader
             put("mixins.mods.netherchest.dupes.json", () -> loaded("netherchest") && UTConfigMods.NETHER_CHEST.utDuplicationFixesToggle);
             put("mixins.mods.netherrocks.json", () -> loaded("netherrocks"));
             put("mixins.mods.nuclearcraft.json", () -> loaded("nuclearcraft"));
-            put("mixins.mods.openblocks.json", () -> loaded("openblocks"));
+            put("mixins.mods.openblocks.json", () -> loaded("openblocks") && UTConfigMods.OPEN_BLOCKS.utLastStandFixToggle);
             put("mixins.mods.quark.dupes.json", () -> loaded("quark") && UTConfigMods.QUARK.utDuplicationFixesToggle);
             put("mixins.mods.reskillable.json", () -> loaded("reskillable"));
             put("mixins.mods.rftoolsdimensions.json", () -> loaded("rftoolsdim"));

diff --git a/src/main/resources/assets/universaltweaks/lang/en_us.lang b/src/main/resources/assets/universaltweaks/lang/en_us.lang
@@ -78,6 +78,7 @@ cfg.universaltweaks.modintegration.mrtjpcore=MrTJPCore
 cfg.universaltweaks.modintegration.netherchest=Nether Chest
 cfg.universaltweaks.modintegration.netherrocks=Netherrocks
 cfg.universaltweaks.modintegration.nuclearcraft=NuclearCraft
+cfg.universaltweaks.modintegration.openblocks=OpenBlocks
 cfg.universaltweaks.modintegration.projectred=ProjectRed
 cfg.universaltweaks.modintegration.quark=Quark
 cfg.universaltweaks.modintegration.rftoolsdimensions=RFTools Dimensions