tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

A few fixes

Browse source
This commit is contained in:
Aidan C. Brady 2013-12-27 12:44:08 -05:00
parent e4521c0841
commit 2241e7e7b9
7 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/client/ClientTickHandler.java
View file

@ -114,7 +114,7 @@ public class ClientTickHandler implements ITickHandler
}
}
if(mc.theWorld != null)
if(mc.theWorld != null && !Mekanism.proxy.isPaused())
{
if((!initHoliday || MekanismClient.ticksPassed % 1200 == 0) && mc.thePlayer != null)
{

7
common/mekanism/client/gui/GuiDigitalMiner.java
View file

@ -326,6 +326,7 @@ public class GuiDigitalMiner extends GuiMekanism
if(stack.itemID != Block.bedrock.blockID)
{
toUse = stack.copy();
toUse.stackSize = 1;
}
}
}
@ -334,7 +335,7 @@ public class GuiDigitalMiner extends GuiMekanism
doNull = true;
}
if(stack != null || doNull)
if(toUse != null || doNull)
{
ArrayList data = new ArrayList();
data.add(2);
@ -342,8 +343,8 @@ public class GuiDigitalMiner extends GuiMekanism
if(stack != null)
{
data.add(false);
data.add(stack.itemID);
data.add(stack.getItemDamage());
data.add(toUse.itemID);
data.add(toUse.getItemDamage());
}
else {
data.add(true);

2
common/mekanism/common/ILogisticalTransporter.java
View file

@ -27,5 +27,5 @@ public interface ILogisticalTransporter extends IBlockableConnection
public boolean canReceiveFrom(TileEntity tileEntity, ForgeDirection side);
public int getPriority();
public int getCost();
}

2
common/mekanism/common/multipart/PartLogisticalTransporter.java
View file

@ -788,7 +788,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti
}
@Override
public int getPriority()
public int getCost()
{
return 1;
}

2
common/mekanism/common/multipart/PartRestrictiveTransporter.java
View file

@ -29,7 +29,7 @@ public class PartRestrictiveTransporter extends PartLogisticalTransporter
}
@Override
public int getPriority()
public int getCost()
{
return 1000;
}

2
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
View file

@ -604,7 +604,7 @@ public class TileEntityLogisticalTransporter extends TileEntity implements ITile
}
@Override
public int getPriority()
public int getCost()
{
return 1;
}

4
common/mekanism/common/transporter/TransporterPathfinder.java
View file

@ -48,7 +48,7 @@ public final class TransporterPathfinder
currentPath.add(pointer);
dist += ((ILogisticalTransporter)pointer.getTileEntity(worldObj)).getPriority();
dist += ((ILogisticalTransporter)pointer.getTileEntity(worldObj)).getCost();
boolean found = false;
@ -421,7 +421,7 @@ public final class TransporterPathfinder
TileEntity tile = neighbor.getTileEntity(worldObj);
double tentativeG = gScore.get(currentNode) + currentNode.distanceTo(neighbor);
tentativeG += ((ILogisticalTransporter)tile).getPriority();
tentativeG += ((ILogisticalTransporter)tile).getCost();
if(closedSet.contains(neighbor))
{