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

Merge branch 'master' into development

Browse source 
* master:
  Use apache library
This commit is contained in:
aidancbrady 2016-01-19 14:41:13 -05:00
commit dc7f5cfc9b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
View file

@ -24,7 +24,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import com.mojang.realmsclient.util.Pair; import org.apache.commons.lang3.tuple.Pair;
public final class TransporterPathfinder public final class TransporterPathfinder
{ {

6
src/main/java/mekanism/common/content/transporter/TransporterStack.java
View file

@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import com.mojang.realmsclient.util.Pair; import org.apache.commons.lang3.tuple.Pair;
public class TransporterStack public class TransporterStack
{ {
@ -220,12 +220,12 @@ public class TransporterStack
return false; return false;
} }
if(newPath.second() == Path.HOME) if(newPath.getRight() == Path.HOME)
{ {
idleDir = ForgeDirection.UNKNOWN; idleDir = ForgeDirection.UNKNOWN;
} }
setPath(newPath.first(), newPath.second()); setPath(newPath.getLeft(), newPath.getRight());
originalLocation = transporter.coord(); originalLocation = transporter.coord();
initiatedPath = true; initiatedPath = true;