diff --git a/dependencies.gradle b/dependencies.gradle index e582bc6f9..0e245bb05 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,5 +15,6 @@ dependencies { compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") compileOnly("com.github.GTNewHorizons:StructureLib:1.4.42:dev") + compileOnly("com.github.GTNewHorizons:Dashboard:1.0.10:api") } 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 40b7d484e..e514bd305 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -401,7 +401,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderNearIndexDisplay(ScaledResolution res) { + static void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); String txt0 = StatCollector.translateToLocal("botaniamisc.nearIndex0"); String txt1 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex1"); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 144b737a8..2676cec04 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -47,6 +47,7 @@ import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; +import vazkii.botania.client.core.handler.DashboardHud; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; @@ -124,6 +125,7 @@ import vazkii.botania.client.render.tile.RenderTileTerraPlate; import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.client.render.world.SkyblockRenderEvents; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; @@ -210,6 +212,8 @@ public class ClientProxy extends CommonProxy { FMLCommonHandler.instance().bus().register(new ClientTickHandler()); MinecraftForge.EVENT_BUS.register(new HUDHandler()); + if(Botania.dashboardLoaded) + DashboardHud.register(); MinecraftForge.EVENT_BUS.register(new LightningHandler()); if(ConfigHandler.boundBlockWireframe) MinecraftForge.EVENT_BUS.register(new BoundTileRenderer()); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 892abdeb7..dadee55c9 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -44,6 +44,7 @@ public class Botania { public static boolean storageDrawersLoaded = false; public static boolean structureLibLoaded = false; public static boolean neiLoaded = false; + public static boolean dashboardLoaded = false; public static ILightHelper lightHelper; @@ -65,6 +66,7 @@ public class Botania { storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); structureLibLoaded = Loader.isModLoaded("structurelib"); neiLoaded = Loader.isModLoaded("NotEnoughItems"); + dashboardLoaded = Loader.isModLoaded("dashboard"); lightHelper = coloredLightsLoaded ? new LightHelperColored() : new LightHelperVanilla(); proxy.preInit(event); diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 6d7b80fe6..88ed5e0fc 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ public final class LibMisc { public static final String MOD_ID = "Botania"; public static final String MOD_NAME = MOD_ID; public static final String VERSION = Tags.VERSION; - public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft;required-after:gtnhlib@[0.5.22,)"; + public static final String DEPENDENCIES = "required-after:Baubles;after:Thaumcraft;required-after:gtnhlib@[0.5.22,);after:dashboard@[1.0.10,)"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID;