Skip to content

Fix regression in #2672 which made all GT material fluids unsearchable in JEI #2854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zorbatron merged 2 commits into from
Aug 22, 2025
Merged

Fix regression in #2672 which made all GT material fluids unsearchable in JEI #2854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e58e3
Fix regression in #2672 due to LangKey#get() behaving improperly
Zorbatron Aug 22, 2025
8ae144e
Remove debug annotation
Zorbatron Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/main/java/gregtech/mixins/mui2/LangKeyMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@
import com.cleanroommc.modularui.drawable.text.BaseKey;
import com.cleanroommc.modularui.drawable.text.LangKey;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.function.Supplier;

// all this mixin does is switch newlines to the expected format
@Mixin(value = LangKey.class, remap = false)
public abstract class LangKeyMixin extends BaseKey {

@Shadow
private long time;

@ModifyExpressionValue(method = "getFormatted",
at = @At(value = "INVOKE",
target = "Lcom/cleanroommc/modularui/drawable/text/FontRenderHelper;formatArgs([Ljava/lang/Object;Lcom/cleanroommc/modularui/drawable/text/FormattingState;Ljava/lang/String;Z)Ljava/lang/String;"))
Expand All @@ -25,4 +34,11 @@ public String getTranslateKey(String original) {
public String switchNewLines(String original) {
return original.replace("/n", "\n");
}

@Inject(method = "<init>(Ljava/util/function/Supplier;Ljava/util/function/Supplier;)V",
at = @At(value = "RETURN"))
private void setTimeToNegativeOne(@NotNull Supplier<String> keySupplier, @NotNull Supplier<Object[]> argsSupplier,
CallbackInfo ci) {
time = -1;
}
}
Loading