From 25eafab3b1a6e8ef23eecd275d4cba5e620b9f10 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Mon, 9 Jan 2023 15:20:36 -0600 Subject: [PATCH] Created a new config to enable/disable animation mixins. --- src/api | 2 +- src/main/java/noppes/npcs/config/ConfigClient.java | 6 ++++++ src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/api b/src/api index ed926020a..75ef3578f 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit ed926020ab9be2822efb49ebe2f30456fd3cc919 +Subproject commit 75ef3578f62f894217e001b7259291b6a956834d diff --git a/src/main/java/noppes/npcs/config/ConfigClient.java b/src/main/java/noppes/npcs/config/ConfigClient.java index 5b72dab8f..665abb982 100644 --- a/src/main/java/noppes/npcs/config/ConfigClient.java +++ b/src/main/java/noppes/npcs/config/ConfigClient.java @@ -34,6 +34,9 @@ public class ConfigClient public static Property EntityRendererMixinProperty; public static boolean EntityRendererMixin = true; + public static Property AnimationMixinProperty; + public static boolean AnimationMixin = true; + /** * Questing Properties **/ @@ -70,6 +73,9 @@ public class ConfigClient EntityRendererMixinProperty = config.get(VISUAL, "Entity Render Mixin", true, "Enables Overlay Mixins for Conflicts relating to Optifine or other Skin Renderers. If crashes occur, please disable."); EntityRendererMixin = EntityRendererMixinProperty.getBoolean(true); + AnimationMixinProperty = config.get(VISUAL, "Animation Mixin", true, "Enables mixins for the ModelRenderer and RenderPlayer classes, allowing for additional animation functionality in the API. If crashes or visual errors occur, please disable."); + AnimationMixin = AnimationMixinProperty.getBoolean(true); + // Questing TrackingInfoAlignmentProperty = config.get(QUESTING, "Tracking Info Alignment", 3, "Client sided! Determines where tracking quest info shows up on the screen based on a number from 0 to 8. Default: 3"); TrackingInfoAlignment = TrackingInfoAlignmentProperty.getInt(3); diff --git a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java index 70ee5c79e..e35bd8687 100644 --- a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java +++ b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java @@ -38,8 +38,10 @@ public class CustomNPCsMixinPlugin implements IMixinConfigPlugin { if (ConfigClient.EntityRendererMixin){ mixins.add("MixinEntityRenderer"); } - mixins.add("MixinModelRenderer"); - mixins.add("MixinRenderPlayer"); + if (ConfigClient.AnimationMixin) { + mixins.add("MixinModelRenderer"); + mixins.add("MixinRenderPlayer"); + } return mixins; }