From 50db9039dff939d6c2bb8e17f2038862cd86ce6c Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 26 Mar 2023 16:33:52 +0100
Subject: [PATCH] Separate no copy file flag for JK3

---
 assets/z_vr_assets_jka.pk3                 | Bin 1153218 -> 1153218 bytes
 java/com/drbeef/jkxr/GLES3JNIActivity.java |   7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/assets/z_vr_assets_jka.pk3 b/assets/z_vr_assets_jka.pk3
index 3fd4bb8ff424635ffe4feb5688c37130d43cb0a7..75eb8059df9be3c7bd40e37be3b94aa50dee2ae4 100644
GIT binary patch
delta 933
zcmXw#T}V@59L9G%`_}3ChnvOvu+YptoJ(6#Sy^K<voI0~qKlv|x~w2WL>eU$>2|i`
zc7}u(RyPr~^})I6qBbI<3nz3Vtg9eYEHAt;hfwc%&by0;_jjJ>dH?VGo?JGR%Z6ON
z=R~v9WU|{$L%oA>*KUz5*+9NlUzLs8o%;H=-reZ{T;G1yfK1aX1Frd3;^<z=??Gia
zf1?V<ui0H#D+>r71PWT9Abf4sO|_yVGys}Q!hXQzlHk{2bgU$3W2K7rQ3w0#@ALb<
zFRCkPu~GXI5&wGhinf>*19hawSAOqZSlj0^%?!It+tj&;ST`EZh)iZC3zL<}#$;!5
zFgckjnW~svOw~*^S~w#)jcfE3rAFLms3;x4VK0l)dAvy5SdiWe2;VJ9sB1r$q$wkO
zxF&rx!tgo|@2*QvjL>bRoDs6IThvt>;RkC@J3TiVZ)(ep0T0#V;7JczszK8Y^sfT+
ztcf1kK&?J{VFvwZqecwZEQjbq4ZQv!P1-@LJrvmr8n{V$>{UB%(I;5KZJP4xq)v}h
zJ79jCjsrGF$p`3;(iwmp<<V>zs$+BvQBRBlfRPxT1bm56YdP|&Zkdd8+GGmC9+c@I
z;I&Lg0n0Mq+7hQQoO^NV27E5VrUZ4txtgFhfRf->m`m_oUWIqqWUm@gXa|Z<6$$~C
z6<$Psaf0V}CV2i~g6GyGA013`Cz|A==abZeVa^oqbfx$+MpASN(M*au0aYp;0fbfV
YJXWa#&Nr1#7@ag7287CRKTW6q1OGBpm;e9(

delta 933
zcmXw%OK1~O7=<&Lyql!+OOh(_QKhl1)}}EvidwZAl3H6)EJYAO#V%ZGp%IZ{&=SNp
znLKYOl10^xiYC5h<3ba}ii@V;rWjX(w58fb7qy|FcmBCq9PT&gocqrm?i34wVj*BT
zbBfoPR4Ri()&FidZrRCS%3Ue=N;Y{-uG_ZD>+42)w-Mp$){_e4n_nn!*|QwS?zvJ6
zRz^!hW;A}y?7+3I+`^llh3@*wlCR8tX_ZZ)u5wKXtyQiK;e3_z$PgK?a?*HJ-5D{`
zr@;Y_``ZFp&hjqlPniGfkSo$cmiIM)9AEgoYkqaNMKwKYQEef!VZI>}%=1(lDlL_c
zN>62=GE$kS>Zr_A7Ah-My%fv~rZ)cj&<Gi*2rh)%6=9DI(({VYZ$?_57v6FhzF8Eo
zF8y2-a!Pn_RrsKU!8I0+tO*a5(5{1`64J4o$ci3pIMHN)Craa$t=0%Rpb^7K2WYKG
zQ%&$sjr6z~?(2~{-0)O`^ur4-94=}1!RdPR2K_K;Kw9a8@MfgYH7Ma;(sdm^qQ%{S
zoRg<FPo^fI6YpVe0uCc=jDj1XHwq^Z#3+kqYG94QA&mNB;6oUT!BK?IG3cm8PGT3q
zDgOn;D}o>GTO#a5cqzg`ge8$}ZI43`otts!Mfg;M4GHLxPfji-z>APf&?CssY=Z8R
z!I@+oI@w9WN!W(=qa*|nmXfT9`Pmf9hf^$npJKT#%|`pv%!#Ji=(#ks<1kZ(b$T-N
rGvwEgW#AaXbOyQ+%mfY~1POB<5a>eZD}f_QCky)#0yVgkh2#GLY6EQ;

diff --git a/java/com/drbeef/jkxr/GLES3JNIActivity.java b/java/com/drbeef/jkxr/GLES3JNIActivity.java
index d3517d7..3a32911 100644
--- a/java/com/drbeef/jkxr/GLES3JNIActivity.java
+++ b/java/com/drbeef/jkxr/GLES3JNIActivity.java
@@ -244,10 +244,15 @@ import java.util.Vector;
 
 			//Weapon Models
 			copy_asset("/sdcard/JKXR/JK2/base", "z_Crusty_and_Elin_vr_weapons.pk3", false);
+		}
+
+		//Bunch of cool mods and their credits - only copy if user wants them
+		if (!new File("/sdcard/JKXR/JK3/base/no_copy").exists()) {
+			//Weapon Models
 			copy_asset("/sdcard/JKXR/JK3/base", "z_Crusty_and_Elin_vr_weapons.pk3", false);
 		}
 
-		//Copy mods to the demo folder if it exists, since the demo doesn't seem to be able to load mods from base
+		//Copy mods to the demo folder if demo assets exist, since the demo doesn't seem to be able to load mods from base
 		if (new File("/sdcard/JKXR/JK2/jk2demo/assets0.pk3").exists()) {
 
 			//Copy the weapon adjustment config - should we force overwrite?