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

Cleanup, fixed a transporter bug

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-24 18:33:13 -04:00
parent 6c70dc100b
commit 0e51852baa
7 changed files with 5 additions and 7 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

@ -204,7 +204,7 @@ public final class TransporterPathfinder
} }
public static List<Destination> getPaths(ILogisticalTransporter start, TransporterStack stack, int min) public static List<Destination> getPaths(ILogisticalTransporter start, TransporterStack stack, int min)
{ {
InventoryNetwork network = start.getTransmitterNetwork(); InventoryNetwork network = start.getTransmitterNetwork();
List<AcceptorData> acceptors = network.calculateAcceptors(stack.itemStack, stack.color); List<AcceptorData> acceptors = network.calculateAcceptors(stack.itemStack, stack.color);
List<Destination> paths = new ArrayList<Destination>(); List<Destination> paths = new ArrayList<Destination>();

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

@ -286,10 +286,9 @@ public class TransporterStack
return false; return false;
} }
TileEntity from = Coord4D.get(tileEntity).getFromSide(side.getOpposite()).getTileEntity(tileEntity.getWorldObj());
ILogisticalTransporter transporter = (ILogisticalTransporter)tileEntity; ILogisticalTransporter transporter = (ILogisticalTransporter)tileEntity;
if(!transporter.canConnectMutual(side.getOpposite())) if(!transporter.canConnectMutual(side))
{ {
return false; return false;
} }

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

@ -407,7 +407,7 @@ public class PartLogisticalTransporter extends PartTransmitter<InventoryNetwork>
stack.originalLocation = original; stack.originalLocation = original;
stack.homeLocation = original; stack.homeLocation = original;
stack.color = color; stack.color = color;
if((force && !canReceiveFrom(original.getTileEntity(world()), from)) || !stack.canInsertToTransporter(tile(), from)) if((force && !canReceiveFrom(original.getTileEntity(world()), from)) || !stack.canInsertToTransporter(tile(), from))
{ {
return itemStack; return itemStack;

1
src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
View file

@ -25,7 +25,6 @@ public class TileEntityAdvancedFactory extends TileEntityFactory
configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {10, 11, 12, 13, 14})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {10, 11, 12, 13, 14}));
configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0}); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
configComponent.addSupported(TransmissionType.GAS);
configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0})); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
configComponent.fillConfig(TransmissionType.GAS, 1); configComponent.fillConfig(TransmissionType.GAS, 1);

2
src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
View file

@ -147,10 +147,12 @@ public abstract class TileEntityChanceMachine<RECIPE extends ChanceMachineRecipe
public RECIPE getRecipe() public RECIPE getRecipe()
{ {
ItemStackInput input = getInput(); ItemStackInput input = getInput();
if(cachedRecipe == null || !input.testEquality(cachedRecipe.getInput())) if(cachedRecipe == null || !input.testEquality(cachedRecipe.getInput()))
{ {
cachedRecipe = RecipeHandler.getChanceRecipe(input, getRecipes()); cachedRecipe = RecipeHandler.getChanceRecipe(input, getRecipes());
} }
return cachedRecipe; return cachedRecipe;
} }

1
src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
View file

@ -25,7 +25,6 @@ public class TileEntityEliteFactory extends TileEntityFactory
configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {12, 13, 14, 15, 16, 17, 18})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {12, 13, 14, 15, 16, 17, 18}));
configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0}); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
configComponent.addSupported(TransmissionType.GAS);
configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0})); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
configComponent.fillConfig(TransmissionType.GAS, 1); configComponent.fillConfig(TransmissionType.GAS, 1);

1
src/main/java/mekanism/common/tile/TileEntityFactory.java
View file

@ -132,7 +132,6 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {8, 9, 10})); configComponent.addOutput(TransmissionType.ITEM, new SideData("Output", EnumColor.DARK_BLUE, new int[] {8, 9, 10}));
configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0}); configComponent.setConfig(TransmissionType.ITEM, new byte[] {4, 3, 0, 2, 1, 0});
configComponent.addSupported(TransmissionType.GAS);
configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY)); configComponent.addOutput(TransmissionType.GAS, new SideData("None", EnumColor.GREY, InventoryUtils.EMPTY));
configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0})); configComponent.addOutput(TransmissionType.GAS, new SideData("Gas", EnumColor.DARK_RED, new int[] {0}));
configComponent.fillConfig(TransmissionType.GAS, 1); configComponent.fillConfig(TransmissionType.GAS, 1);