Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed SGCraft link handling

Browse source
This commit is contained in:
Unknown 2019-02-16 21:23:04 +01:00 committed by unknown
parent c58ecddaee
commit 3145866254
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/cr0s/warpdrive/compat/CompatSGCraft.java
View file

@ -54,7 +54,7 @@ public class CompatSGCraft implements IBlockTransformer {
reason.append(Commons.styleWarning, "warpdrive.compat.guide.stargate_is_active", state);
return false;
}
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException exception) {
} catch (final IllegalAccessException | IllegalArgumentException | InvocationTargetException exception) {
exception.printStackTrace();
}
}
@ -82,11 +82,34 @@ public class CompatSGCraft implements IBlockTransformer {
// Link between stargate controller and DHD
if (nbtTileEntity.hasKey("isLinkedToStargate")) {
if ( nbtTileEntity.getBoolean("isLinkedToStargate")
&& nbtTileEntity.hasKey("linkedX") && nbtTileEntity.hasKey("linkedY") && nbtTileEntity.hasKey("linkedZ")) {
final BlockPos targetLink = transformation.apply(nbtTileEntity.getInteger("linkedX"), nbtTileEntity.getInteger("linkedY"), nbtTileEntity.getInteger("linkedZ"));
nbtTileEntity.setInteger("linkedX", targetLink.getX());
nbtTileEntity.setInteger("linkedY", targetLink.getY());
nbtTileEntity.setInteger("linkedZ", targetLink.getZ());
&& nbtTileEntity.hasKey("linkedX") && nbtTileEntity.hasKey("linkedY") && nbtTileEntity.hasKey("linkedZ") ) {
if (transformation.isInside(nbtTileEntity.getInteger("linkedX"), nbtTileEntity.getInteger("linkedY"), nbtTileEntity.getInteger("linkedZ"))) {
final BlockPos targetLink = transformation.apply(nbtTileEntity.getInteger("linkedX"), nbtTileEntity.getInteger("linkedY"), nbtTileEntity.getInteger("linkedZ"));
nbtTileEntity.setInteger("linkedX", targetLink.getX());
nbtTileEntity.setInteger("linkedY", targetLink.getY());
nbtTileEntity.setInteger("linkedZ", targetLink.getZ());
} else {
nbtTileEntity.setBoolean("isLinkedToController", false);
nbtTileEntity.setInteger("linkedX", 0);
nbtTileEntity.setInteger("linkedY", 0);
nbtTileEntity.setInteger("linkedZ", 0);
}
}
}
if (nbtTileEntity.hasKey("isLinkedToController")) {
if ( nbtTileEntity.getBoolean("isLinkedToController")
&& nbtTileEntity.hasKey("linkedX") && nbtTileEntity.hasKey("linkedY") && nbtTileEntity.hasKey("linkedZ") ) {
if (transformation.isInside(nbtTileEntity.getInteger("linkedX"), nbtTileEntity.getInteger("linkedY"), nbtTileEntity.getInteger("linkedZ"))) {
final BlockPos targetLink = transformation.apply(nbtTileEntity.getInteger("linkedX"), nbtTileEntity.getInteger("linkedY"), nbtTileEntity.getInteger("linkedZ"));
nbtTileEntity.setInteger("linkedX", targetLink.getX());
nbtTileEntity.setInteger("linkedY", targetLink.getY());
nbtTileEntity.setInteger("linkedZ", targetLink.getZ());
} else {
nbtTileEntity.setBoolean("isLinkedToController", false);
nbtTileEntity.setInteger("linkedX", 0);
nbtTileEntity.setInteger("linkedY", 0);
nbtTileEntity.setInteger("linkedZ", 0);
}
}
}