From 7f4ea4e0479258bdee750adb2cc09fe2a8ce794d Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Thu, 4 Aug 2022 21:37:50 +0200
Subject: [PATCH] Check for JContainers before running
 _00E_Theriantrophist_Update_12

---
 scripts/_00e_theriantrophist_update_12.pex    | Bin 1470 -> 1853 bytes
 .../_00e_theriantrophist_update_12.psc        |  31 +++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/scripts/_00e_theriantrophist_update_12.pex b/scripts/_00e_theriantrophist_update_12.pex
index 5d1650a679f19fe88ce1e8d0550ab82e4e6854a1..9ff7a184f6b1bcaa26f9d21ad43f483c6b9cbcc2 100644
GIT binary patch
literal 1853
zcmb7F-BQ~|7(HtX0|xUK0uBM9ByH2bxIhSLxl1xmrp+W}a7!;eLRzqhyz7zHae0P5
zL*J!O(kJLmd)XU$Rx8zR)6OJXulD;r=lgb7<3E4+<=1Kj0(?$?+x{7Mx;s1V?sq+z
z#(^@a9`xeObiW@&fsx(az1AQLQEx|)9;Vqa@v$IFxiyNFk4M-hg6x`qAq-0d63sl9
zreg?*+2`75CsvP#3iDb$k>{~;rn**b6*+k>)GCTitW}Vp){CP^D)e6JH!|{#_5(kY
zgCHfQpM_~WFxHsLKK(vR@xOVhl?h@c)69?LKq{t(m;PC*`~H7+{5T1FvVUpQQk}qi
zrIp0oQ4(Cr^l=gg8ScJI-t^(2k^R9As$VOELfeJ+L=&`7_e$XbraLb>?Gu?oyhiOv
z+jcQG$k$gvUuKwh%1a%|BrEgw;hpKUU#bsF;h+>Aq1G{Jtj<frmzX^~v@M+kDZK1;
zCQ;|1kU6uIOO%h2ArGRoG$uCiU>}p}$uX)I(J8!CYXk419}G}Cm*(5k3p9CtG7XYv
zoz}5b>>zSYW!M^f@@Ag)0(Cxi&s^A!EY!4;KbjZvGRI^WSnLK-WOt*$!c>?@wsG&-
zP=$8Kc;JEI;hSNqvi$VJVVX*1{4Bq8+;(@TzWQfIHi``o-KNBuuTL*zm|r7%f3krL
z<FlBT&0)+aIdULgCX+Mlx8GQTRE9FPS8~*owhrRt@xB!teB=kCz}-CDe~&Dq%a8OY
zOz|TUsMwFz3e{5ZfEH>TGygN@V8?tu7O;TDzsC~XSVlQkFdnP8o)61r$@vJ<@Tp*0
zkc_HTe&;$%K{!2Mr{JOPbZfTs3uxrzOC(z&%@VFrw<K#^*EyTGfep@^v~6Mw+nl!u
z)4Czx3)~iH<Xtxeu2JS(q-0H%1%VZ+Yh0{8>oV>X8KQ!_bT5|xjHbMNozq5pZ$*E=
zX#O0Xi(YXQ%O%BaCVeRIQ5i+`p1{Y2TIE{7CuO-zYP>`Ir)B&)<840zYq^Q}i&ki|
zh$i^rHVJ$t@HutsARl9zbkKQ|68C78lGQ8>+qG)lHO|ny@p+3xkHfkzusO!s;2#9t
zgdDrK3pdMa(#@sCvlX~i*h#S|uw9_q>~WbJ6VP<f$uc*JGFPitS66?yGQKGA1Y3H`
zvc76zgnRQIZefRd@d);^%MYWDJ!cVkzzE{eRAsd_f&Bs<WZtEp)~N|A?{^&!OF+9$
J(Qq(f_zR$7TpR!Z

literal 1470
zcmb7E%Tg0T6g^EsAR&NC4B?@S;0qN5L@n8Yg_dQBmiSnvhM9&;oOH*T4w1j}OI*8l
z=>|{F!{B3~b8FJ)-qZKodwaU_{r%@Jg&_#=Irv)ph{fjG+HUhrOGbgKOr*Q5AU4gn
zUEejbxxTU5jXhL$eP8#YxEDH@kU3uM2g<=+T&99-n%@+9xdID~K9y$QP!Q#(+UOJ(
zUiTELTJ6ZAK&7FIR=dhi@tCKTADBQZH$<rw_`Xyq?r9}4_9}EwWV9UyZj7bB_P-r^
zE!jDFtnEl4Mz*$$>~z;qc&1G5t)sZ3Ns13Bz0$T4#=6P6=XPX_YU;euz6|3$X#>SW
z9d&Z|UJf>Ma6bnRP}(<9ppNpuLzK6+>;UiF2!*zPfMTSzL9yL&yC@w=^YWmL22Vgn
zZun$>^|e%N#7}#RacRILJw0x@>S#cZwryipYDCFT=D9pcG}!|to38KMp)xHDd!b|#
zH=gvAX9sso%Qa3UO)pY09qD+zD3Z!Jaq`)Ce(6_v^lL`k4-605rUbF058Bc*j?sxi
z+?8H%7)U?U7*(>LiWFlR9%5zp*cOPSCxc_|>bIorgE~n~$AVPerzAH2W4qgTPn^R@
zck*i<Vwl%ZV8~v33ko?X0t+Z5HUev9TIHvWA+;)U8^^#VagJv7tb77Wb{WEmz^IK|
zXOF8z>2JCYqsTf5Z^IRqu?5C40V{eQ7l^0$)^HJZzSE2~$jx9DbA0ESzAz(jN#L?T
zHJOL*f`F5`1+GK5k}%@}7wG=O{>6O%6!$Y{f|*IEPHaJgk(v$HLAfP?tMo0wdfZ<l
zL2{aiMb8mg50e6o)U70_LAi#_s#+y7sn#`tnSoZF|5KzXIiTk<n(fs{v(9xMpTK+;
zXGKcQWvVuN&}RLNGzpSSuV-!63a6*1-_ka2WO{-l{Slc;rnPrz7B@LT_J~=5W!|eY
qZlw`{+uT7Vh6*fH61bD;f;E@PGdg@G%3D;%N-k*E5(BGe0zUvUfe``#

diff --git a/source/scripts/_00e_theriantrophist_update_12.psc b/source/scripts/_00e_theriantrophist_update_12.psc
index 49c8588c..1c78dd40 100644
--- a/source/scripts/_00e_theriantrophist_update_12.psc
+++ b/source/scripts/_00e_theriantrophist_update_12.psc
@@ -1,19 +1,26 @@
 scriptname _00E_Theriantrophist_Update_12 Hidden
+{Moved to a separate script to remove the JContainers dependency from _00E_Theriantrophist_AlchemyControl}
 
 function Run(_00E_Theriantrophist_AlchemyControl PlayerAlias) global
 
-	Potion k
-	int potionNames = JMap.getObj(JDB.root(), "EnderalFS.RenamedPotions")
-	int potionModels = JMap.getObj(JDB.root(), "EnderalFS.ModelChangedPotions")
-	
-	if potionNames > 0
-		k = JFormMap.nextKey(potionNames, previousKey = None, endKey = None) as Potion
-		while k != None
-			PlayerAlias._addNamedPotion(k, JFormMap.getStr(potionNames, k), JFormMap.getStr(potionModels, k))
-			k = JFormMap.nextKey(potionNames, k, endKey = None) as Potion
-		endwhile
-		JFormMap.clear(potionNames)
-		JFormMap.clear(potionModels)
+	Int SKSEVer = SKSE.GetVersion()
+
+	if SKSEVer >= 2 && (SKSE.GetPluginVersion("JContainers64") > 0 || SKSE.GetPluginVersion("JContainersVR") > 0)
+
+		Potion k
+		int potionNames = JMap.getObj(JDB.root(), "EnderalFS.RenamedPotions")
+		int potionModels = JMap.getObj(JDB.root(), "EnderalFS.ModelChangedPotions")
+		
+		if potionNames > 0
+			k = JFormMap.nextKey(potionNames, previousKey = None, endKey = None) as Potion
+			while k != None
+				PlayerAlias._addNamedPotion(k, JFormMap.getStr(potionNames, k), JFormMap.getStr(potionModels, k))
+				k = JFormMap.nextKey(potionNames, k, endKey = None) as Potion
+			endwhile
+			JFormMap.clear(potionNames)
+			JFormMap.clear(potionModels)
+		endif
+		
 	endif
 
 endfunction