Merge pull request #28 from GTNewHorizons/fix/wonky-storage-bus-inver…

…ted-mode

fix wonky storage bus under inverted mode

build.gradle

@@ -34,7 +34,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.11'
     }
 }
 
@@ -745,4 +745,4 @@ def checkPropertyExists(String propertyName) {
 
 def getFile(String relativePath) {
     return new File(projectDir, relativePath)
-}
+}

src/main/java/thaumicenergistics/common/inventory/HandlerEssentiaStorageBusBase.java

@@ -130,7 +130,7 @@ protected boolean canTransferGas( final GaseousEssentia essentiaGas )
 		 * Validate based on if the aspect is filtered and the storage bus is
 		 * inverted. See explanation below.
 		 */
-		return( this.filteredAspects.contains( essentiaGas.getAspect() ) == !this.inverted );
+		return( this.filteredAspects.contains( essentiaGas.getAspect() ) != this.inverted );
 
 		/*
 		 * Truth 'table' ---- Conditions: * isFiltered = true * inverted = false
@@ -339,6 +339,12 @@ public final boolean isPrioritized( final IAEFluidStack fluidStack )
 			return false;
 		}
 
+		if( this.inverted )
+		{
+			// no prioritization under blacklist mode
+			return false;
+		}
+
 		// Is the aspect prioritized?
 		try
 		{

src/main/java/thaumicenergistics/common/inventory/HandlerEssentiaStorageBusContainer.java

@@ -139,7 +139,7 @@ private List<IAspectStack> getContainerEssentia()
 		for( IAspectStack essentiaStack : containerStacks )
 		{
 			// Is the aspect in the filter?
-			if( skipFilterCheck || ( this.filteredAspects.contains( essentiaStack.getAspect() ) ) )
+			if( skipFilterCheck || ( this.filteredAspects.contains( essentiaStack.getAspect() ) != this.inverted ) )
 			{
 				// Convert to fluid
 				GaseousEssentia gas = GaseousEssentia.getGasFromAspect( essentiaStack.getAspect() );
@@ -577,12 +577,12 @@ public boolean validForPass( final int pass )
 			// Is this the priority pass?
 			if( pass == 1 )
 			{
-				// Valid if has filters or container has something in it
-				return( hasFilters || hasStored );
+				// Valid if has whitelist or container has something in it
+				return( ( hasFilters && !this.inverted ) || hasStored );
 			}
 
-			// Valid if has no filters.
-			return( !hasFilters );
+			// Valid if has no filters or is blacklist.
+			return( !hasFilters || this.inverted );
 
 		}