Convert to using my black hole renderer lib

Author: MEEPofFaith

build.gradle

@@ -1,9 +1,7 @@
-import arc.files.*
-import arc.util.*
+import arc.files.Fi
+import arc.util.OS
 import arc.util.serialization.Jval
 
-import java.util.regex.*
-
 buildscript{
     dependencies{
         classpath "com.github.Anuken.Arc:arc-core:$arcVersion"
@@ -38,6 +36,10 @@ configure(allprojects){
         mindustry = {String module ->
             return "com.github.Anuken.Mindustry$module:$mindustryVersion"
         }
+
+        blackhole = {String module ->
+            return "com.github.MEEPofFaith$module:$blackHoleRendererVersion"
+        }
     }
 
     configurations.configureEach{
@@ -102,6 +104,8 @@ configure(rootProject){
         // Depend on Mindustry/Arc classpath.
         compileOnly "${mindustry(':core')}"
         compileOnly "${arc(':arc-core')}"
+
+        compileOnly "${blackhole(':MindustryBlackHoleRenderer')}"
     }
 
     jar{
@@ -204,4 +208,4 @@ for(def i = 0; i < 2; i++){
             logger.log(LogLevel.LIFECYCLE, "Copied :${isDex ? 'dex' : 'jar'} output to $folder.")
         }
     }
-}
+}

gradle.properties

@@ -25,6 +25,8 @@ mindustryVersion = v146
 mindustryBEVersion =
 # Arc version, should either follow `mindustryVersion` for release or whatever hash bleeding-edge Mindustry uses.
 arcVersion = v146
+# My black hole renderer. Just use the latest release.
+blackHoleRendererVersion = v7
 
 ##### Android SDK configuration for building Android artifacts.
 # Android platform SDK version.

src/progressed/ProgMats.java

@@ -142,7 +142,6 @@ void loadSettings(){
             t.sliderPref("pm-sword-opacity", 100, 20, 100, 5, s -> s + "%");
             t.sliderPref("pm-zone-opacity", 100, 0, 100, 5, s -> s + "%");
             t.checkPref("pm-tesla-range", true);
-            t.checkPref("pm-advanced-blackhole-rendering", true, PMRenders::toggleAdvancedBlackholes);
             t.pref(new Separator("pm-other-settings"));
             t.checkPref("pm-farting", false, b -> Sounds.wind3.play(Interp.pow2In.apply(Core.settings.getInt("sfxvol") / 100f) * 5f));
         });

src/progressed/content/effects/EnergyFx.java

@@ -4,9 +4,9 @@
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
+import blackhole.entities.effect.*;
 import mindustry.entities.*;
 import mindustry.graphics.*;
-import progressed.entities.effect.*;
 import progressed.graphics.*;
 import progressed.util.*;
 
@@ -79,9 +79,9 @@ public class EnergyFx{
         Drawf.light(e.x, e.y, rX * 2f, e.color, 0.8f);
     }),
 
-    kugelblitzCharge = new SwirlEffect(30f, 8, 2f, 30f, 90f, false).layer(Layer.bullet - 0.03f),
+    kugelblitzCharge = new SwirlEffect(30f, 8, 2f, 30f, 90f, false, false).layer(Layer.bullet - 0.03f),
 
-    blackHoleSwirl = new SwirlEffect(90f, 8, 3f, 120f, 480f, true, true).layer(Layer.effect + 0.005f),
+    blackHoleSwirl = new SwirlEffect(90f, 8, 3f, 120f, 480f, true).layer(Layer.effect + 0.005f),
 
     blackHoleDespawn = new Effect(80f, e -> {
         float rad = 24f;

src/progressed/content/effects/ModuleFx.java

@@ -5,10 +5,10 @@
 import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
+import blackhole.entities.effect.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.graphics.*;
-import progressed.entities.effect.*;
 import progressed.graphics.*;
 
 import static arc.graphics.g2d.Draw.*;

src/progressed/entities/bullet/energy/BlackHoleBulletType.java

@@ -5,6 +5,7 @@
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import blackhole.graphics.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.entities.bullet.*;
@@ -13,7 +14,6 @@
 import progressed.content.effects.*;
 import progressed.entities.*;
 import progressed.entities.bullet.pseudo3d.*;
-import progressed.graphics.renders.*;
 
 public class BlackHoleBulletType extends BulletType{
     static Seq<Class<?>> immuneTypes = Seq.with(
@@ -117,7 +117,7 @@ public void updateTrailEffects(Bullet b){
     @Override
     public void draw(Bullet b){
         float fout = fout(b);
-        PMRenders.blackHole(b.x, b.y, size * fout, lensEdge * fout, b.team.color);
+        BlackHoleRenderer.addBlackHole(b.x, b.y, size * fout, lensEdge * fout, b.team.color);
     }
 
     @Override