Fixed annotations

tools/build.gradle

@@ -348,7 +348,7 @@ task updateBundles{
             StringBuilder result = new StringBuilder()
 
             //add everything ordered
-            for(String key : base.orderedKeys().copy().and(extras.keys().toSeq())){
+            for(String key : base.orderedKeys().copy().add(extras.keys().toSeq())){
                 if(other.get(key) == null) continue
 
                 result.append(processor.get(key, other.get(key)))

tools/src/mindustry/tools/ScriptMainGenerator.java

@@ -104,7 +104,7 @@ public class ScriptMainGenerator{
         StringBuilder cdef = new StringBuilder();
 
         Seq<Class<?>> mapped = classes.select(c -> Modifier.isPublic(c.getModifiers()) && packages.contains(c.getCanonicalName()::startsWith))
-        .and(Block.class); //special case
+        .add(Block.class); //special case
 
         for(Class<?> c : mapped){
             cdef.append("        classes.put(\"").append(c.getSimpleName()).append("\", ").append(c.getCanonicalName()).append(".class);\n");