Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1
This commit is contained in:
@@ -664,13 +664,20 @@ public class Registration
|
|||||||
|
|
||||||
private void registerSpatial(boolean force)
|
private void registerSpatial(boolean force)
|
||||||
{
|
{
|
||||||
|
if ( ! AEConfig.instance.isFeatureEnabled( AEFeature.SpatialIO ) )
|
||||||
|
return;
|
||||||
|
|
||||||
AEConfig config = AEConfig.instance;
|
AEConfig config = AEConfig.instance;
|
||||||
|
|
||||||
if ( storageBiome == null )
|
if ( storageBiome == null )
|
||||||
{
|
{
|
||||||
if ( force && config.storageBiomeID == -1 )
|
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();
|
config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -379,8 +379,12 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
|
|||||||
src.injectItems( failed, Actionable.MODULATE, mySrc );
|
src.injectItems( failed, Actionable.MODULATE, mySrc );
|
||||||
}
|
}
|
||||||
|
|
||||||
itemsToMove -= possible;
|
if ( possible > 0 )
|
||||||
didStuff = true;
|
{
|
||||||
|
itemsToMove -= possible;
|
||||||
|
didStuff = true;
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user