finished mirrored jar

This commit is contained in:
makeo committed 2015-10-24 14:52:15 +02:00
1 parent c7a4f6b03c
commit 3b4feb4065
5 files changed
+62 -16

No files matched your search

@@ -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;
@@ -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<TileRemoteJar> jars = new ArrayList<TileRemoteJar>();
private List<TileJarFillable> jars = new ArrayList<TileJarFillable>();
private void update() {
long time = MinecraftServer.getServer().getEntityWorld().getTotalWorldTime();
if(time > lastTime) {
if(jars.size() > 1) {
Collections.sort(jars, new Comparator<TileRemoteJar>() {
Collections.sort(jars, new Comparator<TileJarFillable>() {
@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);
}
@@ -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);
@@ -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<String> getWailaHead(ItemStack stack, List<String> strings, IWailaDataAccessor data, IWailaConfigHandler config) {
return null;
public List<String> getWailaHead(final ItemStack stack, final List<String> 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<IWailaDataProvider>() {
@Override
public void call(IWailaDataProvider provider) {
provider.getWailaHead(stack, strings, data, config);
}
});
}
return strings;
}
@Override
public List<String> getWailaBody(ItemStack stack, List<String> strings, IWailaDataAccessor data, IWailaConfigHandler config) {
return null;
public List<String> getWailaBody(final ItemStack stack, final List<String> 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<IWailaDataProvider>() {
@Override
public void call(IWailaDataProvider provider) {
provider.getWailaBody(stack, strings, data, config);
}
});
}
return strings;
}
@Override
public List<String> getWailaTail(ItemStack stack, List<String> strings, IWailaDataAccessor data, IWailaConfigHandler config) {
public List<String> getWailaTail(final ItemStack stack, final List<String> 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<IWailaDataProvider>() {
@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<Integer, List<IWailaDataProvider>> providers, Callable<IWailaDataProvider> callable) {
for(Map.Entry<Integer, List<IWailaDataProvider>> entry : providers.entrySet()) {
for(IWailaDataProvider provider : entry.getValue()) {
callable.call(provider);
}
}
}
private abstract static class Callable<T> {
public abstract void call(IWailaDataProvider provider);
}
}