From a1b3d83422619b380ef44b0eb8c441216e64cfcc Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Tue, 24 Nov 2020 00:25:16 -0800 Subject: [PATCH] Created :tools subproject default configs --- tools/assets/ic_launcher_128.png | Bin 0 -> 2084 bytes tools/assets/ic_launcher_16.png | Bin 0 -> 1080 bytes tools/assets/ic_launcher_32.png | Bin 0 -> 1575 bytes tools/build.gradle | 26 +++++++++++++++++ tools/font-metrics/build.gradle | 27 +----------------- .../java/com/riiablo/FontMetricsTool.java | 4 +++ tools/map-viewer/build.gradle | 27 +----------------- .../main/java/com/riiablo/map/MapViewer.java | 4 +++ 8 files changed, 36 insertions(+), 52 deletions(-) create mode 100644 tools/assets/ic_launcher_128.png create mode 100644 tools/assets/ic_launcher_16.png create mode 100644 tools/assets/ic_launcher_32.png diff --git a/tools/assets/ic_launcher_128.png b/tools/assets/ic_launcher_128.png new file mode 100644 index 0000000000000000000000000000000000000000..abf412d5a8f9dffb28b17a71b70e15a3a5e00865 GIT binary patch literal 2084 zcmWku4^$I(68-^;1`WF6T31|Q@fL5f0T;}{;^kzKMHaf!U~`&k&WpM|;xqc9<`gZ5 z3q}QvHDHu@rke7n@+#WY^3K%bFw%&Ev>-vAHw) zGK7)gYFNU_aaK;MNKAtv8bYF?Q58+-QCKH~H7sEuP@RIvmq`U)X5b_ui5it;F-7Q= zj9D%<;JQ3DYi1aehO*0vDiW>Y5VOFT4YXOObh7d~9=93Pjy$Gbi`h+_N2R)^$7}P| z&SLIbzN*K7yX-2T47kmPR-3ZVMD-X9?Y6wv#fm`(-R%;3s!T(5tk=yCInBN#OqlJP-s)Boe7q z3d1mhASj9w7>eUKK@cQKQY21M6itzGzt9SnmMatrUO_Po!!in%WtE&l&C)#2Yk7rS ztx+nKDwRs3(daZvtyaq#jQN66r_<^6`aHeXU@#bs#{B$zt0-7Z#@b?o#bU8rO`_H1 za5$W`w%XcSm&?`K+S=XS-P-Ew>+ACY5k@2kCP8osN=R{;6qlnEjRBlRfleZU5Cle1 z1j7&vhY1`dNQ5MD8A;$Wijom>ilpT-O2IG+ImgmUp4F&%twyC2)bHNCD<8dn-G2ii z2JYi+089=WM?lBD0v`ZSOD3DD%CkSa^WoPs(&47HMeMPnxk=ECP^hwGqdPyldM%~=jxgh3I#LdoI+Ui3wEZsZ&i;*2hB@3nRx5@n8Mp>`R3WL z|1C>ix&Igb#k)n`^N=oJaH?U)6+hzL`gqmAp0eCA z_c+tcv>jR4KxN1NWxMBCUZ#9-{ME4X`G!$+tWyYW+cq>FayAT{^>|Xt^bu2|OVKv< zr3O{YA98P&>xjhExM3nGbuzfB*wPqG%@Fqom!c{2xjb;F-ec*#G52bkx!TbD`i2EM_SAiKA2{8%7!Ap+82J!i1^ykR z+q4u31?vV|;Puknob|_tD+ux4`+r$*{7B=KG30Bky}}NQk#(Ry5GH|8Sa)0NnRO^7 z^2x0i*6xm?F#X8kOz=^SYe!4SO!sq;_*FoU{B{l1r2Hwup71tfKpz9!6Haurme&H3 zzr6;$3ed4W zXVJ=$LGgd{3w>2qlNB6gC%F6Bg!4ZJ+NLt8jW3ZfyN4L7YZ`q}wb;Ef`k?VNFJ|F^ z?)cHBzOH^_z~B@I-n=APl^9OIGnY` zMQ5kv(U)%Ai9WdDLhzX@qf3*5L!vLoir)bQ2~0ZxXP5O>JY6y{*#6s^1uOKb(f++# zyRS4b|MJgEKcqdoqWe?;2?Np36tb0HFig+UJ!9mD%%wx@cv z`}oWg@A1o@q;HrKH`A>Flfw4u4sfx>dgY7=AZs1^zHH~I@{0?%GG}vpMX0MjX+lM? z^N(WCfqIULUqB*XWs+Ou4^yloQ3BSvHofQ5oZg0@1BfEdKK`MB| zgox?q1Dc!mq)lMl&6l^o*Vf;4xFxka=Jy)^z8IE(HT0)=WQ@1Un*LeRByk;-hfxP7 z;wL^z>BxwitlcdlhZCnwfaZcJWv>FxUpcffIO@mn^`#9z$X5IF!yX+Oq)%3;oU6e$ z;0f4-Bh}asjc>Fu**2)L8JT@RnVtK9o;SO|a`<=CYkExq?fvVUf~lF{YD?-T_Ic?g z4UGsp#TlYpyuIc6=Ik?vK9?0p+*8+p(V)KeO#GLejS+*Np_L&^cYZOgxZbm9kzt31Zuu<1uZ{(uSLt>sTQU+#25pf(V%# z8J}>nmx!!e&X|8q@hE1u)Fa>ahqtYrSg0B2iZ(HbbqNC+4V8Cnq9Rr$q}V&f_Qs{@(o+3dL`+M@ph D=p{`? literal 0 HcmV?d00001 diff --git a/tools/assets/ic_launcher_16.png b/tools/assets/ic_launcher_16.png new file mode 100644 index 0000000000000000000000000000000000000000..1347de576f2d5bf87f7fe8263e68a3230b7a3de2 GIT binary patch literal 1080 zcmWkte`wrf82;umja#~X8xg)q{`eT5_z9WD5;3sg(vf1y!pLTJwlht2frRYhuM$g*=&-3s;@WS){ z@t(8}JUX!X?#%#zfe}ML)OUD`?8d&*-P;}mU?Z?hd$>Om00hK}1gbJ}0WdUd8?*pG zWWZ?v+9B>X(^1ZGQ4GUyEW>kT$8j>A>Umx+6NF({E)|>2 zX1CjA83r-{u?&K&z(c|@7;zZ!B4mjGDdrTGkpw7FUgJ51LW5%zDwvqlMP3uJ16f1H zx=d{e?MkTin62wj~71oz5IRSadv%J9am_>xcB8O!pDFVPc z0zS(!JP#4#1%VeZBp4COQ;J1Ouqa6)ktM3gqNHk?DjT|DnY!zkDcANrr`PM9{%3Bk z{{wdh#^IL%*s|jmH+=Km>q$Rc8qtSr^xl!y(Eg?bH+ACUSNxL$PrvXv-S^gie^f^G zHEVq9n@4x}7k3|`Q+qFqOXax}@2tH&(ObK)zI6N9@)n5iH@|qKc>Ut}A12hJXBTFp zod@xcpT$=uN*sk>dMqTL)-5~m%d*g zzHPg-z&HM$-}KY^rTzBD+ec^43?6)Z`p;btnI!+*(8zDS7{2t$N4?ptXW9=gwMOS( z+%vK8%kaa}u_=66Ss8zl{d(}j6DxOoy6xK!{(bex`{fcMKlNk5g5iWj3h9MqBxdjSymK9MHV%MQ540iahj(2 zy}Dr-k=CYEDwWISK!*c%04V4{VGu)L0&?Iegrf)rg9HYXIK+Yu8iQ#P;Sq=>VG(k$ zBqrgIKp{MZD=;WBxWJH35>qimB|s;OI$6Sl!fpyy1wtoKH%Is>NRudC1Op`MmB}DY zcx2vWARTx66v5a6LO;{tO+!drF4^6^O*7BR$>(|Oi|$NWk> zD4z8@vpSxLIBg2(HuZF?JYvvUUGHo4JqU9Dw%ANU%SMff6GEgaCm?HIPsVHovz=ApHpMWfULHL@?c8MT=3wl8_{gR?(G^P#f@GQ_ViVWd|XM z%;y0>VG#i)+$5)wq)&natYpx1ljt&8)sp3y2#{9>Q-f! z%O&Vuzb3ogZjZ;~^SE?f_j5t76ylE5jN zrU-^6S%#uHp63`*U}Z^A70IPK-J0_7;lq|6dwcUgFkKh_@D>34{PCaoNdNVBYyc>@ zuu@p&WOwb@^U520Y2^LYPt>(UQ}=e)h;J(r3m(fHs_d&{?Mw;v z&YU})`{rQJxQj|oAL!w(PrP>X%cpN!;Q#0adhsM@URgf;WyR?AuIl(-j(qfw#_E~t zwiNxM;ntrob^P-`RdxFwzxB=h`X`>cTU*#JAG~gQ3EsRuHC{ik@wooW!B5wJE(e1b zX1@BfEq`}B`H?m`XY$g^e(B|+N4qB8d~EyMGZs5K%Gw$l9G$L?`(M`&{A$FWK2m?9 zcJunJEj7zN{&h*)+qLE14_-O3ApU$}#kGmQb_SA1s?nYs_YRNEzu!De4+@7@_Vn!e zVb_e;&Me9*H79pI81vMf1>ZY&_XD6~Raecj-(*kEP31lrhMx}=RPBDWaPs40;MO0j z!olLDWfhGZ)-047e;7TD8_4&ySr0sRUoGikhi;#oS>Q|kzO$xEJM-1M4ig_7Ru^Zt zFFkOnK+JogYEcWMY;CA^)tcmYjiZ;xrsNBy m*aW+&+5h^~;@#D^9|G+Kg}-ehlhgCp4y;^WA^fe})$o7R;E3!1 literal 0 HcmV?d00001 diff --git a/tools/build.gradle b/tools/build.gradle index 510ed307..0e774d8c 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -22,6 +22,9 @@ subprojects { apply plugin: 'java' apply plugin: 'application' + sourceSets.main.resources.srcDirs += project(':tools').file('assets') + idea.module.resourceDirs += project(':tools').file('assets') + dependencies { implementation project(':core') implementation "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" @@ -35,4 +38,27 @@ subprojects { dependencies { testImplementation 'junit:junit:4.12' } + + run { + ignoreExitValue true + + // Required to run LWJGL3 java apps on MacOS + if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) { + jvmArgs += "-XstartOnFirstThread" + } + } + + jar { + archiveBaseName = project.name + duplicatesStrategy DuplicatesStrategy.EXCLUDE + dependsOn configurations.runtimeClasspath + from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + manifest { + attributes 'Main-Class': application.mainClass + } + + doLast { + file(archiveFile).setExecutable(true, false) + } + } } diff --git a/tools/font-metrics/build.gradle b/tools/font-metrics/build.gradle index 5349f173..9707ba65 100644 --- a/tools/font-metrics/build.gradle +++ b/tools/font-metrics/build.gradle @@ -1,26 +1 @@ -application { - mainClass = 'com.riiablo.FontMetricsTool' -} - -run { - workingDir = rootProject.file('assets').path - setIgnoreExitValue(true) - - // Required to run LWJGL3 java apps on MacOS - if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) { - jvmArgs += "-XstartOnFirstThread" - } -} - -jar { - archiveBaseName = project.name - dependsOn configurations.runtimeClasspath - from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } - manifest { - attributes 'Main-Class': application.mainClass - } - - doLast { - file(archiveFile).setExecutable(true, false) - } -} +application.mainClassName = 'com.riiablo.FontMetricsTool' diff --git a/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java b/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java index 6bc89a28..9980ba2c 100644 --- a/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java +++ b/tools/font-metrics/src/main/java/com/riiablo/FontMetricsTool.java @@ -8,6 +8,7 @@ import com.kotcrab.vis.ui.widget.spinner.Spinner; import com.badlogic.gdx.Application; import com.badlogic.gdx.ApplicationAdapter; +import com.badlogic.gdx.Files.FileType; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; @@ -52,6 +53,9 @@ public class FontMetricsTool extends ApplicationAdapter { FileHandle d2Home = homeDirs.first(); LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); + config.addIcon("ic_launcher_16.png", FileType.Internal); + config.addIcon("ic_launcher_32.png", FileType.Internal); + config.addIcon("ic_launcher_128.png", FileType.Internal); config.title = TAG; config.resizable = true; config.width = 800; diff --git a/tools/map-viewer/build.gradle b/tools/map-viewer/build.gradle index 28bb32f5..89449ca0 100644 --- a/tools/map-viewer/build.gradle +++ b/tools/map-viewer/build.gradle @@ -1,26 +1 @@ -application { - mainClass = 'com.riiablo.map.MapViewer' -} - -run { - workingDir = rootProject.file('assets').path - setIgnoreExitValue(true) - - // Required to run LWJGL3 java apps on MacOS - if (org.gradle.internal.os.OperatingSystem.current() == org.gradle.internal.os.OperatingSystem.MAC_OS) { - jvmArgs += "-XstartOnFirstThread" - } -} - -jar { - archiveBaseName = project.name - dependsOn configurations.runtimeClasspath - from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } - manifest { - attributes 'Main-Class': application.mainClass - } - - doLast { - file(archiveFile).setExecutable(true, false) - } -} +application.mainClassName = 'com.riiablo.map.MapViewer' diff --git a/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java b/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java index 2a99a79c..056ec1de 100644 --- a/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java +++ b/tools/map-viewer/src/main/java/com/riiablo/map/MapViewer.java @@ -18,6 +18,7 @@ import net.mostlyoriginal.api.event.common.EventSystem; import com.badlogic.gdx.Application; import com.badlogic.gdx.ApplicationAdapter; +import com.badlogic.gdx.Files.FileType; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.InputAdapter; @@ -184,6 +185,9 @@ public class MapViewer extends ApplicationAdapter { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.title = "Map Viewer"; + config.addIcon("ic_launcher_16.png", FileType.Internal); + config.addIcon("ic_launcher_32.png", FileType.Internal); + config.addIcon("ic_launcher_128.png", FileType.Internal); config.resizable = true; config.vSyncEnabled = false; config.width = 1280; // 1280