tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Cleanup of Item railings

Browse source
This commit is contained in:
tgame14 2014-04-20 15:02:16 +03:00
parent 2be853c78c
commit c8d41fa55e
6 changed files with 101 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
electrical/src/main/scala/resonantinduction/electrical/itemrailing/GridRailing.java
View file

@ -1,6 +1,7 @@
package resonantinduction.electrical.itemrailing;
import calclavia.lib.grid.NodeGrid;
import calclavia.lib.grid.TickingGrid;
import net.minecraft.item.ItemStack;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailing;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailingTransfer;
@ -11,11 +12,13 @@ import java.util.Arrays;
* @since 18/03/14
* @author tgame14
*/
public class GridRailing extends NodeGrid<NodeRailing>
public class GridRailing extends TickingGrid<NodeRailing>
{
public GridRailing (Class type)
public final static String CATEGORY_RAILING = "Item_Railings";
public GridRailing (NodeRailing railing, Class type)
{
super(type);
super(railing, type);
}
public IItemRailing findTargetForIItemTransfer(IItemRailingTransfer itemwrapper)

78
electrical/src/main/scala/resonantinduction/electrical/itemrailing/NodeRailing.java
View file

@ -1,42 +1,94 @@
package resonantinduction.electrical.itemrailing;
import calclavia.lib.config.Config;
import calclavia.lib.grid.Node;
import calclavia.lib.render.EnumColor;
import calclavia.lib.type.Pair;
import com.google.common.collect.Lists;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailing;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailingProvider;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailingTransfer;
import universalelectricity.api.vector.IVectorWorld;
import universalelectricity.api.vector.VectorWorld;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* @author tgame14
* @since 18/03/14
*/
public class NodeRailing extends Node<PartRailing, GridRailing, IItemRailing> implements IVectorWorld, IItemRailing
public class NodeRailing extends Node<IItemRailingProvider, GridRailing, Object> implements IVectorWorld, IItemRailing
{
private int maxItemSpeed;
private byte connectionMap;
private EnumColor color;
private Set<IItemRailingTransfer> itemNodeSet;
@Config(category = GridRailing.CATEGORY_RAILING)
private static int MAX_TICKS_IN_RAILING = 5;
/** hold a timer here per item */
private Set<Pair<IItemRailingTransfer, Integer>> itemNodeSet;
public NodeRailing(PartRailing parent)
{
super(parent);
this.itemNodeSet = new HashSet<IItemRailingTransfer>();
this.itemNodeSet = new HashSet<Pair<IItemRailingTransfer, Integer>>();
this.color = null;
this.connectionMap = Byte.parseByte("111111", 2);
this.maxItemSpeed = 20;
}
public NodeRailing setConnection(byte connectionMap)
{
this.connectionMap = connectionMap;
return this;
}
@Override
public void update(float deltaTime)
{
if (!world().isRemote)
{
Iterator<Map.Entry<Object, ForgeDirection>> iterator = new HashMap(getConnections()).entrySet().iterator();
for (Pair<IItemRailingTransfer, Integer> pair : this.itemNodeSet)
{
if (pair.right() <= 0)
{
//TODO move to next item railing
}
else
{
pair.setRight(pair.right() - 1);
}
}
while (iterator.hasNext())
{
Map.Entry<Object, ForgeDirection> entry = iterator.next();
Object obj = entry.getKey();
if (obj instanceof NodeRailing)
{
}
}
}
}
@Override
protected GridRailing newGrid()
{
return new GridRailing(getClass());
return new GridRailing(this, getClass());
}
@Override
@ -91,13 +143,7 @@ public class NodeRailing extends Node<PartRailing, GridRailing, IItemRailing> im
@Override
public VectorWorld getWorldPos()
{
return parent.getWorldPos();
}
@Override
public Map<IItemRailing, ForgeDirection> getConnectionMap()
{
return this.getConnections();
return (VectorWorld) parent.getWorldPos();
}
@Override
@ -117,7 +163,7 @@ public class NodeRailing extends Node<PartRailing, GridRailing, IItemRailing> im
@Override
public boolean isLeaf()
{
return parent.getConnections().length < 2;
return connectionMap < 2;
}

3
electrical/src/main/scala/resonantinduction/electrical/itemrailing/PartRailing.java
View file

@ -10,6 +10,7 @@ import net.minecraftforge.common.ForgeDirection;
import resonantinduction.core.prefab.part.PartFramedConnection;
import resonantinduction.electrical.Electrical;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailing;
import resonantinduction.electrical.itemrailing.interfaces.IItemRailingProvider;
import universalelectricity.api.energy.EnergyNetworkLoader;
import universalelectricity.api.energy.IConductor;
import universalelectricity.api.energy.IEnergyNetwork;
@ -21,7 +22,7 @@ import java.lang.reflect.Constructor;
* @since 16/03/14
* @author tgame14
*/
public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, IConductor, IEnergyNetwork> implements IConductor, INodeProvider
public class PartRailing extends PartFramedConnection<PartRailing.EnumRailing, IConductor, IEnergyNetwork> implements IConductor, IItemRailingProvider
{
public static enum EnumRailing

17
electrical/src/main/scala/resonantinduction/electrical/itemrailing/RenderRailing.java Normal file
View file

@ -0,0 +1,17 @@
package resonantinduction.electrical.itemrailing;
import calclavia.lib.render.item.ISimpleItemRenderer;
import net.minecraft.item.ItemStack;
/**
* @author tgame14
* @since 20/04/14
*/
public class RenderRailing implements ISimpleItemRenderer
{
@Override
public void renderInventoryItem(ItemStack itemStack)
{
}
}

2
electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailing.java
View file

@ -26,8 +26,6 @@ public interface IItemRailing extends INode
public VectorWorld getWorldPos();
public Map<IItemRailing, ForgeDirection> getConnectionMap();
public IInventory[] getInventoriesNearby();
public boolean isLeaf();

14
electrical/src/main/scala/resonantinduction/electrical/itemrailing/interfaces/IItemRailingProvider.java Normal file
View file

@ -0,0 +1,14 @@
package resonantinduction.electrical.itemrailing.interfaces;
import calclavia.lib.grid.INodeProvider;
import universalelectricity.api.vector.IVectorWorld;
import universalelectricity.api.vector.VectorWorld;
/**
* @author tgame14
* @since 20/04/14
*/
public interface IItemRailingProvider extends INodeProvider
{
public IVectorWorld getWorldPos();
}