diff --git a/build.gradle b/build.gradle index 9c75d7a3c9..a0e3c900b1 100644 --- a/build.gradle +++ b/build.gradle @@ -13,11 +13,12 @@ buildscript{ google() maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url 'https://jitpack.io' } + maven{ url "http://artifactory.nimblygames.com/artifactory/ng-public/" } //packr } dependencies{ classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.11' - classpath "com.github.anuken:packr:-SNAPSHOT" + classpath "com.badlogicgames.packr:packr-all:4.0.0" classpath "com.github.Anuken.Arc:packer:$arcHash" classpath "com.github.Anuken.Arc:arc-core:$arcHash" } diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b44eec609b..934546ec78 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1759,7 +1759,7 @@ public class UnitTypes implements ContentList{ armor = 3f; - buildSpeed = 2f; + buildSpeed = 1.5f; weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{ x = 0f; @@ -1833,7 +1833,7 @@ public class UnitTypes implements ContentList{ trailY = -4f; trailScl = 1.9f; - buildSpeed = 2.5f; + buildSpeed = 2f; weapons.add(new Weapon("plasma-mount-weapon"){{ @@ -1906,7 +1906,7 @@ public class UnitTypes implements ContentList{ trailY = -9f; trailScl = 2f; - buildSpeed = 3f; + buildSpeed = 2f; weapons.add(new RepairBeamWeapon("repair-beam-weapon-center"){{ x = 11f; @@ -2044,7 +2044,7 @@ public class UnitTypes implements ContentList{ trailY = -17f; trailScl = 3.2f; - buildSpeed = 3.5f; + buildSpeed = 3f; abilities.add(new EnergyFieldAbility(35f, 65f, 180f){{ repair = 35f; @@ -2085,7 +2085,7 @@ public class UnitTypes implements ContentList{ trailY = -32f; trailScl = 3.5f; - buildSpeed = 3.8f; + buildSpeed = 3.5f; for(float mountY : new float[]{-117/4f, 50/4f}){ for(float sign : Mathf.signs){ diff --git a/desktop/build.gradle b/desktop/build.gradle index 948b5413f9..872b8a5891 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -72,7 +72,12 @@ task steamtest(dependsOn: dist){ } } -//TODO replace with jpackage templates +//required templates: +//- Windows64 +//required JDKs: +//- Windows32 +//- Linux64 +//- Mac PackrConfig.Platform.values().each{ platform -> task "packr${platform.toString()}"{ dependsOn dist @@ -102,6 +107,7 @@ PackrConfig.Platform.values().each{ platform -> }else{ def config = new PackrConfig() config.with{ + //TODO consider useZgcIfSupportedOs = true config.executable = appName config.platform = platform verbose = true @@ -112,8 +118,7 @@ PackrConfig.Platform.values().each{ platform -> classpath = ["$rootDir/desktop/build/packr/desktop.jar".toString()] removePlatformLibs = ["$rootDir/desktop/build/packr/desktop.jar".toString()] - vmArgs = [] - minimizeJre = "$rootDir/desktop/packr_minimize.json".toString() + vmArgs = ["XX:+ShowCodeDetailsInExceptionMessages"] jdk = JDK_DIR + "jdk-${platform.toString().toLowerCase()}.zip" if(platform == PackrConfig.Platform.MacOS){ diff --git a/desktop/packr_minimize.json b/desktop/packr_minimize.json deleted file mode 100644 index d18eb478a8..0000000000 --- a/desktop/packr_minimize.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "reduce": [ - { - "archive": "jre/lib/rt.jar", - "paths": [ - "javax/transaction", - "javax/tools", - "javax/swing", - "javax/sql", - "javax/smartcardio", - "javax/rmi", - "javax/print", - "javax/naming", - "javax/management", - "javax/lang", - "javax/jws", - "javax/swing", - "javax/imageio", - "javax/annotation", - "javax/activity", - "javax/activation", - "javax/accessibility", - "com/sun/corba", - "com/sun/jmx", - "com/sun/org", - "com/sun/imageio", - "com/sun/jndi", - "com/sun/xml", - "com/sun/script", - "sun/awt", - "sun/java2d", - "sun/font", - "sun/rmi", - "sun/swing", - "com/sun/media", - "sun/print", - "sun/awt", - "sun/instrument", - "sun/security/tools", - "sun/security/smartcardio", - "sun/audio", - "javax/xml", - "javax/sound", - "javax/script", - "java/beans", - "java/applet", - "java/rmi", - "com/sun/naming", - "java/awt", - "com/sun/org/apache/xpath", - "com/sun/rowset", - "com/sun/script", - "sun/applet", - "sun/corba", - "sun/management" - ] - }, - { - "archive": "jre/lib/charsets.jar", - "paths": [ - ] - }, - { - "archive": "jre/lib/jsse.jar", - "paths": [ - ] - }, - { - "archive": "jre/lib/resources.jar", - "paths": [ - ] - } - ], - "remove": [ - { - "platform": "*", - "paths": [ - "jre/lib/rhino.jar" - ] - }, - { - "platform": "linux", - "paths": [ - "jre/lib/amd64/libawt.so", - "jre/lib/amd64/libawt_xawt.so", - "jre/lib/amd64/libjawt.so", - "jre/lib/amd64/libhprof.so", - "jre/lib/amd64/libdt_socket.so", - "jre/lib/amd64/libsplashscreen.so", - "jre/lib/amd64/libunpack.so", - "jre/lib/amd64/libnpt.so", - "jre/lib/amd64/libmlib_image.so", - "jre/lib/amd64/libinstrument.so", - "jre/lib/amd64/libjava_crw_demo.so", - "jre/lib/amd64/libfreetype.so", - "jre/lib/amd64/libmanagement.so", - "jre/lib/amd64/libsctp.so", - "jre/lib/amd64/libjpeg.so", - "jre/lib/amd64/libfreetype.so.6", - "jre/lib/amd64/libjsoundalsa.so", - "jre/lib/amd64/libjsound.so", - "jre/lib/amd64/libattach.so", - "jre/lib/amd64/libawt_headless.so", - "jre/lib/amd64/libfontmanager.so" - ] - }, - { - "platform": "windows", - "paths": [ - "jre/bin/*.exe", - "jre/bin/client", - "jre/bin/awt.dll" - ] - } - ] -}