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