From 05eaaf1d2a5ad20415dcabb59c13b66b2c1e34b6 Mon Sep 17 00:00:00 2001 From: gamma-delta <29877714+gamma-delta@users.noreply.github.com> Date: Sun, 6 Nov 2022 12:47:28 -0600 Subject: [PATCH] prevent weird dev modmenu crash and update bool display --- .../at/petrak/hexcasting/api/spell/iota/BooleanIota.java | 3 ++- Fabric/build.gradle | 5 +++++ Fabric/src/main/resources/fabric.mod.json | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/iota/BooleanIota.java b/Common/src/main/java/at/petrak/hexcasting/api/spell/iota/BooleanIota.java index 2f5fd9eb..70ce915c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/iota/BooleanIota.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/iota/BooleanIota.java @@ -62,6 +62,7 @@ public class BooleanIota extends Iota { } public static Component display(boolean b) { - return Component.literal(String.valueOf(b)).withStyle(b ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_RED); + return Component.literal(b ? "True" : "False") + .withStyle(b ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_RED); } } diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 6e86a4fc..84433481 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -92,6 +92,11 @@ dependencies { modApi("com.github.Virtuoel:Pehkui:${pehkuiVersion}", { exclude group: "net.fabricmc.fabric-api" }) + + // *Something* is including an old version of modmenu with a broken mixin + // We can't figure out what it is + // so i'm just including a fresher version + modImplementation("com.terraformersmc:modmenu:4.1.0") } tasks.withType(JavaCompile) { diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 6236a826..74daa54f 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -30,9 +30,6 @@ "cardinal-components": [ "at.petrak.hexcasting.fabric.cc.HexCardinalComponents" ], - "rei_plugins_v0": [ - "at.petrak.hexcasting.fabric.interop.rei.HexREIPlugin" - ], "emi": [ "at.petrak.hexcasting.fabric.interop.emi.HexEMIPlugin" ]