diff --git a/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java b/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java index 3bde5ee79d9..29e7e9a0b9a 100644 --- a/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java +++ b/src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java @@ -212,9 +212,9 @@ protected IWidget createIoRow() { .coverChildrenHeight() .child(new ToggleButton() .value(new BooleanSyncValue(this::isIoEnabled, this::setIoEnabled)) - .overlay(IKey.dynamic(() -> IKey.lang(this.ioEnabled ? + .overlay(IKey.lang(() -> this.ioEnabled ? "behaviour.soft_hammer.enabled" : - "behaviour.soft_hammer.disabled").get()) + "behaviour.soft_hammer.disabled") .color(Color.WHITE.darker(1))) .widthRel(0.6f) .left(0)); diff --git a/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java b/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java index 524998ec460..d1c2fe60e7b 100644 --- a/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java +++ b/src/main/java/gregtech/common/covers/filter/BaseFilterContainer.java @@ -97,7 +97,7 @@ public boolean isItemValid(int slot, @NotNull ItemStack stack) { protected abstract boolean isItemValid(ItemStack stack); - protected abstract String getFilterName(); + protected abstract @NotNull IKey getFilterKey(); @Override public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) { @@ -244,7 +244,7 @@ public IWidget initUI(GuiData data, PanelSyncManager manager) { } return true; })) - .child(IKey.dynamic(this::getFilterName) + .child(getFilterKey() .color(CoverWithUI.UI_TEXT_COLOR) .shadow(false) .alignment(Alignment.CenterRight).asWidget() diff --git a/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java b/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java index a3793c0ffed..635854a9ab8 100644 --- a/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java +++ b/src/main/java/gregtech/common/covers/filter/FluidFilterContainer.java @@ -6,6 +6,7 @@ import com.cleanroommc.modularui.api.drawable.IKey; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import java.util.function.BooleanSupplier; import java.util.function.Consumer; @@ -56,9 +57,9 @@ protected boolean isItemValid(ItemStack stack) { } @Override - protected String getFilterName() { - return hasFilter() ? - getFilterStack().getDisplayName() : - IKey.lang("metaitem.fluid_filter.name").get(); + protected @NotNull IKey getFilterKey() { + return IKey.lang(() -> hasFilter() ? + getFilterStack().getTranslationKey() + ".name" : + "metaitem.fluid_filter.name"); } } diff --git a/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java b/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java index d282595253d..2cc171b62ce 100644 --- a/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java +++ b/src/main/java/gregtech/common/covers/filter/ItemFilterContainer.java @@ -10,6 +10,7 @@ import com.cleanroommc.modularui.api.drawable.IKey; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; import java.util.function.BooleanSupplier; import java.util.function.Consumer; @@ -57,9 +58,9 @@ protected boolean isItemValid(ItemStack stack) { } @Override - protected String getFilterName() { - return hasFilter() ? - getFilterStack().getDisplayName() : - IKey.lang("metaitem.item_filter.name").get(); + protected @NotNull IKey getFilterKey() { + return IKey.lang(() -> hasFilter() ? + getFilterStack().getTranslationKey() + ".name" : + "metaitem.item_filter.name"); } }