From 1400967c10cbf75ea751bdce9771640891a1a266 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Thu, 6 Oct 2022 01:32:15 -0400 Subject: [PATCH] Add Mixin Config --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 5 ++++- src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 51027b334..de0b533aa 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ configurations { apply plugin: 'forge' -version = "1.6.3" +version = "1.6.4-pre1" group= "com.kamkeel.customnpc-plus" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 95e31cf48..e863b0ea8 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Set; import java.util.UUID; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6.3") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.6.4-pre1") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") @@ -159,6 +159,9 @@ public class CustomNpcs { @ConfigProp(info="Font size for custom fonts (doesn't work with minecrafts font)") public static int FontSize = 18; + @ConfigProp(info = "Enables Overlay Mixins for Conflicts relating to Optifine or other Skin Renderers. If crashes occur, please disable.") + public static boolean EntityRendererMixin = true; + public static FMLEventChannel Channel; public static FMLEventChannel ChannelPlayer; diff --git a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java index 7173da9dd..630444f5c 100644 --- a/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java +++ b/src/main/java/noppes/npcs/mixin/CustomNPCsMixinPlugin.java @@ -1,5 +1,6 @@ package noppes.npcs.mixin; +import noppes.npcs.CustomNpcs; import org.spongepowered.asm.lib.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -32,9 +33,9 @@ public class CustomNPCsMixinPlugin implements IMixinConfigPlugin { @Override public List getMixins() { List mixins = new ArrayList<>(); - - mixins.add("MixinEntityRenderer"); - + if (CustomNpcs.EntityRendererMixin){ + mixins.add("MixinEntityRenderer"); + } return mixins; }