diff options
author | Linnea Gräf <roman.graef@gmail.com> | 2023-10-09 17:32:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-09 17:32:01 +0200 |
commit | 6586ede9947bdc04fb51119da2d9e521a89d693e (patch) | |
tree | 3210497f88d9072cae2c9e7dcfdb135da792640c | |
parent | 97af5634a0c794b76e7c2592a2068bbd4c24f379 (diff) | |
download | NotEnoughUpdates-6586ede9947bdc04fb51119da2d9e521a89d693e.tar.gz NotEnoughUpdates-6586ede9947bdc04fb51119da2d9e521a89d693e.tar.bz2 NotEnoughUpdates-6586ede9947bdc04fb51119da2d9e521a89d693e.zip |
Fix auction house sort double rendering with chattriggers (#873)
See: https://github.com/hannibal002/SkyHanni/pull/539
2 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java index f9e0a132..49ef0390 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinGuiContainer.java @@ -184,8 +184,9 @@ public abstract class MixinGuiContainer extends GuiScreen { @Inject(method = "drawScreen", at = @At( value = "INVOKE", - target = "Lnet/minecraft/client/renderer/GlStateManager;popMatrix()V", - shift = At.Shift.AFTER + target = "Lnet/minecraft/entity/player/InventoryPlayer;getItemStack()Lnet/minecraft/item/ItemStack;", + shift = At.Shift.BEFORE, + ordinal = 1 ) ) public void drawScreen_after(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) { diff --git a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinThreadDownloadImageDataThread.java b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinThreadDownloadImageDataThread.java index aea52378..ac8868e6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinThreadDownloadImageDataThread.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/mixins/MixinThreadDownloadImageDataThread.java @@ -35,9 +35,11 @@ public class MixinThreadDownloadImageDataThread { method = "run", at = @At( value = "INVOKE", - target = "Ljava/net/HttpURLConnection;setDoOutput(Z)V" + target = "Ljava/net/HttpURLConnection;setDoOutput(Z)V", + remap = false ), - locals = LocalCapture.CAPTURE_FAILSOFT + locals = LocalCapture.CAPTURE_FAILSOFT, + remap = false ) public void patchHttpConnection(CallbackInfo ci, HttpURLConnection httpURLConnection) { ThreadDownloadImageHook.hookThreadImageConnection(httpURLConnection); |