From 9cbad193e2baada00f26fe7b3fbf40a7c43a5411 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Fri, 24 Dec 2021 11:56:49 -0500 Subject: [PATCH] fancy new java feature --- .../shadowfacts/phycon/mixin/client/MixinHandledScreen.java | 6 ++---- .../phycon/mixin/client/MixinMinecraftClient.java | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java index 0c27fdc..8bba4df 100644 --- a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java +++ b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java @@ -26,8 +26,7 @@ public class MixinHandledScreen { at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableDepthTest()V") ) private void drawSlotUnderlay(MatrixStack matrixStack, Slot slot, CallbackInfo ci) { - if ((Object)this instanceof AbstractTerminalScreen) { - AbstractTerminalScreen self = (AbstractTerminalScreen)(Object)this; + if ((Object)this instanceof AbstractTerminalScreen self) { self.drawSlotUnderlay(matrixStack, slot); } } @@ -37,8 +36,7 @@ public class MixinHandledScreen { at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/item/ItemRenderer;renderGuiItemOverlay(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V") ) private void drawSlotAmount(ItemRenderer itemRenderer, TextRenderer textRenderer, ItemStack stack, int x, int y, @Nullable String countLabel, MatrixStack matrixStack, Slot slot) { - if ((Object)this instanceof AbstractTerminalScreen) { - AbstractTerminalScreen self = (AbstractTerminalScreen)(Object)this; + if ((Object)this instanceof AbstractTerminalScreen self) { AbstractTerminalScreenHandler handler = self.getScreenHandler(); if (slot.id < handler.getNetworkSlotsEnd() && stack.getCount() > 1) { self.drawNetworkSlotAmount(stack, x, y); diff --git a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinMinecraftClient.java b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinMinecraftClient.java index 3212411..81f2ab7 100644 --- a/src/main/java/net/shadowfacts/phycon/mixin/client/MixinMinecraftClient.java +++ b/src/main/java/net/shadowfacts/phycon/mixin/client/MixinMinecraftClient.java @@ -20,8 +20,8 @@ public class MixinMinecraftClient { at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;", opcode = Opcodes.PUTFIELD, shift = At.Shift.AFTER) ) private void setScreen(Screen screen, CallbackInfo ci) { - if (screen instanceof AbstractCacaoScreen) { - ((AbstractCacaoScreen)screen).screenWillAppear(); + if (screen instanceof AbstractCacaoScreen cacaoScreen) { + cacaoScreen.screenWillAppear(); } }