diff --git a/OpenRocket-15.03.jar b/OpenRocket-15.03.jar deleted file mode 100644 index 455b711..0000000 Binary files a/OpenRocket-15.03.jar and /dev/null differ diff --git a/README.md b/README.md index 1b7788f..d6052b7 100644 --- a/README.md +++ b/README.md @@ -22,20 +22,20 @@ To use ORBrake, it must be enabled on your simulation. To do this, create a new ## Contributing ORBrake is written in Java. This section explains what dependencies are required to build the project as well as how to configure the development environment. ### Dependencies -1. [jdk 8](https://adoptopenjdk.net/): OpenRocket requires Java 8. More recent versions are incompatible. To compile code, jdk 8 is required. +1. [jdk 17](https://adoptopenjdk.net/): OpenRocket requires Java 17. Older versions are incompatible. To compile code, jdk 17 is required. 1. [Apache Ant](https://mkyong.com/ant/how-to-install-apache-ant-on-windows/): Ant is used to automate the build process. Note that if you are using Eclipse as your IDE, Ant is built in and you don't need to download it seperetly. 1. [Eclipse](https://github.com/WPIRoboticsEngineering/ESP32ArduinoEclipseInstaller) *[Recomended]*: While not explicetly required for this project, you can use the Sloeber Eclipse that is used for HPRC's embedded firmware programs. There is no reason you couldn't use other IDEs like IDEA or VIM (depending on how much of a hacker you are) but the environment setup will be up to you. -1. OpenRocket 15.03: For obvious reasons, this OpenRocket plugin requires OpenRocket to run. Version 15.03, the most recent official release, is included in this repo. +1. OpenRocket 23.09: For obvious reasons, this OpenRocket plugin requires OpenRocket to run. Version 23.09, the most recent official release, is included in this repo. ### Eclipse Setup _Note: Some of these steps my automatically be done by importing from the repository. You may not have to do every one of them, but you should still verify they are completed. These instructions should enable you to configure the environment from scratch or in a different IDE._ 1. Start by importing the project into Eclipse via `File->Import->Git->Projects from Git`. -1. Add `OpenRocket-15.03.jar` to the class path via `Project->Properties->Java Build Path->Libraries->Add External JARs...` +1. Add `OpenRocket-23.09.jar` to the class path via `Project->Properties->Java Build Path->Libraries->Add External JARs...` 1. Add `JUnit 5` to the class path via `Project->Properties->Java Build Path->Libraries->Add Library...` -1. Go to `Window->Preferences->Java->Installed JREs` and select jdk 8. - 1. If jdk 8 is not on the list, select `Add...` +1. Go to `Window->Preferences->Java->Installed JREs` and select jdk 17. + 1. If jdk 17 is not on the list, select `Add...` 1. Select `Standard VM` then click `Next >` - 1. Click `Directory...` then navigate to and select `C:\Program Files\AdoptOpenJDK\jdk-8.0.275.1-hotspot\jre` or where ever you installed jdk 8 to. + 1. Click `Directory...` then navigate to and select `C:\Program Files\AdoptOpenJDK\` or where ever you installed jdk 17 to. 1. Click `Finish`. 1. Configure Ant 1. Go to `Run->External Tools->External Tools Configurations...` diff --git a/build.xml b/build.xml index 3935688..0c82b6f 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ Building... - + Done @@ -22,7 +22,7 @@ Done Running OpenRocket... - + Done diff --git a/src/net/sf/openrocket/ORBrake/ORBrakeConfigurator.java b/src/net/sf/openrocket/ORBrake/ORBrakeConfigurator.java index 6cecc84..5ad305a 100644 --- a/src/net/sf/openrocket/ORBrake/ORBrakeConfigurator.java +++ b/src/net/sf/openrocket/ORBrake/ORBrakeConfigurator.java @@ -97,7 +97,7 @@ protected JComponent getConfigurationComponent(ORBrake extension, Simulation sim panel.add(sliderTau, "w 75lp, wrap"); - panel.add(new JLabel("Drag Coeficient:")); + panel.add(new JLabel("Drag Coefficient:")); DoubleModel Cd = new DoubleModel(extension, "Cd", UnitGroup.UNITS_COEFFICIENT, 0); JSpinner spinCd = new JSpinner(Cd.getSpinnerModel()); diff --git a/src/net/sf/openrocket/ORBrake/ORBrakeProvider.java b/src/net/sf/openrocket/ORBrake/ORBrakeProvider.java index d672963..3f8a2e8 100644 --- a/src/net/sf/openrocket/ORBrake/ORBrakeProvider.java +++ b/src/net/sf/openrocket/ORBrake/ORBrakeProvider.java @@ -12,7 +12,7 @@ public class ORBrakeProvider extends AbstractSimulationExtensionProvider { */ public ORBrakeProvider() { - super(ORBrake.class, "WPI", "OR Brake"); + super(ORBrake.class, "Flight", "OR Brake"); } } \ No newline at end of file