From 771c5fbe3d08f805b04e57515fed8d13542c2354 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 21 Mar 2019 11:15:03 -0400 Subject: [PATCH] Better packr minimization --- core/assets/maps/craters.mmap | Bin 12955 -> 12956 bytes .../io/anuke/mindustry/content/Blocks.java | 2 +- desktop/build.gradle | 8 ++++ desktop/packr_minimize.json | 38 +++++++++++++++++- 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap index 0382c65d8465771bc111f38416c0ae3174bd9b7e..551a0376b6c0b88f679178642da3c2553206fe65 100644 GIT binary patch delta 12445 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 delta 12444 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 U`_HU8_->Hp;?l)PsE0HK#PG5`Po 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" ] }, {