From 6f8ca82d98a16a2754096af37c75d0be508c44bc Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Wed, 25 Dec 2013 00:24:02 +0100 Subject: [PATCH] Waila: Configuration support --- .../java/tconstruct/plugins/waila/BasinDataProvider.java | 2 +- .../plugins/waila/CastingChannelDataProvider.java | 2 +- .../tconstruct/plugins/waila/SearedTankDataProvider.java | 2 +- .../tconstruct/plugins/waila/SmelteryDataProvider.java | 2 +- .../java/tconstruct/plugins/waila/TableDataProvider.java | 3 +-- .../java/tconstruct/plugins/waila/WailaRegistrar.java | 8 ++++++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java index d60cda7deff..f7bc9b58fe2 100644 --- a/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java @@ -27,7 +27,7 @@ public List getWailaHead(ItemStack itemStack, List currenttip, I @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getTileEntity() instanceof CastingBasinLogic) + if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true)) { CastingBasinLogic te = (CastingBasinLogic)accessor.getTileEntity(); if (te.getFluidAmount() != 0) diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index 647cad9fe97..fd4b19a4918 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -27,7 +27,7 @@ public List getWailaHead (ItemStack itemStack, List currenttip, @Override public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getTileEntity() instanceof CastingChannelLogic) + if (accessor.getTileEntity() instanceof CastingChannelLogic && config.getConfig("tcon.castingchannel", true)) { CastingChannelLogic te = (CastingChannelLogic) accessor.getTileEntity(); if (te.liquid != null && te.liquid.amount > 0) diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index 1414643fbee..b17582705a5 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -27,7 +27,7 @@ public List getWailaHead (ItemStack itemStack, List currenttip, @Override public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getTileEntity() instanceof LavaTankLogic) + if (accessor.getTileEntity() instanceof LavaTankLogic && config.getConfig("tcon.searedtank", true)) { LavaTankLogic te = (LavaTankLogic) accessor.getTileEntity(); if (te.containsFluid()) diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index 9b49cd048f4..638cc422bfe 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -27,7 +27,7 @@ public List getWailaHead (ItemStack itemStack, List currenttip, @Override public List getWailaBody (ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getTileEntity() instanceof SmelteryLogic) + if (accessor.getTileEntity() instanceof SmelteryLogic && config.getConfig("tcon.smeltery", true)) { SmelteryLogic te = (SmelteryLogic) accessor.getTileEntity(); if (te.validStructure) diff --git a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java index fc5bacf3e30..ea84e2e4bdd 100644 --- a/src/main/java/tconstruct/plugins/waila/TableDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java @@ -4,7 +4,6 @@ import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.ForgeDirection; import tconstruct.blocks.logic.CastingTableLogic; import java.util.List; @@ -28,7 +27,7 @@ public List getWailaHead(ItemStack itemStack, List currenttip, I @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (accessor.getTileEntity() instanceof CastingTableLogic) + if (accessor.getTileEntity() instanceof CastingTableLogic && config.getConfig("tcon.table", true)) { CastingTableLogic te = (CastingTableLogic)accessor.getTileEntity(); if (te.getStackInSlot(1) != null) diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index 7e023705232..e72637cc0f4 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -17,6 +17,14 @@ public static void wailaCallback (IWailaRegistrar registrar) { TConstruct.logger.info("[Waila-Compat] Got registrar: " + registrar); + // Configs + registrar.addConfig("Tinkers' Construct", "tcon.searedtank", "Seared Tank"); + registrar.addConfig("Tinkers' Construct", "tcon.castingchannel", "Casting Channel"); + //registrar.addConfig("Tinkers' Construct", "tcon.essenceetractor", "Essence Extractor"); + registrar.addConfig("Tinkers' Construct", "tcon.basin", "Casting Basin"); + registrar.addConfig("Tinkers' Construct", "tcon.table", "Casting Table"); + registrar.addConfig("Tinkers' Construct", "tcon.smeltery", "Smeltery status"); + // Tanks registrar.registerBodyProvider(new SearedTankDataProvider(), LavaTankBlock.class); registrar.registerBodyProvider(new CastingChannelDataProvider(), CastingChannelLogic.class);