From cc8c142a2b74eaeefb74a267aaf16b0fa543e7ac Mon Sep 17 00:00:00 2001 From: alterNERDtive Date: Mon, 19 Jun 2023 01:49:31 +0200 Subject: [PATCH] removed the performance killing colour event thing --- .../VaultModTweaks/Configuration.java | 6 +++++- .../mixin/MixinClientInitEvents.java | 21 +++++++++++++++++++ .../resources/mixins.the_vault_tweaks.json | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java b/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java index 772bfd1..0a16628 100644 --- a/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java +++ b/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java @@ -38,6 +38,8 @@ public class Configuration { public static ConfigValue JUNKMGMT_T3; public static ConfigValue JUNKMGMT_T4; + public static BooleanValue COLOURLESS; + static { Builder builder = new Builder(); setupConfig(builder); @@ -104,12 +106,14 @@ public class Configuration { // Bug fixes builder.push("Fixes"); - builder.comment("Fix fake player research (e.g. Router + Botany Pots interaction, AE2 auto crafting, …) (CURRENTLY NON-FUNCTIONAL)"); + builder.comment("Fix fake player research (e.g. Router + Botany Pots interaction, AE2 auto crafting, …)"); FAKE_PLAYER_FIX = builder.define("fakePlayerResearchFix", true); builder.comment("Fix Routers unable to place Vault Rocks on your Vaultar"); ROUTER_VAULTAR_FIX = builder.define("routerVaultarFix", true); builder.comment("Fix №5 fragments of all relics having half the weight"); FRAGMENT_WEIGHT_FIX = builder.define("fragmentFix", true); + builder.comment("Fix performance issues when determining item colours (WARNING: will make jewels and unidentified gear go white)"); + COLOURLESS = builder.define("colourPerformanceFix", true); builder.pop(); } } diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java new file mode 100644 index 0000000..d6dfabe --- /dev/null +++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java @@ -0,0 +1,21 @@ +package tv.alterNERD.VaultModTweaks.integration.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import iskallia.vault.event.ClientInitEvents; +import iskallia.vault.init.ModModels; +import net.minecraftforge.client.event.ColorHandlerEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import tv.alterNERD.VaultModTweaks.Configuration; + +@Mixin(ClientInitEvents.class) +public class MixinClientInitEvents { + @Overwrite(remap = false) + @SubscribeEvent + public static void onColorHandlerRegister(ColorHandlerEvent.Item event) { + if (!Configuration.COLOURLESS.get()) { + ModModels.registerItemColors(event.getItemColors()); + } + } +} diff --git a/src/main/resources/mixins.the_vault_tweaks.json b/src/main/resources/mixins.the_vault_tweaks.json index 2d6f549..3671c4f 100644 --- a/src/main/resources/mixins.the_vault_tweaks.json +++ b/src/main/resources/mixins.the_vault_tweaks.json @@ -4,6 +4,7 @@ "compatibilityLevel": "JAVA_17", "refmap": "mixins.the_vault_tweaks.refmap.json", "mixins": [ + "MixinClientInitEvents", "MixinCrystalBuddingConfig", "MixinEnchantmentEntry", "MixinExpertisesGuiConfig",