From c065da7294f7752bf9faa2855f0f0950c8ac02fc Mon Sep 17 00:00:00 2001 From: inyourwalls Date: Wed, 8 Nov 2023 10:34:37 -0500 Subject: shrink code --- src/main/java/net/inyourwalls/frank/Frank.java | 41 ++++---------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/main/java/net/inyourwalls/frank/Frank.java b/src/main/java/net/inyourwalls/frank/Frank.java index 5b5166d..5bd12e0 100644 --- a/src/main/java/net/inyourwalls/frank/Frank.java +++ b/src/main/java/net/inyourwalls/frank/Frank.java @@ -7,12 +7,10 @@ import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ingame.BlastFurnaceScreen; -import net.minecraft.client.gui.screen.ingame.FurnaceScreen; -import net.minecraft.client.gui.screen.ingame.SmokerScreen; +import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen; import net.minecraft.item.ItemStack; +import net.minecraft.screen.AbstractFurnaceScreenHandler; import net.minecraft.screen.BlastFurnaceScreenHandler; -import net.minecraft.screen.FurnaceScreenHandler; import net.minecraft.screen.SmokerScreenHandler; import net.minecraft.text.Text; import org.slf4j.Logger; @@ -28,9 +26,10 @@ public class Frank implements ClientModInitializer { @Override public void onInitializeClient() { ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> { - if (screen instanceof FurnaceScreen furnace) { + if (screen instanceof AbstractFurnaceScreen furnace) { ScreenEvents.afterRender(screen).register((_s, drawContext, mouseX, mouseY, tickDelta) -> { - FurnaceScreenHandler handler = furnace.getScreenHandler(); + AbstractFurnaceScreenHandler handler = (AbstractFurnaceScreenHandler) furnace.getScreenHandler(); + int speedMultiplier = (handler instanceof BlastFurnaceScreenHandler || handler instanceof SmokerScreenHandler) ? 2 : 1; renderInfoLines( screen, drawContext, @@ -39,35 +38,7 @@ public class Frank implements ClientModInitializer { handler.getCookProgress(), handler.getSlot(FUEL_SLOT_INDEX).getStack(), handler.getFuelProgress(), - 1 - ); - }); - } else if (screen instanceof BlastFurnaceScreen furnace) { - ScreenEvents.afterRender(screen).register((_s, drawContext, mouseX, mouseY, tickDelta) -> { // bleh - BlastFurnaceScreenHandler handler = furnace.getScreenHandler(); - renderInfoLines( - screen, - drawContext, - client.textRenderer, - handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(), - handler.getCookProgress(), - handler.getSlot(FUEL_SLOT_INDEX).getStack(), - handler.getFuelProgress(), - 2 - ); - }); - } else if (screen instanceof SmokerScreen furnace) { - ScreenEvents.afterRender(screen).register((_s, drawContext, mouseX, mouseY, tickDelta) -> { - SmokerScreenHandler handler = furnace.getScreenHandler(); - renderInfoLines( - screen, - drawContext, - client.textRenderer, - handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(), - handler.getCookProgress(), - handler.getSlot(FUEL_SLOT_INDEX).getStack(), - handler.getFuelProgress(), - 2 + speedMultiplier ); }); } -- cgit v1.3.1