diff --git a/assets/waila/lang/de_DE.lang b/assets/waila/lang/de_DE.lang index 2cf3c90..ba5f41d 100644 --- a/assets/waila/lang/de_DE.lang +++ b/assets/waila/lang/de_DE.lang @@ -132,4 +132,5 @@ option.bcapi.consump=Zeige maximale Energie option.bcapi.trigger=Zeige Startenergie option.pr.showio=Zeige Gatter IO option.pr.showdata=Zeige Gatterdaten -option.extrautilities.fluidamount=Zeige Flüssigk.-Menge \ No newline at end of file +option.extrautilities.fluidamount=Zeige Flüssigk.-Menge +option.openblocks.fluidamount=Zeige Flüssigk.-Menge \ No newline at end of file diff --git a/assets/waila/lang/en_US.lang b/assets/waila/lang/en_US.lang index e4d8ca4..c167202 100644 --- a/assets/waila/lang/en_US.lang +++ b/assets/waila/lang/en_US.lang @@ -132,4 +132,5 @@ option.bcapi.consump=Show maximum power option.bcapi.trigger=Show triggering energy option.pr.showio=Show gates IO option.pr.showdata=Show gates data -option.extrautilities.fluidamount=Show fluid amount \ No newline at end of file +option.extrautilities.fluidamount=Show fluid amount +option.openblocks.fluidamount=Show fluid amount \ No newline at end of file diff --git a/assets/waila/lang/fr_FR.lang b/assets/waila/lang/fr_FR.lang index d61a718..22434d9 100644 --- a/assets/waila/lang/fr_FR.lang +++ b/assets/waila/lang/fr_FR.lang @@ -131,4 +131,5 @@ option.bcapi.consump=Afficher puissance maximale option.bcapi.trigger=Energie déclanchement option.pr.showio=Afficher plaques IO option.pr.showdata=Afficher plaques data -option.extrautilities.fluidamount=Afficher niveau fluides \ No newline at end of file +option.extrautilities.fluidamount=Afficher niveau fluides +option.openblocks.fluidamount=Afficher niveau fluides \ No newline at end of file diff --git a/assets/waila/lang/nl_NL.lang b/assets/waila/lang/nl_NL.lang index a88f0dd..13f9e73 100644 --- a/assets/waila/lang/nl_NL.lang +++ b/assets/waila/lang/nl_NL.lang @@ -112,4 +112,5 @@ option.vanilla.repeater=Herhaler vertraging option.vanilla.comparator=Vergelijker modus option.vanilla.redstone=Redstone vermogen option.vanilla.jukebox=Jukebox schijf -option.extrautilities.fluidamount=Toon vloeistofhoeveelheid \ No newline at end of file +option.extrautilities.fluidamount=Toon vloeistofhoeveelheid +option.openblocks.fluidamount=Toon vloeistofhoeveelheid \ No newline at end of file diff --git a/assets/waila/lang/ru_RU.lang b/assets/waila/lang/ru_RU.lang index 0f4cb3b..d7ca570 100644 --- a/assets/waila/lang/ru_RU.lang +++ b/assets/waila/lang/ru_RU.lang @@ -126,3 +126,5 @@ option.bcapi.consump=Показывать макс. энергию option.bcapi.trigger=Показывать энергию активации option.pr.showio=Показывать ввод/вывод схем option.pr.showdata=Показывать инф. о схемах +option.extrautilities.fluidamount=Показывать кол-во жидкости +option.openblocks.fluidamount=Показывать кол-во жидкости \ No newline at end of file diff --git a/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java new file mode 100644 index 0000000..a7b7e9d --- /dev/null +++ b/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java @@ -0,0 +1,66 @@ +package mcp.mobius.waila.addons.openblocks; + +import java.util.List; + +import codechicken.lib.lang.LangUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + +public class HUDHandlerTank implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; + + IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + FluidStack fluid = tanks[0].fluid; + String name = currenttip.get(0); + + try{ + name += String.format(" < %s >", fluid.getFluid().getLocalizedName()); + } catch (NullPointerException f){ + name += " " + LangUtil.translateG("hud.msg.empty"); + } + + currenttip.set(0, name); + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + if (!config.getConfig("openblocks.fluidamount")) return currenttip; + + IFluidHandler handler = (IFluidHandler)accessor.getTileEntity(); + if (handler == null) return currenttip; + + FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); + if (tanks.length != 1) return currenttip; + + currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + return currenttip; + } + +} diff --git a/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java new file mode 100644 index 0000000..ac75e8b --- /dev/null +++ b/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -0,0 +1,33 @@ +package mcp.mobius.waila.addons.openblocks; + +import java.util.logging.Level; + +import mcp.mobius.waila.mod_Waila; +import mcp.mobius.waila.addons.ExternalModulesHandler; + +public class OpenBlocksModule { + + public static Class ModOpenBlocks = null; + public static Class TileEntityTank = null; + + public static void register(){ + try{ + Class ModOpenBlocks = Class.forName("openblocks.OpenBlocks"); + mod_Waila.log.log(Level.INFO, "OpenBlocks mod found."); + } catch (ClassNotFoundException e){ + mod_Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); + return; + } + + try{ + TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); + } catch (ClassNotFoundException e){ + mod_Waila.log.log(Level.WARNING, "[OpenBlocks] Class not found. " + e); + return; + } + + ExternalModulesHandler.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount"); + ExternalModulesHandler.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank); + ExternalModulesHandler.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank); + } +} diff --git a/mcp/mobius/waila/client/ProxyClient.java b/mcp/mobius/waila/client/ProxyClient.java index 926c1d1..1991060 100644 --- a/mcp/mobius/waila/client/ProxyClient.java +++ b/mcp/mobius/waila/client/ProxyClient.java @@ -11,6 +11,7 @@ import mcp.mobius.waila.addons.etb.ETBModule; import mcp.mobius.waila.addons.exu.ExtraUtilitiesModule; import mcp.mobius.waila.addons.gravestone.GravestoneModule; import mcp.mobius.waila.addons.ic2.IC2Module; +import mcp.mobius.waila.addons.openblocks.OpenBlocksModule; import mcp.mobius.waila.addons.projectred.ProjectRedModule; import mcp.mobius.waila.addons.thaumcraft.ThaumcraftModule; import mcp.mobius.waila.addons.thermalexpansion.ThermalExpansionModule; @@ -119,7 +120,10 @@ public class ProxyClient extends ProxyServer { ProjectRedModule.register(); /* ExtraUtilities */ - ExtraUtilitiesModule.register(); + ExtraUtilitiesModule.register(); + + /* OpenBlocks */ + OpenBlocksModule.register(); } @Override