Cleanup, fixed a transporter bug
This commit is contained in:
parent
6c70dc100b
commit
0e51852baa
7 changed files with 5 additions and 7 deletions
src/main/java/mekanism/common
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue