[Bug Fix] Fixed Xaero's Minimap onClose mixin failing to inject (#367)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
authored and GitHub committed 2026-10-30 18:49:01 +00:00
1 parent 66343fcb43
commit 4dfbe07fd7
4 files changed
+49 -18

No files matched your search

+5 -2
View File
@@ -8,6 +8,7 @@ minecraft {
def addGtForTesting = Boolean.parseBoolean(project.getProperties().getOrDefault("withGregtech", "false").toString())
def addReikaModsForTesting = Boolean.parseBoolean(project.getProperties().getOrDefault("withReikaMods", "false").toString())
def addXaeroForTesting = Boolean.parseBoolean(project.getProperties().getOrDefault("withXaeros", "false").toString())
configurations.configureEach {
resolutionStrategy.dependencySubstitution {
@@ -72,9 +73,11 @@ dependencies {
// runtimeOnlyNonPublishable('maven.modrinth:cursormod:1.2.2-1.7.10')
// runtimeOnlyNonPublishable(rfg.deobf("curse.maven:fplib-665627:7244842"))
// runtimeOnlyNonPublishable(rfg.deobf("curse.maven:mcpatcher-1344779:7032456"))
// runtimeOnlyNonPublishable(rfg.deobf("curse.maven:xaeros-minimap-263420:6012805"))
// runtimeOnlyNonPublishable(rfg.deobf("curse.maven:xaeros-world-map-317780:5987124"))
// runtimeOnlyNonPublishable(rfg.deobf("curse.maven:signpicture-250822:2450569"))
if (addXaeroForTesting) {
runtimeOnlyNonPublishable(rfg.deobf("curse.maven:xaeros-minimap-263420:6012805"))
runtimeOnlyNonPublishable(rfg.deobf("curse.maven:xaeros-world-map-317780:5987124"))
}
if (addGtForTesting) {
runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.222:dev')
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-999-GTNH:dev")
@@ -48,6 +48,9 @@ public enum Mixins implements IMixins {
),
// Mod compat patches
XAEROS_MINIMAP_TEXT_INPUT(Phase.LATE, new MixinBuilder()
.addClientMixins("xaeros.XaerosMinimapTextInput")
.addRequiredMod(TargetedMod.XAEROS_MINIMAP)),
XAEROS_MINIMAP_SCROLL(Phase.LATE, new MixinBuilder()
.addClientMixins("xaeros.XaerosMinimapScrolling")
.addRequiredMod(TargetedMod.XAEROS_MINIMAP)),
@@ -1,34 +1,20 @@
package me.eigenraven.lwjgl3ify.mixins.late.xaeros;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import me.eigenraven.lwjgl3ify.client.TextFieldHandler;
import xaero.common.gui.GuiAddWaypoint;
import xaero.common.gui.GuiEntityRadar;
import xaero.common.gui.GuiTransfer;
import xaero.common.gui.GuiWaypoints;
@Mixin(value = { GuiAddWaypoint.class, GuiEntityRadar.class, GuiTransfer.class, GuiWaypoints.class })
public class XaerosMinimapScrolling {
@Mixin(value = { GuiEntityRadar.class, GuiWaypoints.class, GuiTransfer.class, GuiAddWaypoint.class })
public abstract class XaerosMinimapScrolling {
// Optional because an old hodgepodge patch might also do the same
@ModifyConstant(method = "handleMouseInput", constant = @Constant(intValue = 120), expect = -1)
private int lwjgl3ify$rescaledGetEventDWheel(int original) {
return 1;
}
@Inject(method = "initGui()V", at = @At("HEAD"), remap = false)
private void lwjgl3ify$onInit(CallbackInfo ci) {
TextFieldHandler.beginTextInput();
}
@Inject(method = "onGuiClosed()V", at = @At("HEAD"), remap = false)
private void lwjgl3ify$onClose(CallbackInfo ci) {
TextFieldHandler.endTextInput(null);
}
}
@@ -0,0 +1,39 @@
package me.eigenraven.lwjgl3ify.mixins.late.xaeros;
import net.minecraft.client.gui.GuiScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import me.eigenraven.lwjgl3ify.client.TextFieldHandler;
import xaero.common.gui.GuiAddWaypoint;
import xaero.common.gui.GuiEntityRadar;
import xaero.common.gui.GuiTransfer;
import xaero.common.gui.GuiWaypoints;
@Mixin(value = { GuiEntityRadar.class, GuiTransfer.class, GuiWaypoints.class, GuiAddWaypoint.class })
public abstract class XaerosMinimapTextInput extends GuiScreen {
// Ensure "initGui" exists in the target class
@Unique
@Override
public void initGui() {}
// Ensure "onGuiClosed" exists in the target class
@Unique
@Override
public void onGuiClosed() {}
@Inject(method = "initGui()V", at = @At("HEAD"))
private void lwjgl3ify$onInit(CallbackInfo ci) {
TextFieldHandler.beginTextInput();
}
@Inject(method = "onGuiClosed()V", at = @At("HEAD"))
public void lwjgl3ify$onGuiClosed(CallbackInfo ci) {
TextFieldHandler.endTextInput(null);
}
}