diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java index 03bcdca..783526d 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java @@ -7,6 +7,7 @@ import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java index 5707588..c7844bf 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -29,7 +29,7 @@ public class TileRemoteJar extends TileJarFillable { JarNetwork network = getNetwork(networkId); if(!network.jars.contains(this)) { - network.jars.add(this); + network.jars.add((TileJarFillable) worldObj.getTileEntity(xCoord, yCoord, zCoord)); } network.update(); @@ -57,26 +57,26 @@ public class TileRemoteJar extends TileJarFillable { private static class JarNetwork { private long lastTime = 0; - private List jars = new ArrayList(); + private List jars = new ArrayList(); private void update() { long time = MinecraftServer.getServer().getEntityWorld().getTotalWorldTime(); if(time > lastTime) { if(jars.size() > 1) { - Collections.sort(jars, new Comparator() { + Collections.sort(jars, new Comparator() { @Override - public int compare(TileRemoteJar o1, TileRemoteJar o2) { + public int compare(TileJarFillable o1, TileJarFillable o2) { return o2.amount - o1.amount; } }); - TileRemoteJar jar1 = jars.get(0); + TileJarFillable jar1 = jars.get(0); if(!isValid(jar1)) { jars.remove(0); return; } - TileRemoteJar jar2 = jars.get(jars.size() - 1); + TileJarFillable jar2 = jars.get(jars.size() - 1); if(!isValid(jar2)) { jars.remove(jars.size() - 1); return; @@ -90,7 +90,7 @@ public class TileRemoteJar extends TileJarFillable { } } - private static boolean isValid(TileRemoteJar jar) { + private static boolean isValid(TileJarFillable jar) { return jar != null && jar.getWorldObj() != null && !jar.isInvalid() && jar.getWorldObj().blockExists(jar.xCoord, jar.yCoord, jar.zCoord); } diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java index 6bc7a74..8f75178 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java @@ -2,6 +2,7 @@ package makeo.gadomancy.common.integration.waila; import makeo.gadomancy.common.blocks.BlockInfusionClaw; import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.BlockStickyJar; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.integration.IntegrationMod; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -28,8 +29,10 @@ public class IntegrationWaila extends IntegrationMod { public static void registerProviders(ModuleRegistrar registrar) { StickyJarProvider stickyJarProvider = new StickyJarProvider(); - registrar.registerTailProvider(stickyJarProvider, TileStickyJar.class); - registrar.registerStackProvider(stickyJarProvider, TileStickyJar.class); + registrar.registerTailProvider(stickyJarProvider, BlockStickyJar.class); + registrar.registerStackProvider(stickyJarProvider, BlockStickyJar.class); + registrar.registerHeadProvider(stickyJarProvider, BlockStickyJar.class); + registrar.registerBodyProvider(stickyJarProvider, BlockStickyJar.class); registrar.registerTailProvider(new AdvancedGolemProvider(), EntityGolemBase.class); diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java index 4999ee3..9aa4aeb 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java @@ -7,6 +7,7 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +17,7 @@ import net.minecraft.world.World; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * This class is part of the Gadomancy Mod @@ -27,7 +29,7 @@ import java.util.List; */ public class StickyJarProvider implements IWailaDataProvider { @Override - public ItemStack getWailaStack(IWailaDataAccessor data, IWailaConfigHandler config) { + public ItemStack getWailaStack(final IWailaDataAccessor data, final IWailaConfigHandler config) { if(data.getTileEntity() instanceof TileStickyJar) { TileStickyJar stickyJar = (TileStickyJar) data.getTileEntity(); @@ -53,17 +55,45 @@ public class StickyJarProvider implements IWailaDataProvider { } @Override - public List getWailaHead(ItemStack stack, List strings, IWailaDataAccessor data, IWailaConfigHandler config) { - return null; + public List getWailaHead(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { + TileStickyJar tile = (TileStickyJar) data.getTileEntity(); + if(tile != null && tile.isValid()) { + callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + @Override + public void call(IWailaDataProvider provider) { + provider.getWailaHead(stack, strings, data, config); + } + }); + } + return strings; } @Override - public List getWailaBody(ItemStack stack, List strings, IWailaDataAccessor data, IWailaConfigHandler config) { - return null; + public List getWailaBody(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { + TileStickyJar tile = (TileStickyJar) data.getTileEntity(); + if(tile != null && tile.isValid()) { + callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + @Override + public void call(IWailaDataProvider provider) { + provider.getWailaBody(stack, strings, data, config); + } + }); + } + return strings; } @Override - public List getWailaTail(ItemStack stack, List strings, IWailaDataAccessor data, IWailaConfigHandler config) { + public List getWailaTail(final ItemStack stack, final List strings, final IWailaDataAccessor data, final IWailaConfigHandler config) { + TileStickyJar tile = (TileStickyJar) data.getTileEntity(); + if(tile != null && tile.isValid()) { + callParentProviders(ModuleRegistrar.instance().getBodyProviders(tile.getParentBlock()), new Callable() { + @Override + public void call(IWailaDataProvider provider) { + provider.getWailaTail(stack, strings, data, config); + } + }); + } + if(data.getTileEntity() instanceof TileStickyJar) { if(strings.size() > 0) { String oldMod = strings.get(strings.size() - 1); @@ -79,4 +109,16 @@ public class StickyJarProvider implements IWailaDataProvider { public NBTTagCompound getNBTData(EntityPlayerMP paramEntityPlayerMP, TileEntity paramTileEntity, NBTTagCompound paramNBTTagCompound, World paramWorld, int paramInt1, int paramInt2, int paramInt3) { return null; } + + private void callParentProviders(Map> providers, Callable callable) { + for(Map.Entry> entry : providers.entrySet()) { + for(IWailaDataProvider provider : entry.getValue()) { + callable.call(provider); + } + } + } + + private abstract static class Callable { + public abstract void call(IWailaDataProvider provider); + } } diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index a8a9894..ee7a025 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -40,7 +40,7 @@ gadomancy.lore.remotejar=ยง7Network: %s tile.BlockStickyJar.name=Sticky Jar tile.BlockArcaneDropper.name=Arcane Dropper tile.BlockInfusionClaw.name=Infusion Claw -tile.BlockRemoteJar.name=[WIP] Mirrored Jar +tile.BlockRemoteJar.name=Mirrored Jar tile.BlockNode.name=Aura Node gadomancy.nodes.growing=Growing