Removed more rail junk and TileSorter
This commit is contained in:
Robert S
parent
255a566a7c
commit
d110776a6e
|
|
@ -36,7 +36,6 @@ import resonantinduction.mechanical.logistic.belt.BlockDetector;
|
|||
import resonantinduction.mechanical.logistic.belt.BlockManipulator;
|
||||
import resonantinduction.mechanical.logistic.belt.TileDetector;
|
||||
import resonantinduction.mechanical.logistic.belt.TileManipulator;
|
||||
import resonantinduction.mechanical.logistic.belt.TileSorter;
|
||||
import resonantinduction.mechanical.process.crusher.TileMechanicalPiston;
|
||||
import resonantinduction.mechanical.process.edit.TileBreaker;
|
||||
import resonantinduction.mechanical.process.edit.TilePlacer;
|
||||
|
|
@ -88,9 +87,7 @@ public class Mechanical
|
|||
public static Block blockConveyorBelt;
|
||||
public static Block blockManipulator;
|
||||
public static Block blockDetector;
|
||||
// public static Block blockRejector;
|
||||
public static Block blockSorter;
|
||||
|
||||
|
||||
// Fluids
|
||||
public static Block blockReleaseValve;
|
||||
public static Block blockPump;
|
||||
|
|
@ -125,7 +122,6 @@ public class Mechanical
|
|||
blockManipulator = contentRegistry.createTile(BlockManipulator.class, TileManipulator.class);
|
||||
blockDetector = contentRegistry.createTile(BlockDetector.class, TileDetector.class);
|
||||
// blockRejector = contentRegistry.createTile(BlockRejector.class, TileRejector.class);
|
||||
blockSorter = contentRegistry.newBlock(TileSorter.class);
|
||||
|
||||
blockPump = contentRegistry.newBlock(TilePump.class);
|
||||
|
||||
|
|
@ -147,7 +143,6 @@ public class Mechanical
|
|||
|
||||
PacketAnnotation.register(TileWindTurbine.class);
|
||||
PacketAnnotation.register(TileWaterTurbine.class);
|
||||
PacketAnnotation.register(TileSorter.class);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
|
@ -171,7 +166,6 @@ public class Mechanical
|
|||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockConveyorBelt, 4), "III", "GGG", 'I', Item.ingotIron, 'G', itemGear));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(blockManipulator, "SSS", "SRS", "SCS", 'S', Item.ingotIron, 'C', blockConveyorBelt, 'R', Block.blockRedstone));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(blockDetector, "SWS", "SRS", "SWS", 'S', Item.ingotIron, 'W', UniversalRecipe.WIRE.get()));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(blockSorter, "SSS", "SPS", "SRS", 'P', Block.pistonStickyBase, 'S', Item.ingotIron, 'R', Block.blockRedstone));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWindTurbine, 1, 0), "CWC", "WGW", "CWC", 'G', itemGear, 'C', Block.cloth, 'W', Item.stick));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockWindTurbine, 1, 1), "CWC", "WGW", "CWC", 'G', new ItemStack(blockWindTurbine, 1, 0), 'C', Block.stone, 'W', Item.stick));
|
||||
|
|
|
|||
|
|
@ -1,276 +0,0 @@
|
|||
package resonantinduction.mechanical.logistic.belt;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.model.AdvancedModelLoader;
|
||||
import net.minecraftforge.client.model.IModelCustom;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import resonant.lib.content.module.TileRender;
|
||||
import resonant.lib.content.module.prefab.TileInventory;
|
||||
import resonant.lib.network.Synced.SyncedInput;
|
||||
import resonant.lib.network.Synced.SyncedOutput;
|
||||
import resonant.lib.prefab.vector.Cuboid;
|
||||
import resonant.lib.render.RenderUtility;
|
||||
import resonant.lib.utility.inventory.InventoryUtility;
|
||||
import resonantinduction.core.Reference;
|
||||
import resonantinduction.core.prefab.imprint.ItemImprint;
|
||||
import universalelectricity.api.UniversalElectricity;
|
||||
import universalelectricity.api.vector.Vector3;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class TileSorter extends TileInventory
|
||||
{
|
||||
private boolean isInverted = false;
|
||||
|
||||
public TileSorter()
|
||||
{
|
||||
super(UniversalElectricity.machine);
|
||||
textureName = "material_metal_side";
|
||||
maxSlots = 12;
|
||||
normalRender = false;
|
||||
isOpaqueCube = false;
|
||||
bounds = Cuboid.full().expand(-0.01);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean use(EntityPlayer player, int side, Vector3 vector3)
|
||||
{
|
||||
return interactCurrentItem(side, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean configure(EntityPlayer player, int side, Vector3 vector3)
|
||||
{
|
||||
isInverted = !isInverted;
|
||||
|
||||
if (world().isRemote)
|
||||
{
|
||||
player.addChatMessage("Sorter filter inversion: " + !isInverted);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int slot, ItemStack stack)
|
||||
{
|
||||
if (slot < 6)
|
||||
return stack.getItem() instanceof ItemImprint;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canStore(ItemStack stack, int slot, ForgeDirection side)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void collide(Entity entity)
|
||||
{
|
||||
if (!world().isRemote)
|
||||
{
|
||||
if (entity instanceof EntityItem)
|
||||
{
|
||||
EntityItem entityItem = (EntityItem) entity;
|
||||
sortItem(entityItem.getEntityItem());
|
||||
entityItem.setDead();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int i)
|
||||
{
|
||||
if (i < 6)
|
||||
return this.getInventory().getStackInSlot(i);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int i, ItemStack itemStack)
|
||||
{
|
||||
if (i >= 6)
|
||||
{
|
||||
if (itemStack != null)
|
||||
sortItem(itemStack);
|
||||
return;
|
||||
}
|
||||
|
||||
super.setInventorySlotContents(i, itemStack);
|
||||
}
|
||||
|
||||
public void sortItem(ItemStack sortStack)
|
||||
{
|
||||
List<ForgeDirection> possibleDirections = new ArrayList<ForgeDirection>();
|
||||
|
||||
/**
|
||||
* Move item to position where a filter allows it.
|
||||
*/
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
ItemStack stack = getStackInSlot(i);
|
||||
|
||||
if (!isInverted == ItemImprint.isFiltering(stack, sortStack))
|
||||
{
|
||||
ForgeDirection dir = ForgeDirection.getOrientation(i);
|
||||
|
||||
int blockID = position().translate(dir).getBlockID(world());
|
||||
Block block = Block.blocksList[blockID];
|
||||
|
||||
if (block == null || !Block.isNormalCube(blockID))
|
||||
{
|
||||
possibleDirections.add(dir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (possibleDirections.size() == 0)
|
||||
{
|
||||
List<ForgeDirection> inventoryDirections = new ArrayList<ForgeDirection>();
|
||||
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
ForgeDirection dir = ForgeDirection.getOrientation(i);
|
||||
|
||||
int blockID = position().translate(dir).getBlockID(world());
|
||||
Block block = Block.blocksList[blockID];
|
||||
|
||||
if (block == null || !Block.isNormalCube(blockID))
|
||||
{
|
||||
possibleDirections.add(dir);
|
||||
}
|
||||
|
||||
if (position().translate(dir).getTileEntity(world()) instanceof IInventory)
|
||||
{
|
||||
inventoryDirections.add(dir);
|
||||
}
|
||||
}
|
||||
|
||||
if (inventoryDirections.size() > 0)
|
||||
possibleDirections = inventoryDirections;
|
||||
}
|
||||
|
||||
int size = possibleDirections.size();
|
||||
|
||||
ForgeDirection dir = possibleDirections.get(size > 1 ? world().rand.nextInt(size - 1) : 0);
|
||||
|
||||
Vector3 spawn = center().translate(dir, 1);
|
||||
|
||||
TileEntity tile = spawn.getTileEntity(world());
|
||||
ItemStack remain = sortStack;
|
||||
|
||||
if (tile instanceof IInventory)
|
||||
remain = InventoryUtility.putStackInInventory((IInventory) tile, remain, dir.ordinal(), false);
|
||||
|
||||
if (remain != null)
|
||||
{
|
||||
if (!world().isRemote)
|
||||
InventoryUtility.dropItemStack(world(), spawn, remain, 20, 0);
|
||||
|
||||
remain = null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getAccessibleSlotsFromSide(int side)
|
||||
{
|
||||
return new int[] { side + 6 };
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cuboid getSelectBounds()
|
||||
{
|
||||
return Cuboid.full();
|
||||
}
|
||||
|
||||
@SyncedInput
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.readFromNBT(nbt);
|
||||
nbt.getBoolean("isInverted");
|
||||
}
|
||||
|
||||
@SyncedOutput
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbt)
|
||||
{
|
||||
super.writeToNBT(nbt);
|
||||
nbt.setBoolean("isInverted", isInverted);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
protected TileRender newRenderer()
|
||||
{
|
||||
return new TileRender()
|
||||
{
|
||||
final IModelCustom MODEL = AdvancedModelLoader.loadModel(Reference.MODEL_DIRECTORY + "sorter.tcn");
|
||||
final ResourceLocation TEXTURE = new ResourceLocation(Reference.DOMAIN, Reference.MODEL_PATH + "sorter.png");
|
||||
|
||||
@Override
|
||||
public boolean renderStatic(RenderBlocks renderer, Vector3 position)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderDynamic(Vector3 position, boolean isItem, float frame)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
RenderUtility.enableBlending();
|
||||
GL11.glTranslated(position.x + 0.5, position.y + 0.5, position.z + 0.5);
|
||||
RenderUtility.bind(TEXTURE);
|
||||
|
||||
if (!isItem)
|
||||
{
|
||||
for (int i = 0; i < TileSorter.this.getSizeInventory(); i++)
|
||||
{
|
||||
if (TileSorter.this.getStackInSlot(i) != null)
|
||||
{
|
||||
ForgeDirection dir = ForgeDirection.getOrientation(i);
|
||||
GL11.glPushMatrix();
|
||||
|
||||
if (dir.ordinal() == 0)
|
||||
GL11.glRotatef(-90, 0, 0, 1);
|
||||
|
||||
if (dir.ordinal() == 1)
|
||||
GL11.glRotatef(90, 0, 0, 1);
|
||||
|
||||
RenderUtility.rotateBlockBasedOnDirection(dir);
|
||||
if (TileSorter.this.isInverted)
|
||||
MODEL.renderOnly("portRed", "connector");
|
||||
else
|
||||
MODEL.renderOnly("portBlue", "connector");
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MODEL.renderAllExcept("portBlue", "portRed", "connector");
|
||||
|
||||
RenderUtility.disableBlending();
|
||||
GL11.glPopMatrix();
|
||||
return true;
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
package resonantinduction.mechanical.logistic.rail;
|
||||
|
||||
import universalelectricity.api.net.IConnector;
|
||||
import universalelectricity.api.net.INodeNetwork;
|
||||
|
||||
public interface IRailing extends IConnector<INodeNetwork>
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
package resonantinduction.mechanical.logistic.rail;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import resonantinduction.core.prefab.part.PartFramedConnection;
|
||||
import resonantinduction.mechanical.fluid.pipe.EnumPipeMaterial;
|
||||
import universalelectricity.api.net.INodeNetwork;
|
||||
import codechicken.microblock.IHollowConnect;
|
||||
import codechicken.multipart.JNormalOcclusion;
|
||||
import codechicken.multipart.TSlottedPart;
|
||||
|
||||
/**
|
||||
* NO-OP
|
||||
*
|
||||
* @author Calclavia
|
||||
*
|
||||
*/
|
||||
public class PartRailing extends PartFramedConnection<EnumPipeMaterial, IRailing, INodeNetwork> implements IRailing, TSlottedPart, JNormalOcclusion, IHollowConnect
|
||||
{
|
||||
public PartRailing()
|
||||
{
|
||||
super(null);
|
||||
}
|
||||
|
||||
RedstoneControl control;
|
||||
|
||||
@Override
|
||||
protected boolean canConnectTo(TileEntity tile, ForgeDirection dir)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected PartRailing getConnector(TileEntity tile)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMaterial(int i)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemStack getItem()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public INodeNetwork getNetwork()
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
package resonantinduction.mechanical.logistic.rail;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class RedstoneControl
|
||||
{
|
||||
private TileEntity tile;
|
||||
|
||||
/**
|
||||
* Settings
|
||||
* 0 - Ignore Redstone
|
||||
* 1 - Redstone Pulse
|
||||
* 2 - Redstone Constant
|
||||
*/
|
||||
private byte input;
|
||||
private byte output;
|
||||
|
||||
boolean pulse = false;
|
||||
boolean isOutputting = false;
|
||||
|
||||
public RedstoneControl(TileEntity tile)
|
||||
{
|
||||
this.tile = tile;
|
||||
}
|
||||
|
||||
public void update()
|
||||
{
|
||||
if (pulse)
|
||||
pulse = false;
|
||||
|
||||
if (isRedstonePowered())
|
||||
pulse = true;
|
||||
|
||||
if (isOutputting && output == 1)
|
||||
isOutputting = false;
|
||||
}
|
||||
|
||||
public void setOutput(boolean isOutputting)
|
||||
{
|
||||
if (output > 0)
|
||||
this.isOutputting = isOutputting;
|
||||
}
|
||||
|
||||
public boolean isRedstonePowered()
|
||||
{
|
||||
return tile.worldObj.isBlockIndirectlyGettingPowered(tile.xCoord, tile.yCoord, tile.zCoord);
|
||||
}
|
||||
|
||||
public boolean isActive()
|
||||
{
|
||||
return pulse;
|
||||
}
|
||||
|
||||
public int getOutput()
|
||||
{
|
||||
return isOutputting ? 15 : 0;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue