mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-22 04:28:27 +07:00
JITPack-based dependencies
This commit is contained in:
parent
35348f1150
commit
4386d3169a
@ -31,7 +31,7 @@ dependencies {
|
||||
implementation 'org.sufficientlysecure:donations:2.5'
|
||||
implementation 'com.google.android.gms:play-services-auth:16.0.1'
|
||||
|
||||
implementation project(":Arc:backends:backend-android")
|
||||
implementation arcModule("backends:backend-android")
|
||||
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
|
||||
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a"
|
||||
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
|
||||
|
38
build.gradle
38
build.gradle
@ -12,6 +12,11 @@ buildscript{
|
||||
}
|
||||
}
|
||||
|
||||
//make sure snapshot Arc does not get cached
|
||||
configurations.all {
|
||||
resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
|
||||
}
|
||||
|
||||
allprojects{
|
||||
apply plugin: "idea"
|
||||
|
||||
@ -25,6 +30,17 @@ allprojects{
|
||||
gdxVersion = '1.9.9'
|
||||
roboVMVersion = '2.3.0'
|
||||
uCoreVersion = 'bf399460a6a3656b0ed7cfe398a72befe2b66b42'
|
||||
|
||||
arcModule = { String name ->
|
||||
def comp = System.properties["release"] == null || System.properties["release"] == "false"
|
||||
|
||||
if(new File(projectDir.parent, '../Arc').exists() && comp){
|
||||
return project(":Arc:$name")
|
||||
}else{
|
||||
if(name.contains(':')) name = name.split(':').last()
|
||||
return "com.github.Anuken.Arc:$name:-SNAPSHOT"
|
||||
}
|
||||
}
|
||||
|
||||
getVersionString = {
|
||||
String buildVersion = getBuildVersion()
|
||||
@ -95,7 +111,7 @@ project(":desktop"){
|
||||
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
|
||||
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
|
||||
|
||||
compile project(":Arc:backends:backend-lwjgl3")
|
||||
compile arcModule("backends:backend-lwjgl3")
|
||||
compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
|
||||
}
|
||||
}
|
||||
@ -148,7 +164,7 @@ project(":ios"){
|
||||
compile project(":core")
|
||||
compile project(":net")
|
||||
|
||||
compile project(":Arc:backends:backend-robovm")
|
||||
compile arcModule("backends:backend-robovm")
|
||||
|
||||
compile "com.mobidevelop.robovm:robovm-rt:$roboVMVersion"
|
||||
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
|
||||
@ -166,17 +182,9 @@ project(":core"){
|
||||
|
||||
dependencies{
|
||||
build.finalizedBy(finish)
|
||||
|
||||
def comp = System.properties["release"] == null || System.properties["release"] == "false"
|
||||
if(!comp) println("Note: Compiling release build.")
|
||||
|
||||
if(new File(projectDir.parent, '../Arc').exists() && comp){
|
||||
compile project(":Arc:arc-core")
|
||||
compile project(":Arc:extensions:freetype")
|
||||
}else{
|
||||
//TODO compile arc from jitpack
|
||||
//compile 'com.github.Anuken.Arc:arc:-SNAPSHOT'
|
||||
}
|
||||
|
||||
compile arcModule("arc-core")
|
||||
compile arcModule("extensions:freetype")
|
||||
|
||||
compileOnly project(":annotations")
|
||||
annotationProcessor project(":annotations")
|
||||
@ -189,7 +197,7 @@ project(":server"){
|
||||
dependencies{
|
||||
compile project(":core")
|
||||
compile project(":net")
|
||||
compile project(":Arc:backends:backend-headless")
|
||||
compile arcModule("backends:backend-headless")
|
||||
}
|
||||
}
|
||||
|
||||
@ -200,7 +208,7 @@ project(":tests"){
|
||||
testImplementation project(":core")
|
||||
testImplementation('org.junit.jupiter:junit-jupiter-api:5.1.0')
|
||||
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.1.0')
|
||||
compile project(":Arc:backends:backend-headless")
|
||||
compile arcModule("backends:backend-headless")
|
||||
}
|
||||
|
||||
test{
|
||||
|
@ -172,15 +172,9 @@ public class Renderer implements ApplicationListener{
|
||||
blocks.processBlocks();
|
||||
|
||||
blocks.drawShadows();
|
||||
blocks.drawBlocks(Layer.block);
|
||||
|
||||
for(Team team : Team.all){
|
||||
if(blocks.isTeamShown(team)){
|
||||
blocks.drawTeamBlocks(Layer.block, team);
|
||||
}
|
||||
}
|
||||
blocks.skipLayer(Layer.block);
|
||||
|
||||
Draw.shader(Shaders.blockbuild, false);
|
||||
Draw.shader(Shaders.blockbuild, true);
|
||||
blocks.drawBlocks(Layer.placement);
|
||||
Draw.shader();
|
||||
|
||||
|
@ -140,7 +140,6 @@ public class BuildBlock extends Block{
|
||||
for(TextureRegion region : target.getBlockIcon()){
|
||||
Shaders.blockbuild.region = region;
|
||||
Shaders.blockbuild.progress = entity.progress;
|
||||
Shaders.blockbuild.apply();
|
||||
|
||||
Draw.rect(region, tile.drawx(), tile.drawy(), target.rotate ? tile.getRotation() * 90 : 0);
|
||||
Draw.flush();
|
||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user