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

Merge branch 'development' into v9

Browse source 
* development:
  Fixed Metallurgic Infuser slots, added new helper UpdateProtocol methods
This commit is contained in:
aidancbrady 2016-01-17 13:59:50 -05:00
commit 66cc62a600
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java
View file

@ -75,7 +75,7 @@ public class ContainerMetallurgicInfuser extends Container
{
if(InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type))
{
if(!mergeItemStack(slotStack, 1, 2, false))
if(!mergeItemStack(slotStack, 0, 1, false))
{
return null;
}
@ -89,7 +89,7 @@ public class ContainerMetallurgicInfuser extends Container
}
else if(isInputItem(slotStack))
{
if(!mergeItemStack(slotStack, 2, 3, false))
if(!mergeItemStack(slotStack, 1, 2, false))
{
return null;
}

13
src/main/java/mekanism/common/multiblock/UpdateProtocol.java
View file

@ -200,13 +200,17 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin))
{
structureFound = structure;
return;
if(isInteriorValid(structure))
{
structureFound = structure;
return;
}
}
}
}
}
innerNodes.clear();
iteratedNodes.add(tile);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
@ -222,6 +226,11 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
}
}
}
public boolean isInteriorValid(T structure)
{
return true;
}
public ForgeDirection getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax)
{