From 30ad8d98cf475c0fd9a533f463b47bbdecb97e45 Mon Sep 17 00:00:00 2001 From: Robert S Date: Sat, 4 Oct 2014 16:22:34 -0400 Subject: [PATCH] Converted waila support to scala --- .../archaic/waila/Waila.java | 36 ----------- .../archaic/waila/Waila.scala | 30 ++++++++++ .../archaic/waila/WailaCrate.java | 59 ------------------- .../archaic/waila/WailaCrate.scala | 53 +++++++++++++++++ .../archaic/waila/WailaFluidTank.java | 55 ----------------- .../archaic/waila/WailaFluidTank.scala | 49 +++++++++++++++ .../archaic/waila/WailaRegistrar.java | 14 ----- .../archaic/waila/WailaRegistrar.scala | 14 +++++ 8 files changed, 146 insertions(+), 164 deletions(-) delete mode 100644 src/main/scala/resonantinduction/archaic/waila/Waila.java create mode 100644 src/main/scala/resonantinduction/archaic/waila/Waila.scala delete mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaCrate.java create mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaCrate.scala delete mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java create mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.scala delete mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.java create mode 100644 src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.scala diff --git a/src/main/scala/resonantinduction/archaic/waila/Waila.java b/src/main/scala/resonantinduction/archaic/waila/Waila.java deleted file mode 100644 index 32d1abec8..000000000 --- a/src/main/scala/resonantinduction/archaic/waila/Waila.java +++ /dev/null @@ -1,36 +0,0 @@ -package resonantinduction.archaic.waila; - -import cpw.mods.fml.common.event.FMLInterModComms; -import resonant.lib.compat.Mods; -import resonant.lib.loadable.ICompatProxy; - -/** - * @author tgame14 - * @since 21/03/14 - */ -public class Waila implements ICompatProxy -{ - @Override - public void preInit() - { - // nothing - } - - @Override - public void init() - { - FMLInterModComms.sendMessage(Mods.WAILA(), "register", "resonantinduction.archaic.waila.WailaRegistrar.wailaCallBack"); - } - - @Override - public void postInit() - { - // nothing - } - - @Override - public String modId() - { - return Mods.WAILA(); - } -} diff --git a/src/main/scala/resonantinduction/archaic/waila/Waila.scala b/src/main/scala/resonantinduction/archaic/waila/Waila.scala new file mode 100644 index 000000000..611a13271 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/waila/Waila.scala @@ -0,0 +1,30 @@ +package resonantinduction.archaic.waila + +import cpw.mods.fml.common.event.FMLInterModComms +import resonant.lib.compat.Mods +import resonant.lib.loadable.ICompatProxy + +/** + * @author tgame14 + * @since 21/03/14 + */ +class Waila extends ICompatProxy +{ + def preInit + { + } + + def init + { + FMLInterModComms.sendMessage(Mods.WAILA, "register", "resonantinduction.archaic.waila.WailaRegistrar.wailaCallBack") + } + + def postInit + { + } + + def modId: String = + { + return Mods.WAILA + } +} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java b/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java deleted file mode 100644 index 805078c1f..000000000 --- a/src/main/scala/resonantinduction/archaic/waila/WailaCrate.java +++ /dev/null @@ -1,59 +0,0 @@ -package resonantinduction.archaic.waila; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import resonant.lib.utility.LanguageUtility; -import resonantinduction.archaic.crate.TileCrate; - -import java.util.List; - -/** - * Waila support for crates - * - * @author Darkguardsman - */ -public class WailaCrate implements IWailaDataProvider -{ - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - TileEntity tile = accessor.getTileEntity(); - if (tile instanceof TileCrate) - { - ItemStack stored = ((TileCrate) tile).getSampleStack(); - int cap = ((TileCrate) tile).getSlotCount() * 64; - if (stored != null) - { - currenttip.add(LanguageUtility.getLocal("info.waila.crate.stack") + " " + stored.getDisplayName()); - currenttip.add(LanguageUtility.getLocal("info.waila.crate.stored") + " " + stored.stackSize + " / " + cap); - } - else - { - currenttip.add(LanguageUtility.getLocal("info.waila.crate.empty")); - } - } - return currenttip; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return currenttip; - } - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return currenttip; - } - -} diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaCrate.scala b/src/main/scala/resonantinduction/archaic/waila/WailaCrate.scala new file mode 100644 index 000000000..25b306539 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/waila/WailaCrate.scala @@ -0,0 +1,53 @@ +package resonantinduction.archaic.waila + +import mcp.mobius.waila.api.IWailaConfigHandler +import mcp.mobius.waila.api.IWailaDataAccessor +import mcp.mobius.waila.api.IWailaDataProvider +import net.minecraft.item.ItemStack +import net.minecraft.tileentity.TileEntity +import resonant.lib.utility.LanguageUtility +import resonantinduction.archaic.crate.TileCrate +import java.util.List + +/** + * Waila support for crates + * + * @author Darkguardsman + */ +class WailaCrate extends IWailaDataProvider +{ + override def getWailaBody(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + val tile: TileEntity = accessor.getTileEntity + if (tile.isInstanceOf[TileCrate]) + { + val stored: ItemStack = (tile.asInstanceOf[TileCrate]).getSampleStack + val cap: Int = (tile.asInstanceOf[TileCrate]).getSlotCount * 64 + if (stored != null) + { + currenttip.add(LanguageUtility.getLocal("info.waila.crate.stack") + " " + stored.getDisplayName) + currenttip.add(LanguageUtility.getLocal("info.waila.crate.stored") + " " + stored.stackSize + " / " + cap) + } + else + { + currenttip.add(LanguageUtility.getLocal("info.waila.crate.empty")) + } + } + return currenttip + } + + override def getWailaHead(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + return currenttip + } + + override def getWailaStack(accessor: IWailaDataAccessor, config: IWailaConfigHandler): ItemStack = + { + return null + } + + override def getWailaTail(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + return currenttip + } +} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java b/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java deleted file mode 100644 index 73764db5f..000000000 --- a/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.java +++ /dev/null @@ -1,55 +0,0 @@ -package resonantinduction.archaic.waila; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.IFluidTank; -import resonant.lib.utility.LanguageUtility; -import resonantinduction.archaic.fluid.tank.TileTank; - -import java.util.List; - -/** - * Waila support for tanks - * - * @author Darkguardsman - */ -public class WailaFluidTank implements IWailaDataProvider -{ - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - TileEntity tile = accessor.getTileEntity(); - if (tile instanceof TileTank) - { - IFluidTank tank = ((TileTank) tile).getTank(); - if (tank != null && tank.getFluid() != null) - { - currenttip.add(LanguageUtility.getLocal("info.waila.tank.fluid") + " " + tank.getFluid().getFluid().getLocalizedName()); - currenttip.add(LanguageUtility.getLocal("info.waila.tank.vol") + " " + tank.getFluidAmount() + " / " + tank.getCapacity()); - } - } - return currenttip; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return currenttip; - } - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return null; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) - { - return currenttip; - } - -} diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.scala b/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.scala new file mode 100644 index 000000000..93555052a --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/waila/WailaFluidTank.scala @@ -0,0 +1,49 @@ +package resonantinduction.archaic.waila + +import mcp.mobius.waila.api.IWailaConfigHandler +import mcp.mobius.waila.api.IWailaDataAccessor +import mcp.mobius.waila.api.IWailaDataProvider +import net.minecraft.item.ItemStack +import net.minecraft.tileentity.TileEntity +import net.minecraftforge.fluids.IFluidTank +import resonant.lib.utility.LanguageUtility +import resonantinduction.archaic.fluid.tank.TileTank +import java.util.List + +/** + * Waila support for tanks + * + * @author Darkguardsman + */ +class WailaFluidTank extends IWailaDataProvider +{ + override def getWailaBody(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + val tile: TileEntity = accessor.getTileEntity + if (tile.isInstanceOf[TileTank]) + { + val tank: IFluidTank = (tile.asInstanceOf[TileTank]).getTank + if (tank != null && tank.getFluid != null) + { + currenttip.add(LanguageUtility.getLocal("info.waila.tank.fluid") + " " + tank.getFluid.getFluid.getLocalizedName) + currenttip.add(LanguageUtility.getLocal("info.waila.tank.vol") + " " + tank.getFluidAmount + " / " + tank.getCapacity) + } + } + return currenttip + } + + override def getWailaHead(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + return currenttip + } + + override def getWailaStack(accessor: IWailaDataAccessor, config: IWailaConfigHandler): ItemStack = + { + return null + } + + override def getWailaTail(itemStack: ItemStack, currenttip: List[String], accessor: IWailaDataAccessor, config: IWailaConfigHandler): List[String] = + { + return currenttip + } +} \ No newline at end of file diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.java b/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.java deleted file mode 100644 index 5209f9b5e..000000000 --- a/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.java +++ /dev/null @@ -1,14 +0,0 @@ -package resonantinduction.archaic.waila; - -import mcp.mobius.waila.api.IWailaRegistrar; -import resonantinduction.archaic.crate.TileCrate; -import resonantinduction.archaic.fluid.tank.TileTank; - -public class WailaRegistrar -{ - public static void wailaCallBack(IWailaRegistrar registrar) - { - registrar.registerBodyProvider(new WailaCrate(), TileCrate.class); - registrar.registerBodyProvider(new WailaFluidTank(), TileTank.class); - } -} diff --git a/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.scala b/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.scala new file mode 100644 index 000000000..663403058 --- /dev/null +++ b/src/main/scala/resonantinduction/archaic/waila/WailaRegistrar.scala @@ -0,0 +1,14 @@ +package resonantinduction.archaic.waila + +import mcp.mobius.waila.api.IWailaRegistrar +import resonantinduction.archaic.crate.TileCrate +import resonantinduction.archaic.fluid.tank.TileTank + +object WailaRegistrar +{ + def wailaCallBack(registrar: IWailaRegistrar) + { + registrar.registerBodyProvider(new WailaCrate, classOf[TileCrate]) + registrar.registerBodyProvider(new WailaFluidTank, classOf[TileTank]) + } +} \ No newline at end of file