Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Don't break the API!

Browse source
This commit is contained in:
Ellpeck 2016-09-01 18:08:15 +02:00
parent 0e4967ea70
commit a4ac7ccb81
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/api/laser/ConnectionPair.java
View file

@ -78,7 +78,9 @@ public class ConnectionPair{
compound.setInteger("y"+i, relay.getY());
compound.setInteger("z"+i, relay.getZ());
}
compound.setString("Type", this.type.name());
if(this.type != null){
compound.setString("Type", this.type.name());
}
compound.setBoolean("SuppressRender", this.suppressConnectionRender);
return compound;
}

6
src/main/java/de/ellpeck/actuallyadditions/api/laser/ILaserRelayConnectionHandler.java
View file

@ -30,6 +30,12 @@ public interface ILaserRelayConnectionHandler{
Network getNetworkFor(BlockPos relay, World world);
@Deprecated
boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, World world);
@Deprecated
boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, World world, boolean suppressConnectionRender);
boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, LaserType type, World world);
boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, LaserType type, World world, boolean suppressConnectionRender);

4
src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java
View file

@ -164,7 +164,9 @@ public class CommonEvents{
if(!fixed){
for(int i = 0; i < pair.positions.length; i++){
ActuallyAdditionsAPI.connectionHandler.removeRelayFromNetwork(pair.positions[i], event.getWorld());
if(ActuallyAdditionsAPI.connectionHandler.getNetworkFor(pair.positions[i], event.getWorld()) != null){
ActuallyAdditionsAPI.connectionHandler.removeRelayFromNetwork(pair.positions[i], event.getWorld());
}
}
ModUtil.LOGGER.error("Had to remove a Laser Relay connection between "+pair.positions[0]+" and "+pair.positions[1]+" because it couldn't be adapted to the new system!");
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java
View file

@ -91,6 +91,16 @@ public final class LaserRelayConnectionHandler implements ILaserRelayConnectionH
return null;
}
@Override
public boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, World world){
return this.addConnection(firstRelay, secondRelay, null, world);
}
@Override
public boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, World world, boolean suppressConnectionRender){
return this.addConnection(firstRelay, secondRelay, null, world, suppressConnectionRender);
}
@Override
public boolean addConnection(BlockPos firstRelay, BlockPos secondRelay, LaserType type, World world){
return this.addConnection(firstRelay, secondRelay, type, world, false);