From 65b8ca57c19683e728d5ab2101c6e7cb7bc5b869 Mon Sep 17 00:00:00 2001 From: ACGaming <4818419+ACGaming@users.noreply.github.com> Date: Mon, 24 Feb 2025 18:33:03 +0100 Subject: [PATCH] Remove Mute Ore Dictionary Errors tweak --- README.md | 1 - .../config/UTConfigTweaks.java | 5 ---- .../universaltweaks/core/UTLoadingPlugin.java | 1 - .../mixin/UTOreDictionaryCheckMixin.java | 23 ------------------- ...tweaks.performance.oredictionarycheck.json | 7 ------ 5 files changed, 37 deletions(-) delete mode 100644 src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java delete mode 100644 src/main/resources/mixins.tweaks.performance.oredictionarycheck.json diff --git a/README.md b/README.md index 1c6ee8d3..b21074ef 100644 --- a/README.md +++ b/README.md @@ -208,7 +208,6 @@ All changes are toggleable via config files. * **Modern Knockback:** Backports 1.16+ knockback to 1.12: Knockback resistance is now a scale instead of a probability * **More Banner Layers:** Sets the amount of applicable pattern layers for banners * **Mute Advancement Errors:** Silences advancement errors -* **Mute Ore Dictionary Errors:** Silences ore dictionary errors * **Mute Texture Map Errors:** Silences texture map errors * **No Attack Cooldown:** Disables the 1.9 combat update attack cooldown * **No Crafting Repair:** Disables crafting recipes for repairing tools diff --git a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigTweaks.java b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigTweaks.java index 94e65968..e7fdb124 100644 --- a/src/main/java/mod/acgaming/universaltweaks/config/UTConfigTweaks.java +++ b/src/main/java/mod/acgaming/universaltweaks/config/UTConfigTweaks.java @@ -2247,11 +2247,6 @@ public static class PerformanceCategory @Config.Comment("Silences advancement errors") public boolean utAdvancementCheckToggle = false; - @Config.RequiresMcRestart - @Config.Name("Mute Ore Dictionary Errors") - @Config.Comment("Silences ore dictionary errors") - public boolean utOreDictionaryCheckToggle = false; - @Config.RequiresMcRestart @Config.Name("Mute Texture Map Errors") @Config.Comment("Silences texture map errors") diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java index fae7b247..a8013d73 100644 --- a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java +++ b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java @@ -159,7 +159,6 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader put("mixins.tweaks.performance.dyeblending.json", () -> UTConfigTweaks.PERFORMANCE.utDyeBlendingToggle); put("mixins.tweaks.performance.entityradiuscheck.lesscollisions.json", () -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utLessCollisionsToggle); put("mixins.tweaks.performance.entityradiuscheck.reducesearchsize.json", () -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utReduceSearchSizeToggle); - put("mixins.tweaks.performance.oredictionarycheck.json", () -> UTConfigTweaks.PERFORMANCE.utOreDictionaryCheckToggle); put("mixins.tweaks.performance.pathfinding.json", () -> UTConfigTweaks.PERFORMANCE.utPathfindingChunkCacheFixToggle); put("mixins.tweaks.performance.prefixcheck.json", () -> UTConfigTweaks.PERFORMANCE.utPrefixCheckToggle); put("mixins.tweaks.performance.redstone.json", () -> UTConfigTweaks.PERFORMANCE.utRedstoneLightingToggle); diff --git a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java b/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java deleted file mode 100644 index de21744e..00000000 --- a/src/main/java/mod/acgaming/universaltweaks/tweaks/performance/oredictionarycheck/mixin/UTOreDictionaryCheckMixin.java +++ /dev/null @@ -1,23 +0,0 @@ -package mod.acgaming.universaltweaks.tweaks.performance.oredictionarycheck.mixin; - -import net.minecraftforge.oredict.OreDictionary; - -import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; -import mod.acgaming.universaltweaks.config.UTConfigTweaks; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -// Courtesy of fonnymunkey -@Mixin(OreDictionary.class) -public abstract class UTOreDictionaryCheckMixin -{ - @WrapWithCondition( - method = "registerOreImpl", - at = @At(value = "INVOKE", target = "Lnet/minecraftforge/fml/common/FMLLog;bigWarning(Ljava/lang/String;[Ljava/lang/Object;)V"), - remap = false - ) - private static boolean utCheckOreDictionary(String i, Object[] format) - { - return !UTConfigTweaks.PERFORMANCE.utOreDictionaryCheckToggle; - } -} \ No newline at end of file diff --git a/src/main/resources/mixins.tweaks.performance.oredictionarycheck.json b/src/main/resources/mixins.tweaks.performance.oredictionarycheck.json deleted file mode 100644 index ede037c0..00000000 --- a/src/main/resources/mixins.tweaks.performance.oredictionarycheck.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "package": "mod.acgaming.universaltweaks.tweaks.performance.oredictionarycheck.mixin", - "refmap": "universaltweaks.refmap.json", - "minVersion": "0.8", - "compatibilityLevel": "JAVA_8", - "mixins": ["UTOreDictionaryCheckMixin"] -} \ No newline at end of file