From 2c72183f774a06f1363f36e676241f302bacf551 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 19 Apr 2020 19:31:11 -0500 Subject: [PATCH] Reduce some accesses to Patchouli internals --- .../botania/client/core/handler/ClientTickHandler.java | 6 ++---- .../botania/client/core/handler/KonamiHandler.java | 10 ++-------- .../botania/client/core/handler/RenderLexicon.java | 4 +--- .../java/vazkii/botania/common/item/ItemLexicon.java | 4 ++++ 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index b8305fa14..3689dd0a7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -11,7 +11,6 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.api.distmarker.Dist; @@ -25,9 +24,9 @@ import vazkii.botania.client.render.tile.RenderTileRedString; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; +import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.patchouli.client.book.gui.GuiBook; import java.lang.reflect.Field; @@ -98,8 +97,7 @@ public final class ClientTickHandler { } int ticksToOpen = 10; - Screen gui = Minecraft.getInstance().currentScreen; - if (gui instanceof GuiBook && ((GuiBook) gui).book.getBookItem().getItem() == ModItems.lexicon) { + if (ItemLexicon.isOpen()) { if (ticksWithLexicaOpen < 0) { ticksWithLexicaOpen = 0; } diff --git a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java index e7bd7a8fd..56a9f95d8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java @@ -25,7 +25,6 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.BookDrawScreenEvent; -import vazkii.patchouli.client.book.gui.GuiBook; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public class KonamiHandler { @@ -39,18 +38,13 @@ public class KonamiHandler { private static int nextLetter = 0; private static int konamiTime = 0; - private static boolean isBookOpen() { - Minecraft mc = Minecraft.getInstance(); - return mc.currentScreen instanceof GuiBook && ((GuiBook) mc.currentScreen).book == ItemLexicon.getBook(); - } - @SubscribeEvent public static void clientTick(TickEvent.ClientTickEvent evt) { if (konamiTime > 0) { konamiTime--; } - if (!isBookOpen()) { + if (!ItemLexicon.isOpen()) { nextLetter = 0; } } @@ -58,7 +52,7 @@ public class KonamiHandler { @SubscribeEvent public static void handleInput(InputEvent.KeyInputEvent evt) { Minecraft mc = Minecraft.getInstance(); - if (evt.getModifiers() == 0 && evt.getAction() == GLFW.GLFW_PRESS && isBookOpen()) { + if (evt.getModifiers() == 0 && evt.getAction() == GLFW.GLFW_PRESS && ItemLexicon.isOpen()) { if (konamiTime == 0 && evt.getKey() == KONAMI_CODE[nextLetter]) { nextLetter++; if (nextLetter >= KONAMI_CODE.length) { diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 35453f2d4..072e4cb31 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -43,7 +43,6 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; -import vazkii.patchouli.client.book.gui.GuiBook; import java.lang.invoke.MethodHandle; import java.util.ArrayList; @@ -120,8 +119,7 @@ public class RenderLexicon { float ticks = ClientTickHandler.ticksWithLexicaOpen; if (ticks > 0 && ticks < 10) { - if (Minecraft.getInstance().currentScreen instanceof GuiBook - && ((GuiBook) Minecraft.getInstance().currentScreen).book.getBookItem().getItem() == ModItems.lexicon) { + if (ItemLexicon.isOpen()) { ticks += partialTicks; } else { ticks -= partialTicks; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 75d2b296a..6ff2efdfd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -54,6 +54,10 @@ public class ItemLexicon extends Item implements IElvenItem { return BookRegistry.INSTANCE.books.get(ModItems.lexicon.getRegistryName()); } + public static boolean isOpen() { + return ModItems.lexicon.getRegistryName().equals(PatchouliAPI.instance.getOpenBookGui()); + } + @Override public void fillItemGroup(@Nonnull ItemGroup tab, @Nonnull NonNullList list) { if (isInGroup(tab)) {