Merge remote-tracking branch 'origin/engine' into client

Author: TheApplePieGod

build.gradle

@@ -3,10 +3,13 @@ apply plugin: 'maven-publish'
 
 import java.nio.file.*
 
-sourceCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
-if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
-    throw new GradleException("The engine must be run using the Java 8 JDK")
+if(JavaVersion.current() < JavaVersion.VERSION_21) {
+    throw new GradleException("The engine must be run using >= Java 21 JDK")
 }
 
 // Avoid weird configuration-time dependency bugs
@@ -60,6 +63,11 @@ task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build'
   classpath = files(serverJar) + project(':example-bots').sourceSets.main.output + configurations.scala
   args = ['-c=-']
   jvmArgs = [
+    '--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED',
+    '--add-opens=java.base/jdk.internal.math=ALL-UNNAMED',
+    '--add-opens=java.base/jdk.internal.util=ALL-UNNAMED',
+    '--add-opens=java.base/jdk.internal.access=ALL-UNNAMED',
+    '--add-opens=java.base/sun.security.action=ALL-UNNAMED',
     '-Dbc.server.wait-for-client=' + (project.findProperty('waitForClient') ?: 'false'),
     '-Dbc.server.mode=headless',
     '-Dbc.server.map-path=maps',
@@ -112,10 +120,10 @@ task release_main(type: Jar, dependsOn: [':engine:build']) {
     Files.write(f_version.toPath(), [project.property("release_version")]);
   }
 
-  archiveBaseName = "battlecode";
+  archiveBaseName.set("battlecode")
   if (project.hasProperty("release_version"))
-    archiveVersion = project.property("release_version");
-  destinationDirectory = project.projectDir;
+    archiveVersion.set(project.property("release_version"))
+  destinationDirectory.set(project.projectDir)
 
   FileCollection src = files(f_version);
   src += zipTree(serverJar);
@@ -133,19 +141,21 @@ task release_docs(type: Jar, dependsOn: [':engine:javadoc']) {
       throw new InvalidUserDataException("Must provide property \"release_version\"")
   }
 
-  archiveBaseName = "battlecode-javadoc"
+  archiveBaseName.set("battlecode-javadoc")
   if (project.hasProperty("release_version"))
-    archiveVersion = project.property("release_version");
-  destinationDirectory = project.projectDir;
+    archiveVersion.set(project.property("release_version"))
+  destinationDirectory.set(project.projectDir)
+  archiveClassifier.set('javadoc')
 
   from new File(project(":engine").docsDir, "javadoc")
 }
 
 task release_sources(type: Jar, dependsOn: classes) {
-  archiveBaseName = "battlecode-source"
+  archiveBaseName.set("battlecode-source")
   if (project.hasProperty("release_version"))
-    archiveVersion = project.property("release_version");
-  destinationDirectory = project.projectDir;
+    archiveVersion.set(project.property("release_version"))
+  destinationDirectory.set(project.projectDir)
+  archiveClassifier.set('sources')
 
   from project(":engine").sourceSets.main.allSource
 }
@@ -158,14 +168,8 @@ publishing {
       version project.findProperty('release_version') ?: 'NONSENSE'
 
       artifact release_main
-
-      artifact release_docs {
-        classifier 'javadoc'
-      }
-
-      artifact release_sources {
-        classifier 'sources'
-      }
+      artifact release_docs
+      artifact release_sources
     }
 
     client(MavenPublication) {

engine/build.gradle

@@ -1,6 +1,9 @@
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
 
 sourceSets {
   main {
@@ -38,8 +41,8 @@ dependencies {
     [group: 'commons-cli', name: 'commons-cli', version: '1.5.0'],
     [group: 'commons-io', name: 'commons-io', version: '2.11.0'],
 
-    [group: 'org.ow2.asm', name: 'asm', version: '5.0.4'],
-    [group: 'org.ow2.asm', name: 'asm-tree', version: '5.0.4'],
+    [group: 'org.ow2.asm', name: 'asm', version: '9.7.1'],
+    [group: 'org.ow2.asm', name: 'asm-tree', version: '9.7.1'],
 
     // Flatbuffers
     [group: 'com.google.flatbuffers', name: 'flatbuffers-java', version: '23.5.26'],
@@ -53,9 +56,6 @@ dependencies {
     // Java Spatial Index, RTree indexing
     [group: 'net.sf.jsi', name: 'jsi', version: '1.1.0-SNAPSHOT'],
     [group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'],
-
-    // Javadoc manipulation libraries
-    files("$System.env.JAVA_HOME" + '/lib/tools.jar')
   )
 
   testImplementation(
@@ -73,9 +73,9 @@ jar {
 
 javadoc {
   includes = ["**/common/**"]
-  options.windowTitle = "Battlecode 2022"
+  options.windowTitle = "Battlecode 2025"
   options.classpath = sourceSets.main.compileClasspath as List
-  options.doclet = "com.sun.tools.doclets.standard.Standard"
+  options.doclet = "jdk.javadoc.doclet.StandardDoclet"
   options.taglets = ["battlecode.doc.CostlyMethodTaglet"]
   options.tagletPath = ( sourceSets.main.output.classesDirs as List )+ sourceSets.main.compileClasspath
 }

engine/src/main/battlecode/common/GameConstants.java

@@ -76,9 +76,6 @@ public class GameConstants {
     /** Paint capacity for mopper robots */
     public static final int PAINT_CAPACITY_MOPPER = 100;
 
-    /** The amount of a paint a paint tower starts with. */
-    public static final int INITIAL_PAINT_TOWER_PAINT = 500;
-
     /** The amount of money each team starts with. */
     public static final int INITIAL_TEAM_MONEY = 1000;
 
@@ -104,6 +101,12 @@ public class GameConstants {
     /** The number of defense towers a player starts with */
     public static final int NUMBER_INITIAL_DEFENSE_TOWERS = 0;
 
+    /** The amount of a paint a paint tower starts with. */
+    public static final int INITIAL_PAINT_TOWER_PAINT = 500;
+
+    /** The percentage of a robot's paint capacity that is full when first built. */
+    public static final int INITIAL_ROBOT_PAINT_PERCENTAGE = 50;
+
     /** The width and height of the patterns that robots can draw */
     public static final int PATTERN_SIZE = 5;
 

engine/src/main/battlecode/common/MapLocation.java

@@ -8,7 +8,7 @@
  * This class is an immutable representation of two-dimensional coordinates
  * in the battlecode world.
  */
-public final strictfp class MapLocation implements Serializable, Comparable<MapLocation> {
+public final class MapLocation implements Serializable, Comparable<MapLocation> {
 
     private static final long serialVersionUID = -8945913587066072824L;
     /**

engine/src/main/battlecode/common/RobotController.java

@@ -9,7 +9,7 @@
  * controls the newly created robot.
  */
 @SuppressWarnings("unused")
-public strictfp interface RobotController {
+public interface RobotController {
 
     // *********************************
     // ****** GLOBAL QUERY METHODS *****

engine/src/main/battlecode/doc/CostlyMethodTaglet.java

@@ -2,10 +2,15 @@
 
 import battlecode.instrumenter.TeamClassLoaderFactory;
 import battlecode.instrumenter.bytecode.MethodCostUtil;
-import com.sun.javadoc.Tag;
-import com.sun.tools.doclets.Taglet;
+import com.sun.source.doctree.DocTree;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.QualifiedNameable;
+import jdk.javadoc.doclet.Taglet;
 
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * A taglet for the "battlecode.doc.costlymethod" annotation.
@@ -21,45 +26,25 @@ public static void register(Map<String, Taglet> map) {
         map.put(TAG_NAME, new CostlyMethodTaglet());
     }
 
-    public String getName() {
-        return TAG_NAME;
-    }
-
-    public boolean inConstructor() {
-        return false;
-    }
-
-    public boolean inField() {
-        return false;
-    }
-
-    public boolean inMethod() {
-        return true;
+    @Override
+    public Set<Taglet.Location> getAllowedLocations() {
+        return Set.of(Taglet.Location.METHOD);
     }
 
-    public boolean inOverview() {
-        return false;
-    }
-
-    public boolean inPackage() {
-        return false;
-    }
-
-    public boolean inType() {
-        return false;
+    @Override
+    public String getName() {
+        return TAG_NAME;
     }
 
+    @Override
     public boolean isInlineTag() {
         return false;
     }
 
-    public String toString(Tag tag) {
-        final String methodName = tag.holder().name();
-        final String fileName = tag.holder().position().file().toString();
-
-        // Note: this makes an assumption that this method is in the battlecode/ package.
-        final String className = fileName.substring(fileName.lastIndexOf("battlecode/"),
-                fileName.length() - 5); // remove .java
+    public String toString(Element element) {
+        final String methodName = element.getSimpleName().toString();
+        final QualifiedNameable enclosingType = (QualifiedNameable) element.getEnclosingElement();
+        final String className = enclosingType.getQualifiedName().toString().replace('.', '/');
 
         final MethodCostUtil.MethodData data =
                 MethodCostUtil.getMethodData(className, methodName);
@@ -79,11 +64,11 @@ public String toString(Tag tag) {
                 "</code></dd>";
     }
 
-    public String toString(Tag[] tags) {
-        if (tags.length != 1) {
-            throw new IllegalArgumentException("Too many @"+TAG_NAME+"tags: "+tags.length);
+    public String toString(List<? extends DocTree> tags, Element element) {
+        if (tags.size() != 1) {
+            throw new IllegalArgumentException("Too many @"+TAG_NAME+"tags: "+tags.size());
         }
 
-        return toString(tags[0]);
+        return toString(element);
     }
 }

engine/src/main/battlecode/instrumenter/bytecode/ClassReferenceUtil.java

@@ -113,7 +113,9 @@ private boolean shouldAddInstrumentedPrefix(String className) {
                 className.startsWith("java/util/jar") ||
                 className.startsWith("java/util/zip") ||
                 className.equals("java/util/Iterator") ||
-                className.equals("java/util/concurrent/TimeUnit"))
+                className.equals("java/util/concurrent/TimeUnit") ||
+                // Only instrument part of the jdk internals
+                (className.startsWith("jdk/internal") && !className.contains("util")))
             return false;
 
         if (className.startsWith("java/util/") ||

engine/src/main/battlecode/instrumenter/bytecode/InstrumentingClassVisitor.java

@@ -43,7 +43,7 @@ public InstrumentingClassVisitor(final ClassVisitor cv,
                                      boolean checkDisallowed,
                                      boolean debugMethodsEnabled,
                                      boolean profilerEnabled) throws InstrumentationException {
-        super(Opcodes.ASM5, cv);
+        super(Opcodes.ASM9, cv);
         this.loader = loader;
         this.silenced = silenced;
         this.checkDisallowed = checkDisallowed;
@@ -148,4 +148,17 @@ public void visitInnerClass(String name, String outerName, String innerName, int
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public void visitNestHost(final String nestHost) {
+        super.visitNestHost(loader.getRefUtil().classReference(nestHost, checkDisallowed));
+    }
+    /**
+     * @inheritDoc
+     */
+    public void visitNestMember(final String nestMember) {
+        super.visitNestMember(loader.getRefUtil().classReference(nestMember, checkDisallowed));
+    }
+
 }

engine/src/main/battlecode/instrumenter/bytecode/InstrumentingMethodVisitor.java

@@ -67,7 +67,7 @@ public InstrumentingMethodVisitor(final MethodVisitor mv,
                                       boolean checkDisallowed,
                                       boolean debugMethodsEnabled,
                                       boolean profilerEnabled) {
-        super(ASM5, access, methodName, methodDesc, signature, exceptions);
+        super(ASM9, access, methodName, methodDesc, signature, exceptions);
         this.methodWriter = mv;
 
         this.loader = loader;
@@ -346,12 +346,13 @@ private void visitInvokeDynamicInsnNode(InvokeDynamicInsnNode n) {
         for (int i = 0; i < n.bsmArgs.length; i++) {
             final Object arg = n.bsmArgs[i];
 
-            if (arg instanceof Type) {
-                Type t = (Type) arg;
-                n.bsmArgs[i] = Type.getType(methodDescReference(t.getDescriptor()));
-            } else if (arg instanceof Handle) {
-                Handle h = (Handle) arg;
-
+            if (arg instanceof Type t) {
+                n.bsmArgs[i] = switch (t.getSort()){
+                    case Type.METHOD -> Type.getType(methodDescReference(t.getDescriptor()));
+                    case Type.OBJECT, Type.ARRAY -> Type.getType(classDescReference(t.getDescriptor()));
+                    default -> t;
+                };
+            } else if (arg instanceof Handle h) {
                 if (checkDisallowed) {
                     checkDisallowedMethod(h.getOwner(), h.getName(), h.getDesc());
                 }
@@ -392,11 +393,18 @@ private void visitInvokeDynamicInsnNode(InvokeDynamicInsnNode n) {
                     }
                 }
 
+                String desc = switch (Type.getType(h.getDesc()).getSort()) {
+                    case Type.METHOD -> methodDescReference(h.getDesc());
+                    case Type.OBJECT, Type.ARRAY -> classDescReference(h.getDesc());
+                    default -> h.getDesc();
+                };
+
                 n.bsmArgs[i] = new Handle(
-                        h.getTag(),
-                        classReference(h.getOwner()),
-                        h.getName(),
-                        methodDescReference(h.getDesc())
+                    h.getTag(),
+                    classReference(h.getOwner()),
+                    h.getName(),
+                    desc,
+                    h.isInterface()
                 );
             }
         }
@@ -417,6 +425,16 @@ private void visitMethodInsnNode(MethodInsnNode n) {
             return;
         }
 
+        if (n.owner.equals("java/util/stream/Stream") && n.name.equals("toList") && n.getOpcode() != INVOKESTATIC) {
+            bytecodeCtr++;
+            endOfBasicBlock(n);
+            n.owner = "battlecode/instrumenter/inject/StreamMethods";
+            n.desc = "(Ljava/lang/Object;)Ljava/util/List;";
+            n.itf = false;
+            n.setOpcode(INVOKESTATIC);
+            return;
+        }
+
         if (n.name.equals("toString") && n.desc.equals("()Ljava/lang/String;") && n.getOpcode() != INVOKESTATIC) {
             bytecodeCtr++;
             endOfBasicBlock(n);

engine/src/main/battlecode/instrumenter/bytecode/InterfaceReader.java

@@ -30,7 +30,7 @@ class InterfaceReader extends ClassVisitor {
     private String[] interfaces = null;
 
     public InterfaceReader(TeamClassLoaderFactory factory) {
-        super(Opcodes.ASM5);
+        super(Opcodes.ASM9);
         this.factory = factory;
     }