Few changes.

-Removed: BooleanSet classes are gone. (Unused anyways)
-Removed: Boolean2xMaps are also now gone. (Unused Anyways)
-Added: GlobalFlags that are shared across packages.

src/builder/java/speiger/src/builder/ModulePackage.java

@@ -31,9 +31,11 @@ public class ModulePackage
 	List<Predicate<String>> blockedFilters = new ArrayList<>();
 	List<IMapper> mappers = new ArrayList<>();
 	Set<String> flags = new LinkedHashSet<>();
+	Set<String> globalFlags;
 	BiConsumer<String, RequiredType> requirements = VOID;
 	
-	public ModulePackage(ClassType keyType, ClassType valueType) {
+	public ModulePackage(Set<String> globalFlags, ClassType keyType, ClassType valueType) {
+		this.globalFlags = globalFlags;
 		this.keyType = keyType;
 		this.valueType = valueType;
 	}
@@ -68,6 +70,10 @@ public class ModulePackage
 		flags.add(flag);
 	}
 	
+	public void addGlobalFlag(String flag) {
+		globalFlags.add(flag);
+	}
+	
 	public void addRequirement(String fileName, RequiredType type) {
 		requirements.accept(fileName, type);
 	}
@@ -99,6 +105,7 @@ public class ModulePackage
 		TemplateProcess process = new TemplateProcess(newName+".java");
 		process.setPathBuilder(new PathBuilder(keyType.getPathType()));
 		process.addFlags(flags);
+		process.addFlags(globalFlags);
 		process.addMappers(mappers);
 		result.accept(process);
 	}
@@ -111,11 +118,11 @@ public class ModulePackage
 		return false;
 	}
 	
-	public static List<ModulePackage> createPackages() {
+	public static List<ModulePackage> createPackages(Set<String> globalFlags) {
 		List<ModulePackage> list = new ArrayList<>();
 		for(ClassType key : TYPE) {
 			for(ClassType value : TYPE) {
-				list.add(new ModulePackage(key, value));
+				list.add(new ModulePackage(globalFlags, key, value));
 			}
 		}
 		return list;

src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java

@@ -37,6 +37,7 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 	private static final int LOAD = 0x2; //If Configs should be loaded
 	private static final int ANTI_SAVE = SPECIAL | LOAD; //If save should be disabled since load/save shouldn't happen at the same time.
 	private static final int SAVE = 0x4; //if the configuration should be created
+	Set<String> globalFlags = new HashSet<>();
 	List<ModulePackage> simplePackages = new ArrayList<>();
 	List<ModulePackage> biPackages = new ArrayList<>();
 	List<ModulePackage> enumPackages = new ArrayList<>();
@@ -154,7 +155,7 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 	private void prepPackages()
 	{
 		if((flags & LOAD) != 0) manager.load();
-		for(ModulePackage entry : ModulePackage.createPackages())
+		for(ModulePackage entry : ModulePackage.createPackages(globalFlags))
 		{
 			entry.setRequirements(requirements::put);
 			biPackages.add(entry);

src/builder/java/speiger/src/builder/modules/BaseModule.java

@@ -73,7 +73,7 @@ public abstract class BaseModule
 	
 	protected void addKeyFlag(String name) {
 		entry.addFlag(name);
-		entry.addFlag(keyType.getCapType()+"_"+name);
+		entry.addGlobalFlag(keyType.getCapType()+"_"+name);
 	}
 	
 	protected void addBiRequirement(String fileName) {

src/builder/java/speiger/src/builder/modules/MapModule.java

@@ -1,5 +1,9 @@
 package speiger.src.builder.modules;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import speiger.src.builder.ClassType;
 
 @SuppressWarnings("javadoc")
@@ -16,6 +20,12 @@ public class MapModule extends BaseModule
 	@Override
 	public boolean isModuleValid(ClassType keyType, ClassType valueType) { return keyType != ClassType.BOOLEAN; }
 	
+	@Override
+	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType)
+	{
+		return new HashSet<>(Arrays.asList("ConcurrentMap", "HashMap", "CustomHashMap", "ImmutableMap", "ArrayMap", "EnumMap", "AVLTreeMap", "RBTreeMap"));
+	}
+	
 	@Override
 	protected void loadBlockades()
 	{
@@ -25,7 +35,7 @@ public class MapModule extends BaseModule
 			addBlockedFiles("SortedMap", "NavigableMap", "RBTreeMap", "AVLTreeMap");
 			addBlockedFiles("OrderedMap", "ArrayMap", "LinkedOpenHashMap", "LinkedOpenCustomHashMap");
 			addBlockedFiles("ConcurrentMap", "ConcurrentOpenHashMap");
-			addBlockedFiles("ImmutableOpenHashMap", "OpenHashMap", "OpenCustomHashMap");
+			addBlockedFiles("Map", "Maps", "AbstractMap", "ImmutableOpenHashMap", "OpenHashMap", "OpenCustomHashMap");
 			
 			//Test Classes
 			addBlockedFiles("TestMap", "MapTests", "MapTestSuiteBuilder", "MapConstructorTests", "TestMapGenerator", "SimpleMapTestGenerator", "DerivedMapGenerators", "AbstractMapTester");

src/builder/java/speiger/src/builder/modules/SetModule.java

@@ -20,7 +20,7 @@ public class SetModule extends BaseModule
 			//Main Classes
 			addBlockedFiles("SortedSet", "NavigableSet", "AVLTreeSet", "RBTreeSet");
 			addBlockedFiles("OrderedSet", "ArraySet", "LinkedOpenHashSet", "LinkedOpenCustomHashSet");
-			addBlockedFiles("OpenHashSet", "OpenCustomHashSet", "ImmutableOpenHashSet");
+			addBlockedFiles("Set", "Sets", "AbstractSet", "OpenHashSet", "OpenCustomHashSet", "ImmutableOpenHashSet");
 			
 			//Test Classes
 			addBlockedFiles("SetTests", "SetTestSuiteBuilder");