This commit is contained in:
Anuken
2019-05-28 09:24:13 -04:00
parent 752267c521
commit bd134bf9c9
4 changed files with 4 additions and 29 deletions

View File

@@ -8,7 +8,7 @@ buildscript{
} }
dependencies{ dependencies{
classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.android.tools.build:gradle:3.4.1'
} }
} }
@@ -166,27 +166,4 @@ task run(type: Exec){
def adb = path + "/platform-tools/adb" def adb = path + "/platform-tools/adb"
commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher' commandLine "$adb", 'shell', 'am', 'start', '-n', 'io.anuke.mindustry/io.anuke.mindustry.AndroidLauncher'
} }
// sets up the Android Idea project, using the old Ant based build.
idea{
module{
sourceDirs += file("src")
scopes = [COMPILE: [plus: [project.configurations.compile]]]
iml{
withXml{
def node = it.asNode()
def builder = NodeBuilder.newInstance()
builder.current = node
builder.component(name: "FacetManager"){
facet(type: "android", name: "Android"){
configuration{
option(name: "UPDATE_PROPERTY_FILES", value: "true")
}
}
}
}
}
}
}

View File

@@ -15,8 +15,6 @@ buildscript{
} }
allprojects{ allprojects{
apply plugin: "idea"
version = 'release' version = 'release'
ext{ ext{

View File

@@ -795,7 +795,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
} }
public boolean isShooting(){ public boolean isShooting(){
return isShooting && (!isBoosting || mech.flying); return isShooting && (!isBoosting || mech.flying) && mining == null;
} }
public void updateRespawning(){ public void updateRespawning(){

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists