From 00cdfbf4feeb14d90cc1845ac59d908a7b5c384f Mon Sep 17 00:00:00 2001
From: Tyler <tarehart@gmail.com>
Date: Tue, 11 Jun 2019 19:37:06 -0700
Subject: [PATCH 01/14] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 05f8b47..e7c2910 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,6 @@ https://youtu.be/mPfYqKe_KRs
 1. Make sure you've installed the Java 8 JDK or newer. Here's the [Java 8 JDK](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
 1. Make sure you've [set the JAVA_HOME environment variable](https://javatutorial.net/set-java-home-windows-10).
 1. Download this repository
-1. Open Rocket League
 1. Double click on run-bot.bat and leave it running. It's supposed to stay
 open and it's OK if it says something like "75%".
 1. Double click on run-gui.bat

From 007f4c13898637289c50134bcca51056b18e6027 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Tue, 11 Jun 2019 09:42:54 -0700
Subject: [PATCH 02/14] Switching to socket-based python interop, and adding a
 nice icon.

---
 build.gradle                                  |  22 ++++---
 src/main/java/rlbotexample/JavaExample.java   |  56 +++++++++++-------
 .../rlbotexample/SamplePythonInterface.java   |   8 +--
 .../java/rlbotexample/util/PortReader.java    |  23 +++----
 src/main/python/javaExample.py                |  15 ++---
 src/main/python/port.cfg                      | Bin 8 -> 0 bytes
 src/main/resources/icon.png                   | Bin 0 -> 18448 bytes
 7 files changed, 65 insertions(+), 59 deletions(-)
 delete mode 100644 src/main/python/port.cfg
 create mode 100644 src/main/resources/icon.png

diff --git a/build.gradle b/build.gradle
index 7863d80..0124827 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,15 +15,7 @@ mainClassName = 'rlbotexample.JavaExample'
 // This directory will be created and the interface dll copied into it at runtime.
 // The end result is that the interface dll will be available for loading.
 def dllDirectory = 'build/dll'
-
-applicationDefaultJvmArgs = ["-Djna.library.path=" + dllDirectory, "-Duser.dir=MY_WORKING_DIR"]
-
-// https://www.mkyong.com/gradle/gradle-application-plugin-app_home-in-applicationdefaultjvmargs/
-startScripts {
-    doLast {
-        windowsScript.text = windowsScript.text.replace('MY_WORKING_DIR', "%~dp0.")
-    }
-}
+applicationDefaultJvmArgs = ["-Djna.library.path=" + dllDirectory]
 
 dependencies {
     // Fetch the framework jar file
@@ -86,7 +78,13 @@ distZip {
             exclude '__pycache__'
         }
     }
-    into (applicationName + '/bin') {
-        from fileTree('port.cfg')
+}
+
+// This is the same as distZip, but not zipped. Handy for testing your tournament submission more rapidly.
+installDist {
+    into ('../python') {
+        from fileTree('src/main/python') {
+            exclude '__pycache__'
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/rlbotexample/JavaExample.java b/src/main/java/rlbotexample/JavaExample.java
index 3b910ab..c188933 100644
--- a/src/main/java/rlbotexample/JavaExample.java
+++ b/src/main/java/rlbotexample/JavaExample.java
@@ -1,15 +1,15 @@
 package rlbotexample;
 
 import rlbot.manager.BotManager;
-import rlbot.pyinterop.PythonInterface;
-import rlbot.pyinterop.PythonServer;
 import rlbotexample.util.PortReader;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
+import java.awt.*;
 import java.awt.event.ActionListener;
-import java.util.OptionalInt;
+import java.net.URL;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * See JavaAgent.py for usage instructions.
@@ -18,41 +18,57 @@
  */
 public class JavaExample {
 
+    private static final Integer DEFAULT_PORT = 17357;
+
     public static void main(String[] args) {
 
         BotManager botManager = new BotManager();
-        PythonInterface pythonInterface = new SamplePythonInterface(botManager);
-        Integer port = PortReader.readPortFromFile("port.cfg");
-        PythonServer pythonServer = new PythonServer(pythonInterface, port);
-        pythonServer.start();
+        Integer port = PortReader.readPortFromArgs(args).orElseGet(() -> {
+            System.out.println("Could not read port from args, using default!");
+            return DEFAULT_PORT;
+        });
+
+        SamplePythonInterface pythonInterface = new SamplePythonInterface(port, botManager);
+        new Thread(pythonInterface::start).start();
 
         JFrame frame = new JFrame("Java Bot");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
         JPanel panel = new JPanel();
         panel.setBorder(new EmptyBorder(10, 10, 10, 10));
-        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.add(new JLabel("Listening on port " + port));
-        panel.add(new JLabel("I'm the thing controlling the Java bot, keep me open :)"));
+        BorderLayout borderLayout = new BorderLayout();
+        panel.setLayout(borderLayout);
+        JPanel dataPanel = new JPanel();
+        dataPanel.setLayout(new BoxLayout(dataPanel, BoxLayout.Y_AXIS));
+        dataPanel.setBorder(new EmptyBorder(0, 10, 0, 0));
+        dataPanel.add(new JLabel("Listening on port " + port), BorderLayout.CENTER);
+        dataPanel.add(new JLabel("I'm the thing controlling the Java bot, keep me open :)"), BorderLayout.CENTER);
         JLabel botsRunning = new JLabel("Bots running: ");
-        panel.add(botsRunning);
+        dataPanel.add(botsRunning, BorderLayout.CENTER);
+        panel.add(dataPanel, BorderLayout.CENTER);
         frame.add(panel);
 
+        URL url = JavaExample.class.getClassLoader().getResource("icon.png");
+        Image image = Toolkit.getDefaultToolkit().createImage(url);
+        panel.add(new JLabel(new ImageIcon(image)), BorderLayout.WEST);
+        frame.setIconImage(image);
+
         frame.pack();
         frame.setVisible(true);
 
         ActionListener myListener = e -> {
             Set<Integer> runningBotIndices = botManager.getRunningBotIndices();
-            OptionalInt maxIndex = runningBotIndices.stream().mapToInt(k -> k).max();
-            String botsStr = "None";
-            if (maxIndex.isPresent()) {
-                StringBuilder botsStrBuilder = new StringBuilder();
-                for (int i = 0; i <= maxIndex.getAsInt(); i++) {
-                    botsStrBuilder.append(runningBotIndices.contains(i) ? "☑ " : "☐ ");
-                }
-                botsStr = botsStrBuilder.toString();
+
+            String botsStr;
+            if (runningBotIndices.isEmpty()) {
+                botsStr = "None";
+            } else {
+                botsStr = runningBotIndices.stream()
+                        .sorted()
+                        .map(i -> "#" + i)
+                        .collect(Collectors.joining(", "));
             }
-            botsRunning.setText("Bots running: " + botsStr);
+            botsRunning.setText("Bots indices running: " + botsStr);
         };
 
         new Timer(1000, myListener).start();
diff --git a/src/main/java/rlbotexample/SamplePythonInterface.java b/src/main/java/rlbotexample/SamplePythonInterface.java
index e6812ca..829aa93 100644
--- a/src/main/java/rlbotexample/SamplePythonInterface.java
+++ b/src/main/java/rlbotexample/SamplePythonInterface.java
@@ -2,12 +2,12 @@
 
 import rlbot.Bot;
 import rlbot.manager.BotManager;
-import rlbot.pyinterop.DefaultPythonInterface;
+import rlbot.pyinterop.SocketServer;
 
-public class SamplePythonInterface extends DefaultPythonInterface {
+public class SamplePythonInterface extends SocketServer {
 
-    public SamplePythonInterface(BotManager botManager) {
-        super(botManager);
+    public SamplePythonInterface(int port, BotManager botManager) {
+        super(port, botManager);
     }
 
     protected Bot initBot(int index, String botType, int team) {
diff --git a/src/main/java/rlbotexample/util/PortReader.java b/src/main/java/rlbotexample/util/PortReader.java
index 892b662..3664bdd 100644
--- a/src/main/java/rlbotexample/util/PortReader.java
+++ b/src/main/java/rlbotexample/util/PortReader.java
@@ -1,28 +1,23 @@
 package rlbotexample.util;
 
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 /**
- * Utility for reading a network port out of a config file. We're expecting a file that has only one line
- * that's just a number.
+ * Utility for reading a network port out of a command line arguments.
  *
  * This class is here for your convenience, it is NOT part of the framework. You can add to it as much
  * as you want, or delete it.
  */
 public class PortReader {
-    public static Integer readPortFromFile(String s) {
-        Path path = Paths.get(s);
 
-        try (Stream<String> lines = Files.lines(path)) {
-            Optional<String> firstLine = lines.findFirst();
-            return firstLine.map(Integer::parseInt).orElseThrow(() -> new RuntimeException("Port config file was empty!"));
-        } catch (final IOException e) {
-            throw new RuntimeException("Failed to read port file! Tried to find it at " + path.toAbsolutePath().toString());
+    public static Optional<Integer> readPortFromArgs(String[] args) {
+        if (args.length == 0) {
+            return Optional.empty();
+        }
+        try {
+            return Optional.of(Integer.parseInt(args[0]));
+        } catch (NumberFormatException e) {
+            return Optional.empty();
         }
     }
 }
diff --git a/src/main/python/javaExample.py b/src/main/python/javaExample.py
index dad0097..faf3765 100644
--- a/src/main/python/javaExample.py
+++ b/src/main/python/javaExample.py
@@ -1,18 +1,15 @@
-import os
-
 from rlbot.agents.base_agent import BOT_CONFIG_AGENT_HEADER
-from rlbot.agents.base_java_agent import BaseJavaAgent
+from rlbot.agents.executable_with_socket_agent import ExecutableWithSocketAgent
 from rlbot.parsing.custom_config import ConfigHeader, ConfigObject
 
 
-class JavaExample(BaseJavaAgent):
-    def get_port_file_path(self):
-        # Look for a port.cfg file in the same directory as THIS python file.
-        return os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__), 'port.cfg'))
+class JavaExample(ExecutableWithSocketAgent):
+    def get_port(self) -> int:
+        return 17357
 
     def load_config(self, config_header: ConfigHeader):
-        self.java_executable_path = config_header.getpath('java_executable_path')
-        self.logger.info("Java executable is configured as {}".format(self.java_executable_path))
+        self.executable_path = config_header.getpath('java_executable_path')
+        self.logger.info("Java executable is configured as {}".format(self.executable_path))
 
     @staticmethod
     def create_agent_configurations(config: ConfigObject):
diff --git a/src/main/python/port.cfg b/src/main/python/port.cfg
deleted file mode 100644
index 1256cfb1817cf7effe298709bcf1c94f4cf727fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmXpsH#Rlr<zfH;24evq

diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bafcdffebac433872c344eb5183ec12de160b38
GIT binary patch
literal 18448
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
D0DH`?

literal 0
HcmV?d00001


From 8a90353808a5c26cdd83352f7a62a410c6a65f59 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Sun, 30 Jun 2019 13:01:50 -0700
Subject: [PATCH 03/14] Updating ControlsOutput to include useItem (for
 rumble).

---
 .../java/rlbotexample/output/ControlsOutput.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/rlbotexample/output/ControlsOutput.java b/src/main/java/rlbotexample/output/ControlsOutput.java
index b544024..ace5d65 100644
--- a/src/main/java/rlbotexample/output/ControlsOutput.java
+++ b/src/main/java/rlbotexample/output/ControlsOutput.java
@@ -28,6 +28,7 @@ public class ControlsOutput implements ControllerState {
     private boolean jumpDepressed;
     private boolean boostDepressed;
     private boolean slideDepressed;
+    private boolean useItemDepressed;
 
     public ControlsOutput() {
     }
@@ -72,6 +73,11 @@ public ControlsOutput withSlide(boolean slideDepressed) {
         return this;
     }
 
+    public ControlsOutput withUseItem(boolean useItemDepressed) {
+        this.useItemDepressed = useItemDepressed;
+        return this;
+    }
+
     public ControlsOutput withJump() {
         this.jumpDepressed = true;
         return this;
@@ -87,6 +93,11 @@ public ControlsOutput withSlide() {
         return this;
     }
 
+    public ControlsOutput withUseItem() {
+        this.useItemDepressed = true;
+        return this;
+    }
+
     private float clamp(float value) {
         return Math.max(-1, Math.min(1, value));
     }
@@ -130,4 +141,9 @@ public boolean holdBoost() {
     public boolean holdHandbrake() {
         return slideDepressed;
     }
+
+    @Override
+    public boolean holdUseItem() {
+        return useItemDepressed;
+    }
 }

From 82f97803f86746b027adca2b4fbb6879ec7f9c3e Mon Sep 17 00:00:00 2001
From: NicEastvillage <nicoesterby@gmail.com>
Date: Thu, 4 Jul 2019 12:06:15 +0200
Subject: [PATCH 04/14] Fixed comment

---
 src/main/java/rlbotexample/dropshot/DropshotTile.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/rlbotexample/dropshot/DropshotTile.java b/src/main/java/rlbotexample/dropshot/DropshotTile.java
index 06c639a..a81f553 100644
--- a/src/main/java/rlbotexample/dropshot/DropshotTile.java
+++ b/src/main/java/rlbotexample/dropshot/DropshotTile.java
@@ -11,7 +11,7 @@
  */
 public class DropshotTile {
 
-    public static final double TILE_SIZE = 443.405; // side length and length from center to side
+    public static final double TILE_SIZE = 443.405; // side length and length from center to corner
     public static final double TILE_WIDTH = 768; // length from side to opposite side
     public static final double TILE_HEIGHT = 886.81; // length from corner to opposite corner
 

From 6776eeccd06cb922401d3054421145032b4cb59e Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Sat, 24 Aug 2019 09:13:23 -0700
Subject: [PATCH 05/14] Adding a ball prediction helper, and removing dropshot
 code since we lost support.

---
 src/main/java/rlbotexample/SampleBot.java     |  23 ++--
 .../rlbotexample/dropshot/DropshotTile.java   |  42 --------
 .../dropshot/DropshotTileManager.java         | 100 ------------------
 .../dropshot/DropshotTileState.java           |   8 --
 src/main/java/rlbotexample/dropshot/Hex.java  |  61 -----------
 .../prediction/BallPredictionHelper.java      |  30 ++++++
 6 files changed, 39 insertions(+), 225 deletions(-)
 delete mode 100644 src/main/java/rlbotexample/dropshot/DropshotTile.java
 delete mode 100644 src/main/java/rlbotexample/dropshot/DropshotTileManager.java
 delete mode 100644 src/main/java/rlbotexample/dropshot/DropshotTileState.java
 delete mode 100644 src/main/java/rlbotexample/dropshot/Hex.java
 create mode 100644 src/main/java/rlbotexample/prediction/BallPredictionHelper.java

diff --git a/src/main/java/rlbotexample/SampleBot.java b/src/main/java/rlbotexample/SampleBot.java
index b4a116f..1639980 100644
--- a/src/main/java/rlbotexample/SampleBot.java
+++ b/src/main/java/rlbotexample/SampleBot.java
@@ -3,17 +3,17 @@
 import rlbot.Bot;
 import rlbot.ControllerState;
 import rlbot.cppinterop.RLBotDll;
+import rlbot.cppinterop.RLBotInterfaceException;
+import rlbot.flat.BallPrediction;
 import rlbot.flat.GameTickPacket;
 import rlbot.flat.QuickChatSelection;
 import rlbot.manager.BotLoopRenderer;
 import rlbot.render.Renderer;
 import rlbotexample.boost.BoostManager;
-import rlbotexample.dropshot.DropshotTile;
-import rlbotexample.dropshot.DropshotTileManager;
-import rlbotexample.dropshot.DropshotTileState;
 import rlbotexample.input.CarData;
 import rlbotexample.input.DataPacket;
 import rlbotexample.output.ControlsOutput;
+import rlbotexample.prediction.BallPredictionHelper;
 import rlbotexample.vector.Vector2;
 
 import java.awt.*;
@@ -75,17 +75,13 @@ private void drawDebugLines(DataPacket input, CarData myCar, boolean goLeft) {
 
         renderer.drawString3d(goLeft ? "left" : "right", Color.WHITE, myCar.position, 2, 2);
 
-        for (DropshotTile tile: DropshotTileManager.getTiles()) {
-            if (tile.getState() == DropshotTileState.DAMAGED) {
-                renderer.drawCenteredRectangle3d(Color.YELLOW, tile.getLocation(), 4, 4, true);
-            } else if (tile.getState() == DropshotTileState.DESTROYED) {
-                renderer.drawCenteredRectangle3d(Color.RED, tile.getLocation(), 4, 4, true);
-            }
+        try {
+            // Draw 3 seconds of ball prediction
+            BallPrediction ballPrediction = RLBotDll.getBallPrediction();
+            BallPredictionHelper.drawTillMoment(ballPrediction, myCar.elapsedSeconds + 3, Color.CYAN, renderer);
+        } catch (RLBotInterfaceException e) {
+            e.printStackTrace();
         }
-
-        // Draw a rectangle on the tile that the car is on
-        DropshotTile tile = DropshotTileManager.pointToTile(myCar.position.flatten());
-        if (tile != null) renderer.drawCenteredRectangle3d(Color.green, tile.getLocation(), 8, 8, false);
     }
 
 
@@ -108,7 +104,6 @@ public ControllerState processInput(GameTickPacket packet) {
 
         // Update the boost manager and tile manager with the latest data
         BoostManager.loadGameTickPacket(packet);
-        DropshotTileManager.loadGameTickPacket(packet);
 
         // Translate the raw packet data (which is in an unpleasant format) into our custom DataPacket class.
         // The DataPacket might not include everything from GameTickPacket, so improve it if you need to!
diff --git a/src/main/java/rlbotexample/dropshot/DropshotTile.java b/src/main/java/rlbotexample/dropshot/DropshotTile.java
deleted file mode 100644
index a81f553..0000000
--- a/src/main/java/rlbotexample/dropshot/DropshotTile.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package rlbotexample.dropshot;
-
-
-import rlbotexample.vector.Vector3;
-
-/**
- * Representation of one of the floor tiles in dropshot mode.
- *
- * This class is here for your convenience, it is NOT part of the framework. You can change it as much
- * as you want, or delete it.
- */
-public class DropshotTile {
-
-    public static final double TILE_SIZE = 443.405; // side length and length from center to corner
-    public static final double TILE_WIDTH = 768; // length from side to opposite side
-    public static final double TILE_HEIGHT = 886.81; // length from corner to opposite corner
-
-    private final Vector3 location;
-    private final int team;
-    private DropshotTileState state;
-
-    public DropshotTile(Vector3 location) {
-        this.location = location;
-        this.team = location.y < 0 ? 0 : 1;
-    }
-
-    public void setState(DropshotTileState state) {
-        this.state = state;
-    }
-
-    public Vector3 getLocation() {
-        return location;
-    }
-
-    public DropshotTileState getState() {
-        return state;
-    }
-
-    public int getTeam() {
-        return team;
-    }
-}
diff --git a/src/main/java/rlbotexample/dropshot/DropshotTileManager.java b/src/main/java/rlbotexample/dropshot/DropshotTileManager.java
deleted file mode 100644
index fcd82dd..0000000
--- a/src/main/java/rlbotexample/dropshot/DropshotTileManager.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package rlbotexample.dropshot;
-
-import rlbot.cppinterop.RLBotDll;
-import rlbot.flat.FieldInfo;
-import rlbot.flat.GameTickPacket;
-import rlbotexample.vector.Vector2;
-import rlbotexample.vector.Vector3;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import static rlbotexample.dropshot.DropshotTile.TILE_HEIGHT;
-import static rlbotexample.dropshot.DropshotTile.TILE_WIDTH;
-
-/**
- * Information about where dropshot tiles are located in the arena and what state they have. Can also convert a
- * vector2 point to a tile, which is useful for checking the state of the tile where the ball lands.
- *
- * This class is here for your convenience, it is NOT part of the framework. You can change it as much
- * as you want, or delete it.
- */
-public class DropshotTileManager {
-
-    private static final ArrayList<DropshotTile> tiles = new ArrayList<>();
-    private static final HashMap<Hex, DropshotTile> blueTileMap = new HashMap<>();
-    private static final HashMap<Hex, DropshotTile> orangeTileMap = new HashMap<>();
-
-    public static List<DropshotTile> getTiles() {
-        return tiles;
-    }
-
-    private static void loadFieldInfo(FieldInfo fieldInfo) {
-
-        synchronized (tiles) {
-
-            tiles.clear();
-
-            for (int i = 0; i < fieldInfo.goalsLength(); i++) {
-                rlbot.flat.GoalInfo goalInfo = fieldInfo.goals(i);
-                Vector3 location = new Vector3(goalInfo.location());
-                DropshotTile tile = new DropshotTile(location);
-                tiles.add(new DropshotTile(location));
-
-                Hex hex = pointToHex(location.flatten());
-                if (location.y < 0) {
-                    blueTileMap.put(hex, tile);
-                } else {
-                    orangeTileMap.put(hex, tile);
-                }
-            }
-        }
-    }
-
-    public static void loadGameTickPacket(GameTickPacket packet) {
-
-        if (packet.tileInformationLength() > tiles.size()) {
-            try {
-                loadFieldInfo(RLBotDll.getFieldInfo());
-            } catch (IOException e) {
-                e.printStackTrace();
-                return;
-            }
-        }
-
-        for (int i = 0; i < packet.tileInformationLength(); i++) {
-            rlbot.flat.DropshotTile tile = packet.tileInformation(i);
-            DropshotTile existingTile = tiles.get(i);
-            existingTile.setState(DropshotTileState.values()[tile.tileState()]);
-        }
-    }
-
-    /**
-     * Returns the tile under the point, or null if none is.
-     */
-    public static DropshotTile pointToTile(Vector2 point) {
-        Hex hex = pointToHex(point);
-        if (point.y < 0) return blueTileMap.get(hex);
-        else return orangeTileMap.get(hex);
-    }
-
-    /**
-     * Converts a point to a hex.
-     */
-    private static Hex pointToHex(Vector2 point) {
-
-        // Apply offset
-        if (point.y < 0) {
-            point = point.plus(new Vector2(0, 128));
-        } else {
-            point = point.plus(new Vector2(0, -128));
-        }
-
-        // Calculate q and r component
-        double q = point.x / TILE_WIDTH - point.y * 2 / (3 * TILE_HEIGHT);
-        double r = point.y * 4 / (3 * TILE_HEIGHT);
-        return Hex.fromRounding(q, r);
-    }
-}
diff --git a/src/main/java/rlbotexample/dropshot/DropshotTileState.java b/src/main/java/rlbotexample/dropshot/DropshotTileState.java
deleted file mode 100644
index b2dba3f..0000000
--- a/src/main/java/rlbotexample/dropshot/DropshotTileState.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package rlbotexample.dropshot;
-
-public enum DropshotTileState {
-    UNKNOWN,
-    FRESH,
-    DAMAGED,
-    DESTROYED
-}
diff --git a/src/main/java/rlbotexample/dropshot/Hex.java b/src/main/java/rlbotexample/dropshot/Hex.java
deleted file mode 100644
index eef320e..0000000
--- a/src/main/java/rlbotexample/dropshot/Hex.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package rlbotexample.dropshot;
-
-import java.util.Objects;
-
-/**
- * This class is used to convert a 2d point to a hex grid in the DropshotTileManager. Look here for more information:
- * https://www.redblobgames.com/grids/hexagons/
- *
- * This class is here for your convenience, it is NOT part of the framework. You can add to it as much
- * as you want, or delete it.
- */
-public class Hex {
-
-    // For a hex the following must always be true: q + r + s == 0
-    public final int q, r, s;
-
-    public Hex(int q, int r) {
-        this.q = q;
-        this.r = r;
-        this.s = -q - r;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Hex that = (Hex) o;
-        return q == that.q &&
-                r == that.r;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(q, r);
-    }
-
-    /**
-     * Construct a Hex from rounding two floating point q and r coordinates.
-     */
-    public static Hex fromRounding(double fq, double fr) {
-        double fs = -fq - fr;
-
-        int rx = (int)Math.round(fq);
-        int ry = (int)Math.round(fr);
-        int rz = (int)Math.round(fs);
-
-        // Find how much each component was rounded
-        double x_diff = Math.abs(rx - fq);
-        double y_diff = Math.abs(ry - fr);
-        double z_diff = Math.abs(rz - fs);
-
-        // We reset the component with the largest change back to what the constraint rx + ry + rz = 0 requires
-        if (x_diff > y_diff && x_diff > z_diff) {
-            rx = -ry - rz;
-        } else if (y_diff > z_diff) {
-            ry = -rx - rz;
-        }
-
-        return new Hex(rx, ry);
-    }
-}
diff --git a/src/main/java/rlbotexample/prediction/BallPredictionHelper.java b/src/main/java/rlbotexample/prediction/BallPredictionHelper.java
new file mode 100644
index 0000000..77b56c7
--- /dev/null
+++ b/src/main/java/rlbotexample/prediction/BallPredictionHelper.java
@@ -0,0 +1,30 @@
+package rlbotexample.prediction;
+
+import rlbot.flat.BallPrediction;
+import rlbot.flat.PredictionSlice;
+import rlbot.render.Renderer;
+import rlbotexample.vector.Vector3;
+
+import java.awt.*;
+
+/**
+ * This class can help you get started with ball prediction. Feel free to change it as much as you want,
+ * this is part of your bot, not part of the framework!
+ */
+public class BallPredictionHelper {
+
+    public static void drawTillMoment(BallPrediction ballPrediction, float gameSeconds, Color color, Renderer renderer) {
+        Vector3 previousLocation = null;
+        for (int i = 0; i < ballPrediction.slicesLength(); i += 4) {
+            PredictionSlice slice = ballPrediction.slices(i);
+            if (slice.gameSeconds() > gameSeconds) {
+                break;
+            }
+            Vector3 location = new Vector3(slice.physics().location());
+            if (previousLocation != null) {
+                renderer.drawLine3d(color, previousLocation, location);
+            }
+            previousLocation = location;
+        }
+    }
+}

From 98babb46a5534433e512b5f6f07f934b43b58452 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Tue, 27 Aug 2019 10:26:15 -0700
Subject: [PATCH 06/14] Getting rid of unused port.cfg file.

---
 port.cfg                             | Bin 8 -> 0 bytes
 src/main/python/README_Tournament.md |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 port.cfg

diff --git a/port.cfg b/port.cfg
deleted file mode 100644
index 1256cfb1817cf7effe298709bcf1c94f4cf727fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8
PcmXpsH#Rlr<zfH;24evq

diff --git a/src/main/python/README_Tournament.md b/src/main/python/README_Tournament.md
index ecff5a5..6ff3059 100644
--- a/src/main/python/README_Tournament.md
+++ b/src/main/python/README_Tournament.md
@@ -15,5 +15,5 @@ in the whole match, even on opposite teams.
 Advanced:
 
 - It's fine to close and restart `.bat` while the framework is active.
-- If there is a port conflict, you can modify both copies of `port.cfg`
+- If there is a port conflict, you can modify the port in the bot's python file.
 to use a different one. There's one here and one in the bin folder.

From 22a4fba2a888c23c1d71672062ef810b9270e2a7 Mon Sep 17 00:00:00 2001
From: Robbie <42142350+robbai@users.noreply.github.com>
Date: Sun, 6 Oct 2019 22:39:37 +0100
Subject: [PATCH 07/14] Add a BallTouch class (#16)

---
 src/main/java/rlbotexample/SampleBot.java     |  8 ++++-
 .../java/rlbotexample/input/DataPacket.java   |  2 ++
 .../input/{ => ball}/BallData.java            |  6 +++-
 .../rlbotexample/input/ball/BallTouch.java    | 29 +++++++++++++++++++
 .../rlbotexample/input/{ => car}/CarData.java |  2 +-
 .../input/{ => car}/CarOrientation.java       |  2 +-
 6 files changed, 45 insertions(+), 4 deletions(-)
 rename src/main/java/rlbotexample/input/{ => ball}/BallData.java (70%)
 create mode 100644 src/main/java/rlbotexample/input/ball/BallTouch.java
 rename src/main/java/rlbotexample/input/{ => car}/CarData.java (98%)
 rename src/main/java/rlbotexample/input/{ => car}/CarOrientation.java (98%)

diff --git a/src/main/java/rlbotexample/SampleBot.java b/src/main/java/rlbotexample/SampleBot.java
index 1639980..80c5e3d 100644
--- a/src/main/java/rlbotexample/SampleBot.java
+++ b/src/main/java/rlbotexample/SampleBot.java
@@ -10,8 +10,8 @@
 import rlbot.manager.BotLoopRenderer;
 import rlbot.render.Renderer;
 import rlbotexample.boost.BoostManager;
-import rlbotexample.input.CarData;
 import rlbotexample.input.DataPacket;
+import rlbotexample.input.car.CarData;
 import rlbotexample.output.ControlsOutput;
 import rlbotexample.prediction.BallPredictionHelper;
 import rlbotexample.vector.Vector2;
@@ -75,6 +75,12 @@ private void drawDebugLines(DataPacket input, CarData myCar, boolean goLeft) {
 
         renderer.drawString3d(goLeft ? "left" : "right", Color.WHITE, myCar.position, 2, 2);
 
+        if(input.ball.hasBeenTouched) {
+            float lastTouchTime = myCar.elapsedSeconds - input.ball.latestTouch.gameSeconds;
+            Color touchColor = input.ball.latestTouch.team == 0 ? Color.BLUE : Color.ORANGE;
+            renderer.drawString3d((int)lastTouchTime + "s", touchColor, input.ball.position, 2, 2);
+        }
+
         try {
             // Draw 3 seconds of ball prediction
             BallPrediction ballPrediction = RLBotDll.getBallPrediction();
diff --git a/src/main/java/rlbotexample/input/DataPacket.java b/src/main/java/rlbotexample/input/DataPacket.java
index 7001897..a61b69c 100644
--- a/src/main/java/rlbotexample/input/DataPacket.java
+++ b/src/main/java/rlbotexample/input/DataPacket.java
@@ -1,6 +1,8 @@
 package rlbotexample.input;
 
 import rlbot.flat.GameTickPacket;
+import rlbotexample.input.ball.BallData;
+import rlbotexample.input.car.CarData;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/rlbotexample/input/BallData.java b/src/main/java/rlbotexample/input/ball/BallData.java
similarity index 70%
rename from src/main/java/rlbotexample/input/BallData.java
rename to src/main/java/rlbotexample/input/ball/BallData.java
index c7f042f..8dffab4 100644
--- a/src/main/java/rlbotexample/input/BallData.java
+++ b/src/main/java/rlbotexample/input/ball/BallData.java
@@ -1,4 +1,4 @@
-package rlbotexample.input;
+package rlbotexample.input.ball;
 
 
 import rlbot.flat.BallInfo;
@@ -14,10 +14,14 @@ public class BallData {
     public final Vector3 position;
     public final Vector3 velocity;
     public final Vector3 spin;
+    public final BallTouch latestTouch;
+    public final boolean hasBeenTouched;
 
     public BallData(final BallInfo ball) {
         this.position = new Vector3(ball.physics().location());
         this.velocity = new Vector3(ball.physics().velocity());
         this.spin = new Vector3(ball.physics().angularVelocity());
+        this.hasBeenTouched = ball.latestTouch() != null;
+        this.latestTouch = this.hasBeenTouched ? new BallTouch(ball.latestTouch()) : null;
     }
 }
diff --git a/src/main/java/rlbotexample/input/ball/BallTouch.java b/src/main/java/rlbotexample/input/ball/BallTouch.java
new file mode 100644
index 0000000..d0af1bb
--- /dev/null
+++ b/src/main/java/rlbotexample/input/ball/BallTouch.java
@@ -0,0 +1,29 @@
+package rlbotexample.input.ball;
+
+
+import rlbot.flat.Touch;
+import rlbotexample.vector.Vector3;
+
+/**
+ * Basic information about the ball's latest touch.
+ *
+ * This class is here for your convenience, it is NOT part of the framework. You can change it as much
+ * as you want, or delete it.
+ */
+public class BallTouch {
+	public final Vector3 position;
+	public final Vector3 normal;
+	public final String playerName;
+	public final float gameSeconds;
+	public final int playerIndex;
+	public final int team;
+
+	public BallTouch(final Touch touch) {
+		this.position = new Vector3(touch.location());
+		this.normal = new Vector3(touch.normal());
+		this.playerName = touch.playerName();
+		this.gameSeconds = touch.gameSeconds();
+		this.playerIndex = touch.playerIndex();
+		this.team = touch.team();
+	}
+}
diff --git a/src/main/java/rlbotexample/input/CarData.java b/src/main/java/rlbotexample/input/car/CarData.java
similarity index 98%
rename from src/main/java/rlbotexample/input/CarData.java
rename to src/main/java/rlbotexample/input/car/CarData.java
index 87fbfa9..1023e73 100644
--- a/src/main/java/rlbotexample/input/CarData.java
+++ b/src/main/java/rlbotexample/input/car/CarData.java
@@ -1,4 +1,4 @@
-package rlbotexample.input;
+package rlbotexample.input.car;
 
 
 import rlbotexample.vector.Vector3;
diff --git a/src/main/java/rlbotexample/input/CarOrientation.java b/src/main/java/rlbotexample/input/car/CarOrientation.java
similarity index 98%
rename from src/main/java/rlbotexample/input/CarOrientation.java
rename to src/main/java/rlbotexample/input/car/CarOrientation.java
index 84a0fa3..68370ec 100644
--- a/src/main/java/rlbotexample/input/CarOrientation.java
+++ b/src/main/java/rlbotexample/input/car/CarOrientation.java
@@ -1,4 +1,4 @@
-package rlbotexample.input;
+package rlbotexample.input.car;
 
 
 import rlbot.flat.PlayerInfo;

From 23c698fb1a2ab4c7b0c43299dc939378bc6c30e7 Mon Sep 17 00:00:00 2001
From: Antoine Tran <31257370+Tran-Antoine@users.noreply.github.com>
Date: Tue, 19 Nov 2019 21:27:35 +0100
Subject: [PATCH 08/14] Minor improvements (#17)

Minor changes, such as:
- Usage of primitives instead of wrappers
- Generified type declarations + added missing @Override annotations
- Added method displayWindow
---
 src/main/java/rlbotexample/JavaExample.java           |  8 ++++++--
 src/main/java/rlbotexample/SampleBot.java             |  1 +
 src/main/java/rlbotexample/SamplePythonInterface.java |  1 +
 src/main/java/rlbotexample/boost/BoostManager.java    | 11 ++++++-----
 src/main/java/rlbotexample/output/ControlsOutput.java |  2 +-
 src/main/java/rlbotexample/vector/Vector2.java        |  5 +++++
 src/main/java/rlbotexample/vector/Vector3.java        |  5 +++++
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/rlbotexample/JavaExample.java b/src/main/java/rlbotexample/JavaExample.java
index c188933..d3d7230 100644
--- a/src/main/java/rlbotexample/JavaExample.java
+++ b/src/main/java/rlbotexample/JavaExample.java
@@ -18,12 +18,12 @@
  */
 public class JavaExample {
 
-    private static final Integer DEFAULT_PORT = 17357;
+    private static final int DEFAULT_PORT = 17357;
 
     public static void main(String[] args) {
 
         BotManager botManager = new BotManager();
-        Integer port = PortReader.readPortFromArgs(args).orElseGet(() -> {
+        int port = PortReader.readPortFromArgs(args).orElseGet(() -> {
             System.out.println("Could not read port from args, using default!");
             return DEFAULT_PORT;
         });
@@ -31,6 +31,10 @@ public static void main(String[] args) {
         SamplePythonInterface pythonInterface = new SamplePythonInterface(port, botManager);
         new Thread(pythonInterface::start).start();
 
+        displayWindow(botManager, port);
+    }
+    
+    private static void displayWindow(BotManager botManager, int port) {
         JFrame frame = new JFrame("Java Bot");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
diff --git a/src/main/java/rlbotexample/SampleBot.java b/src/main/java/rlbotexample/SampleBot.java
index 80c5e3d..0a82f17 100644
--- a/src/main/java/rlbotexample/SampleBot.java
+++ b/src/main/java/rlbotexample/SampleBot.java
@@ -121,6 +121,7 @@ public ControllerState processInput(GameTickPacket packet) {
         return controlsOutput;
     }
 
+    @Override
     public void retire() {
         System.out.println("Retiring sample bot " + playerIndex);
     }
diff --git a/src/main/java/rlbotexample/SamplePythonInterface.java b/src/main/java/rlbotexample/SamplePythonInterface.java
index 829aa93..aa679bc 100644
--- a/src/main/java/rlbotexample/SamplePythonInterface.java
+++ b/src/main/java/rlbotexample/SamplePythonInterface.java
@@ -10,6 +10,7 @@ public SamplePythonInterface(int port, BotManager botManager) {
         super(port, botManager);
     }
 
+    @Override
     protected Bot initBot(int index, String botType, int team) {
         return new SampleBot(index);
     }
diff --git a/src/main/java/rlbotexample/boost/BoostManager.java b/src/main/java/rlbotexample/boost/BoostManager.java
index a9fa1bf..b93d7a6 100644
--- a/src/main/java/rlbotexample/boost/BoostManager.java
+++ b/src/main/java/rlbotexample/boost/BoostManager.java
@@ -8,6 +8,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Information about where boost pads are located on the field and what status they have.
@@ -17,15 +18,15 @@
  */
 public class BoostManager {
 
-    private static final ArrayList<BoostPad> orderedBoosts = new ArrayList<>();
-    private static final ArrayList<BoostPad> fullBoosts = new ArrayList<>();
-    private static final ArrayList<BoostPad> smallBoosts = new ArrayList<>();
+    private static final List<BoostPad> orderedBoosts = new ArrayList<>();
+    private static final List<BoostPad> fullBoosts = new ArrayList<>();
+    private static final List<BoostPad> smallBoosts = new ArrayList<>();
 
-    public static ArrayList<BoostPad> getFullBoosts() {
+    public static List<BoostPad> getFullBoosts() {
         return fullBoosts;
     }
 
-    public static ArrayList<BoostPad> getSmallBoosts() {
+    public static List<BoostPad> getSmallBoosts() {
         return smallBoosts;
     }
 
diff --git a/src/main/java/rlbotexample/output/ControlsOutput.java b/src/main/java/rlbotexample/output/ControlsOutput.java
index ace5d65..9cdbd2b 100644
--- a/src/main/java/rlbotexample/output/ControlsOutput.java
+++ b/src/main/java/rlbotexample/output/ControlsOutput.java
@@ -146,4 +146,4 @@ public boolean holdHandbrake() {
     public boolean holdUseItem() {
         return useItemDepressed;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/rlbotexample/vector/Vector2.java b/src/main/java/rlbotexample/vector/Vector2.java
index 2197505..dad1633 100644
--- a/src/main/java/rlbotexample/vector/Vector2.java
+++ b/src/main/java/rlbotexample/vector/Vector2.java
@@ -98,4 +98,9 @@ public double correctionAngle(Vector2 ideal) {
     public static double angle(Vector2 a, Vector2 b) {
         return Math.abs(a.correctionAngle(b));
     }
+
+    @Override
+    public String toString() {
+        return String.format("(%s, %s)", x, y);
+    }
 }
diff --git a/src/main/java/rlbotexample/vector/Vector3.java b/src/main/java/rlbotexample/vector/Vector3.java
index b359c52..506ab21 100644
--- a/src/main/java/rlbotexample/vector/Vector3.java
+++ b/src/main/java/rlbotexample/vector/Vector3.java
@@ -99,4 +99,9 @@ public Vector3 crossProduct(Vector3 v) {
         double tz = x * v.y - y * v.x;
         return new Vector3(tx, ty, tz);
     }
+
+    @Override
+    public String toString() {
+        return String.format("(%s, %s, %s)", x, y, z);
+    }
 }

From f12ed427db7f84122561f9041a10dfd788622333 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Sat, 30 Nov 2019 02:24:11 -0800
Subject: [PATCH 09/14] Updating run.py to avoid
 https://github.com/RLBot/RLBot/issues/462.

---
 run.py | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/run.py b/run.py
index 89b5a0e..60af312 100644
--- a/run.py
+++ b/run.py
@@ -1,36 +1,46 @@
+import sys
+
 # https://stackoverflow.com/a/51704613
 try:
     from pip import main as pipmain
 except ImportError:
     from pip._internal import main as pipmain
 
+# More pip changes breaking us.
+main_fn = pipmain
+if hasattr(pipmain, 'main'):
+    main_fn = pipmain.main
+
+DEFAULT_LOGGER = 'rlbot'
 
-# https://stackoverflow.com/a/24773951
-def install_and_import(package):
-    import importlib
+if __name__ == '__main__':
 
     try:
-        importlib.import_module(package)
-    except ImportError:
-        pipmain(['install', package])
-    finally:
-        globals()[package] = importlib.import_module(package)
+        from rlbot.utils import public_utils, logging_utils
 
+        logger = logging_utils.get_logger(DEFAULT_LOGGER)
+        if not public_utils.have_internet():
+            logger.log(logging_utils.logging_level,
+                       'Skipping upgrade check for now since it looks like you have no internet')
+        elif public_utils.is_safe_to_upgrade():
+            main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
 
-if __name__ == '__main__':
-    install_and_import('rlbot')
-    from rlbot.utils import public_utils
+            # https://stackoverflow.com/a/44401013
+            rlbots = [module for module in sys.modules if module.startswith('rlbot')]
+            for rlbot_module in rlbots:
+                sys.modules.pop(rlbot_module)
 
-    if public_utils.is_safe_to_upgrade():
-        pipmain(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
+    except ImportError:
+        main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
 
     try:
-        import sys
         if len(sys.argv) > 1 and sys.argv[1] == 'gui':
             from rlbot.gui.qt_root import RLBotQTGui
+
             RLBotQTGui.main()
         else:
             from rlbot import runner
+
             runner.main()
     except Exception as e:
         print("Encountered exception: ", e)

From c5a016a2e829eca6da9727c566d46e7ab7f2009c Mon Sep 17 00:00:00 2001
From: Viliam Vadocz <viliam.vadocz@gmail.com>
Date: Mon, 20 Jan 2020 11:47:13 +0100
Subject: [PATCH 10/14] Updated outdated comment

---
 rlbot.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rlbot.cfg b/rlbot.cfg
index 80411c4..930f607 100644
--- a/rlbot.cfg
+++ b/rlbot.cfg
@@ -5,7 +5,7 @@
 # Visit https://github.com/RLBot/RLBot/wiki/Config-File-Documentation to see what you can put here.
 
 [Match Configuration]
-# Number of bots/players which will be spawned.  We support up to max 10.
+# Number of bots/players which will be spawned.  We support up to max 64.
 num_participants = 2
 game_mode = Soccer
 game_map = Mannfield

From 3a47339772324f34bb01fb90992b57bfa8763c37 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Mon, 23 Mar 2020 20:02:47 -0700
Subject: [PATCH 11/14] Upgrading to RLBot Java framework 2.0 and cleaning some
 obsolete gradle tasks.

---
 build.gradle | 40 ++--------------------------------------
 run-bot.bat  |  6 ------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0124827..8f55dc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,54 +19,18 @@ applicationDefaultJvmArgs = ["-Djna.library.path=" + dllDirectory]
 
 dependencies {
     // Fetch the framework jar file
-    compile 'org.rlbot.commons:framework:1.+'
+    compile 'org.rlbot.commons:framework:2.+'
 
     // This is makes it easy to find the dll when running in intellij, where JVM args don't get passed from gradle.
     runtime files(dllDirectory)
 }
 
-task checkPipUpgradeSafety {
-    doLast {
-        new ByteArrayOutputStream().withStream { os ->
-            def exitValue = exec {
-                commandLine "python", "-c", "from rlbot.utils import public_utils; print(public_utils.is_safe_to_upgrade());"
-                standardOutput = os
-                ignoreExitValue = true
-            }.exitValue
-
-            // If the exit value is nonzero, the command  probably failed because rlbot is not installed at all.
-            ext.isSafe = exitValue != 0 || os.toString().trim() == "True"
-        }
-    }
-}
-
-
-// Uses pip (the python package manager) to install all the python packages needed for this bot, as defined
-// in requirements.txt.
-task pipInstallRequirements {
-    dependsOn 'checkPipUpgradeSafety'
-
-    doLast {
-        if (checkPipUpgradeSafety.isSafe) {
-            exec {
-                commandLine "python", "-m", "pip", "install", "-r", "requirements.txt", "--upgrade"
-            }
-        } else {
-            println 'Skipping upgrade attempt because files are in use.'
-        }
-    }
-}
 
 task createDllDirectory {
     mkdir dllDirectory
 }
 
-// Installs or updates RLBot. Empty task for now. It still does stuff because it "dependsOn" tasks that do things.
-task updateRLBot {
-    dependsOn 'pipInstallRequirements'
-    dependsOn 'createDllDirectory'
-}
-updateRLBot.dependsOn pipInstallRequirements
+run.dependsOn createDllDirectory
 
 applicationDistribution.exclude(dllDirectory)
 
diff --git a/run-bot.bat b/run-bot.bat
index 4508712..fd7a00b 100644
--- a/run-bot.bat
+++ b/run-bot.bat
@@ -1,12 +1,6 @@
 @rem Change the working directory to the location of this file so that relative paths will work
 cd /D "%~dp0"
 
-@rem Make sure the environment variables are up-to-date. This is useful if the user installed python a moment ago.
-call ./RefreshEnv.cmd
-
-@rem Install or update rlbot and related python packages.
-call ./gradlew.bat --no-daemon updateRLBot
-
 @rem Start running the bot.
 call ./gradlew.bat --no-daemon run
 

From 9b4c363dff8bc0b130f82b914c76adbed7c56a3b Mon Sep 17 00:00:00 2001
From: Tyler <tarehart@gmail.com>
Date: Sun, 17 May 2020 18:33:26 -0700
Subject: [PATCH 12/14] Setting enable_rendering and enable_state_setting to
 true

---
 rlbot.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rlbot.cfg b/rlbot.cfg
index 930f607..7944055 100644
--- a/rlbot.cfg
+++ b/rlbot.cfg
@@ -5,10 +5,13 @@
 # Visit https://github.com/RLBot/RLBot/wiki/Config-File-Documentation to see what you can put here.
 
 [Match Configuration]
+# Visit https://github.com/RLBot/RLBot/wiki/Config-File-Documentation to see what you can put here.
 # Number of bots/players which will be spawned.  We support up to max 64.
 num_participants = 2
 game_mode = Soccer
 game_map = Mannfield
+enable_rendering = True
+enable_state_setting = True
 
 [Mutator Configuration]
 # Visit https://github.com/RLBot/RLBot/wiki/Config-File-Documentation to see what you can put here.

From cb4db9648293b028861dc10596bc376786d08010 Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Sun, 12 Jul 2020 15:09:57 -0700
Subject: [PATCH 13/14] Removing references to legacy GUI.

---
 README.md   | 12 +++++-------
 run-gui.bat | 11 -----------
 run.py      | 27 ++++++---------------------
 3 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 run-gui.bat

diff --git a/README.md b/README.md
index e7c2910..d354da3 100644
--- a/README.md
+++ b/README.md
@@ -3,23 +3,21 @@ An example bot implemented in Java
 
 ## Video Guide
 
-https://youtu.be/mPfYqKe_KRs
+https://youtu.be/mPfYqKe_KRs (slightly outdated because it uses the old GUI)
 
 ## Usage Instructions:
 
-1. Make sure you've installed Python 3.6.5 or newer. Here's [Python 3.7 64 bit](https://www.python.org/ftp/python/3.7.0/python-3.7.0-amd64.exe). Some older versions like 3.6.0 will not work. During installation:
-   - Select "Add Python to PATH"
-   - Make sure pip is included in the installation
 1. Make sure you've installed the Java 8 JDK or newer. Here's the [Java 8 JDK](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html).
 1. Make sure you've [set the JAVA_HOME environment variable](https://javatutorial.net/set-java-home-windows-10).
 1. Download this repository
 1. Double click on run-bot.bat and leave it running. It's supposed to stay
 open and it's OK if it says something like "75%".
-1. Double click on run-gui.bat
-1. Click the 'Run' button
+  - Alternatively you can launch the bot from inside an IDE
+1. Get RLBotGUI (see https://youtu.be/lPkID_IH88U for instructions).
+1. Use Add -> Load folder in RLBotGUI on the current directory. This bot should appear in the list.
+1. In RLBotGUI, put the bot on a team and start the match.
 
 - Bot behavior is controlled by `src/main/java/rlbotexample/SampleBot.java`
-- Bot appearance is controlled by `src/main/python/javaExampleAppearance.cfg`
 
 See the [wiki](https://github.com/RLBot/RLBotJavaExample/wiki)
 for tips to improve your programming experience.
diff --git a/run-gui.bat b/run-gui.bat
deleted file mode 100644
index a1c00d9..0000000
--- a/run-gui.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-
-@rem Change the working directory to the location of this file so that relative paths will work
-cd /D "%~dp0"
-
-@rem Make sure the environment variables are up-to-date. This is useful if the user installed python a moment ago.
-call ./RefreshEnv.cmd
-
-python run.py gui
-
-pause
diff --git a/run.py b/run.py
index 60af312..23ea98a 100644
--- a/run.py
+++ b/run.py
@@ -1,16 +1,6 @@
+import subprocess
 import sys
 
-# https://stackoverflow.com/a/51704613
-try:
-    from pip import main as pipmain
-except ImportError:
-    from pip._internal import main as pipmain
-
-# More pip changes breaking us.
-main_fn = pipmain
-if hasattr(pipmain, 'main'):
-    main_fn = pipmain.main
-
 DEFAULT_LOGGER = 'rlbot'
 
 if __name__ == '__main__':
@@ -23,7 +13,8 @@
             logger.log(logging_utils.logging_level,
                        'Skipping upgrade check for now since it looks like you have no internet')
         elif public_utils.is_safe_to_upgrade():
-            main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
+            subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt'])
+            subprocess.call([sys.executable, "-m", "pip", "install", 'rlbot', '--upgrade'])
 
             # https://stackoverflow.com/a/44401013
             rlbots = [module for module in sys.modules if module.startswith('rlbot')]
@@ -31,17 +22,11 @@
                 sys.modules.pop(rlbot_module)
 
     except ImportError:
-        main_fn(['install', '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
+        subprocess.call([sys.executable, "-m", "pip", "install", '-r', 'requirements.txt', '--upgrade', '--upgrade-strategy=eager'])
 
     try:
-        if len(sys.argv) > 1 and sys.argv[1] == 'gui':
-            from rlbot.gui.qt_root import RLBotQTGui
-
-            RLBotQTGui.main()
-        else:
-            from rlbot import runner
-
-            runner.main()
+        from rlbot import runner
+        runner.main()
     except Exception as e:
         print("Encountered exception: ", e)
         print("Press enter to close.")

From ffed34b232f5349fb81dd05c66fd63839ce8f5cd Mon Sep 17 00:00:00 2001
From: Tyler Arehart <tarehart@gmail.com>
Date: Sun, 17 Oct 2021 17:45:14 -0700
Subject: [PATCH 14/14] Switching from jcenter to mavenCentral.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8f55dc7..e4bda5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'application'
 sourceCompatibility = 1.8
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 mainClassName = 'rlbotexample.JavaExample'