diff --git a/CHANGELOG.md b/CHANGELOG.md index 60e0a21..0213e6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # devel * fixed AE2 auto crafting needing NBT editing +* removed colour handler fix; install instead # 3.10.1.0 diff --git a/README.md b/README.md index 56aaedf..c942a3f 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ expertise reset after installing this mod. ## Fixes * Removed the “Andersite” “joke”. -* Removed call to a colour handling event that is called several thousand times +* ~~Removed call to a colour handling event that is called several thousand times per second; gives a noticeable performance boost, but turns jewels and - unidentified items white + unidentified items white~~ use * Fake players work with research again (e.g. Routers + Botany Pots, AE2 auto crafting) * Fake players can put Vault Rocks on the Altar again diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java b/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java index 6693ce0..44c44c6 100644 --- a/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java +++ b/src/main/java/tv/alterNERD/VaultModTweaks/Configuration.java @@ -39,8 +39,6 @@ public class Configuration { public static ConfigValue JUNKMGMT_T3; public static ConfigValue JUNKMGMT_T4; - public static BooleanValue COLOURLESS; - static { Builder builder = new Builder(); @@ -114,12 +112,6 @@ public class Configuration { CONFIG = builder.build(); builder = new Builder(); - - // Bug fixes - builder.push("Fixes"); - 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(); CLIENTCONFIG = builder.build(); } diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java deleted file mode 100644 index d6dfabe..0000000 --- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinClientInitEvents.java +++ /dev/null @@ -1,21 +0,0 @@ -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 e3965a0..72c5721 100644 --- a/src/main/resources/mixins.the_vault_tweaks.json +++ b/src/main/resources/mixins.the_vault_tweaks.json @@ -4,7 +4,6 @@ "compatibilityLevel": "JAVA_17", "refmap": "mixins.the_vault_tweaks.refmap.json", "mixins": [ - "MixinClientInitEvents", "MixinCrystalBuddingConfig", "MixinEnchantmentEntry", "MixinExpertisesGuiConfig",