Final deprecations

Next destination: Release
stianloader · Apr 14, 2022 · ddc3ba8 · ddc3ba8
1 parent c0d4d4b
commit ddc3ba8
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 22 deletions.
diff --git a/brachyura-bootstrap-0.jar b/brachyura-bootstrap-0.jar
diff --git a/buildscript/src/main/java/Buildscript.java b/buildscript/src/main/java/Buildscript.java
@@ -19,6 +19,14 @@ public Buildscript() {
                     .addHttpRepository("https://geolykt.de/maven", false) // FIXME fix this at the source
                     .addHttpRepository("https://repo1.maven.org/maven2/")
                     .setAccessWidenerFile("starloader-api.accesswidener")
+                    .addDependency("org.ow2.asm", "asm-analysis", "9.2", "https://asm.ow2.io/javadoc/")
+                    .addDependency("org.ow2.asm", "asm-commons", "9.2", "https://asm.ow2.io/javadoc/")
+                    .addDependency("org.ow2.asm", "asm-util", "9.2", "https://asm.ow2.io/javadoc/")
+                    .addDependency("org.ow2.asm", "asm-tree", "9.2", "https://asm.ow2.io/javadoc/")
+                    .addDependency("org.ow2.asm", "asm", "9.2", "https://asm.ow2.io/javadoc/")
+                    .addDependency("org.jetbrains", "annotations", "22.0.0", "https://javadoc.io/doc/org.jetbrains/annotations/22.0.0/")
+                    .addDependency("de.geolykt.starloader", "mixin", "0.8.4", "https://jenkins.liteloader.com/view/Other/job/Mixin/javadoc/")
+                    .addDependency("com.badlogicgames.gdx", "gdx", "1.9.11", "https://libgdx.badlogicgames.com/ci/nightlies/docs/api/")
                     .addDependency("de.geolykt.starloader", "launcher", "3.0.0"));
 
         this.getCompileOptions()
@@ -37,6 +45,6 @@ public String getBuildscriptName() {
     }
 
     static {
-        System.setProperty("de.geolykt.starplane.nocache", "true");
+        //System.setProperty("de.geolykt.starplane.nocache", "true");
     }
 }
diff --git a/buildscript/starplane.jar b/buildscript/starplane.jar
diff --git a/src/main/java/de/geolykt/starloader/api/empire/ActiveEmpire.java b/src/main/java/de/geolykt/starloader/api/empire/ActiveEmpire.java
@@ -183,7 +183,9 @@ public default void addSLActor(@NotNull ActorSpec actor) {
      * the Empire is currently owned by the player.
      *
      * @return The {@link Flagship} owned by the Empire
+     * @deprecated Exposes galimulator internals directly. Generally stupid API
      */
+    @Deprecated(forRemoval = true, since = "1.6.0")
     public @Nullable Flagship getFlagship();
 
     /**
@@ -192,7 +194,9 @@ public default void addSLActor(@NotNull ActorSpec actor) {
      * directly.
      *
      * @return An {@link ArrayList} of {@link Fleet} that are assigned to the empire
+     * @deprecated Exposes galimulator internals directly. Generally stupid API
      */
+    @Deprecated(forRemoval = true, since = "1.6.0")
     public @NotNull ArrayList<Fleet> getFleets();
 
     /**

diff --git a/src/main/java/de/geolykt/starloader/api/empire/Empire.java b/src/main/java/de/geolykt/starloader/api/empire/Empire.java
@@ -62,7 +62,9 @@ public default int getAge() {
      * change without reason to not confuse the user.
      *
      * @return The GalColor assigned to the empire
+     * @deprecated snoddasmannen.galimulator.GalColor getters and setters are scheduled for purging in a future version
      */
+    @Deprecated(forRemoval = true, since = "1.6.0")
     public @NotNull GalColor getColor();
 
     /**

diff --git a/src/main/java/de/geolykt/starloader/api/registry/RegistryExpander.java b/src/main/java/de/geolykt/starloader/api/registry/RegistryExpander.java
@@ -88,14 +88,14 @@ public void addEmpireSpecial(@NotNull NamespacedKey key, @NotNull String enumNam
          * These regions are not rendered if the star region rendering setting is disabled. This  function may be called very often
          * so caching might be needed on the function's side. This parameter is there to reduce the burden of extensions
          * when it comes to actually making the map mode useful and such functionality is the most needed type of map modes</li>
-         *
+         * </ul>
          * <ul>
-         * <li>Parameter is null if there should be no obvious colouring of star regions.</li>
+         * <li>The parameter is null if there should be no obvious colouring of star regions.</li>
          * <li>The function will return null for any non-null star if the star's overlaid region should not be painted
          * in any obvious color. The function may throw an exception if it is fed in a null star.</li>
          * <li>If neither of the above conditions apply, the function must return a non-null color which should be used to
          * paint the overlaying region in a certain color.</li>
-         * </ul></ul>
+         * </ul>
          * @param key The registry key of the enum to register
          * @param enumName The unique enum-like name of the map mode. Used for {@link Enum#name()} along other methods
          * @param sprite The sprite to use for the map mode in the map mode selection menu.

diff --git a/src/main/java/de/geolykt/starloader/api/resource/AudioSampleWrapper.java b/src/main/java/de/geolykt/starloader/api/resource/AudioSampleWrapper.java
@@ -14,24 +14,24 @@
  */
 public abstract class AudioSampleWrapper implements ResourceWrapper<Sound> {
 
-    public static AudioSampleWrapper ACTOR_ORDERED = null;
-    public static AudioSampleWrapper ACTOR_SELECTED = null;
-    public static AudioSampleWrapper ALARM = null;
-    public static AudioSampleWrapper BAD_MINI = null;
-    public static AudioSampleWrapper BIG_LASER = null;
-    public static AudioSampleWrapper BIGBOOM_1 = null;
-    public static AudioSampleWrapper BIGBOOM_2 = null;
-    public static AudioSampleWrapper CLONE = null;
-    public static AudioSampleWrapper GOOD_MINI = null;
-    public static AudioSampleWrapper HEALRAY = null;
-    public static AudioSampleWrapper HIT_1 = null;
-    public static AudioSampleWrapper HIT_2 = null;
-    public static AudioSampleWrapper HIT_3 = null;
-    public static AudioSampleWrapper MISSILE = null;
-    public static AudioSampleWrapper SMALL_LASER = null;
-    public static AudioSampleWrapper UI_BIG_SELECT = null;
-    public static AudioSampleWrapper UI_ERROR = null;
-    public static AudioSampleWrapper UI_SMALL_SELECT = null;
+    public static AudioSampleWrapper ACTOR_ORDERED;
+    public static AudioSampleWrapper ACTOR_SELECTED;
+    public static AudioSampleWrapper ALARM;
+    public static AudioSampleWrapper BAD_MINI;
+    public static AudioSampleWrapper BIG_LASER;
+    public static AudioSampleWrapper BIGBOOM_1;
+    public static AudioSampleWrapper BIGBOOM_2;
+    public static AudioSampleWrapper CLONE;
+    public static AudioSampleWrapper GOOD_MINI;
+    public static AudioSampleWrapper HEALRAY;
+    public static AudioSampleWrapper HIT_1;
+    public static AudioSampleWrapper HIT_2;
+    public static AudioSampleWrapper HIT_3;
+    public static AudioSampleWrapper MISSILE;
+    public static AudioSampleWrapper SMALL_LASER;
+    public static AudioSampleWrapper UI_BIG_SELECT;
+    public static AudioSampleWrapper UI_ERROR;
+    public static AudioSampleWrapper UI_SMALL_SELECT;
 
     /**
      * The location of the resource within the respective data folder.