From d2c1e2b360ace334bdd49756c41a6145a59a055e Mon Sep 17 00:00:00 2001 From: emilyploszaj Date: Mon, 7 Oct 2024 17:58:15 -0500 Subject: [PATCH] 1.1.16 --- CHANGELOG.md | 5 ++--- gradle.properties | 2 +- xplat/src/main/java/dev/emi/emi/VanillaPlugin.java | 2 +- xplat/src/main/java/dev/emi/emi/config/EffectLocation.java | 1 + .../java/dev/emi/emi/mixin/AbstractInventoryScreenMixin.java | 4 ++-- xplat/src/main/resources/assets/emi/lang/en_us.json | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d91e8aba..f74689dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ ### Tweaks -* The "Default Stack" bind will now clear a default when used on a defaulted stack (to clear a tag resolution, for example) +* Added "Hidden" option for status effect display location #517 ### Fixes -* #739 -* More update for JEI compatibility #732 #734 +* Properly implement JEI fixes in 1.20.1 #743 diff --git a/gradle.properties b/gradle.properties index 5e100824..14218041 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.21.1 enabled_platforms=fabric,neoforge archives_base_name=emi -mod_version=1.1.15 +mod_version=1.1.16 maven_group=dev.emi architectury_version=4.9.83 diff --git a/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java b/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java index 1e5cde20..a4591db1 100644 --- a/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java +++ b/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java @@ -271,7 +271,7 @@ public void register(EmiRegistry registry) { }); registry.addGenericExclusionArea((screen, consumer) -> { - if (screen instanceof AbstractInventoryScreen inv) { + if (EmiConfig.effectLocation != EffectLocation.HIDDEN && screen instanceof AbstractInventoryScreen inv) { MinecraftClient client = MinecraftClient.getInstance(); Collection collection = client.player.getStatusEffects(); if (!collection.isEmpty()) { diff --git a/xplat/src/main/java/dev/emi/emi/config/EffectLocation.java b/xplat/src/main/java/dev/emi/emi/config/EffectLocation.java index b536c201..cd1f88a7 100644 --- a/xplat/src/main/java/dev/emi/emi/config/EffectLocation.java +++ b/xplat/src/main/java/dev/emi/emi/config/EffectLocation.java @@ -9,6 +9,7 @@ public enum EffectLocation implements ConfigEnum { RIGHT_COMPRESSED("right-compressed", true), LEFT("left", false), RIGHT("right", false), + HIDDEN("hidden", false), ; public final String name; diff --git a/xplat/src/main/java/dev/emi/emi/mixin/AbstractInventoryScreenMixin.java b/xplat/src/main/java/dev/emi/emi/mixin/AbstractInventoryScreenMixin.java index 2ebf498d..aa1d03e2 100644 --- a/xplat/src/main/java/dev/emi/emi/mixin/AbstractInventoryScreenMixin.java +++ b/xplat/src/main/java/dev/emi/emi/mixin/AbstractInventoryScreenMixin.java @@ -66,7 +66,7 @@ private void drawStatusEffects(DrawContext draw, int mouseX, int mouseY, Callbac @ModifyVariable(at = @At(value = "INVOKE", target = "java/util/Collection.size()I", ordinal = 0), method = "drawStatusEffects", ordinal = 0) private Collection drawStatusEffects(Collection original) { - if (EmiConfig.effectLocation == EffectLocation.TOP) { + if (EmiConfig.effectLocation == EffectLocation.TOP || EmiConfig.effectLocation == EffectLocation.HIDDEN) { return List.of(); } return original; @@ -132,7 +132,7 @@ private boolean squishEffects(boolean original) { method = "drawStatusEffects", ordinal = 2) private int changeEffectSpace(int original) { return switch (EmiConfig.effectLocation) { - case RIGHT, RIGHT_COMPRESSED -> original; + case RIGHT, RIGHT_COMPRESSED, HIDDEN -> original; case TOP -> this.x; case LEFT_COMPRESSED -> this.x - 2- 32; case LEFT -> this.x - 2 - 120; diff --git a/xplat/src/main/resources/assets/emi/lang/en_us.json b/xplat/src/main/resources/assets/emi/lang/en_us.json index 283dbfd2..5915c4ae 100644 --- a/xplat/src/main/resources/assets/emi/lang/en_us.json +++ b/xplat/src/main/resources/assets/emi/lang/en_us.json @@ -70,6 +70,7 @@ "emi.effect_location.right_compressed": "Right (Compressed)", "emi.effect_location.left": "Left", "emi.effect_location.right": "Right", + "emi.effect_location.hidden": "Hidden", "emi.recipe_book_action.default": "Default", "emi.recipe_book_action.toggle_craftables": "Toggle Craftables", "emi.recipe_book_action.toggle_visibility": "Toggle Visibility",