bump forge/mantle versions, restore waila integration

This commit is contained in:
Progwml6 committed 2014-05-10 16:50:27 -04:00
1 parent 6b51e9c072
commit 546cc2198e
16 files changed
+149 -193

No files matched your search

@@ -0,0 +1,64 @@
package tconstruct.plugins.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.minecraftforge.fluids.FluidStack;
import tconstruct.blocks.logic.CastingBasinLogic;
import java.util.List;
public class BasinDataProvider implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof CastingBasinLogic)
{
return ((CastingBasinLogic) accessor.getTileEntity()).getStackInSlot(0);
}
return null;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof CastingBasinLogic && config.getConfig("tcon.basin", true))
{
CastingBasinLogic te = (CastingBasinLogic) accessor.getTileEntity();
if (te.getFluidAmount() != 0)
{
FluidStack fs = te.getFluid();
currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs));
currenttip.add("Amount: " + fs.amount + "/" + te.getCapacity());
}
else
{
if (te.getStackInSlot(0) != null)
{
currenttip.add("Contains: " + te.getStackInSlot(0).getDisplayName());
}
else
{
currenttip.add("§oEmpty"); // "§o" == Italics
}
}
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
}
@@ -0,0 +1,77 @@
package tconstruct.plugins.waila;
import java.util.List;
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.util.StatCollector;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import tconstruct.blocks.logic.CastingChannelLogic;
public class CastingChannelDataProvider implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return null;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof CastingChannelLogic)
{
CastingChannelLogic te = (CastingChannelLogic) accessor.getTileEntity();
FluidTankInfo internalTank = te.getTankInfo(null)[0];
FluidTankInfo northTank = te.getTankInfo(ForgeDirection.NORTH)[0];
FluidTankInfo southTank = te.getTankInfo(ForgeDirection.SOUTH)[0];
FluidTankInfo westTank = te.getTankInfo(ForgeDirection.WEST)[0];
FluidTankInfo eastTank = te.getTankInfo(ForgeDirection.EAST)[0];
if (internalTank.fluid != null && internalTank.fluid.amount > 0)
{
FluidStack fs = internalTank.fluid;
currenttip.add(StatCollector.translateToLocal("tconstruct.waila.liquidtag") + WailaRegistrar.fluidNameHelper(fs));
currenttip.add(StatCollector.translateToLocal("tconstruct.waila.amounttag") + fs.amount + "/" + internalTank.capacity);
}
else
{
currenttip.add("§o" + StatCollector.translateToLocal("tconstruct.waila.empty")); // "§o" == Italics
}
currenttip.add(StatCollector.translateToLocal("tconstruct.waila.subtanks"));
String s1, s2, s3, s4;
s1 = s2 = s3 = s4 = "§o" + StatCollector.translateToLocal("tconstruct.waila.empty");
if (northTank.fluid != null)
s1 = northTank.fluid.amount + " / " + northTank.capacity;
if (southTank.fluid != null)
s2 = southTank.fluid.amount + " / " + southTank.capacity;
if (westTank.fluid != null)
s3 = westTank.fluid.amount + " / " + westTank.capacity;
if (eastTank.fluid != null)
s4 = eastTank.fluid.amount + " / " + eastTank.capacity;
currenttip.add(s1 + "; " + s2 + "; " + s3 + "; " + s4);
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
}
@@ -0,0 +1,53 @@
package tconstruct.plugins.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.minecraftforge.fluids.FluidStack;
import tconstruct.blocks.logic.LavaTankLogic;
import java.util.List;
public class SearedTankDataProvider implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return null;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof LavaTankLogic && config.getConfig("tcon.searedtank", true))
{
LavaTankLogic te = (LavaTankLogic) accessor.getTileEntity();
if (te.containsFluid())
{
FluidStack fs = te.tank.getFluid();
currenttip.add("Liquid: " + WailaRegistrar.fluidNameHelper(fs));
currenttip.add("Amount: " + fs.amount + "/" + te.tank.getCapacity());
}
else
{
currenttip.add("§oEmpty"); // "§o" == Italics
}
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
}
@@ -0,0 +1,64 @@
package tconstruct.plugins.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.minecraftforge.fluids.FluidStack;
import tconstruct.blocks.logic.SmelteryLogic;
import java.util.List;
public class SmelteryDataProvider implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return null;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof SmelteryLogic && config.getConfig("tcon.smeltery", true))
{
SmelteryLogic te = (SmelteryLogic) accessor.getTileEntity();
if (te.validStructure)
{
List<FluidStack> fls = te.moltenMetal;
if (fls.size() <= 0)
{
currenttip.add("§oEmpty"); // "§o" == Italics
}
else
{
for (int i = 0; i < fls.size(); i++)
{
FluidStack st = fls.get(i);
currenttip.add(WailaRegistrar.fluidNameHelper(st) + " (" + st.amount + "mB)");
}
}
}
else
{
currenttip.add("§oInvalid structure");
}
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
}
@@ -0,0 +1,56 @@
package tconstruct.plugins.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 tconstruct.blocks.logic.CastingTableLogic;
import java.util.List;
public class TableDataProvider implements IWailaDataProvider
{
@Override
public ItemStack getWailaStack (IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof CastingTableLogic)
{
CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity();
return te.getStackInSlot(0);
}
return null;
}
@Override
public List<String> getWailaHead (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
@Override
public List<String> getWailaBody (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
if (accessor.getTileEntity() instanceof CastingTableLogic && config.getConfig("tcon.table", true))
{
CastingTableLogic te = (CastingTableLogic) accessor.getTileEntity();
if (te.getStackInSlot(1) != null)
{
currenttip.add("Contains: " + te.getStackInSlot(1).getDisplayName());
}
if (te.getFluid() != null)
{
currenttip.add("Fluid: " + WailaRegistrar.fluidNameHelper(te.getFluid()));
currenttip.add("Amount: " + te.getFluidAmount() + "/" + te.getCapacity());
}
}
return currenttip;
}
@Override
public List<String> getWailaTail (ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config)
{
return currenttip;
}
}
@@ -0,0 +1,34 @@
package tconstruct.plugins.waila;
import mantle.module.ILoadableModule;
import cpw.mods.fml.common.event.FMLInterModComms;
import tconstruct.TConstruct;
public class Waila implements ILoadableModule
{
@SuppressWarnings("unused")
public static String modId = "Waila";
@Override
public void preInit ()
{
// Nothing
}
@Override
public void init ()
{
TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry.");
FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback");
}
@Override
public void postInit ()
{
// Nothing
}
}
@@ -0,0 +1,45 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaRegistrar;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.TConstruct;
import tconstruct.blocks.LavaTankBlock;
import tconstruct.blocks.SmelteryBlock;
import tconstruct.blocks.logic.CastingBasinLogic;
import tconstruct.blocks.logic.CastingChannelLogic;
import tconstruct.blocks.logic.CastingTableLogic;
public class WailaRegistrar
{
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.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);
//registrar.registerBodyProvider(new EssenceExtractorDataProvider(), EssenceExtractor.class);
// Casting systems
registrar.registerBodyProvider(new BasinDataProvider(), CastingBasinLogic.class);
registrar.registerBodyProvider(new TableDataProvider(), CastingTableLogic.class);
// Smeltery
registrar.registerBodyProvider(new SmelteryDataProvider(), SmelteryBlock.class);
}
public static String fluidNameHelper (FluidStack f)
{
return StatCollector.translateToLocal(FluidRegistry.getFluidName(f));
}
}