Fixes, filters technically work now!
This commit is contained in:
parent
9b378f1fff
commit
0bab44a522
4 changed files with 18 additions and 16 deletions
|
@ -267,6 +267,12 @@ public class GuiOreDictFilter extends GuiMekanism
|
||||||
{
|
{
|
||||||
filter.color = TransporterUtils.increment(filter.color);
|
filter.color = TransporterUtils.increment(filter.color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(xAxis >= 131 && xAxis <= 143 && yAxis >= 48 && yAxis <= 60)
|
||||||
|
{
|
||||||
|
mc.sndManager.playSoundFX("random.click", 1.0F, 1.0F);
|
||||||
|
setOreDictKey();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ public class RenderLogisticalTransporter extends TileEntitySpecialRenderer
|
||||||
MekanismRenderer.glowOn();
|
MekanismRenderer.glowOn();
|
||||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||||
GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F);
|
GL11.glColor4f(stack.color.getColor(0), stack.color.getColor(1), stack.color.getColor(2), 1.0F);
|
||||||
GL11.glTranslatef((float)(x + 0.5 + offset.xCoord*progress), (float)(y + 0.5 + offset.yCoord*progress - entityItem.yOffset - itemFix), (float)(z + 0.5 + offset.zCoord*progress));
|
GL11.glTranslatef((float)(x + 0.5 + offset.xCoord*progress), (float)(y + 0.5 + offset.yCoord*progress - entityItem.yOffset - 0.1F), (float)(z + 0.5 + offset.zCoord*progress));
|
||||||
modelBox.render(0.0625F);
|
modelBox.render(0.0625F);
|
||||||
MekanismRenderer.glowOff();
|
MekanismRenderer.glowOff();
|
||||||
GL11.glPopMatrix();
|
GL11.glPopMatrix();
|
||||||
|
|
|
@ -19,8 +19,6 @@ public class PacketNewFilter implements IMekanismPacket
|
||||||
{
|
{
|
||||||
public Object3D object3D;
|
public Object3D object3D;
|
||||||
|
|
||||||
public int type;
|
|
||||||
|
|
||||||
public TransporterFilter filter;
|
public TransporterFilter filter;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -47,8 +45,6 @@ public class PacketNewFilter implements IMekanismPacket
|
||||||
|
|
||||||
int id = dataStream.readInt();
|
int id = dataStream.readInt();
|
||||||
|
|
||||||
int type = dataStream.readInt();
|
|
||||||
|
|
||||||
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(id);
|
World worldServer = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(id);
|
||||||
|
|
||||||
if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof TileEntityLogisticalSorter)
|
if(worldServer != null && worldServer.getBlockTileEntity(x, y, z) instanceof TileEntityLogisticalSorter)
|
||||||
|
|
|
@ -71,19 +71,19 @@ public class TileEntityLogisticalSorter extends TileEntityElectricBlock implemen
|
||||||
|
|
||||||
SlotInfo inInventory = TransporterUtils.takeItem(inventory, facing);
|
SlotInfo inInventory = TransporterUtils.takeItem(inventory, facing);
|
||||||
|
|
||||||
EnumColor color = null;
|
|
||||||
|
|
||||||
for(TransporterFilter filter : filters)
|
|
||||||
{
|
|
||||||
if(filter.canFilter(inInventory.itemStack))
|
|
||||||
{
|
|
||||||
color = filter.color;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(inInventory != null && inInventory.itemStack != null)
|
if(inInventory != null && inInventory.itemStack != null)
|
||||||
{
|
{
|
||||||
|
EnumColor color = null;
|
||||||
|
|
||||||
|
for(TransporterFilter filter : filters)
|
||||||
|
{
|
||||||
|
if(filter.canFilter(inInventory.itemStack))
|
||||||
|
{
|
||||||
|
color = filter.color;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(TransporterUtils.insert(this, transporter, inInventory.itemStack, color))
|
if(TransporterUtils.insert(this, transporter, inInventory.itemStack, color))
|
||||||
{
|
{
|
||||||
inventory.setInventorySlotContents(inInventory.slotID, null);
|
inventory.setInventorySlotContents(inInventory.slotID, null);
|
||||||
|
|
Loading…
Reference in a new issue