diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap index 0382c65d84..551a0376b6 100644 Binary files a/core/assets/maps/craters.mmap and b/core/assets/maps/craters.mmap differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 6d54064b79..b58f931a4c 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1359,7 +1359,7 @@ public class Blocks implements ContentList{ //region units spiritFactory = new UnitFactory("spirit-factory"){{ - requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 100)); + requirements(Category.units, ItemStack.with(Items.copper, 70, Items.lead, 110, Items.silicon, 80)); type = UnitTypes.spirit; produceTime = 5700; size = 2; diff --git a/desktop/build.gradle b/desktop/build.gradle index 674b46e30b..713244db0d 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -69,6 +69,12 @@ task dist(type: Jar){ } } +task ttt(){ + fileTree("/home/anuke/Projects/Mindustry/deploy/Mindustry-Linux64-4-beta-66/jre/lib/amd64/newst").each{t -> + println("\"jre/lib/amd64/${t.absoluteFile.name}\",") + } +} + //note: call desktop:dist beforehand task packrCmd(){ @@ -83,6 +89,8 @@ task packrCmd(){ outDir = file("packr-out/") mainClass = project.ext.mainClassName classpath = ["desktop/build/libs/desktop-release.jar"] + removePlatformLibs = ["desktop/build/libs/desktop-release.jar"] + vmArgs = ["Djava.net.preferIPv4Stack=true"] minimizeJre = "desktop/packr_minimize.json" jdk = JDK_DIR + "jdk-${getPlatform().toString().toLowerCase()}.zip" diff --git a/desktop/packr_minimize.json b/desktop/packr_minimize.json index 0887fdf720..0f3ad13771 100644 --- a/desktop/packr_minimize.json +++ b/desktop/packr_minimize.json @@ -23,9 +23,17 @@ "javax/accessibility", "com/sun/corba", "com/sun/jmx", + "com/sun/org", + "com/sun/imageio", "com/sun/jndi", "com/sun/xml", "com/sun/script", + "sum/awt", + "sun/java2d", + "sun/font", + "sun/rmi", + "sun/swing", + "java/util/stream", "com/sun/media", "com/sun/naming", "java/awt", @@ -67,7 +75,35 @@ "paths": [ "jre/lib/amd64/libawt.so", "jre/lib/amd64/libawt_xawt.so", - "jre/lib/amd64/libjawt.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/liblcms.so", + "jre/lib/amd64/libnpt.so", + "jre/lib/amd64/libmlib_image.so", + "jre/lib/amd64/libjsig.so", + "jre/lib/amd64/libinstrument.so", + "jre/lib/amd64/libjaas_unix.so", + "jre/lib/amd64/libj2pcsc.so", + "jre/lib/amd64/libsaproc.so", + "jre/lib/amd64/libsunec.so", + "jre/lib/amd64/libj2pkcs11.so", + "jre/lib/amd64/libjsdt.so", + "jre/lib/amd64/libjdwp.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/libj2gss.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" ] }, {