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

slight package change

Browse source
This commit is contained in:
DarkGuardsman 2013-07-05 19:52:51 -04:00
parent f9f985b468
commit 0621433663
26 changed files with 26 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/assemblyline/client/ClientProxy.java
View file

@ -21,8 +21,8 @@ import assemblyline.client.render.RenderManipulator;
import assemblyline.client.render.RenderRejector;
import assemblyline.common.CommonProxy;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.TileEntityImprinter;
import assemblyline.common.machine.TileEntityCrate;
import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;

2
src/minecraft/assemblyline/client/render/RenderCrate.java
View file

@ -18,7 +18,7 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.TileEntityCrate;
public class RenderCrate extends TileEntitySpecialRenderer
{

8
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -21,15 +21,15 @@ import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.armbot.BlockArmbot;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.armbot.command.GrabDictionary;
import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.BlockTurntable;
import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.BlockImprinter;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.imprinter.TileEntityImprinter;
import assemblyline.common.machine.BlockCrate;
import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.BlockRejector;
import assemblyline.common.machine.BlockTurntable;
import assemblyline.common.machine.ItemBlockCrate;
import assemblyline.common.machine.TileEntityCrate;
import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.belt.BlockConveyorBelt;

2
src/minecraft/assemblyline/common/CommonProxy.java
View file

@ -13,9 +13,9 @@ import net.minecraft.world.World;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.multiblock.TileEntityMulti;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.ContainerImprinter;
import assemblyline.common.imprinter.TileEntityImprinter;
import assemblyline.common.machine.TileEntityCrate;
import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;

2
src/minecraft/assemblyline/common/armbot/BlockArmbot.java
View file

@ -11,7 +11,7 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.multiblock.IMultiBlock;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java
View file

@ -33,7 +33,7 @@ import assemblyline.common.armbot.command.CommandReturn;
import assemblyline.common.armbot.command.CommandRotateBy;
import assemblyline.common.armbot.command.CommandRotateTo;
import assemblyline.common.armbot.command.CommandUse;
import assemblyline.common.block.TileEntityAssembly;
import assemblyline.common.machine.TileEntityAssembly;
import assemblyline.common.machine.encoder.ItemDisk;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;

2
src/minecraft/assemblyline/common/imprinter/BlockImprinter.java
View file

@ -15,7 +15,7 @@ import net.minecraft.world.World;
import assemblyline.common.AssemblyLine;
import assemblyline.common.CommonProxy;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/imprinter/prefab/BlockImprintable.java
View file

@ -11,8 +11,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import universalelectricity.prefab.implement.IRedstoneReceptor;
import assemblyline.api.IFilterable;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.machine.BlockALMachine;
/**
* Extend this block class if a filter is allowed to be placed inside of this block.

2
src/minecraft/assemblyline/common/imprinter/prefab/TileEntityFilterable.java
View file

@ -19,8 +19,8 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IFilterable;
import assemblyline.common.AssemblyLine;
import assemblyline.common.block.TileEntityAssembly;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.machine.TileEntityAssembly;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/assemblyline/common/block/BlockALMachine.java → src/minecraft/assemblyline/common/machine/BlockALMachine.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;

3
src/minecraft/assemblyline/common/block/BlockCrate.java → src/minecraft/assemblyline/common/machine/BlockCrate.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import java.util.List;
@ -14,7 +14,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import assemblyline.common.AssemblyLine;
import assemblyline.common.PathfinderCrate;
import assemblyline.common.TabAssemblyLine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/block/BlockTurntable.java → src/minecraft/assemblyline/common/machine/BlockTurntable.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import java.util.Random;

2
src/minecraft/assemblyline/common/machine/InvInteractionHelper.java
View file

@ -13,8 +13,6 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.multiblock.TileEntityMulti;
import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.ItemImprinter;
public class InvInteractionHelper

2
src/minecraft/assemblyline/common/block/ItemBlockCrate.java → src/minecraft/assemblyline/common/machine/ItemBlockCrate.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import java.util.List;

1
src/minecraft/assemblyline/common/machine/NetworkAssembly.java
View file

@ -5,7 +5,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Set;
import assemblyline.common.block.TileEntityAssembly;
import universalelectricity.core.block.IConductor;
import universalelectricity.core.block.IConnectionProvider;

3
src/minecraft/assemblyline/common/PathfinderCrate.java → src/minecraft/assemblyline/common/machine/PathfinderCrate.java
View file

@ -1,4 +1,4 @@
package assemblyline.common;
package assemblyline.common.machine;
import java.util.ArrayList;
import java.util.List;
@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.core.vector.VectorHelper;
import assemblyline.common.block.TileEntityCrate;
/**
* A class that allows flexible path finding in Minecraft Blocks. Back Ported from UE 1.3.0.

71
src/minecraft/assemblyline/common/machine/PowerPathFinder.java
View file

@ -1,71 +0,0 @@
package assemblyline.common.machine;
import java.util.HashSet;
import java.util.Set;
import assemblyline.common.block.TileEntityAssembly;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.path.IPathCallBack;
import universalelectricity.core.path.Pathfinder;
import universalelectricity.core.vector.Vector3;
public class PowerPathFinder extends Pathfinder
{
public PowerPathFinder(final World world, final Vector3 start, final Vector3 goal, final int distance)
{
super(new pathCallBack(world, start, goal, distance));
}
public static class pathCallBack implements IPathCallBack
{
World world;
Vector3 start, end;
int distance;
public pathCallBack(final World world, final Vector3 start, final Vector3 end, int distance)
{
this.world = world;
this.start = start;
this.end = end;
this.distance = distance;
}
@Override
public Set<Vector3> getConnectedNodes(Pathfinder finder, Vector3 currentNode)
{
Set<Vector3> neighbors = new HashSet<Vector3>();
//TODO change this to get the connected tiles from the tile itself so to allow for non-forge direction connections
for (int i = 0; i < 6; i++)
{
ForgeDirection direction = ForgeDirection.getOrientation(i);
Vector3 position = currentNode.clone().modifyPositionFromSide(direction);
TileEntity connectedBlock = position.getTileEntity(world);
if (connectedBlock instanceof TileEntityAssembly && position.distanceTo(start) <= distance)
{
if (((TileEntityAssembly) connectedBlock).canTileConnect(connectedBlock, direction.getOpposite()))
{
neighbors.add(position);
}
}
}
return neighbors;
}
@Override
public boolean onSearch(Pathfinder finder, Vector3 node)
{
if (node.equals(this.end))
{
finder.results.add(node);
return true;
}
return false;
}
}
}

3
src/minecraft/assemblyline/common/block/TileEntityAssembly.java → src/minecraft/assemblyline/common/machine/TileEntityAssembly.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@ -17,7 +17,6 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import universalelectricity.prefab.tile.TileEntityElectrical;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.NetworkAssembly;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/assemblyline/common/block/TileEntityCrate.java → src/minecraft/assemblyline/common/machine/TileEntityCrate.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.block;
package assemblyline.common.machine;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;

2
src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
View file

@ -16,7 +16,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import assemblyline.common.machine.belt.TileEntityConveyorBelt.SlantType;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
View file

@ -22,7 +22,7 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IBelt;
import assemblyline.common.AssemblyLine;
import assemblyline.common.block.TileEntityAssembly;
import assemblyline.common.machine.TileEntityAssembly;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/assemblyline/common/machine/crane/BlockCraneController.java
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/crane/BlockCraneFrame.java
View file

@ -8,7 +8,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/crane/TileEntityCraneController.java
View file

@ -7,7 +7,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import assemblyline.api.ICraneStructure;
import assemblyline.common.AssemblyLine;
import assemblyline.common.block.TileEntityAssembly;
import assemblyline.common.machine.TileEntityAssembly;
public class TileEntityCraneController extends TileEntityAssembly implements ICraneStructure
{

2
src/minecraft/assemblyline/common/machine/crane/TileEntityCraneRail.java
View file

@ -2,7 +2,7 @@ package assemblyline.common.machine.crane;
import net.minecraftforge.common.ForgeDirection;
import assemblyline.api.ICraneStructure;
import assemblyline.common.block.TileEntityAssembly;
import assemblyline.common.machine.TileEntityAssembly;
public class TileEntityCraneRail extends TileEntityAssembly implements ICraneStructure
{

2
src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java
View file

@ -10,7 +10,7 @@ import net.minecraft.world.World;
import assemblyline.common.AssemblyLine;
import assemblyline.common.CommonProxy;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.machine.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;