From 439c1a71e07547cf933015dfac6915279bb31f51 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 28 Jun 2015 23:24:24 +0100 Subject: [PATCH] Fix what SoundLogic broke >_> --- .../botania/client/core/handler/HUDHandler.java | 2 +- .../common/block/tile/corporea/TileCorporeaIndex.java | 11 ++++++++++- .../vazkii/botania/common/core/proxy/CommonProxy.java | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index b1b968431..08abcb2a6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -101,7 +101,7 @@ public final class HUDHandler { renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile); } - if(!TileCorporeaIndex.input.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { + if(!TileCorporeaIndex.getInputHandler().getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { profiler.startSection("nearIndex"); renderNearIndexDisplay(event.resolution); profiler.endSection(); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 9e9f197d8..f4a0561c5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -40,12 +40,14 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileCorporeaIndex extends TileCorporeaBase { public static final double RADIUS = 2.5; - public static final InputHandler input = new InputHandler(); + private static InputHandler input; public static final Set indexes = Collections.newSetFromMap(new WeakHashMap()); private static final Map patterns = new LinkedHashMap(); @@ -215,6 +217,12 @@ public class TileCorporeaIndex extends TileCorporeaBase { } } + public static InputHandler getInputHandler() { + if(input == null) + input = new InputHandler(); + return input; + } + public static final class InputHandler implements ICorporeaAutoCompleteController { public InputHandler() { @@ -277,6 +285,7 @@ public class TileCorporeaIndex extends TileCorporeaBase { } @Override + @SideOnly(Side.CLIENT) public boolean shouldAutoComplete() { return !getNearbyIndexes(Minecraft.getMinecraft().thePlayer).isEmpty(); } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 361209943..91994ede0 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -111,7 +111,7 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new SheddingHandler()); MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); - MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.input); + MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); FMLCommonHandler.instance().bus().register(new CommonTickHandler());