Fixed a casting issue and Microblock trait reference to class path
This commit is contained in:
parent
8341033ade
commit
7918802c66
2 changed files with 10 additions and 7 deletions
|
@ -19,7 +19,7 @@ public class MultipartMechanical implements IPartFactory
|
|||
MultiPartRegistry.registerParts(this, PART_TYPES);
|
||||
MultipartGenerator.registerPassThroughInterface("resonantinduction.core.grid.fluid.IPressureNodeProvider");
|
||||
// TODO: Move to UE
|
||||
MultipartGenerator.registerTrait("calclavia.lib.grid.INodeProvider", "resonantinduction.core.grid.TraitNodeProvider");
|
||||
MultipartGenerator.registerTrait("resonant.lib.grid.INodeProvider", "resonantinduction.core.grid.TraitNodeProvider");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -49,17 +49,20 @@ public class GearShaftNode extends MechanicalNode
|
|||
dirs.add(shaft().placementSide.getOpposite());
|
||||
/** Check for internal connections, the FRONT and BACK. */
|
||||
Iterator<ForgeDirection> it = dirs.iterator();
|
||||
while(it.hasNext())
|
||||
while (it.hasNext())
|
||||
{
|
||||
ForgeDirection checkDir = it.next();
|
||||
if (checkDir == shaft().placementSide || checkDir == shaft().placementSide.getOpposite())
|
||||
{
|
||||
MechanicalNode instance = ((INodeProvider) shaft().tile()).getNode(MechanicalNode.class, checkDir);
|
||||
|
||||
if (instance != null && instance != this && instance.canConnect(checkDir.getOpposite(), this))
|
||||
if (shaft().tile() instanceof INodeProvider)
|
||||
{
|
||||
connections.put(instance, checkDir);
|
||||
it.remove();
|
||||
MechanicalNode instance = ((INodeProvider) shaft().tile()).getNode(MechanicalNode.class, checkDir);
|
||||
|
||||
if (instance != null && instance != this && instance.canConnect(checkDir.getOpposite(), this))
|
||||
{
|
||||
connections.put(instance, checkDir);
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue