From 6084ac4e809e42203ad8644e5eb634d8c406ed9a Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 17 Jun 2014 16:45:26 -0500 Subject: [PATCH 1/2] Fix Failed Insert Loop in IO Port. --- tile/storage/TileIOPort.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tile/storage/TileIOPort.java b/tile/storage/TileIOPort.java index 832bdefe7..4d160af54 100644 --- a/tile/storage/TileIOPort.java +++ b/tile/storage/TileIOPort.java @@ -379,8 +379,12 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC src.injectItems( failed, Actionable.MODULATE, mySrc ); } - itemsToMove -= possible; - didStuff = true; + if ( possible > 0 ) + { + itemsToMove -= possible; + didStuff = true; + } + break; } } From d7ca8e519a8b421987a279bfbc4ca63ab639d9cd Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 17 Jun 2014 16:46:01 -0500 Subject: [PATCH 2/2] Improve No Biomes crash, and don't register Spatial if spatial is disabled. --- core/Registration.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/Registration.java b/core/Registration.java index 2b0d42396..48c7951ad 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -637,13 +637,20 @@ public class Registration private void registerSpatial(boolean force) { + if ( ! AEConfig.instance.isFeatureEnabled( AEFeature.SpatialIO ) ) + return; + AEConfig config = AEConfig.instance; if ( storageBiome == null ) { if ( force && config.storageBiomeID == -1 ) { - storageBiome = new BiomeGenStorage( config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() ) ); + config.storageBiomeID = Platform.findEmpty( BiomeGenBase.getBiomeGenArray() ); + if ( config.storageBiomeID == -1 ) + throw new RuntimeException("Biome Array is full, please free up some Biome ID's or disable spatial."); + + storageBiome = new BiomeGenStorage( config.storageBiomeID ); config.save(); }