mobile support :o

Author: nullotte

.gitignore

@@ -1,3 +1,4 @@
 /build/
 /.idea/
-/.gradle/
+/.gradle/
+/local.properties

README.md

@@ -2,6 +2,6 @@
 # Dusted Lands
 A small mod which adds powders to the game, along with a ton of turrets, units, and other content.
 # Compiling
-1. Download Java 16.
-2. Run `gradlew jar` (or `./gradlew jar` on Linux/Mac).
-3. The mod jar will be in `/build/libs/`. Currently doesn't support android.
+1. Clone this repository.
+2. Install any necessary files, such as Java 16 and the Android SDK.
+3. Run `gradlew deploy`. This should create a jar in the `build/libs` directory.

build.gradle

@@ -16,6 +16,7 @@ repositories {
 ext {
     mindustryVersion = 'v135'
     jabelVersion = '0.6.0'
+    sdkRoot = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
 }
 
 allprojects {
@@ -30,13 +31,58 @@ dependencies {
     annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
 }
 
+
+
 jar {
-    archiveFileName = "${project.archivesBaseName}.jar"
+    archiveFileName = "${project.archivesBaseName}Desktop.jar"
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }
 
     from(rootDir) {
         include "mod.hjson"
     }
+}
+
+task jarAndroid {
+    dependsOn "jar"
+
+    doLast {
+        if (!sdkRoot || !new File(sdkRoot).exists()) throw new GradleException("No valid Android SDK found. Ensure that ANDROID_HOME is set to your Android SDK directory.")
+
+        def platformRoot = new File("$sdkRoot/platforms/").listFiles().sort().reverse().find { f -> new File(f, "android.jar").exists() }
+
+        if (!platformRoot) throw new GradleException("No android.jar found. Ensure that you have an Android platform installed.")
+
+        //collect dependencies needed for desugaring
+        def dependencies = (configurations.compileClasspath.asList() + configurations.runtimeClasspath.asList() + [new File(platformRoot, "android.jar")]).collect { "--classpath $it.path" }.join(" ")
+
+        //dex and desugar files - this requires d8 in your PATH
+        def paras = "$dependencies --min-api 14 --output ${project.archivesBaseName}Android.jar ${project.archivesBaseName}Desktop.jar".toString()
+        try {
+            "d8 $paras".execute(null, new File("$buildDir/libs")).waitForProcessOutput(System.out, System.err)
+        } catch (Exception ignored) {
+            logger.lifecycle("d8 cannot be found in your PATH, so trying to use an absolute path.")
+            def cmdOutput = new ByteArrayOutputStream()
+            "where d8".execute().waitForProcessOutput(cmdOutput, System.err)
+            def d8FullPath = cmdOutput.toString().replace("\r", "").replace("\n", "")
+            logger.lifecycle("d8 was found at $d8FullPath")
+            "$d8FullPath $paras".execute(null, new File("$buildDir/libs")).waitForProcessOutput(System.out, System.err)
+        }
+    }
+}
+
+task deploy(type: Jar) {
+    dependsOn jarAndroid
+    dependsOn jar
+    archiveFileName = "${project.archivesBaseName}.jar"
+
+    from { [zipTree("$buildDir/libs/${project.archivesBaseName}Desktop.jar"), zipTree("$buildDir/libs/${project.archivesBaseName}Android.jar")] }
+
+    doLast {
+        delete {
+            delete "$buildDir/libs/${project.archivesBaseName}Desktop.jar"
+            delete "$buildDir/libs/${project.archivesBaseName}Android.jar"
+        }
+    }
 }

mod.hjson

@@ -1,10 +1,10 @@
 name: "dusted-lands"
 main: "dusted.DustedLands"
-version: 0.2
+version: 0.21
 minGameVersion: 129
 java: true
 
 displayName: "Dusted Lands"
 author: "KayAyeAre"
-description: "A small mod which adds powders to the game, along with a ton of turrets, units, and other content."
+description: "A small mod which adds powders to the game, along with some of turrets, units, and other content."
 repo: "KayyAyeAre/Dusted-Lands"

src/dusted/DustedLands.java

@@ -1,20 +1,18 @@
 package dusted;
 
 import arc.*;
-import arc.struct.*;
 import dusted.content.*;
 import dusted.input.*;
 import dusted.world.*;
 import mindustry.*;
 import mindustry.mod.*;
-import mindustry.world.*;
 
 public class DustedLands extends Mod {
-    public static DustedInput input;
+    public DustedInputHandler inputHandler;
 
     public DustedLands() {
         Vars.enableConsole = true;
-        Core.app.addListener(input = new DustedInput());
+        Core.app.addListener(inputHandler = new DustedInputHandler());
         VolcanoSpawner.load();
     }
 

src/dusted/ai/types/BounceAI.java

@@ -6,8 +6,8 @@
 
 public class BounceAI extends FlyingAI {
     @Override
-    public void updateWeapons() {
-        super.updateWeapons();
+    public void updateTargeting() {
+        super.updateTargeting();
         if (target != null) unit.abilities.each(a -> a instanceof BounceAbility, a -> ((BounceAbility) a).bounce(unit, target));
     }
 }

src/dusted/ai/types/OrbsAI.java

@@ -1,6 +1,7 @@
 package dusted.ai.types;
 
 import dusted.entities.abilities.*;
+import mindustry.*;
 import mindustry.ai.types.*;
 import mindustry.gen.*;
 
@@ -9,11 +10,11 @@ public class OrbsAI extends GroundAI {
     public void updateUnit() {
         super.updateUnit();
 
-        if (unit.abilities.contains(a -> a instanceof RevolvingOrbAbility)) {
-            RevolvingOrbAbility ability = (RevolvingOrbAbility) unit.abilities.find(a -> a instanceof RevolvingOrbAbility);
-            if (Groups.bullet.intersect(unit.x - (ability.radius * 2), unit.y - (ability.radius * 2), ability.radius * 4, ability.radius * 4).contains(b -> b.team.isEnemy(unit.team))) {
-                ability.summon();
+        unit.abilities.each(a -> a instanceof RevolvingOrbAbility, a -> {
+            RevolvingOrbAbility orbs = (RevolvingOrbAbility) a;
+            if (Groups.bullet.intersect(unit.x - (orbs.radius * 2), unit.y - (orbs.radius * 2), orbs.radius * 4, orbs.radius * 4).contains(b -> b.team.isEnemy(Vars.player.unit().team))) {
+                orbs.summon();
             }
-        }
+        });
     }
 }

src/dusted/content/DustedBlocks.java

@@ -589,7 +589,10 @@ DustedPowders.quartzDust, new RocketBulletType(3.8f, 50f) {{
 
             consumes.power(5f);
             consumes.items(ItemStack.with(Items.silicon, 120, Items.titanium, 100, DustedItems.plastel, 60));
-            upgrades.addAll(new UnitType[]{DustedUnitTypes.recur, DustedUnitTypes.saltate});
+            upgrades.addAll(
+                    new UnitType[]{DustedUnitTypes.recur, DustedUnitTypes.saltate},
+                    new UnitType[]{DustedUnitTypes.rancor, DustedUnitTypes.animus}
+            );
         }};
         //endregion
         //region cores

src/dusted/input/CustomInput.java

@@ -0,0 +1,5 @@
+package dusted.input;
+
+public interface CustomInput {
+    void update();
+}

src/dusted/input/DustedDesktopInput.java

@@ -0,0 +1,17 @@
+package dusted.input;
+
+import arc.*;
+import arc.input.*;
+import dusted.entities.abilities.*;
+import mindustry.*;
+
+public class DustedDesktopInput implements CustomInput {
+    @Override
+    public void update() {
+        if (Vars.state.isPlaying()) {
+            if (Core.input.keyTap(KeyCode.b) && !Core.scene.hasKeyboard()) Vars.player.unit().abilities.each(a -> a instanceof BounceAbility, a -> ((BounceAbility) a).bounce(Vars.player.unit()));
+            if (Core.input.keyTap(KeyCode.q) && !Core.scene.hasKeyboard()) Vars.player.unit().abilities.each(a -> a instanceof QuakeAbility, a -> ((QuakeAbility) a).quake());
+            if (Core.input.keyTap(KeyCode.r) && !Core.scene.hasKeyboard()) Vars.player.unit().abilities.each(a -> a instanceof RevolvingOrbAbility, a -> ((RevolvingOrbAbility) a).summon());
+        }
+    }
+}

src/dusted/input/DustedInput.java

@@ -0,0 +1,16 @@
+package dusted.input;
+
+import arc.*;
+import mindustry.*;
+
+public class DustedInputHandler implements ApplicationListener {
+    public CustomInput input;
+
+    {
+        input = Vars.mobile ? new DustedMobileInput() : new DustedDesktopInput();
+    }
+    @Override
+    public void update() {
+        input.update();
+    }
+}

src/dusted/input/DustedInputHandler.java

@@ -0,0 +1,23 @@
+package dusted.input;
+
+import arc.*;
+import dusted.entities.abilities.*;
+import mindustry.*;
+import mindustry.gen.*;
+
+public class DustedMobileInput implements CustomInput {
+    @Override
+    public void update() {
+        if (Vars.player.shooting) {
+            Vars.player.unit().abilities.each(a -> a instanceof BounceAbility, a -> ((BounceAbility) a).bounce(Vars.player.unit()));
+            Vars.player.unit().abilities.each(a -> a instanceof QuakeAbility, a -> ((QuakeAbility) a).quake());
+        }
+
+        Vars.player.unit().abilities.each(a -> a instanceof RevolvingOrbAbility, a -> {
+            RevolvingOrbAbility orbs = (RevolvingOrbAbility) a;
+            if (Groups.bullet.intersect(Vars.player.unit().x - (orbs.radius * 2), Vars.player.unit().y - (orbs.radius * 2), orbs.radius * 4, orbs.radius * 4).contains(b -> b.team.isEnemy(Vars.player.unit().team))) {
+                orbs.summon();
+            }
+        });
+    }
+}