imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-04-02 13:37:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Only overwrite screen on SUCCESS, fix whitespace changes

Browse Source
This commit is contained in:
Max
2021-01-25 04:10:11 +01:00
parent 0c7241ddfb
commit 5fbb420dd7
3 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMinecraft.java
View File

@@ -57,13 +57,13 @@ public abstract class MixinMinecraft {
private @Unique String hostname;
private @Unique int port;
// @formatter:on
@Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/chat/NarratorChatListener;clear()V"))
private void handleLogin(Screen screen, CallbackInfo ci) {
ClientPlayerEvent.CLIENT_PLAYER_QUIT.invoker().quit(player);
}
@Inject(method = "startUseItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;isEmpty()Z", ordinal = 1),
locals = LocalCapture.CAPTURE_FAILHARD)
private void rightClickAir(CallbackInfo ci, InteractionHand var1[], int var2, int var3, InteractionHand interactionHand, ItemStack itemStack) {
@@ -71,12 +71,12 @@ public abstract class MixinMinecraft {
InteractionEvent.CLIENT_RIGHT_CLICK_AIR.invoker().click(player, interactionHand);
}
}
@Inject(method = "startAttack", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;resetAttackStrengthTicker()V", ordinal = 0))
private void leftClickAir(CallbackInfo ci) {
InteractionEvent.CLIENT_LEFT_CLICK_AIR.invoker().click(player, InteractionHand.MAIN_HAND);
}
@ModifyVariable(
method = "setScreen",
at = @At(value = "INVOKE",
@@ -88,18 +88,21 @@ public abstract class MixinMinecraft {
public Screen modifyScreen(Screen screen) {
Screen old = screen;
InteractionResultHolder<Screen> event = GuiEvent.SET_SCREEN.invoker().modifyScreen(screen);
if (event.getResult() == InteractionResult.FAIL) {
setScreenCancelled = true;
return old;
switch (event.getResult()) {
case FAIL:
setScreenCancelled = true;
return old;
case SUCCESS:
screen = event.getObject();
if (old != null && screen != old) {
old.removed();
}
default:
setScreenCancelled = false;
return screen;
}
setScreenCancelled = false;
screen = event.getObject();
if (old != null && screen != old) {
old.removed();
}
return screen;
}
@Inject(
method = "setScreen",
at = @At(value = "INVOKE",
@@ -113,7 +116,7 @@ public abstract class MixinMinecraft {
ci.cancel();
}
}
@Redirect(
method = "<init>",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V"),
@@ -124,7 +127,7 @@ public abstract class MixinMinecraft {
)
public void minecraftWhy(Minecraft mc, Screen screen) {
}
@Inject(
method = "<init>",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;resizeDisplay()V"),
@@ -134,8 +137,8 @@ public abstract class MixinMinecraft {
hostname = string2;
port = j;
}
@SuppressWarnings("UnresolvedMixinReference")
@SuppressWarnings({"UnresolvedMixinReference", "ConstantConditions"})
@Inject(
method = {"method_29338", "lambda$null$1"}, // <init>.lambda$null$1
at = @At("RETURN")