From 6acc2de3141a2c1eefd2e7dccf70855a13d9b123 Mon Sep 17 00:00:00 2001 From: janeptrv Date: Mon, 5 Oct 2020 01:41:50 -0400 Subject: [PATCH] Initial Commit - beginnings of base systems. no complete features --- .gitignore | 30 ++ README.md | 10 + build.gradle | 80 +++++ gradle.properties | 17 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58694 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 ++++++++++++ gradlew.bat | 103 +++++++ logs/latest.log | 0 settings.gradle | 10 + .../java/pm/j4/petroleum/PetroleumMod.java | 159 ++++++++++ .../pm/j4/petroleum/gui/PModMenuScreen.java | 50 ++++ .../j4/petroleum/gui/PModuleConfigEntry.java | 47 +++ .../j4/petroleum/gui/PModuleConfigPane.java | 115 +++++++ .../gui/PModuleConfigurationWidget.java | 281 ++++++++++++++++++ .../pm/j4/petroleum/gui/PMovableButton.java | 42 +++ .../pm/j4/petroleum/gui/POptionEntry.java | 94 ++++++ .../pm/j4/petroleum/gui/POptionsScreen.java | 224 ++++++++++++++ .../pm/j4/petroleum/mixin/DebugHudMixin.java | 38 +++ .../mixin/EntryListWidgetAccessor.java | 19 ++ .../pm/j4/petroleum/mixin/ModListMixin.java | 89 ++++++ .../pm/j4/petroleum/mixin/ModMenuMixin.java | 11 + .../j4/petroleum/mixin/OptionsMenuMixin.java | 42 +++ .../j4/petroleum/mixin/TitleScreenMixin.java | 132 ++++++++ .../j4/petroleum/modules/ExampleModule.java | 34 +++ .../modules/base/ConfigurationOption.java | 68 +++++ .../j4/petroleum/modules/base/ModuleBase.java | 210 +++++++++++++ .../modules/base/StringWritable.java | 48 +++ .../modules/base/option/BooleanValue.java | 41 +++ .../modules/base/option/DummyValue.java | 9 + .../modules/base/option/IntegerValue.java | 46 +++ .../modules/base/option/KeybindValue.java | 39 +++ .../base/option/OptionTypeMatcher.java | 29 ++ .../modules/base/option/StringValue.java | 32 ++ .../modules/bindings/BindingInfo.java | 30 ++ .../modules/bindings/BindingManager.java | 92 ++++++ .../pm/j4/petroleum/modules/list/ModList.java | 36 +++ .../pm/j4/petroleum/modules/menu/ModMenu.java | 32 ++ .../petroleum/modules/splash/SplashText.java | 31 ++ .../pm/j4/petroleum/util/config/Config.java | 59 ++++ .../petroleum/util/config/ConfigHolder.java | 93 ++++++ .../petroleum/util/config/ConfigManager.java | 191 ++++++++++++ .../petroleum/util/config/DefaultConfig.java | 15 + .../petroleum/util/config/GlobalConfig.java | 143 +++++++++ .../util/config/OptionSerializiable.java | 32 ++ .../petroleum/util/config/ServerConfig.java | 11 + src/main/resources/assets/petroleum/icon.png | Bin 0 -> 2695 bytes .../petroleum/textures/options_background.png | Bin 0 -> 145 bytes src/main/resources/fabric.mod.json | 37 +++ src/main/resources/petroleum.mixins.json | 18 ++ 50 files changed, 3157 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 logs/latest.log create mode 100644 settings.gradle create mode 100644 src/main/java/pm/j4/petroleum/PetroleumMod.java create mode 100644 src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java create mode 100644 src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java create mode 100644 src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java create mode 100644 src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java create mode 100644 src/main/java/pm/j4/petroleum/gui/PMovableButton.java create mode 100644 src/main/java/pm/j4/petroleum/gui/POptionEntry.java create mode 100644 src/main/java/pm/j4/petroleum/gui/POptionsScreen.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/ModListMixin.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/ModMenuMixin.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java create mode 100644 src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java create mode 100644 src/main/java/pm/j4/petroleum/modules/ExampleModule.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/ConfigurationOption.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/ModuleBase.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/StringWritable.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/BooleanValue.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/DummyValue.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/IntegerValue.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/KeybindValue.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/OptionTypeMatcher.java create mode 100644 src/main/java/pm/j4/petroleum/modules/base/option/StringValue.java create mode 100644 src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java create mode 100644 src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java create mode 100644 src/main/java/pm/j4/petroleum/modules/list/ModList.java create mode 100644 src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java create mode 100644 src/main/java/pm/j4/petroleum/modules/splash/SplashText.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/Config.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/ConfigManager.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/OptionSerializiable.java create mode 100644 src/main/java/pm/j4/petroleum/util/config/ServerConfig.java create mode 100644 src/main/resources/assets/petroleum/icon.png create mode 100644 src/main/resources/assets/petroleum/textures/options_background.png create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/petroleum.mixins.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed36e39 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ +logs/ \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..d4df2a8 --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +# Petroleum +### A Minecraft "mod" + + +#### Features + +- none, yet. + +# +[by janeptrv](https://j4.pm) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a5b3e60 --- /dev/null +++ b/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'java' + id 'idea' + id 'fabric-loom' version '0.4-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. + // You may need to force-disable transitiveness on them. + compileOnly "com.google.code.findbugs:jsr305:3.0.2" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..8d94d1d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.16.3 + yarn_mappings=1.16.3+build.9 + loader_version=0.9.3+build.207 + +# Mod Properties + mod_version = 0.1.3 + maven_group = pm.j4 + archives_base_name = petroleum + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_version=0.22.1+build.409-1.16 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..490fda8577df6c95960ba7077c43220e5bb2c0d9 GIT binary patch literal 58694 zcma&OV~}Oh(k5J8>Mq;1ZQHhO+v>7y+qO>Gc6Hgdjp>5?}0s%q%y~>Cv3(!c&iqe4q$^V<9O+7CU z|6d2bzlQvOI?4#hN{EUmDbvb`-pfo*NK4Vs&cR60P)<+IG%C_BGVL7RP11}?Ovy}9 zNl^cQJPR>SIVjSkXhS0@IVhqGLL)&%E<(L^ymkEXU!M5)A^-c;K>yy`Ihy@nZ}orr zK>gFl%+bKu+T{P~iuCWUZjJ`__9l-1*OFwCg_8CkKtLEEKtOc=d5NH%owJkk-}N#E z7Pd;x29C}qj>HVKM%D&SPSJ`JwhR2oJPU0u3?)GiA|6TndJ+~^eXL<%D)IcZ)QT?t zE7BJP>Ejq;`w$<dd^@|esR(;1Z@9EVR%7cZG`%Xr%6 zLHXY#GmPV!HIO3@j5yf7D{PN5E6tHni4mC;qIq0Fj_fE~F1XBdnzZIRlk<~?V{-Uc zt9ldgjf)@8NoAK$6OR|2is_g&pSrDGlQS);>YwV7C!=#zDSwF}{_1#LA*~RGwALm) zC^N1ir5_}+4!)@;uj92irB5_Ugihk&Uh|VHd924V{MiY7NySDh z|6TZCb1g`c)w{MWlMFM5NK@xF)M33F$ZElj@}kMu$icMyba8UlNQ86~I$sau*1pzZ z4P)NF@3(jN(thO5jwkx(M5HOe)%P1~F!hXMr%Rp$&OY0X{l_froFdbi(jCNHbHj#! z(G`_tuGxu#h@C9HlIQ8BV4>%8eN=MApyiPE0B3dR`bsa1=MM$lp+38RN4~`m>PkE? zARywuzZ#nV|0wt;22|ITkkrt>ahz7`sKXd2!vpFCC4i9VnpNvmqseE%XnxofI*-Mr6tjm7-3$I-v}hr6B($ALZ=#Q4|_2l#i5JyVQCE{hJAnFhZF>vfSZgnw`Vgn zIi{y#1e7`}xydrUAdXQ%e?_V6K(DK89yBJ;6Sf{Viv*GzER9C3Mns=nTFt6`Eu?yu<*Fb}WpP$iO#-y+^H>OQ< zw%DSM@I=@a)183hx!sz(#&cg-6HVfK(UMgo8l2jynx5RWEo8`?+^3x0sEoj9H8%m1 z87?l+w;0=@Dx_J86rA6vesuDQ^nY(n?SUdaY}V)$Tvr%>m9XV>G>6qxKxkH zN6|PyTD(7+fjtb}cgW1rctvZQR!3wX2S|ils!b%(=jj6lLdx#rjQ6XuJE1JhNqzXO zKqFyP8Y1tN91g;ahYsvdGsfyUQz6$HMat!7N1mHzYtN3AcB>par(Q>mP7^`@7@Ox14gD12*4RISSYw-L>xO#HTRgM)eLaOOFuN}_UZymIhu%J?D|k>Y`@ zYxTvA;=QLhu@;%L6;Ir_$g+v3;LSm8e3sB;>pI5QG z{Vl6P-+69G-P$YH-yr^3cFga;`e4NUYzdQy6vd|9${^b#WDUtxoNe;FCcl5J7k*KC z7JS{rQ1%=7o8to#i-`FD3C?X3!60lDq4CqOJ8%iRrg=&2(}Q95QpU_q ziM346!4()C$dHU@LtBmfKr!gZGrZzO{`dm%w_L1DtKvh8UY zTP3-|50~Xjdu9c%Cm!BN^&9r?*Wgd(L@E!}M!#`C&rh&c2fsGJ_f)XcFg~$#3S&Qe z_%R=Gd`59Qicu`W5YXk>vz5!qmn`G>OCg>ZfGGuI5;yQW9Kg*exE+tdArtUQfZ&kO ze{h37fsXuQA2Z(QW|un!G2Xj&Qwsk6FBRWh;mfDsZ-$-!YefG!(+bY#l3gFuj)OHV830Xl*NKp1-L&NPA3a8jx#yEn3>wea~ z9zp8G6apWn$0s)Pa!TJo(?lHBT1U4L>82jifhXlkv^a+p%a{Og8D?k6izWyhv`6prd7Yq5{AqtzA8n{?H|LeQFqn(+fiIbDG zg_E<1t%>753QV!erV^G4^7p1SE7SzIqBwa{%kLHzP{|6_rlM*ae{*y4WO?{%&eQ`| z>&}ZkQ;<)rw;d(Dw*om?J@3<~UrXsvW2*0YOq_-Lfq45PQGUVu?Ws3&6g$q+q{mx4 z$2s@!*|A+74>QNlK!D%R(u22>Jeu}`5dsv9q~VD!>?V86x;Fg4W<^I;;ZEq5z4W5c z#xMX=!iYaaW~O<(q>kvxdjNk15H#p0CSmMaZB$+%v90@w(}o$T7;(B+Zv%msQvjnW z`k7=uf(h=gkivBw?57m%k^SPxZnYu@^F% zKd`b)S#no`JLULZCFuP^y5ViChc;^3Wz#c|ehD+2MHbUuB3IH5+bJ_FChTdARM6Q2 zdyuu9eX{WwRasK!aRXE+0j zbTS8wg@ue{fvJ*=KtlWbrXl8YP88;GXto?_h2t@dY3F?=gX9Frwb8f1n!^xdOFDL7 zbddq6he>%k+5?s}sy?~Ya!=BnwSDWloNT;~UF4|1>rUY!SSl^*F6NRs_DT-rn=t-p z_Ga0p)`@!^cxW_DhPA=0O;88pCT*G9YL29_4fJ(b{| zuR~VCZZCR97e%B(_F5^5Eifes$8!7DCO_4(x)XZDGO%dY9Pkm~-b1-jF#2H4kfl<3 zsBes0sP@Zyon~Q&#<7%gxK{o+vAsIR>gOm$w+{VY8ul7OsSQ>07{|7jB6zyyeu+WU zME>m2s|$xvdsY^K%~nZ^%Y`D7^PCO(&)eV-Qw|2_PnL=Nd=}#4kY)PS=Y62Dzz1e2 z&*)`$OEBuC&M5f`I}A-pEzy^lyEEcd$n1mEgLj}u_b^d!5pg{v+>_FexoDxYj%X_F z5?4eHVXurS%&n2ISv2&Eik?@3ry}0qCwS9}N)`Zc_Q8}^SOViB_AB&o6Eh#bG;NnL zAhP2ZF_la`=dZv6Hs@78DfMjy*KMSExRZfccK=-DPGkqtCK%U1cUXxbTX-I0m~x$3 z&Oc&aIGWtcf|i~=mPvR^u6^&kCj|>axShGlPG}r{DyFp(Fu;SAYJ}9JfF*x0k zA@C(i5ZM*(STcccXkpV$=TznZKQVtec!A24VWu*oS0L(^tkEm2ZIaE4~~?#y9Z4 zlU!AB6?yc(jiB`3+{FC zl|IdP1Fdt#e5DI{W{d8^$EijTU(8FA@8V&_A*tO?!9rI zhoRk`Q*riCozP>F%4pDPmA>R#Zm>_mAHB~Y5$sE4!+|=qK0dhMi4~`<6sFHb=x8Naml}1*8}K_Es3#oh3-7@0W}BJDREnwWmw<{wY9p)3+Mq2CLcX?uAvItguqhk*Po!RoP`kR)!OQy3Ayi zL@ozJ!I_F2!pTC?OBAaOrJmpGX^O(dSR-yu5Wh)f+o5O262f6JOWuXiJS_Jxgl@lS z6A9c*FSHGP4HuwS)6j3~b}t{+B(dqG&)Y}C;wnb!j#S0)CEpARwcF4Q-5J1NVizx7 z(bMG>ipLI1lCq?UH~V#i3HV9|bw%XdZ3Q#c3)GB+{2$zoMAev~Y~(|6Ae z^QU~3v#*S>oV*SKvA0QBA#xmq9=IVdwSO=m=4Krrlw>6t;Szk}sJ+#7=ZtX(gMbrz zNgv}8GoZ&$=ZYiI2d?HnNNGmr)3I);U4ha+6uY%DpeufsPbrea>v!D50Q)k2vM=aF-zUsW*aGLS`^2&YbchmKO=~eX@k9B!r;d{G% zrJU~03(->>utR^5;q!i>dAt)DdR!;<9f{o@y2f}(z(e)jj^*pcd%MN{5{J=K<@T!z zseP#j^E2G31piu$O@3kGQ{9>Qd;$6rr1>t!{2CuT_XWWDRfp7KykI?kXz^{u_T2AZ z-@;kGj8Iy>lOcUyjQqK!1OHkY?0Kz+_`V8$Q-V|8$9jR|%Ng;@c%kF_!rE3w>@FtX zX1w7WkFl%Vg<mE0aAHX==DLjyxlfA}H|LVh;}qcWPd8pSE!_IUJLeGAW#ZJ?W}V7P zpVeo|`)a<#+gd}dH%l)YUA-n_Vq3*FjG1}6mE;@A5ailjH*lJaEJl*51J0)Xecn6X zz zDr~lx5`!ZJ`=>>Xb$}p-!3w;ZHtu zX@xB4PbX!J(Jl((<8K%)inh!-3o2S2sbI4%wu9-4ksI2%e=uS?Wf^Tp%(Xc&wD6lV z*DV()$lAR&##AVg__A=Zlu(o$3KE|N7ZN{X8oJhG+FYyF!(%&R@5lpCP%A|{Q1cdr>x0<+;T`^onat<6tlGfEwRR?ZgMTD-H zjWY?{Fd8=Fa6&d@0+pW9nBt-!muY@I9R>eD5nEDcU~uHUT04gH-zYB>Re+h4EX|IH zp`Ls>YJkwWD3+}DE4rC3kT-xE89^K@HsCt6-d;w*o8xIHua~||4orJ<7@4w_#C6>W z2X$&H38OoW8Y-*i=@j*yn49#_C3?@G2CLiJUDzl(6P&v`lW|=gQ&)DVrrx8Bi8I|$ z7(7`p=^Lvkz`=Cwd<0%_jn&6k_a(+@)G^D04}UylQax*l(bhJ~;SkAR2q*4>ND5nc zq*k9(R}Ijc1J8ab>%Tv{kb-4TouWfA?-r(ns#ghDW^izG3{ts{C7vHc5Mv?G;)|uX zk&Fo*xoN`OG9ZXc>9(`lpHWj~9!hI;2aa_n!Ms1i;BFHx6DS23u^D^e(Esh~H@&f}y z(=+*7I@cUGi`U{tbSUcSLK`S)VzusqEY)E$ZOokTEf2RGchpmTva?Fj! z<7{9Gt=LM|*h&PWv6Q$Td!|H`q-aMIgR&X*;kUHfv^D|AE4OcSZUQ|1imQ!A$W)pJtk z56G;0w?&iaNV@U9;X5?ZW>qP-{h@HJMt;+=PbU7_w`{R_fX>X%vnR&Zy1Q-A=7**t zTve2IO>eEKt(CHjSI7HQ(>L5B5{~lPm91fnR^dEyxsVI-wF@82$~FD@aMT%$`usqNI=ZzH0)u>@_9{U!3CDDC#xA$pYqK4r~9cc_T@$nF1yODjb{=(x^({EuO?djG1Hjb{u zm*mDO(e-o|v2tgXdy87*&xVpO-z_q)f0~-cf!)nb@t_uCict?p-L%v$_mzG`FafIV zPTvXK4l3T8wAde%otZhyiEVVU^5vF zQSR{4him-GCc-(U;tIi;qz1|Az0<4+yh6xFtqB-2%0@ z&=d_5y>5s^NQKAWu@U#IY_*&G73!iPmFkWxxEU7f9<9wnOVvSuOeQ3&&HR<>$!b%J z#8i?CuHx%la$}8}7F5-*m)iU{a7!}-m@#O}ntat&#d4eSrT1%7>Z?A-i^Y!Wi|(we z$PBfV#FtNZG8N-Ot#Y>IW@GtOfzNuAxd1%=it zDRV-dU|LP#v70b5w~fm_gPT6THi zNnEw&|Yc9u5lzTVMAL} zgj|!L&v}W(2*U^u^+-e?Tw#UiCZc2omzhOf{tJX*;i2=i=9!kS&zQN_hKQ|u7_3vo6MU0{U+h~` zckXGO+XK9{1w3Z$U%%Fw`lr7kK8PzU=8%0O8ZkW`aQLFlR4OCb^aQgGCBqu6AymXk zX!p(JDJtR`xB$j48h}&I2FJ*^LFJzJQJ0T>=z{*> zWesZ#%W?fm`?f^B^%o~Jzm|Km5$LP#d7j9a{NCv!j14axHvO<2CpidW=|o4^a|l+- zSQunLj;${`o%xrlcaXzOKp>nU)`m{LuUW!CXzbyvn;MeK#-D{Z4)+>xSC)km=&K%R zsXs3uRkta6-rggb8TyRPnquv1>wDd)C^9iN(5&CEaV9yAt zM+V+%KXhGDc1+N$UNlgofj8+aM*(F7U3=?grj%;Pd+p)U9}P3ZN`}g3`{N`bm;B(n z12q1D7}$``YQC7EOed!n5Dyj4yl~s0lptb+#IEj|!RMbC!khpBx!H-Kul(_&-Z^OS zQTSJA@LK!h^~LG@`D}sMr2VU#6K5Q?wqb7-`ct2(IirhhvXj?(?WhcNjJiPSrwL0} z8LY~0+&7<~&)J!`T>YQgy-rcn_nf+LjKGy+w+`C*L97KMD%0FWRl`y*piJz2=w=pj zxAHHdkk9d1!t#bh8Joi1hTQr#iOmt8v`N--j%JaO`oqV^tdSlzr#3 zw70~p)P8lk<4pH{_x$^i#=~E_ApdX6JpR`h{@<Y;PC#{0uBTe z1Puhl^q=DuaW}Gdak6kV5w);35im0PJ0F)Zur)CI*LXZxZQTh=4dWX}V}7mD#oMAn zbxKB7lai}G8C){LS`hn>?4eZFaEw-JoHI@K3RbP_kR{5eyuwBL_dpWR>#bo!n~DvoXvX`ZK5r|$dBp6%z$H@WZ6Pdp&(zFKGQ z2s6#ReU0WxOLti@WW7auSuyOHvVqjaD?kX;l)J8tj7XM}lmLxLvp5V|CPQrt6ep+t z>7uK|fFYALj>J%ou!I+LR-l9`z3-3+92j2G`ZQPf18rst;qXuDk-J!kLB?0_=O}*XQ5wZMn+?ZaL5MKlZie- z0aZ$*5~FFU*qGs|-}v-t5c_o-ReR@faw^*mjbMK$lzHSheO*VJY)tBVymS^5ol=ea z)W#2z8xCoh1{FGtJA+01Hwg-bx`M$L9Ex-xpy?w-lF8e*xJXS4(I^=k1zFy|V)=ll z#&yez3hRC5?@rPywJo2eOHWezUxZphm#wo`oyA-sP@|^+LV0^nzq|UJEZZM9wqa z5Y}M0Lu@0Qd%+Q=3kCSb6q4J60t_s(V|qRw^LC>UL7I`=EZ zvIO;P2n27=QJ1u;C+X)Si-P#WB#phpY3XOzK(3nEUF7ie$>sBEM3=hq+x<=giJjgS zo;Cr5uINL%4k@)X%+3xvx$Y09(?<6*BFId+399%SC)d# zk;Qp$I}Yiytxm^3rOxjmRZ@ws;VRY?6Bo&oWewe2i9Kqr1zE9AM@6+=Y|L_N^HrlT zAtfnP-P8>AF{f>iYuKV%qL81zOkq3nc!_?K7R3p$fqJ?};QPz6@V8wnGX>3%U%$m2 zdZv|X+%cD<`OLtC<>=ty&o{n-xfXae2~M-euITZY#X@O}bkw#~FMKb5vG?`!j4R_X%$ZSdwW zUA0Gy&Q_mL5zkhAadfCo(yAw1T@}MNo>`3Dwou#CMu#xQKY6Z+9H+P|!nLI;4r9@k zn~I*^*4aA(4y^5tLD+8eX;UJW;>L%RZZUBo(bc{)BDM!>l%t?jm~}eCH?OOF%ak8# z*t$YllfyBeT(9=OcEH(SHw88EOH0L1Ad%-Q`N?nqM)<`&nNrp>iEY_T%M6&U>EAv3 zMsvg1E#a__!V1E|ZuY!oIS2BOo=CCwK1oaCp#1ED_}FGP(~Xp*P5Gu(Pry_U zm{t$qF^G^0JBYrbFzPZkQ;#A63o%iwe;VR?*J^GgWxhdj|tj`^@i@R+vqQWt~^ z-dLl-Ip4D{U<;YiFjr5OUU8X^=i35CYi#j7R! zI*9do!LQrEr^g;nF`us=oR2n9ei?Gf5HRr&(G380EO+L6zJD)+aTh_<9)I^{LjLZ} z{5Jw5vHzucQ*knJ6t}Z6k+!q5a{DB-(bcN*)y?Sfete7Y}R9Lo2M|#nIDsYc({XfB!7_Db0Z99yE8PO6EzLcJGBlHe(7Q{uv zlBy7LR||NEx|QyM9N>>7{Btifb9TAq5pHQpw?LRe+n2FV<(8`=R}8{6YnASBj8x}i zYx*enFXBG6t+tmqHv!u~OC2nNWGK0K3{9zRJ(umqvwQ~VvD;nj;ihior5N$Hf@y0G z$7zrb=CbhyXSy`!vcXK-T}kisTgI$8vjbuCSe7Ev*jOqI&Pt@bOEf>WoQ!A?`UlO5 zSLDKE(-mN4a{PUu$QdGbfiC)pA}phS|A1DE(f<{Dp4kIB_1mKQ5!0fdA-K0h#_ z{qMsj@t^!n0Lq%)h3rJizin0wT_+9K>&u0%?LWm<{e4V8W$zZ1w&-v}y zY<6F2$6Xk>9v{0@K&s(jkU9B=OgZI(LyZSF)*KtvI~a5BKr_FXctaVNLD0NIIokM}S}-mCB^^Sgqo%e{4!Hp)$^S%q@ zU%d&|hkGHUKO2R6V??lfWCWOdWk74WI`xmM5fDh+hy6>+e)rG_w>_P^^G!$hSnRFy z5fMJx^0LAAgO5*2-rsN)qx$MYzi<_A=|xez#rsT9&K*RCblT2FLJvb?Uv3q^@Dg+J zQX_NaZza4dAajS!khuvt_^1dZzOZ@eLg~t02)m2+CSD=}YAaS^Y9S`iR@UcHE%+L0 zOMR~6r?0Xv#X8)cU0tpbe+kQ;ls=ZUIe2NsxqZFJQj87#g@YO%a1*^ zJZ+`ah#*3dVYZdeNNnm8=XOOc<_l-b*uh zJR8{yQJ#-FyZ!7yNxY|?GlLse1ePK!VVPytKmBwlJdG-bgTYW$3T5KinRY#^Cyu@& zd7+|b@-AC67VEHufv=r5(%_#WwEIKjZ<$JD%4!oi1XH65r$LH#nHHab{9}kwrjtf= zD}rEC65~TXt=5bg*UFLw34&*pE_(Cw2EL5Zl2i^!+*Vx+kbkT_&WhOSRB#8RInsh4 z#1MLczJE+GAHR^>8hf#zC{pJfZ>6^uGn6@eIxmZ6g_nHEjMUUfXbTH1ZgT7?La;~e zs3(&$@4FmUVw3n033!1+c9dvs&5g#a;ehO(-Z}aF{HqygqtHf=>raoWK9h7z)|DUJ zlE0#|EkzOcrAqUZF+Wd@4$y>^0eh!m{y@qv6=C zD(){00vE=5FU@Fs_KEpaAU1#$zpPJGyi0!aXI8jWaDeTW=B?*No-vfv=>`L`LDp$C zr4*vgJ5D2Scl{+M;M(#9w_7ep3HY#do?!r0{nHPd3x=;3j^*PQpXv<~Ozd9iWWlY_ zVtFYzhA<4@zzoWV-~in%6$}Hn$N;>o1-pMK+w$LaN1wA95mMI&Q6ayQO9 zTq&j)LJm4xXjRCse?rMnbm%7E#%zk!EQiZwt6gMD=U6A0&qXp%yMa(+C~^(OtJ8dH z%G1mS)K9xV9dlK>%`(o6dKK>DV07o46tBJfVxkIz#%VIv{;|)?#_}Qq(&| zd&;iIJt$|`te=bIHMpF1DJMzXKZp#7Fw5Q0MQe@;_@g$+ELRfh-UWeYy%L*A@SO^J zLlE}MRZt(zOi6yo!);4@-`i~q5OUAsac^;RpULJD(^bTLt9H{0a6nh0<)D6NS7jfB ze{x#X2FLD2deI8!#U@5$i}Wf}MzK&6lSkFy1m2c~J?s=!m}7%3UPXH_+2MnKNY)cI z(bLGQD4ju@^<+%T5O`#77fmRYxbs(7bTrFr=T@hEUIz1t#*ntFLGOz)B`J&3WQa&N zPEYQ;fDRC-nY4KN`8gp*uO@rMqDG6=_hHIX#u{TNpjYRJ9ALCl!f%ew7HeprH_I2L z6;f}G90}1x9QfwY*hxe&*o-^J#qQ6Ry%2rn=9G3*B@86`$Pk1`4Rb~}`P-8^V-x+s zB}Ne8)A3Ex29IIF2G8dGEkK^+^0PK36l3ImaSv1$@e=qklBmy~7>5IxwCD9{RFp%q ziejFT(-C>MdzgQK9#gC?iFYy~bjDcFA^%dwfTyVCk zuralB)EkA)*^8ZQd8T!ofh-tRQ#&mWFo|Y3taDm8(0=KK>xke#KPn8yLCXwq zc*)>?gGKvSK(}m0p4uL8oQ~!xRqzDRo(?wvwk^#Khr&lf9YEPLGwiZjwbu*p+mkWPmhoh0Fb(mhJEKXl+d68b6%U{E994D z3$NC=-avSg7s{si#CmtfGxsijK_oO7^V`s{?x=BsJkUR4=?e@9# z-u?V8GyQp-ANr%JpYO;3gxWS?0}zLmnTgC66NOqtf*p_09~M-|Xk6ss7$w#kdP8`n zH%UdedsMuEeS8Fq0RfN}Wz(IW%D%Tp)9owlGyx#i8YZYsxWimQ>^4ikb-?S+G;HDT zN4q1{0@|^k_h_VFRCBtku@wMa*bIQc%sKe0{X@5LceE`Uqqu7E9i9z-r}N2ypvdX1{P$*-pa$A8*~d0e5AYkh_aF|LHt7qOX>#d3QOp-iEO7Kq;+}w zb)Le}C#pfmSYYGnq$Qi4!R&T{OREvbk_;7 zHP<*B$~Qij1!9Me!@^GJE-icH=set0fF-#u5Z{JmNLny=S*9dbnU@H?OCXAr7nHQH zw?$mVH^W-Y89?MZo5&q{C2*lq}sj&-3@*&EZaAtpxiLU==S@m_PJ6boIC9+8fKz@hUDw==nNm9? z`#!-+AtyCOSDPZA)zYeB|EQ)nBq6!QI66xq*PBI~_;`fHEOor}>5jj^BQ;|-qS5}1 zRezNBpWm1bXrPw3VC_VHd z$B06#uyUhx)%6RkK2r8*_LZ3>-t5tG8Q?LU0Yy+>76dD(m|zCJ>)}9AB>y{*ftDP3 z(u8DDZd(m;TcxW-w$(vq7bL&s#U_bsIm67w{1n|y{k9Ei8Q9*8E^W0Jr@M?kBFJE< zR7Pu}#3rND;*ulO8X%sX>8ei7$^z&ZH45(C#SbEXrr3T~e`uhVobV2-@p5g9Of%!f z6?{|Pt*jW^oV0IV7V76Pd>Pcw5%?;s&<7xelwDKHz(KgGL7GL?IZO%upB+GMgBd3ReR9BS zL_FPE2>LuGcN#%&=eWWe;P=ylS9oIWY)Xu2dhNe6piyHMI#X4BFtk}C9v?B3V+zty zLFqiPB1!E%%mzSFV+n<(Rc*VbvZr)iJHu(HabSA_YxGNzh zN~O(jLq9bX41v{5C8%l%1BRh%NDH7Vx~8nuy;uCeXKo2Do{MzWQyblZsWdk>k0F~t z`~8{PWc86VJ)FDpj!nu))QgHjl7a%ArDrm#3heEHn|;W>xYCocNAqX{J(tD!)~rWu zlRPZ3i5sW;k^^%0SkgV4lypb zqKU2~tqa+!Z<)!?;*50pT&!3xJ7=7^xOO0_FGFw8ZSWlE!BYS2|hqhQT8#x zm2a$OL>CiGV&3;5-sXp>3+g+|p2NdJO>bCRs-qR(EiT&g4v@yhz(N5cU9UibBQ8wM z0gwd4VHEs(Mm@RP(Zi4$LNsH1IhR}R7c9Wd$?_+)r5@aj+!=1-`fU(vr5 z1c+GqAUKulljmu#ig5^SF#{ag10PEzO>6fMjOFM_Le>aUbw>xES_Ow|#~N%FoD{5!xir^;`L1kSb+I^f z?rJ0FZugo~sm)@2rP_8p$_*&{GcA4YyWT=!uriu+ZJ%~_OD4N%!DEtk9SCh+A!w=< z3af%$60rM%vdi%^X2mSb)ae>sk&DI_&+guIC88_Gq|I1_7q#}`9b8X zGj%idjshYiq&AuXp%CXk>zQ3d2Ce9%-?0jr%6-sX3J{*Rgrnj=nJ2`#m`TaW-13kl zS2>w8ehkYEx@ml2JPivxp zIa2l^?)!?Y*=-+jk_t;IMABQ5Uynh&LM^(QB{&VrD7^=pXNowzD9wtMkH_;`H|d0V z*rohM)wDg^EH_&~=1j1*?@~WvMG3lH=m#Btz?6d9$E*V5t~weSf4L%|H?z-^g>Fg` zI_Q+vgHOuz31?mB{v#4(aIP}^+RYU}^%XN}vX_KN=fc{lHc5;0^F2$2A+%}D=gk-) zi1qBh!1%xw*uL=ZzYWm-#W4PV(?-=hNF%1cXpWQ_m=ck1vUdTUs5d@2Jm zV8cXsVsu~*f6=_7@=1 zaV0n2`FeQ{62GMaozYS)v~i10wGoOs+Z8=g$F-6HH1qBbasAkkcZj-}MVz{%xf8`2 z1XJU;&QUY4Hf-I(AG8bX zhu~KqL}TXS6{)DhW=GFkCzMFMSf`Y00e{Gzu2wiS4zB|PczU^tjLhOJUv=i2KuFZHf-&`wi>CU0h_HUxCdaZ`s9J8|7F}9fZXg`UUL}ws7G=*n zImEd-k@tEXU?iKG#2I13*%OX#dXKTUuv1X3{*WEJS41ci+uy=>30LWCv*YfX_A2(M z9lnNAjLIzX=z;g;-=ARa<`z$x)$PYig1|#G;lnOs8-&rB2lT0#e;`EH8qZ_xNvwy7 zo_9>P@SHK(YPu*8r86f==eshYjM3yAPOHDn- zmuW04o02AGMz!S|S32(h560d(IP$;S7LIM(PC7Owwr$&XCbsQNY))+3HYS+ZcHTVq zJm;QsfA`#~_m8fwuI~DFb$@pE-h1t}*HZB7hc-CUM~x6aZ<4v9_Jr-))=El>(rphK z(@wMC$e>^o+cQ(9S+>&JfP;&KM6nff2{RNu;MqE9>L9t^lvzo^*B5>@$TG!gZlh0Z z%us8ys$1~v&&N-gPBvXl5b<#>-@lhAkg_4Ev6#R&r{ObIn=Qki&`wxR_OWj%kU_RW&w#Mxv%x zW|-sJ^jss+;xmxi8?gphNW{^HZ!xF?poe%mgZ>nwlqgvH@TrZ zad5)yJx3T|&$Afl$pkh=7bZAwBdv+tQEP=d3vE#o<&r6h+sTU$64ZZQ0e^Fu9FrnL zN-?**4ta&!+{cP=jt`w)5|dD&CP@-&*BsN#mlbUn!V*(E_gskcQ*%F#Nw#aTkp%x| z8^&g)1d!%Y+`L!Se2s_XzKfonT_BWbn}LQo#YUAx%f7L__h4Xi680GIk)s z8GHm59EYn(@4c&eAO)}0US@((t#0+rNZ680SS<=I^|Y=Yv)b<@n%L20qu7N%V1-k1 z*oxpOj$ZAc>L6T)SZX?Pyr#}Q?B`7ZlBrE1fHHx_Au{q9@ zLxwPOf>*Gtfv6-GYOcT^ZJ7RGEJTVXN=5(;{;{xAV3n`q1Z-USkK626;atcu%dTHU zBewQwrpcZkKoR(iF;fVev&D;m9q)URqvKP*eF9J=A?~0=jn3=_&80vhfBp?6@KUpgyS`kBk(S0@X5Xf%a~?#4Ct5nMB9q~)LP<`G#T-eA z+)6cl1H-2uMP=u<=saDj*;pOggb2(NJO^pW8O<6u^?*eiqn7h)w9{D`TrE1~k?Xuo z(r%NIhw3kcTHS%9nbff>-jK1k^~zr8kypQJ6W+?dkY7YS`Nm z5i;Q23ZpJw(F7|e?)Tm~1bL9IUKx6GC*JpUa_Y00Xs5nyxGmS~b{ zR!(TzwMuC%bB8&O->J82?@C|9V)#i3Aziv7?3Z5}d|0eTTLj*W3?I32?02>Eg=#{> zpAO;KQmA}fx?}j`@@DX-pp6{-YkYY81dkYQ(_B88^-J#rKVh8Wys-;z)LlPu{B)0m zeZr=9{@6=7mrjShh~-=rU}n&B%a7qs1JL_nBa>kJFQ8elV=2!WY1B5t2M5GD5lt|f zSAvTgLUv#8^>CX}cM(i(>(-)dxz;iDvWw5O!)c5)TBoWp3$>3rUI=pH9D1ffeIOUW zDbYx}+)$*+`hT}j226{;=*3(uc*ge(HQpTHM4iD&r<=JVc1(gCy}hK%<(6)^`uY4>Tj6rIHYB zqW5UAzpdS!34#jL;{)Fw{QUgJ~=w`e>PHMsnS1TcIXXHZ&3M~eK5l>Xu zKsoFCd%;X@qk#m-fefH;((&?Y9grF{Al#55A3~L5YF0plJ;G=;Tr^+W-7|6IO;Q+8 z(jAXq$ayf;ZkMZ4(*w?Oh@p8LhC6=8??!%@V(e}%*>fW^Gdn|qZVyvHhcn;7nP7e; z13!D$^-?^#x*6d1)88ft06hVZh%m4w`xR?!cnzuoOj(g9mdE2vbKT@RghJ)XOPj{9 z@)8!#=HRJvG=jDJ77XND;cYsC=CszC!<6GUC=XLuTJ&-QRa~EvJ1rk2+G!*oQJ-rv zDyHVZ{iQN$*5is?dNbqV8|qhc*O15)HGG)f2t9s^Qf|=^iI?0K-Y1iTdr3g=GJp?V z$xZiigo(pndUv;n1xV1r5+5qPf#vQQWw3m&pRT>G&vF( zUfKIQg9%G;R`*OdO#O;nP4o+BElMgmKt<>DmKO1)S$&&!q6#4HnU4||lxfMa-543{ zkyJ+ohEfq{OG3{kZszURE;Rw$%Q;egRKJ%zsVcXx!KIO0*3MFBx83sD=dDVsvc17i zIOZuEaaI~q`@!AR{gEL#Iw}zQpS$K6i&omY2n94@a^sD@tQSO(dA(npgkPs7kGm>;j?$Ia@Q-Xnzz?(tgpkA6VBPNX zE?K%$+e~B{@o>S+P?h6K=XP;caQ=3)I{@ZMNDz)9J2T#5m#h9nXd*33TEH^v7|~i) zeYctF*06eX)*0e{xXaPT!my1$Xq>KPJakJto3xnuT&z zSaL8NwRUFm?&xIMwA~gt4hc3=hAde#vDjQ!I)@;V<9h2YOvi-XzleP!g4blZm|$iV zF%c3G8Cs;FH8|zEczqGSY%F54h`$P_VsmJ6TaXRLc8lSf`Sv%s%6<4+;Wbs-3lya( z=9I>I%97Y~G945O48YaAq6ENPUs%EJvyC! zM4jMgJj}r~@D;cdaQ-j#`5zCRku}42aI<>CgraXuKDr19db~#|@UyM;f-uc!(KDsu z5EA@CsN>^t@oH+0!SALi;ud>`P5mQta+Lh*-#RHJ)Gin%>EaFLSoU`(TG7c|yeFvl zk|Yll%)h-*%WoI6M*j+4xw`OqiDVX{k-^V2{rzCIM9mzNHGP^D={!*P7T)%yDSI5- zkGA4}r3`)#Vl6JFJ3xG)8K;FTtII9o7jNHof_Z_Zc<%@-H4RPpyXudpf)ky zmTH$LFGxaIUGQ;l=>R>?+>ZSCU|@&+Gt@5Bj3w{L{KPpgQ<~)jqx0oNZSv9R&^A42 zzqJr?C#D-n>=9FjM=D=7h_$QO$KQ8*%0%)rI(Npai_JjE9_lBk75BQMI zkk4X5PATWgrub!fb5Hxi8{(Y<(GOO8^HECOA)eanyS{u%leQOkp;1W}_8eH?nPQxW zd#Z+uJfTK>g-TR3WPu~2Ru9A+NkuIICM@PyPmJn(GBZt;xFZNDMbw8`xzl2`(?UC- z#<*=*fo{UOvycb|b&4y0Nm!sHhFMI*Y$Olgh;BG#xBU+yxav82Ejj(ZvQ|64Wwy7I zN=DXx7(V^NTH3YRB4HOu6T5=DW86P`L#Ng!SuT{%&>Cq8>|o8lF^^U%MRU41TT?h& z!uJ$YdbM*2y?#`LJ2)XPoKq`hm$I3R{V5-;@u7!E9tH4sR(`Ab-Qh!|UN-a5fZ?P@2LWRvSv!hOk08;Yy!h&uEI-X}j+&v`X` zkqY%*F@{}DHL*Jgjg2}a54hwEV`63bK4>mL%D^YT|>m1-kX{876BRm&`Y#{$&oz($qWJL}T*tj42k+yu8fa=4b7VUPq()Wb~=L?DU0U-4*Iu^KMZBRByWn-@=_f(4){Or#| zpw}~Ajs6a=z!8_H59lqYlfnS77QY0pHpIz0#)}!EGhypupZeZe@%cv z6Dngnl*SsUy^a`v?>lARi6Yps@%32JpGQvrcd*A8LPLEInBEU2vriGvMqG!jh^=Gj zXvu5zpikqnt*e4&Un_e$2FAB?(yOS0JAzxh@nN?Blqc-)Pv`U}&E5|# z)97-9utpqi*`hR+$;eS)A+KK)CO)V`b?*}z&*+28mDfWI31)sF)tBg6LVlxS z225poL+O|x)5;skkj{rew<}TsDVqFMMLSgd;UK7^clMcObM~IgSq6!eJ($JP!KHPr zBJ&SHi{wLsgMzn1^#kV#_!NO@RG@B5lxBO7WfIAi@o`{_XQg(*{R=@Z(0ij+*i7sK zW5D%_fRN7l6qpytW2K1lUqP&W5jDT!AA9@q<;M!T=CKv*^MP)Er_uLL+Y53>**w7Y zQ!2?^4$wC;Soc!+#~d?Yec;NLdR z{~*hrSQS>UOMBe)1pHe0EsyO@d(IrU4ZiS&jL`wqv6Oqv=HbI^70qu9kn~wGkNL^> z!Pd2)i--+&zp^`#4@*Myg;3r(jt*h@RWgRt70byZr;0Na8n4!bmpuX1&gK=QK!@j< zH2fF7@2s0H0!9%VC-BIp(99@e@<%Ko?BB9uv*xPnZ5dQr z8r7~9cZXv(AZPY^<(X@}GARv&_}mfYA7`vdl=)g2GIyN(<}(b_S_N2--NKp$SgO<3 zRx|EabcjUSB44GaH3Kxmx3SW;E;Eia2Zs5SkbkQ8E%VQqr0J?tQjF~p;nbIXn+D;? zg;t3Jg7A@9U**@aaqs}9;%??Scm{zBIY2ceYAQd*W-hB-!+H&4#yrm*GtT*&#`FXx zGIVm}G<;Pj+h*KQ68S4rcIIGw-mkl039s@O4p9F%TC&&&xRL=N49v2PdBb$MxJoMo zQk8+Sv+F5m{xP1prZvn1=x-Q z&Yox|y&arZrLTm~<%o}VfPV#z+i&{)W5emXhx^g~8>eUe)|Vvwp8-x8d-MOj%@mSk zZ9i{-Hu8m-rfO##y(_Rv;Y@?6%h4Id#6%`7ah+IaQ13o7o>bG&ScMj&KO~QoCmNT6()+oo%B zugV3Da)t>unQq=tbD)FP{JmB~S5QCmb)lq9Fp(*|(UGeXr3kR?k35sKFs{{a*y+h0anA_K@iCi;BR6nFmKHC=@)rMmu=XWS1nVqD*=#${cFJ6<{e=U7!Rbg>Y0b~d#&viX+5m9aNAv=RAMt8=n6a&@t^|2LsKMR7xF z;Cmw>t0<=W2II;doX`p#bcjPV9z&3dhAObzcB9xXMslqr(y!P6+2kG>Eh!rx&ZKmW)Wk~_xh`?neJqVhJk~1eTvRF#ehRwpS>s1{vUx*qf&Jm z$)Wh|lmwYatW@U@*$<14>^|yYwmwFs)C5ke9hG42{gilSU#^ulO`M}`wJ_4*-3 zGb?hfQj_AGQBI?4ghGijqfu>uAYkLK#!^uGUXuctdn8Ae5I7}o+j{9MJiM|sf9Nc{ zuP&Ls@?rMe=IfJo!=iX?9&*4!Yjs5d?0Yx4cIFXrkSHRk17Fc@yM__fyFLLl6O9nT zQqaDXunH;!PpQ7+-&#wJVtJXl8LjIkh)5qmcqhErYrP31w5~#!tS{LYTWGKEtbpE%(hH>qV(!2KMfs#a z?ZzzbDB}(7+NWIiSBQ<_{3>;H;z}uZI;n2PKWJNxM=l;5-^zpu-}+1x|38lS-}6GX z6F=M~bUtHg98X@of>mgCH-&5g6UpXGAla<+g`b&MQANW6D^;zfSzq0mQ)*J%;&tPOYin?J*G7GqmQ=>jvWvOn6E?! z{$(CU7}zChEnl$(>xf`ZdeF2E9Bv=eH&T4HWAOQ!9gBs z{gl^|(78q-ioBS^rR2PEGZLe_4Rl**H(bB?84RHquCEKi8N#29u=Eoh(DV`ZX{+8< z3BIX<`sOFNBziFWS#-X%(e`0C_|Q8;Pw9izjNOF8h|kvmWCmDHM&pANC9MV<wEJ;W{-jXqm!zC+Y@Q1y_lLL zfV^(1{A;L%TWmyI)RPknVUB<4r+d42S(W=%bXd@YB(~d>ABq-E;t)ie6%ouy(Fg`p zuj<=I7^PDs5H+UsG}+GH}zoGt*{yKF&n23C7aW@ z4ydrRtFW-uuAUu@RWe&0c!N4!H;`!n@@t#u zxlGQB4rx(F7#&MKHPy}EI;d+l(G{1KG!ZBE)7)@P!AsUCCCb0IH!P5TW=GoNFcif`NB4en16Cp<7=fhz7^uQAjbJBH>@naf2ueMktmtZ|U|)ICDMN2r`mgMSl=qDwHL;}L-d~El>pf8UJRts_03eTj*hVy6H z5o!>?AcffORZq9!NJNa`-W4wMfe6I{3*rYUhIMA>y|T}KZ56HR5XEs{(|x#SDtP@N z5?12L0W7qfvWl8T-V+u=fkBH8!$}g)7hRs34m7~)^S&Ar zd`Kz7$S2Mz(|5H(Dwn$V7n8K2pqhHQ8!i{G4C~Y6_Ex&Y%EyXdw#Nj}VdG`XCN_1n zFg4;3DGjjUo$%=m@ui%z$JU66QK^qywvLKZpD6ZQ2Ve2VBps8rcvJ6^Cf^#H4?UQ5PW$4;b)55yIY9}@k@48RLtJa>7bofX{EUE7 z?0Cx0PeYbbLAelC-BfqHf_08;{lzC1kwr|a>5{O6*g<~wt6KYPfP5uW0w?VTO!M~Q z6H@n{cONp`{>hVjEIkOV6m^ZP^l;mGz=T&*5&`m84astyZ#XZ6CpH384tt%vSJ zsvYDC5u`D&U_u)1OJ&D2=F*ie-7!%N+V6*qoM6m-zj|}hDZ+@?`mJ10OX3K-`+R0m zNk$^+zBJK7%It=_&sIc}&DT>!LYU{|WPNrp-Nfly8u5&3@(l{!pcPxek3^{L`<9*! zE-0KukkD^^+<&3BNJM$e0=~B$=VQEp@V`L+PsUEL-_%+E_kyR-_mUjr|D1Z2J->y2 zZNHTrzP$=uEKQvy4DG&+4*o5^8Kd?eI>5S#b;NXlSrGVnj3~e^OLe4*Qe7%U#4WiX z)k7h@VHRERR_j{wp8ALHdD6bj&+Dl^?2(MuL9*oTRUI3SQ2jJ4x#!GR~b8F(H6|clt%g_O=v(@*;;5eW{e)CsR{UNDIE{C-1@qe z7NY&S7DeI4?z7tR9LJ$e6za%qLsF(>%M?m1nQQ4htpl?P)yj7_C#Ds5k5F z1h@YlI%a#k9x6}=hs(mkRr-fSrmikEk)Iv6D`S==)-dDVbNK;4F@J7iC(M!K6l<^lm@iXKpYbd7b{_0BDjc9ju~tFH7Qfcgu>A9~3tzmbFnXbS(pWES9955Vbu=iI zX>GH$kbD_?_fRojp{~Mz+%=%RHG!3l(wxQb{zQlW&MTlbr2*9|peUBo#YZ8u!UMPz zJo9lmW3isPrkErmxp&SA4Z4vpe~LLL-w6JUW}f*bf#w6lVyDvUhdK9fX!p#TT3fL+ z7im|;28gcWM)UdfRI;603BWd`d%7#sP0t)qNW*R*WmrD?hg37Zngmu{P;Lm`rlK_> zITGMQH~V(}6l6}TeG5nPEHYI3EHiY}TD%AAQ@%&*Q@w}lLp!VC>E;PCjzgVyNqNmA zYd0t~-pn55?#)1Tc-(xbL07m;Md14bPJOLyoRpLhRx-BtH{Z%<78P>0$olxWy4d9! zncKIDHrWFnBRUUqc`qiz@xrz52u-?2kq~5n$h}&*K?MxJ?xV?vVXvLErROVl7L9s; zedsv`#k1PCWY;`{${N?=R9%uy1P+jKf$&__RLHP zWVH#4;U{}bB4D^B*hm%nhRpQF{4?xW$&|oNp2CUE?Coyj1QI%P|w91%+*lty%ecgZ$I1|mJWq9_c?+4{KElHR%TIU zf+^4^hXY?f0&(|Q5=NG~AhiIVR+(a1gF)Q;L&vH%zPO{yydKt*(f#LehU3CVRIS&* zA1khb+xXe{29|Ggayz;nqv9M8n$JYj?Z!w0Sb}^lq#XQlg~=nkBhYxmlB{huZcL}F zA6sNZgJpJ|laA>P$V#ZhT+&$nvNM2sudEEeUaohc#ab+sC zrj7G)E-#;G-w=I1hTjN@b;lAjX40pR+<>)=n`V_!(JFk*yE zP3nDEs^C9DCSbs8`TV~U17Bmq%9I^$2xWK;N>;W~^^HOu)jQt*LH(-WD@UyR?lk$o z+mZhVgYn<1!ov1;W|rozPKN*0V#Xxdelr-6M$Gf?*Y~BQbHRK-&@B;ni(p_#pe0mg z(1pQKcH#lqe^P^eZVUta>(kWOPSnhH^E-oKtcJzCI^FSuJ zze(PI3_%VP4Fp7k#GyT8c6l?vndL`$$s5Z05+P==upnazJ>&{eIc?MW6fVO34pXfm zmmilQmRYtQ*e*BV>J{aqI%F$j*;=Tdx{msYgM{2Gd`D^TU>~NLKrbqtQDh6KPGcB& zYEY{fj~P1Q zY_vIx8j+W?nOTo{k7|A!vvlK?qYKZnTkm@qV7lWQf#;J@)(qh~m07vHwdQ@701t>}N2> zYt=Q^?p;5oP%enrkvLCarS2rlJ;zjT@1)Ha_28t7T(IMcZi3U?D_dTzMKnR%{b7 zXeWL6f-xfJvhsVNF_?I2^3gmv=2|f7azO~wc+o|=2cR+N_<9sF;vio2z;vtlV7U6o z%q9XNPhjS1Fv)QuRq|0#HVGw&HG!!t0wQo=W>hP)uYZ7o;_qdM=-*`k-Z%4+>VGZ; z{vGL`lv&#q*NFJmy`%{yAIPrAB%*freDk*5cHaNPB~B86YH zIw9gNDz9H+n0&}J-c0V{E(`My-2Nkt0NBY-PjL5r*s48D&j)h7pIpJUb+0ol1F*~` zp1!}vw0*&IA^z*SXZ}pIG9;ySrW01 zpU6d%LB2t@(;)LD!*G(DXK-!R!}Bp1mKS>Uu`^#p z>~WR%dn&;>iuz9Pv3W7EPX~GtnCg$63a-#A$1B7q;ZqH{xws^Pf-V1eO|D zHXE9qC~c)%CS>n>jc?m)ux2hN2UpKIU2hP(X}`Ljjc|CDFH%asVJH&6j5&Rb6aaVeQvSt z6VIX1X(pXAmxL>}wO&QIImzI9LcFhECJ|Mzi1FWhCgS$=^!!D3^vyEEY0HM0>?fsv zz1W(i8*H{v9APY$IW@J9NQ06Y@g$&STTrPC$I1{t0ptDZ=rHjEZnN2BSw{(Pn+6KD zRZ-hjn-KgzRa=ZoUs=W0cAc-}66Rmi)kZgub$G6zPQn>fM&}9X6!J^UsbVFdewj#M zt5erf{g$1$WV`h=0<2Y%iDK|HwH6hSu-8LDPknW`jl$UfmI_z9=GkC(@A$oVsRFl` zMYdksp797E2vzaH-N_%;t@q4}Z;FxZ(y&6&(#;_uzaGV+M%CB= zVNRMN3tj1#%##v%wdYNDfy0)|Q$>JYJ8-6o*K4hcC(;5F=_Mn-l)y@UX$ zt$YU7Q%o3cqwRC6;{vbL1No%d&)=)2$$;SD9a-=PfFh$6P1;*I*d z?C_52JLp$(UF}SCxJXTY+9?uE`@f35}k=i`#4Rk6e@*KDc^(tnQcw(jY^fcG z2hqo(q%7)o0YkX;lCq$o6hgCi3n%i#6vZ7x&_k#aW{QnPk2CWm8yVytzz-Xd_05x& zK3Vo>SFs-R)cf&`{&tL=xJVe`-HvE7&mAL^uj`W z%$d@~HtC6RV)R6}b6PqR$Pa7R8c3d_D4Hqq2NfG(>kTi!rOp%>Lc~n3!5mddW>>pR zt8tmTCxnr(Xk6g2^MqN08AmxcFLP;APA}^V80R_+K#agUx(RR48L2ZQej@XRm?OF3 z&jyIH+L2f<&wdR}X$XB~;2tBIf^AThY(zLA4*i6@9FdbT!Xy~7Ywt-zdi=wCIRuOL z73^T>|0wMU6&500dh%`EqjoMKS;Z+_5iFfnaLNy+B-@vyNWRdcmRaaBUdtQvT_Q17 zTG$aE4SA0iRA}+d@r;k~BwsTn@=r*;LgW8Q~>>Y9oke1Rm(xx!gv){TQFv|25IK_jjLj z_mxH%0-WoyI`)361H|?QVmz7;GfF~EKrTLxMMI`-GF&@Hdq@W!)mBLYniN*qL^iti)BMVHlCJ}6zkOoinJYolUHu!*(WoxKrxmw=1b&YHkFD)8! zM;5~XMl=~kcaLx%$51-XsJ|ZRi6_Vf{D(Kj(u!%R1@wR#`p!%eut#IkZ5eam1QVDF zeNm0!33OmxQ-rjGle>qhyZSvRfes@dC-*e=DD1-j%<$^~4@~AX+5w^Fr{RWL>EbUCcyC%19 z80kOZqZF0@@NNNxjXGN=X>Rfr=1-1OqLD8_LYcQ)$D0 zV4WKz{1eB#jUTU&+IVkxw9Vyx)#iM-{jY_uPY4CEH31MFZZ~+5I%9#6yIyZ(4^4b7 zd{2DvP>-bt9Zlo!MXFM`^@N?@*lM^n=7fmew%Uyz9numNyV{-J;~}``lz9~V9iX8` z1DJAS$ejyK(rPP!r43N(R`R%ay*Te2|MStOXlu&Na7^P-<-+VzRB!bKslVU1OQf;{WQ`}Nd5KDyDEr#7tB zKtpT2-pRh5N~}mdm+@1$<>dYcykdY94tDg4K3xZc?hfwps&VU*3x3>0ejY84MrKTz zQ{<&^lPi{*BCN1_IJ9e@#jCL4n*C;8Tt?+Z>1o$dPh;zywNm4zZ1UtJ&GccwZJcU+H_f@wLdeXfw(8tbE1{K>*X1 ze|9e`K}`)B-$3R$3=j~{{~fvi8H)b}WB$K`vRX}B{oC8@Q;vD8m+>zOv_w97-C}Uj zptN+8q@q-LOlVX|;3^J}OeiCg+1@1BuKe?*R`;8het}DM`|J7FjbK{KPdR!d6w7gD zO|GN!pO4!|Ja2BdXFKwKz}M{Eij2`urapNFP7&kZ!q)E5`811 z_Xf}teCb0lglZkv5g>#=E`*vPgFJd8W}fRPjC0QX=#7PkG2!}>Ei<<9g7{H%jpH%S zJNstSm;lCYoh_D}h>cSujzZYlE0NZj#!l_S$(^EB6S*%@gGHuW z<5$tex}v$HdO|{DmAY=PLn(L+V+MbIN)>nEdB)ISqMDSL{2W?aqO72SCCq${V`~Ze z#PFWr7?X~=08GVa5;MFqMPt$8e*-l$h* zw=_VR1PeIc$LXTeIf3X3_-JoIXLftZMg?JDcnctMTH0aJ`DvU{k}B1JrU(TEqa_F zPLhu~YI`*APCk%*IhBESX!*CLEKTI9vSD9IXLof$a4mLTe?Vowa0cRAGP!J;D)JC( z@n)MB^41Iari`eok4q+2rg;mKqmb)1b@CJ3gf$t{z;o0q4BPVPz_N!Zk0p~iR_&9f ztG4r5U0Fq~2siVlw3h6YEBh_KpiMbas0wAX_B{@z&V@{(7jze4fqf#OP(qSuE|aca zaMu)GD18I+Lq0`_7yC7Vbd44}0`E=pyfUq3poQ-ajw^kZ+BT=gnh{h>him533v+o7 zuI18YU5ZPG>90kTxI(#aFOh~_37&3NK|h?(K7M8_22UIYl$5*-E7X9K++N?J5X3@O z2ym8Yrt5Zekk;S{f3llyqQi)F-ZAq;PkePNF=?`k(ibbbYq)OsFBkC7^H7nb6&bhDx~F#muc#-a(ymv|)2@4)NQw!cgZ|NLJ@N6o#y!T* zi0kdtK#GC8e7m#SA9pSuiE5bOKs^ox%=l6KBL?8Rl;8R~V>7UCaz+Y_hEOZ^fT}$m{$;GJt9$l$m3ax6_ro{OH@r z8LmGIt2C9tM6fNUD<(Y1Q8w(aN2t@VPrjc;dLp9756VNLt9&>pX!L*6kyU=uui9e7 zrQ^&h7Nuk|fa1WH?@{DNg}C&i2BPX$%)+AMi%-ImT2Q_QnRV)3UbO2JW7T-JYoYnU!(}tii1LAN|D(%7cL@IEI0mCT0!t|kd)1KahVC2K z|9L76JA1F#-=|{!eJcN|r2bI={kK#3M*^rokSGIa zWe@gc$gT&!Q!WYqGHNy3PlhBvcjf&X0o_R>a?DGQ`e|uWa)>YuWk(ibM6r_Xpiaq4 zWtcFh6k&ih==f(%+T$`L1EYJ^CeevsviNKGK3iUF&1QI!EZOR4y2d?z{kh!@hfoR4 zR$n!oTq-{w^eSf-ckrX)rp`@DG4(8%e{AtoKlwoHjNIX8hY>P;3y*y_O8XZ8ien=J zQR{%EX3|XA79>Al$+8(rw$Y~9ydiaH!@*{;*H_Weng(B+tJe^@Hh~lm^J?rL_`0$g z%o51AI)M5AP4)R##rWU8U-|zQ>N#rK?x?C*TS+B3tQmUYjh6X32PBq4xJ`|D)tg%M zLwd8z7?Ds5CNhvE8H^bY$XD*~ke$yZo!3P40jio4f0GcqUohXX>C;+gOt>>PizdRd z?{b{G8+tZA!Aj6GmXFD*thAzMDL!h{90}jI=PdjS093DQi3v@l|5~^hKrwR6 zeUbcTjhPDLUg*ao;c>8JN}wB>MOIE^vN22t5147OVW>!BTDvz4xeP$B({i(Po~_BL z9*#5s@;l~%7S3?WkF0}E8>iN+UQZh{-D}3F##`x$+YG@H0vyyD%vY!zsJHcnGrN|& z;j<&E%0i6kwaMT{tjp$m5^V4*+9;13^DDjgaFvvOe3=j2hWU3(PY)kFXvfx#EJF(V zM!l@%;xJuF3pERftbWw~WnR$A&ok4UQ0dISRjNi-j7>!WdGm0^FUmns_uy2DYX1!< zihag3z-a%BI*WE?er9_UTY_Eui-R>cvS1;=N#Bv{mPKKIv5O9iXS- z3|WAAOhFjGB1il&5F9vj6Vm!t99VnZ6v)$mKW$!I)_=41msTtDQ`CAV`azZw#(aSt z5XK052F(2mTOy|hb~KaAM@(Gg9l3=rqXB79Zp!Q>)*)Hhm(8O3s53@BCx_ltYRV=o ztb3!SE4UlbZadeiDcr2NZnT1}MNd0Au}VRHKQ!`nW(2!sPW5ulYI zosR$tFs@ul-q2)^z}}Y;3$Jj4J#kik5ou3xxf)_JL$5C!E%MDFH5fza9unrHXXw5F zHY#AcZSU73&;sy;y;fM_*p0Txd{DmQVYSyT(8Bu@vSLZAPKlVDd&6%bHj%HaV1{=L z91uK99)#H)!*Q6S`Dv))pyUoDkMa0Sllw7Fvb!iKKjbR3>q-@zp>$lcNLt4(&F9yk z!g!~88ulk{z2xgG-3{{il~#8wah-S$PDsv)h$4v?e@iEW{%JRU21>lL%fw8~(DT#^ zywKIPee|O;<3lWQL$hEWAUeA2)~-xA7yV(I(Pe55DMTFD&6fP6bS3JXHE& ze2nS2pMh>pdB%}#XYcS*N|SMQmQ2J&7WZu72OP zj&wXEJHG2^_XZLJUco>yC|q(0L~1fPN+}|}7%$xcp-i$$kXV=D`~$(T`2Y)+8U2yu zvr%Mzd~RzcUfF#X_+uh&RV1fO9P&C;yFTuW5sb%e_xPYEB%AgtaOJ(ztnLEW_Hao2 zZHV-;f-^2epH zxn#@~NOA z11ZBV6tw5T5>Iz^Jb)0%OIlra;qJl^ufG156Ui{A2$qpZ_{^c1^R`+fbi*WT%;He@ zyieltZ{6ivdgz6i=@iEldc;jVS!5E5$rymBrD?v#K?Mr`?ocG-n&lL`@;sMYaM2m6 z)Tt641KSaR_(MIZi0J-0r(53x)8LPvfBwp-{yFxkKiTU)pdB)FGjC~7AfTS_$=v_Y z*Z#MJ`R|V^X!eb+h*>&0yC}OF{rl;vioX)<^+YRtY&IVpwZx%m(G%kbE0AM%G$dMnxO@9U~x`$qY-b?f@fkQ`9pNJeiFRud6ZB~-h_kWX>mCgONAn%y8FDS z1jJ5f3AGpr111cNW(=njoJxN_XIF;t1dO^e0km*ZO?76yVM(*B>Ix?cT=nC+o2XP$ zo!&hK$H9sd8H07(XoY2&7QG(*iL;qrs4U*82`MFg4P0Dzw%rEFXuGLBslk;D|Cf}sL{Bdj9TpChAGEEN*DvCLV(j_N-e zcLNc98=ZJ>3?UluoPSL2QwygpEHOrNp?KEVT77e1i3zzY%Y9lStpis{$m zm(cz{%HDxH)4xj^O$Qy@?AW%`NjkP|cWgVkW81cE+qP}nZ)X0p&N}nVoOeCvGhF+3 z?b@|#SADRMCTILsR4>rrHy4AU0PJ{|)~M^(@q-e3hLdj7_}OdzCb7?6jvhyQy!)3Gv3ELg)6!VjwA<}NC@GK%{NI0 zJT}T#aRk{>TXHs_T?t5eRw>v2ntXC6^p*jkWo`a)WZ0?8&JFWArnx^e@#->FsW0`H zaG;x(iE*;8ugY6Nhw%)c!hpKUyX3jhGA*i6J6@(fUBPL$z{4dz!^d6OL#hN?41I+g z!KjR5!+yZ+z+Y#U0p;s{fV{jmnQyy>%`Eu5GUWo&fsZL97=D~-b_O#00NQ+zO>XS` z6cn1v6jGixMb@=ItgwK*pbiAms3``uBok32wSnIF!(VPSH!Aca2(cTt_k_R zo!iTIMT0nvu%dfM`Tm^UEy_oqiKOy5hANU5*kqB?bbwBoz>e&)X{#5b+bFeY#FB}p zj#JFe|1ix8(itqE%U8Oe9{8p+lmPB#ITX?HhA~WU^`aMeLagZ?{J#$k1(<*Ga=!-# z(r?kozXS&T@4ut}e53yWT>JmB5K8z*I`ZXC(_u$bUyRSI0_sa;;}c3a_~)8{7*#4- z*hR0l-h`v$GUX!Y8S$OAGx`t7Oh5c~5aXowl-+DBh(YT4|& zz2Q~Iz2(b(#FdLc$(X>h-N-=%K&sS{-j3KfIshl~vZ(yd@zZNg`=RANO&IW5GfVZE zs6mU)V!n_RSxggdO;6lhUb4T6hUvzQ$bXz{bZkC4QCxql0E>+~jH^F@J~OC%bQSnw z!dVcM*I_fSE>Yp7Ty9TQ8VjoGh>2rpcziKFwP#ZBOnF7Eb+fb#57*n=S;keHfwc zH49H*3q*cDponQrD`v$M1l5b=n=zY6HiA!3d-3ZhDZ+LzKN9kDW#xrc^yy*`$5>{c zL~=_5`{q}NdlgOp5;!td)>hv&2umQuUJip0G-qJ0O^3tqXGdqmn}Z9DTz4j33Oh6* zRs?8e!2wbIsGfGP{9#WZD|RF{E86KJLEy$vz9KuntCBzNS(>A~j5a$SlK;1USU4_S zB~S;>^=U+8Kqh5?r+Nbfvr>prvVolf25hJ>p9%wx5ew2uyC4l%vXv}jkoT5T@NOml z^@+(g=Fks#f9@XKR3CWI`oEWac$gIO`*&M%ga!iQ{=d%2|J9ZRjEt@AzT>j~_r7Ge zrikzvS+U<-JIh%phK;}dvq;P%#NIq@*-Ro zG795&jLHtK3kt@gsFnVb^geyY&Q#0!O5NK<5l`92U6zg)2z^ixqqM;dD69k{pn5na zjzCXM7%i#qTM&x#D|7;Cs8qI%RB+HS5}ROsznNr@l{c2b$1$=!oSc;%3db4qHN!gG z%>$rEZM~8pIiTEB<|bT*mBLb{tT1uWu6OFJ)KF7(hj^P2rs5QyMx#q_*|BJuoXwJv zyh%!-X{q#YM`heA8Hj!57>5|U9qR_sVak1r z2ZH_d(s!DNqIuDZc5gkw(w^h@n7~LZ82aCz6|aG^n5bXeTCFdW z7m@2Ej5B%8MSD2HAr*BPh~b^9^;NJ~HXJJX7VeGl(#=!DS?r0mNIH^}d}=~&Ui+B^ z_wm)B4@6oIZ9FP|3#qxxW6-_;>b*pN_iexjXi=h}e`(krgGC?N9fbTnyYPYIO6K}B zFA_P-suUrOEb6b`R1i9SkQ*s2Jb7^Y-tOTodB9(}j@~WUg#QJE`jW#~0+;?p-Oyv- zf|?tPS8>)50*6Qh^}EqVu&_nQ+F^C-IvX6tCg-UDYg3UXsv^pjsXxyJD>pVkh$z=?hWh9Cyd8bJRGUUU{A@XK zEFVF%XrUA0yYJ(VcELR{+rh(`Av6SI^lRD?z)AQ$gLvakWpQF`_zp{aqZKUt@U1H2uD*qV*seS(QQ2Dy-oc-O8X zMKUd~h#|T^-6H}`fk?iJx;2kI2$Jj;QIf6%C{vhRVjqTvaHy7Wq*g(r%|c-3w(n|C zr9N;Rs9JfUDeCWJFL}uP;Y0FDf(Wy};!IZ2zFjeU(d+_6MEJlaX*p=3D!D0b>op*k zuYr23N1W0wly8w74c#W1LpXP|?)nWr(3eXs$E(c&PiERe!JWE^z0mm5cg@7F`_!@X za8nQpF$jOM+JDY~nb?BoW=-xIQ22c3TFS?M{R<~rPg$le_1#FXz85*d|IS}UP|x1z z+ey;M%HGW3JB?4_`{vKeW ztvEN4bJui=CcnsQr$FVybke#RDpaIHY{GaczId-A9x@ zD;Gi-lJ9Iau-2o;`eV1*3ztzN3!P`Jxrc)3ocRRAct^jD5E<^lS-Z2}IFL)oUQ<%h z4?B_#BP>07`M}`7ywGkk}UQpFIOvRZx*v_~StXIsHv% zk|F{D@%%dlD`92rZ1oTF`=>D~IOsVT{euA~R8PKHPL!_>)`|SN9}+Q?LbiX7V;y|` zxRlL>%Ik$H(5Pr(Mxx>JnH-I0{je|Ff^ zz-BM|Nl%;W&QA{{-tTu0O+e~5f#GiJBzZraC7MNqDOlr?|LhqN(b;MvwI7GKiU~0K z{eT373oTRU0c$+Rhw4@XlTr&~#ma@bzsx0Wj}{NwfD$q4FH;&|U+$&78LfwdW8CyW z;OP%PLaqA+xw`)8&GY!c(BaeeC9Brzjgx$h5BNTOB+6D5tkg^CsI*KLgPcM%ya0vp zbV@C>a?WQSn!)u=q#cuPB(|i9nbp{($Sdf>!kHiclcaabX4aUu7DhI!LxJ!}0zu6Q zTOuR4jCzAp4HQB~$lx0-I*OxW?+7`C+)yPz2LhTJcEWDtrjrKPGYcx7JOz5>Fq1BbCwdcc~)V(_dWb^W^Cg+d`E znHou4u_BxEZ#{w1)X2Kp1f&31bB$h<4(gDTg@SKrHdbYIH!LCpjoWx$m6H?^Rn_?n zQtIMb-Te>usVOR~oBNm|$%EuM-Al$LI7T(caHlUC_)EwIwb_}nTuQcJOCTkj73b`fRMv9KQcH|un^M#jXkC}A*2{;)>XL4t%9j;TE~jj=;kQxkt|4?2+jG$ zO>MA4Ihwb3fs%0QJ?(xri>|+HFKQwe~VKVDLRp+kcn%p&_N|cAcOg@pMI36hxJ}`pdX&g37 z;cjX3*$bO0ZP)WGjS+*#9BPg-k|%%ld(u(z6#Rs)CdDq3v`;~(3yzuCIThvMSR?)N8k)5*zG&`Z5~4mo5!kDs8X%#wWG=BAOu>f;BBx)i={ZF2%pg&8u9OHu$RwHWi(Zrnb_F!S4}H4Pemup{B?g&x zU#uE<^xzLw!p;7LfV$qJaB~})?F?0goeb3_q^thbL^rZUwm(m}&9u{(G_k#^JTnZ# z?ls#Ol&@v+(`?BLI#?e_JDXMXZ{(A&w5)*9@rU$xbIzoJK{+Kq$9~gGf?d^9H95ge z9~bmk_TQ;pQR=n`mb-!up;6q>rJg5h&~DXGOL10ZCpZElV9+NXAe{ z(U{+>WGl-7n9_cB;esbv`zQd5PGDmtwrS6_?5O|j?f&4!=Swn)P&{DTRm#Q z?lZCaTsQRukADw>9hvymR@=x9j+`A^;gGe7opW<)l3(+nJ@lsz+RXHLf8DN7;}xZk z?qsC(lwIfrLNr`%cX`j&a39Sp*W&E5ABI{ZAa5xsdUx~eii8JeRZF~w%iTbC#CrAF z-f(##d2g%O_TH()d(?*AHm2=rhVJdR;EgIyP9gikuT_JX+bTqZK_f(F?2|1`kjc^R zBzDQ!BZWG%cOfa7HvQaL{Ub@Sf-hnaA$2DxLI5WNxlEM_Y{{$4dSJMYh7u9pnQdxV z4jn2yc%eOWUGmF0IvlC|>3K7RbP86le>*$oQf1o9Hu$U5W?FiyW4x15Ke~2{<~fNTN9&{nZ5ltn)|0&e(%8lU!5}Jn=P4>{Wc_V#@<*& z#iR_5lKis*QVSbHPz*U4gh7_7OW&h{zBrzGiDu1}dlO-OKldzv6xfgM1;iJBv)(xV zL*nOH>}C4e_pM>gMOIgr7fA9zY$T{1XY4SU7$v!*x(F28!b*5-sBQdSve9%p&6M3A zoF)u_&hxDVt(HQi+d30wc#%MI?O*#P7A-(aDiQVoVBc|#+G2bKX3W9;9o8 zD4HbHZV4&TIV&gj0z6v7AXq7b^MENIMn!!BR-tnjn>8c7k|S+hdv8|W%?0CbQ$7B2 z*nZ5BW(Fd9tQJwZVVWzfGE-5!b%f6Gtb7t<-@dIT#=TMz3ERX_;%e*+5i3(E=Fe|ao}{&(4(W{aQ4Aoc)ELdd z5xg&)DFQ19QdauMEM#(&`Aef|XP5yeP7=4gf8P)3_V6z`))+>cj3Zt1W8V+5k z6@?Vs07*I%!{dvD{3k3PvAAMT~6`Iim@M4XaO_%YOCvyx_aZ#OE zEoQCTV=MOnIy3QCDFvy%ko~6YBp3`2U{rdbr*BHVsIz1!_!-at!VxNhO7NC`mw*3v z`Ttu;@xSWcS?XvTO7%Eu&JIN?8S!yGelAjipZZjjL?kL>E`1=KPegVn$cd#Q3 zmrT=BIxi`@g_jH)Xa+_?g2hpyNK%m(2OB8!%k?+{0(O|w)+-aJ*9?afapdUc!Kzrs z{bs76WLj({R!@J8BMHvCo3*s0;2pzhzGX)r8;v!#bHTvh^<3+|+&~E$E|kdCik&Q* zvXm9N43@#(!o=hFvr%fQ&OT-!rqBw$jx?HZJdVPlcdD=K;SDr6uCWgM^>3>bYYyzD zw(m$e)>4rAZ2TKb((Vb1@C$)B zlGwcqUCU-rWbV8uqUIsl`VCcnOj-itFqI_2Vd=!Iq?jNi9x#_YHyx#bWu>p$(+<#3 zm8~w;gB*jg_f08pzm}{qhFqd*D)ma%t4`7=-7rq(#5?lpDE3t^qTn!nJd{~h0E~E- zRQR>Q81&d@rddwej@!YvrbA+RoMKfi;I-d?R$U8^y^k3xwU)Hbm+Y+5OD;`JOia_@ z@eFpvBey;1Twd9l*KHO!*;QK5)5hjZ6$t;DMfiE(0a6m5?s6M|m_vXC)Q4Fs9sn_y zI!or%?trl8Gt;p&}Jf;`yVHP@rsXhgAkueW}cmxLXHXddup{SVk z>^B@F*hxOnbBoJ8BbZ4}yNfh{NlUbMcb;7pL3x^mNLtFPzQXori=YGCNI{)ZAZ2Ki zs3qvR(7N>3nl%-R(nxn9g25ba>ww@!Zk2n&Ba}d16bhv_#ER1_5xYp4v>EZSD=SiN zawHYv%hwEpP%wK16R};MR@m~tu!hMb+v9EDkD&DX5wQI`eh`K1)O`&W>qHzi z!b-DJ&}vPMc~072@*LfJeLTEC`v}F87}68vWOcpLQ|U|l0V(wYixZ*=QHzP%b48F5 zDzkei^(!En6E0%9u}ZGpvth=98Ab7vbAkWtt0*l8ho~bKg&k)N)D{X)Sw;9K%Rymb9ZkXRbICW~F^rHlD@gHfrM)$z@z z$hD#^b4Oa|U>c*}O;;{gCD0tASCj@XM=^K~@*b&A(W9HhBW7}y*>zs`L6&b(Numk+ z?}W2dTTY-k=m`2Mn)4HUL~E6!TYM-44baeHe*R4+@g^O;S2E_999y!?b&i{oCw2p8XKj8~?@*s%WZ!JnBS*(vHBdP{u*jZ;&mPhgW- z$TymUXpLsqmETA3RIEm7PvM~#n2jc{hcz=P?u0)H3}EOmNcTzyZTDabzVJS};Lw~R z^_n%#OhfmE{M47|-{~Pe!$80aEMfivs=~;(cxH+gPUI*ZYK)Fs^CUuPfB%5wwKIf`Er>NFR$wv_^&lqkC2)JPA$tSp%^o25 zAg&XPxP;|y!~aPnY+-Z{-RB5sI)^EdId1W3Ryen*fIbqnZ*#ViWDj((OR4xJM)(;? z@Cf4i$TZxF!ziNG;)MR>mr=gWYsSqO1fHC|%#CXi%S_NF)#i?IVU?g9jGmIR0)3Bq z;tln(pGsuhYpC|QPZ-M*8&b?$?(Qip*nJ?akUU7FF0*UvGnI!R3f3ehEjPhPEH4?iI+hc$O*6CpeI~ z4Sg%6ZtDeiGX3M@Xb0VgXkGxN8nJgs*k=MrN#I7+%!m&e>Y)R!$GXr{Ox1#dMkdI= zlKCh%&BnMT;qlKbqHxO{`^lO_0%GE1Wrg?yydI<3s6he$-Lq$K9S~S3G^v4nX^Z) zB1xZCP}vgY{yApKcg{ysSWd~`b){kFXX{Ue7MRxdIp*Pn%tWiA;G zK}!DfOQSN$&ZWcr5-u-l7x|fv7&wHK*XJt#+uRJnB2FM~@^XCA<8EU7^5gaHgUsjK zVOWSyGNZpfk~vg>rhqFct7@kb;0^O2Xsel9!;mh_$I zaKvjBu*O_)8H>OOS4ydd6g-9Aa_$Ws${Ws6Fz0|USEkulnyRswYM|urnEWUey-5v< zK|YioRQPd{ip*!92N>e3y5>A+Nv3n4toNold<;@)Cpa-}o{A3jKdb?O!_ZABIy-wA ztzaL_l_MAt9Aem+gcuy}HD3IYtK{aB*hzTjXq&0A@uXRXv^;8|0?@Am=!pbiG=C5N zM)McoW~TRnVW3NZq1KJj+xK2C;;K|}6aa~;Hr(bM#K7Rt=}86*!4%lv7!SYq>1?b! zoj=E)44db=!=F?h3B5g#AL`+B*zeH*a^T`<+KZ^BuwjR)kT#^@EDMz<=4WrL{?JQL z(Midu5k`G6nx|MAl2Y&qGSM%%J)+Yw(FWm|z4fu4I z{{3wjNT2C$ql;!i*H5F{3gKU*q?bZrK0;+SlBwYIPElp%gqUQ} zu~PZr#qYvYE(y1#z$@vrcmgY2xRG0o>lUpzY=8Rxlo4QAjRJzT;NnCL<(mUbSdA4= ztVE89jFFMl`L#!Zg%3PXupV$V{iK<4bVwi2|NAg#!f#s}|6Tho-?jh$0}cQ0{CR|dmG3a^sq@LvxXZ)+3$dF}+2P(mIEWS<*7dvo6~{*oVgRl! zQj7D|**X2unoU|<->1K~fm%Nsb}uww1XK5 zPTkQf9B`IX6+xXBtW=vbHP=GNFEGLjjx=4n!T8k>P0Dxgg)8?1odzkeL#&YQ#Ot0b z=PB19V^dl>CF9vFxxuNE`{qHrf083@(u~2?E+QAb|ND4Ak^;V`^p(&%y!)wtA0#DI~1sjPy=Gl=Jk_LKV+s!Y^j?t@%~H!tX2)H zm{hZ!i~RL`v`e690}D)}3FD}V(vmxXyhY%K5Guq{_Mv9?v2lT{bOWg4Zu^7y1ar8n zmAHd)JADf~14}K&Kd>r_R}_x(PBD?%GkD@IDUklYfy|?y1BVdi#9312{)remsr!-H zjW0tu#v*ygyWbLt^s5_5MkpYWOUgiCwk>cCafD`_APTvKBz%WJjzlS-G2A*dS)qkQzz504s~eJE&!(*U_>0mr$HykbwGNoNWwCEjL=c7M*D!Nb`PH zx2NPxryn>XZ%|N7#-LQKLHw1-kG_2=QJ2=JLW=C*nydd_?z&Q5N}%86-u%7SV*Gb- z@Bf(i5)`(qXJx-{k|yJdb?lP{@*FHb*?$CWe>MafB>S6?GqJ~&cUG(*a1pK4j zcf{!2#D*VPQ_jByclkm!s~C_7tTThdil^s=WdwIgp0IA$=lH>9hCTx z5Xr)>@*R|x(DjaQ$DHV74NS`Whn+KWt~fSy84>OBxriMf6kUU4Q-kS1l88`oJ;U37 zBQ0WgFx`l;cSai&{i2YGMjA#*3na}+e^znG8aHDsy4bZf z{#LURLOT3~vp8(Iz0R{4 z(_8XLA)?)amfcWVTsCQ-sSBOwSm)13fLBY`sl!Db%2|ifT=q zA}^pepW;deI;)PQ&|m^3N#3nC$*tDKC&*TfWst8|sxfW&I?b{?nN`JNk9Ca(mhRwR z;e*YDD(uF0O__g-j`;qano_bd|GzAsI+Vubzr}$(&aq;>^uHkxZUTeJ#UKKb;6ZDm zXJ;v)Dg@N3+lUox9T)|rNJr_O>1gvqMG~O-x)ZQ{39k$k* zrcOGGtVyrDyF9^lp_*9wqZg(DHLU6pbt5$?+x}t^@`ZWLSOY9S8qUS0f_DMG--u2U zVVx5|fL}q@Sl3A;632wqbUjvV!&-8wpc7-pG>olAC=&9uR9P+aLa{6Tryv9JHBdyU z`QqpdCu5x$noe5^wes^G-+w6U9@E!NDHQLKi5hO!OIh=Gi{cttNKdQZov`>`$0}qW zwz3-)$gk3`583rGJ_}20tDDcVxc&m|+f<1AbLy?n*OZa;*e5mRaNf1g%?~}~d-9qg z)YnEg7G_l=&u9@fFIBKaalRbC<3=@@*feY>lRsNADQ15TvdRTJZ<)eCYVPqzdL=Ef zN5(>Vd%-(d`|e!KyLWUEG);_E!J-fhAOl=zUcrgVX1&hj`Zz+wvF9Oz%X4gGuONcH z%h?(;os*+5gzz&rd5$4ULvA`P^W&(9fPMjG4QPG?KhaXi@O6O|U0j#gaaIq8)g2TV zw^p{f?V!a@N*#6eiN&o9wm34rAKw#f?N|a+zzc!gN;w?_aaFF$hD3`u9UipKy2=a?eobQF_M*REf$ zj;+{$jx7^GXy!mmwnHMf3B}G*11Dl+ur+U$HV>=|*rWme??d4H)D^+~34-e<&T4fK z9ektGZMEA`+wEVx>}pcQ8=?b3U&4M_&cEw^b7&G~t`IahA*>38X=Dd9PK+d+v5AchxFfgIsaho z3^g-d&4HLt@zfMHx9?onm0BKMiye@&M25!d0|j0nObOP+ni%+TRkv7Sys6+6#71_3 z=3c}|gh*XvU|-!JP`?&KXx|m7=3b=XOQhwATD=v29v@f&3!tGPuaC{Nnek)Hkat;U z8D}L&CC7!O1(_;b_eTUDwOd6z&YPOQpDHX}OEqX&rqBLxbi6Y+6raWRuS~FCMLRMt z&#=5pIeXB!uFvv)dfz7vM;+QgV~i`G1D= z-T1{F=Svc>DCY7thwMnMEmQWBpxlHg7sL~EN*8FEl-J$-QY%K%J<1cYy3$KV zG+EM%8p|KXJPMwGyQmer(9LR9MVP?GkZ=w}PhCJq%Z)LsM&!Gw6`W|6YLt|VXVknn zG+d8xv`&o*XpcrIyO?E>GlQ59W6fo)hgdm&!us+gk&~Z(xzd@ocd|b&VXN{1iqTsr*tppm%|xZev}kgETo?Ip)PrPEKQ`fJY27Z?+iQ zPb+`K9I8RYFXR$~Ml+_RwfhqjPI$G<^2eQukio^mMUAfca=8^`P$}-3av))0#reBX zJO?KRoQN}PfKy6EWE<${E5oA4psTIXI5R3P!`afUEO#@F#cW6?SdJ)pjcBxn{HXms zby#DnxcBA!a)&`0rbZD2SYTN$P0#hKE_J>aS6t>Fk>J=OkHFT(x{~rHi3m`WL<=kn zYqLhsunHC_IFkJ)nD=}RTK!-#DyN3zk?9q}WQ|y1rKvmlPWbjHi7UlXup~E2|PJyPAGVueL7){V%z~!0G zXAH|iVbtT<`S2``Tz}5WNHpQkL-$|7{gJQRQ z{~K-@lS>`6>%9heUPf-y_RL%GwF=+XQ~OK*X5E^AVS9Hz$Yi?j*y$}A5lRJRSrKl( z3QcA!z)W=;sR?}0Mz~&?X z!oKp_GaPNka5j@l=_W8i_Ofa*C=4c}Wn{Tg&f#Kv>KXE-R$KfXiUCcU6VXc% z=8i?pTr4YAqN+|9NHN6(T6PSGByZO+A&`CaMYXfh0S?fVLF)`1*NWI$0?QTU>kd1; zGzWn5_-2B({Gn)x14cpGBq|78lCZr3xPjhMM!`-370O&|EV~3vDVO@igfR9m|9LnF``CmprMnO!UW=7QAFV7bZS z&97u9G63r&&SVh|)l9V;7LLGCY8;X~D^VDNon%jj$@1u7VD2c4OvIF-u>sc%Ihq#3{;M1c1{1p*hfy2MCQDBv0zVR>fl{I|lfOf;-g+=$^M zq0Rs#+yN#^6GhBtw92LZA^WH9cMTdqHT|aKv9`5>skD<(_o8oU-&XLEN{BSkLfhlzuyX9QH{N}qaK6~?EU{Kz zFf*F$WS+nvgybofAOzsSJB2OZAEG_m7vlWn+^D;_jaN7gg(HGtYw~px zw}w`idAI|sf^=i2^*GKT7v~wW-*+2JZJYOB6^uJwuw86RE7aIFD9F(*S)1|L=(x*R zBloIwb9(ht1|YF%8f9femH5?zGAQAwWo zyqo4TV2R=B`U<5m8wAeMHEHpWnOW5wp)I$xr(kkl)R;Oi0isun=y}c-l7LZ7m;lm$ z$q4Iy6Sc&$7dUfcx*n3=`*`*UR zN1JtLOUYS-=7UaFQks;9^B@e^CN+Pz{Jd$gh_F`j>;ZkK-Md1}-@#73aDFjIwBy*d zTlwKK`nqGu3$(>F?Ap8A?q4y9mka`bxGNnAlZNNKWA&(V)8YwF5nmp7j%ul`_QG%4 zaeXBNd7~ytMg3#Xf>6W<>tYbEa%-$6=;P^Sh>aUHZ+e~0RG)Xi3%`rEs8MS8uYqwNdw4SWVkOjZaf` zG5VfUUiPoOG}N6 z<{qp@h!mly6=>7I?*}czyF3Y!CUIt=0}iD^XE&VrDA?Dp@(yuX{qsEJgb&Q}SNvXl zg?HrA?!MH-r4JN!Af3G9!#Qn(6l%OCA`)Ef2g8*M)Z!C4?WMK9NKh2jRTsnTgfut9 zpcZ7xAHd%`iq|80efZ31m3pN9wwBIl#Hqv=X)1r?($L>(#BR+)^)pSgbo+7#q<^S1nr$1&0=q$@M&POX?y?3L&3X z!%^Atu025LgEZ~|-)Cd0=o8K9A{$sT;SHj3M?l{!Er;st5w=T=K2^hJ<$(>&P!j2m zy3~(Qm?r5vh*EGKNLnP31{fhbiIU~c2GX_wqmM}ik7)NF$bEYKH^bK?MD+uJ24Qa=6~Fg-o!gSX*ZYoo{fzTLs$371<;7oLD|PiS3s zz;aIW1HVCV2r*#r`V-0hw_!s4!G4R|L@`u_;)KA?o(p8@$&bkWXV*taO%NC3k? zok=*KA5vswZe|5QOQd*4kD7Db^c|__5C;&|S5MvKdkPtu)vo}DGqDpc097%52V*z( zXp%Esq4?Rzj53SE6hKu;Xc!&LMZPPIj;O-Gnpq&!&u5db7Xi z64ox137#@4w5it68EPn<8RO48KG_2>?+Aa}Qo7fR%&wXJNf2J;Kwm6Opddsyx$gY# zU+b%y*{cBju|sw!wOcY_sMFWX9(C02d(;_YQh1*sH9?j$%`tKJyd(j0PtK#D+KLHI zL;b*n{CZ7IBb}MUGdG3l2vFGJn3TOYJD$Hz2OOy*%!5a{!!0mvok+e+N zaP?Ndm;SO(8-v%yvu#Rr;qFSgZrKJxV^uEnX@L(r4)dZeyh@yRqoi@3M|#Hz`hHN6 zA|8#&oFv8+1F8t(#j1%Ywdn%N2uREt;@bFAF}2zeI2KE&uZr$?-SIwKu<5ThXn_}f z`@RRcJ!3;pKi>mQe)VU5;c)zA@b#dd(J?}$sg0K5L^fIm8%TV4|>Q?qdfMwAh4AM8l8J|tiSF32B4q`!TYj_z!4Lowq99lipY?vlC zJssf0Vy+@In|fg`2sUl$wDGr$XY+4g*%PhDjM^G!Z{H44gwY-ymOqXka)G3ulfWdY ztNvx4oW*}=5^&NGhiS)Vzwb4;K`^*tjj8h$esujKb7&}?V_cU5kQElGgCL<358O^% zcT-EwP>hqb1%_8C_5R4e#7RH zp@tA$bVGG}q@TDR#-_^YT6}Zo5~p_5P%C_pRxwhgkor!;FtNFF#cncoEHm=#?xtY0 z1dHK{(;)5CQJ`0upxdRV?(5PH{JISW%d+@v8FmbTh9n5TXGnM`Cs}{(AbDxaIg&O2 zg<~{fKtj#r91u9PujPqhkFt7tid?IZ={dML<$3sh;A*Hw=VP++12;lVguAyio!na#kaYeX{|8h3_;g*K=UEf zU*{ZR($$Bw*(h;CSO4{alBraU^)52&nxLKUxg=1N5MCBUJ+3a^`9#f?7=4#`&oz?k zoz-#s4C)f8Uk@S*VF!Uc>X}9M`_*gkn0&GI2R*j zUlHUy5b;rLro3?bBLIt%dRd~2lT@kjcfY~OL5ZmTl)ExZyt!)^K#1p>U~rdclk``e z>=zHu6Qp^z%nX2U*RE14f{$U0*Cf)LfBz-c)t%iD%3wxsgHpRPvieqZgEC0IX_Vkd zxh27*KXpXxYD=^PP&EtX{NlX zC%v9)Wz6De((qH}Jqg-g`mwJ!IZ^L?eE2PE9@#9U0T>jD%e^K8-Phz7cZ-bP zU%h91CvGtNYmE{gk=tex+96fK^!I7P7YI3Ma}h)ty%NEN zn}d&kVV1DM4tPht`B!poikUOE396Uy+VE|E*eQuq zoT8M0M&bcREYOX7Q)F5+d!xec;2;H!WO+!r;v#uo402OEt*q%vj)mC@8wg}HO02G( zYG=<5*Vgl3R(5)N@{y+rvBY9CgUHeN`qQLm*3;$@Ez|2z2j3@V_m6j4Kc{5MTf}GG zMS_qp%5n(5$y|Ke#!!7w$4KKAJmhA@sJLcoS}Mv+l^X$2DS9H)ezLP0LfVpNMIPwL2U@Y%%7Q7jPXmGSPlRwa7*y~EkqObIDtyFm)q z-D~m~?At^+db`FvO2uEi2FuK@`RaSN*`T%G!}yA5f-hG1SYtty+Q}}`O^In~cgi>l z=zXVDDNVH?QHtgup3*d46+OEicA^)pIn2`}B}8}{g`msSbzzvq5zHCIjU>OrtmbrG zU26iOxr*A6%_LC(|3nH@ef$16q%glnTl}ob+(w=A9Uk48Pe(F^%ktv(oHC2Ve4|TE zc6J5le1ZqXdLP~+(UY@`Y?r~{B6_Alh8Q{OmhufQSf94*GFtAi(lV<=!6wqxL;jck zOnpR+=HK3Nh}Vv}%LXPzn;0b#^5Afk3y&G)X}NEkE`~TM%tU-P1@^=msCxOyP!IRO zBegW5wZ@10CM!9*_|kF~ZSxrk>r^zyCL|dy9$~*`OX?>1)fL1l(|lW|G!``CEq!N$ zMM)W~G2zDb6wA#)D5OmIMu_&UH_5B%DJ#NKl#R!?QVz>y5jLrK(-JpI6LIGVyD%W9 zg+7;cE40;Rcv9 zkCrUgZ-H}IaC=aY8~7*9+Ny?O=Ep;yso*#-SesEGSa3T&e&DQ`k!p#Zgb<6@KRjgn zG+Z?LoNstww}#+R`Y(?d>>GG^ncorkoKX@REYSTD zQTYHMwNiE~9MM(>u%!3KVR=O=by_thqeFR&Bm;D|lW@>^unOrb^k9yd-=S2LH0S7} z>ae^bwruKEB*7m=)u$5MIo(`)Y+RR5o>9(DDDV623UMVck1##|b`7H%yjK9unoDGkVIKrG*dvN;2S3P_9>ckR6c?7n{s5v!i;dE&<_aDaPA_ zi>Z&SHW^bWYJr-2sb7{WC|0k-a}7>k3)*YgZora(7dVnK7b6?Y7U|>t*u=-aLgC3` zvnz>+QQ_%r^ePEJA5X6^`Ey@^#{dDW(QZr*A_L9Y+QI4?xFXAQ-JDe?&YmeAVN{2b zK0DO+&S-fQWDg`ab0$mQodAEemrA3p{cHbqx{yVqz5Ns6)Rixse^k(i5spvs@22QF zAhsD~>)rC%n(#M+D1!s?DFCBTRfNF~`N7kC8by+1samiHH9dbid%Masz0;p`l^GuF z)taCc0FD9!#^qP3B`G>vZA2db%ma*@6WNWW{*kPq^|f^R%Ee|F-FM69H)u|#Qt{qt zoi{%@b&~<}!vBf99Ef=ih~RNSh2LT6zvdLf+KCi=hu6#d5v7kpppM&Z;F3;`{0FxW z@#nY=LnIjx1?~XD?48~y)>Y&odjWF%6G64~A_3<{rx6>R zqF2ozPyJzzmcF+3AQwJQ@C?KEo|5k3xP%;^ZN*zpQBm5ho(*e)*zn8NzzzG6V?5V0 z2<7tkys|TInay6or7^K(y0ZdwJz|6$blXL}SX7s2es~5{gYwS3d>6k|3V9vz-#G3! zh@|-B?^JP~seJrS$&XAfp`RknZ!pFw@e!a9WgKijDz3K#6@`ifTCWHTa}Tr}n!~;0 zh0~X4_sEKGZZ^}8+X9!T7NazNv{%@nJgpJ8M;Oa zaYo_2Qbk6_j7W15!`+XKC!`+_)IGZ>r6X=buKUkQ*5wXs5}A2D@eYvF0{q(=wm znxEYB{>rdO75{|gy2>`^UB!(y+9acVVRieAMG@Lhf)g>yr+Ccgf8oy1qUO@L$n8@A z;nKV>muW=<*rD@Su=A?nhxTpx>?1>jYOk(ytb|TNwq8q1{;WERaWZi0ov0xFjiIm} z)PkKhn`#2CSuR?p?4)9Vk#`#oL)#q8!B*j3s+x*6kQ~2Pog{K^{k(=xfv{IP9MecW zCB_bMVE;HQS12k5L;tHHjhJ8m%07IN<1N(vQCG+8IilmMo{g$Y5nrPhSx`OH03*55 z;^!ZP!KR|h3~K&8O?uAqKie(}FOYVMt}S-M;FF6%#pX@C<8P!jbk&G&a^_Oj+^2Ys z*1tnnx4eOpd*hgE$xD+(iTw1TaGNs=4*;Pf#P`fd%_%)Jk|eeooma)pR9ka)Ek(PX zq2N$R8sio=D*TQ0BaO+M*8wF-0cR8Bq6vZjr?NAFhjQ!V_)x?Yxmhd9T8#bPWJ^p2 zVbs{=P2C~;GV>Zlkw%u3?OM9&TE|2xMT@t3uSiNEt`MOO*Q>52Wh>pfXJR}YW6XQ{ zJfCN%^ZlJU=RD7Ip3^zMKT-4Q8#0faYOd#r>yK58)sH5XCS>Yj%p1^_p%gSNX4Iai z%;dio52O@`qrWD0>K#6CJvdGFcB%`pA47@W5qIzGe`HRY=O5CK4bZvl6IkJj{#%r? z|A5O4Uo8)Ng;t9f!sRAIsl1a8=TST_Vn(m0i`>XCa0r`>YP-LwxB%^wu8;8+GdQv( zG^usXB?ocI0_)y0MR`T!?Us5ehia8>M~+$sXlUCRovE--QR@;Ys?Ozq9P(Q7ZQ43> zpIo}_{z39UhS{5f8wKSDu+TKfi+#n{O-~4Uk zh*EmSxYYrfwOxCYV}}!zL%2uIc%Oe$XRV@rFeWeka?;Z(XI{}`X?HJGyIgFm@ZX;w zsc2~^A%MTLdqhpoV!jr)}36>dv>Px$jJImpFCzVcs)1b7l%&=qcE;^ zEoSbtk#6sYkpC=iQX(3 z5EUP%LDh0p49U2=$~DIZhi;dDRKwLN8`|PiC-Echa#PXZ|6)S}wWEA@3f!rX>G_!A zphhlmxu@3JVRr3xOWD}*UYv04{*WHt*vT;0@pVLmuu52Mb_Vg9Wg9EUuA2 zl8?Jv5GSU+*{PO$tBpirns`>?!VL-cX@gZO&q)OL%2_8U)8r*4jrGrH`p2zV!T-&| zaf{j)uCI!{A{R9~aJ?$SZ?kk?jfE7FM%1sOCd&S0B(^ckufHtAOetsuspYrqyZ)x8Z8=dG=GG1lcFtKmoxl{>m zAakHGc|f5ZKh>>}F8qu)Y29d2Op+uf?qK|dKPwE!pPkfGl#Sa#?TmJfv}jA5;1`#= zQqplM=!3^!2QZeCx7wu8uWl9!IN85^zrmqGDxsj;TVs=EU)ubiDaD<*@ss- zm%Y-l)9@TN+_0W7Ml5XnEz>_ep>fFIL{5V-n#cCKFhy#0p;!@D!D-=e{(8;*$#2G- z-~F3cHNv>%;D819xg3-F_yHg8bD1W}{1-kQ-da2kMRP?r=@>BD^b5H6=`Lf3y6VPn$`%)-GW}O^kSon7EBP;q9?=n_7O67v9pc>!pQb z)auPuaqG5v3l(E)_GSI_vFY2BtlPgw{(hIMip%d;>9vWnej@q%qMva4iRPI|N7n7w z(!_tL^K*((d428fyiU(eFYzyaICWGnFx_T^a$3(A4p<5kwVtGjOSNa=ey z3;wiIDZDmghb8BsMcSVyT9^W#{YkoGJ9As)0ccff5 zB`U1^TKO@jql!utGX7_6ceT=$mJTWcQ+7_Fk7=jIE7Lu2Ja%~~6K=X$o@5Q7)=`Ao z%Vptz#p~F$l82kO>0*a`LQ8HomkN}$Q0{w8GzfUMX3_$LbiUMT6?eJhshLtmT2m`2 zrK@zuUt8C6$2Zb?u5HM~2xm~H)s1rOJ^3v#{cdG~?xM<+6Lrd(chPMthvmtIcgJoV z-(H!YsUD=t^F)QFU+e|WYBXo`#ht!`&flPI?tga}(nLX13WI~;V?XO(57wx&_pbkw zBgcA$g+wx2w|Xvakrlw=n~x7nWeO7*SwR2(p1`8M*~Ae34SZ&}#$zt|Z%!C%XpOXbpLFv5`sjlu|+#!Pgo9FXG>J~QZn(O%YH zBWQs46dZC)E;!SviJp zefD-koJ?SaKCq_$3t)wALZM_9CQK zGw9iXX^iWLHTQFmME^y==>muB0FYBWAg>aJ#z};63aHSV~ z^&BI1Xx6m%m3k8-P|$7QUIaSpT%uDW?OD?BB+n%~l7+?9t%+Q~hX?=}`?8pcPE~ed z2_t~uEm#W0-QN{N#+ApD+=zZSaBm3ob`3@h+u^Gh4ttNN2s$sX!nzuwp?JOsGoHwj z2@l5>ME8YD3`fUA=$RfY>9hSG4D8@onJ^lTK8T>xz1g7`#v+8NaNr$;IubZHjA0js z2L>_#pi_KLjIjbU(W!eWi-1dyWY}RDad&1C;~9SzVCP+CjBSB%W;hBDGdrDHyErp5 z5X#cSZWs?oRzdJKA&bh!#B=h>1`ELv5fGsjM;8grEB_Ml5nw!Q?T_Fy!`b1Xw-Oi& zJK7`IPZ8{}^QU`YChTvFFb$*GF~83#Ejd(!t%MOOCWZs*(#FDY@nJtyM5ys3r$RH; zGwY5D3&8G^h`_zm90;)SqJ))TM><4FJcR=#j{NChP1sZn(R`H3fhIePF<1&VWkIAq zW^y3K#-asQg8eTLr4LygD9v;SEK4^GSPFI-K%^#fIhF$V7sl;-&O{IvfwyiWBC85G z7MZzT=Na3;D)1g*L}lf9j#XxMO|l*@z#B0U0n~;6Q((CogEzq;QX^ml3_auK-QH(! zYRlFYydetV8<%jvXTLoPZWwqE2_hCzy1W?cwt!a;Ak6maMa=Kjv3M;3Tu%5uArNL? z-SSL!&nS5679sOBE+%t6kqdtVcsdc$>26x21CM6sb)#h-?QyJ literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..622ab64 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/logs/latest.log b/logs/latest.log new file mode 100644 index 0000000..e69de29 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/pm/j4/petroleum/PetroleumMod.java b/src/main/java/pm/j4/petroleum/PetroleumMod.java new file mode 100644 index 0000000..d5744d2 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/PetroleumMod.java @@ -0,0 +1,159 @@ +package pm.j4.petroleum; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.ModContainer; +import net.fabricmc.loader.api.metadata.ModMetadata; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.options.KeyBinding; +import net.minecraft.server.integrated.IntegratedServer; +import pm.j4.petroleum.modules.ExampleModule; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.modules.bindings.BindingManager; +import pm.j4.petroleum.util.config.ConfigHolder; +import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.petroleum.modules.list.ModList; +import pm.j4.petroleum.modules.menu.ModMenu; +import pm.j4.petroleum.modules.splash.SplashText; + + +//TODO: +// petroleum module checklist +// [ ] xray (lol) +// [ ] combat stuff. killaura, anti knockback, etc +// [ ] render stuff. tracers, nametags +// [ ] wurst taco. but a fish +// [ ] elytra fly +// [ ] movement stuff. nofall, jesus, speed +// [ ] elytra bhop +// [ ] boatfly +// [ ] anti anti cheat +/** + * The type Petroleum mod. + */ +public class PetroleumMod implements ModInitializer { + /** + * The Mod data. + */ + public static ModMetadata modData = null; + /** + * The constant client. + */ + private static MinecraftClient client; + /** + * The constant activeMods. + */ + private static final List activeMods = Arrays.asList( + new SplashText(), + new ModMenu(), + new ModList(), + new BindingManager(), + new ExampleModule() + ); + + /** + * Is active boolean. + * + * @param modName the mod name + * @return the boolean + */ + public static boolean isActive(String modName) { + return activeMods.stream().anyMatch(mod -> mod.getModuleName().equals(modName)); + } + + /** + * Gets mod. + * + * @param modName the mod name + * @return the mod + */ + public static Optional getMod(String modName) { + return activeMods.stream().filter(mod -> mod.getModuleName().equals(modName)).findFirst(); + } + + /** + * Gets active mods. + * + * @return the active mods + */ + public static List getActiveMods() { + return activeMods; + } + + /** + * The constant registeredBinds. + */ + private static final List registeredBinds = new ArrayList<>(); + + /** + * Add bind. + * + * @param b the b + */ + public static void addBind(KeyBinding b) { + registeredBinds.add(b); + } + + /** + * Remove bind. + * + * @param b the b + */ + public static void removeBind(KeyBinding b) { + registeredBinds.remove(b); + } + + /** + * Gets active keybinds. + * + * @return the active keybinds + */ + public static List getActiveKeybinds() { + return registeredBinds; + } + + /** + * Gets server address. + * + * @return the server address + */ + public static String getServerAddress() { + if (client != null && client.getServer() != null) { + IntegratedServer server = client.getServer(); + if (server.isRemote() && !server.getServerIp().isEmpty()) { + return server.getServerIp(); + } + } + return null; + } + + @Override + public void onInitialize() { + ConfigManager.initConfig(); + // always update mod data + Optional modContainer = FabricLoader.getInstance().getModContainer("petroleum"); + modContainer.ifPresent(container -> modData = container.getMetadata()); + + //initialize any keybinds, data, etc. + activeMods.forEach(ModuleBase::init); + + Optional conf = ConfigManager.getConfig(); + //initialize keybind handler + conf.ifPresent(configHolder -> ClientTickEvents.END_CLIENT_TICK.register(client -> { + if (PetroleumMod.client != client) { + PetroleumMod.client = client; + } + for (KeyBinding b : PetroleumMod.getActiveKeybinds()) { + while (b.wasPressed()) { + configHolder.globalConfig.bindings.get(b).activate(client); + } + } + //System.out.println(getServerAddress()); + })); + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java b/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java new file mode 100644 index 0000000..c2b399c --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java @@ -0,0 +1,50 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.LiteralText; +import net.minecraft.text.TranslatableText; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.util.config.ConfigManager; + +public class PModMenuScreen extends Screen { + public PModMenuScreen() { + super(new TranslatableText("petroleum.modlist")); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + System.out.println("MENU ACTIVATED"); + this.client.textRenderer.drawWithShadow(matrices, new LiteralText("Menu Open"), 10, 50, -1); + this.renderBackground(matrices); + super.render(matrices, mouseX, mouseY, delta); + } + + @Override + protected void init() { + this.addButton(new PMovableButton(10, 10, 40, 10, PetroleumMod.getActiveMods().get(0))); + } + + @Override + public void onClose() { + ConfigManager.getConfig().get().disableModule("petroleum.modmenu"); + super.onClose(); + } + + @Override + public void renderBackground(MatrixStack matrices) { + Tessellator t_1 = Tessellator.getInstance(); + BufferBuilder buffer = t_1.getBuffer(); + RenderSystem.color4f(0.0F, 0.0F, 0.0F, 0.1F); + buffer.begin(7, VertexFormats.POSITION_COLOR); + buffer.vertex(0,this.height, 0.0D).color(0.0F, 0.0F, 0.0F, 0.1F).next(); + buffer.vertex(this.width, this.height, 0.0D).color(0.0F, 0.0F, 0.0F, 0.1F).next(); + buffer.vertex(this.width, 0, 0.0D).color(0.0F, 0.0F, 0.0F, 0.1F).next(); + buffer.vertex(0,0,0.0D).color(0.0F, 0.0F, 0.0F, 0.1F).next(); + t_1.draw(); + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java b/src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java new file mode 100644 index 0000000..cbbd0a3 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java @@ -0,0 +1,47 @@ +package pm.j4.petroleum.gui; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.EntryListWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; +import pm.j4.petroleum.modules.base.ConfigurationOption; + +/** + * The type P module config entry. + */ +public class PModuleConfigEntry extends EntryListWidget.Entry { + /** + * The Option. + */ + protected final ConfigurationOption option; + /** + * The Display text. + */ + protected final Text displayText; + + /** + * Instantiates a new P module config entry. + * + * @param option the option + * @param text the text + */ + public PModuleConfigEntry(ConfigurationOption option, Text text) { + this.option = option; + this.displayText = text; + } + + @Override + public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + if (this.displayText != null) { + MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, displayText, x, y, 0xAAAAAA); + } + if (this.option != null) { + //TODO option text box (?) + // option should be centered or otherwise offset + // but not extend past the side of the pane + int fontHeight = MinecraftClient.getInstance().textRenderer.fontHeight; + MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, new LiteralText(option.toStringValue()), x, y + fontHeight + 4, 0xFFFFFF); + } + } +} \ No newline at end of file diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java b/src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java new file mode 100644 index 0000000..72273ba --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java @@ -0,0 +1,115 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.widget.EntryListWidget; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; + +/** + * The type P module config pane. + */ +public class PModuleConfigPane extends EntryListWidget { + /** + * The Parent. + */ + private final POptionsScreen parent; + /** + * The Last selected. + */ + private POptionEntry lastSelected; + + /** + * Instantiates a new P module config pane. + * + * @param client the client + * @param width the width + * @param height the height + * @param top the top + * @param bottom the bottom + * @param entryHeight the entry height + * @param screen the screen + */ + public PModuleConfigPane(MinecraftClient client, int width, int height, int top, int bottom, int entryHeight, POptionsScreen screen) { + super(client, width, height, top, bottom, entryHeight); + this.parent = screen; + /** + * The Text renderer. + */ + TextRenderer textRenderer = client.textRenderer; + } + + @Override + public PModuleConfigEntry getSelected() { + return null; + } + + @Override + public int getRowWidth() { + return this.width - 10; + } + + @Override + protected int getScrollbarPositionX() { + return this.width - 6 + left; + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + POptionEntry selectedEntry = parent.getSelected(); + if (selectedEntry != lastSelected) { + lastSelected = selectedEntry; + clearEntries(); + setScrollAmount(-Double.MAX_VALUE); + String id = lastSelected.getModId(); + if (lastSelected != null && id != null && !id.isEmpty()) { + children().addAll(lastSelected.module.getConfigEntries()); + } + } + + Tessellator t_1 = Tessellator.getInstance(); + BufferBuilder buffer = t_1.getBuffer(); + + RenderSystem.depthFunc(515); + RenderSystem.disableDepthTest(); + RenderSystem.enableBlend(); + RenderSystem.blendFuncSeparate(GlStateManager.SrcFactor.SRC_ALPHA, + GlStateManager.DstFactor.ONE_MINUS_DST_ALPHA, + GlStateManager.SrcFactor.ZERO, + GlStateManager.DstFactor.ONE); + RenderSystem.disableAlphaTest(); + RenderSystem.shadeModel(7425); + RenderSystem.disableTexture(); + + buffer.begin(7, VertexFormats.POSITION_TEXTURE_COLOR); + buffer.vertex(this.left, (this.top + 4), 0.0D).texture(0.0F, 1.0F).color(0, 0, 0, 0).next(); + buffer.vertex(this.right, (this.top + 4), 0.0D).texture(1.0F, 1.0F).color(0, 0, 0, 0).next(); + buffer.vertex(this.right, this.top, 0.0D).texture(1.0F, 0.0F).color(0, 0, 0, 255).next(); + buffer.vertex(this.left, this.top, 0.0D).texture(0.0F, 0.0F).color(0, 0, 0, 255).next(); + buffer.vertex(this.left, this.bottom, 0.0D).texture(0.0F, 1.0F).color(0, 0, 0, 255).next(); + buffer.vertex(this.right, this.bottom, 0.0D).texture(1.0F, 1.0F).color(0, 0, 0, 255).next(); + buffer.vertex(this.right, (this.bottom - 4), 0.0D).texture(1.0F, 0.0F).color(0, 0, 0, 0).next(); + buffer.vertex(this.left, (this.bottom - 4), 0.0D).texture(0.0F, 0.0F).color(0, 0, 0, 0).next(); + t_1.draw(); + + buffer.begin(7, VertexFormats.POSITION_COLOR); + buffer.vertex(this.left, this.bottom, 0.0D).color(0, 0, 0, 128).next(); + buffer.vertex(this.right, this.bottom, 0.0D).color(0, 0, 0, 128).next(); + buffer.vertex(this.right, this.top, 0.0D).color(0, 0, 0, 128).next(); + buffer.vertex(this.left, this.top, 0.0D).color(0, 0, 0, 128).next(); + t_1.draw(); + + int rl = this.getRowLeft(); + int sc = this.top + 4 - (int) this.getScrollAmount(); + this.renderList(matrices, rl, sc, mouseX, mouseY, delta); + + RenderSystem.enableTexture(); + RenderSystem.shadeModel(7424); + RenderSystem.enableAlphaTest(); + RenderSystem.disableBlend(); + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java b/src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java new file mode 100644 index 0000000..cd24a72 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java @@ -0,0 +1,281 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Matrix4f; +import pm.j4.petroleum.mixin.EntryListWidgetAccessor; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type P module configuration widget. + */ +public class PModuleConfigurationWidget extends AlwaysSelectedEntryListWidget { + /** + * The Parent. + */ + private final POptionsScreen parent; + /** + * The Module id. + */ + private String moduleId = null; + /** + * The Mods. + */ + private List mods; + /** + * The Extra mods. + */ + private final Set extraMods = new HashSet<>(); + /** + * The Scrolling. + */ + private boolean scrolling = false; + + /** + * Instantiates a new P module configuration widget. + * + * @param client the client + * @param width the width + * @param height the height + * @param y1 the y 1 + * @param y2 the y 2 + * @param entryHeight the entry height + * @param list the list + * @param parent the parent + */ + public PModuleConfigurationWidget(MinecraftClient client, int width, int height, int y1, int y2, int entryHeight, PModuleConfigurationWidget list, POptionsScreen parent) { + super(client, width, height, y1, y2, entryHeight); + this.parent = parent; + if (list != null) { + mods = list.mods; + } + setScrollAmount(parent.getScrollPercent() * Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4))); + } + + @Override + public void setScrollAmount(double amount) { + super.setScrollAmount(amount); + int denominator = Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4)); + if (denominator <= 0) { + parent.updateScrollPercent(0); + } else { + parent.updateScrollPercent(getScrollAmount() / Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4))); + } + } + + @Override + protected boolean isFocused() { + return parent.getFocused() == this; + } + + /** + * Select. + * + * @param entry the entry + */ + public void select(POptionEntry entry) { + this.setSelected(entry); + } + + @Override + public void setSelected(POptionEntry entry) { + super.setSelected(entry); + moduleId = entry.getModId(); + parent.updateSelected(entry); + } + + @Override + protected boolean isSelectedItem(int index) { + return super.isSelectedItem(index); + } + + @Override + public int addEntry(POptionEntry entry) { + if (extraMods.contains(entry.module)) { + return 0; + } + extraMods.add(entry.module); + int i = super.addEntry(entry); + if (entry.getModId().equals(moduleId)) { + setSelected(entry); + } + return i; + } + + @Override + protected boolean removeEntry(POptionEntry entry) { + extraMods.remove(entry.module); + return super.removeEntry(entry); + } + + @Override + protected POptionEntry remove(int index) { + extraMods.remove(getEntry(index).module); + return super.remove(index); + } + + @Override + protected void renderList(MatrixStack matrices, int x, int y, int mouseX, int mouseY, float delta) { + int itemCount = this.getItemCount(); + Tessellator t_1 = Tessellator.getInstance(); + BufferBuilder buffer = t_1.getBuffer(); + + for (int index = 0; index < itemCount; ++index) { + int entryTop = this.getRowTop(index); + int entryBottom = this.getRowTop(index) + this.itemHeight; + if (entryBottom >= this.top && entryTop <= this.bottom) { + int entryHeight = this.itemHeight - 4; + POptionEntry entry = this.getEntry(index); + int rowWidth = this.getRowWidth(); + int entryLeft; + if (((EntryListWidgetAccessor) this).isRenderSelection() && this.isSelectedItem(index)) { + entryLeft = getRowLeft() - 2 + entry.getXOffset(); + int selectionRight = x + rowWidth + 2; + RenderSystem.disableTexture(); + float brightness = this.isFocused() ? 1.0F : 0.5F; + RenderSystem.color4f(brightness, brightness, brightness, 1.0F); + Matrix4f matrix = matrices.peek().getModel(); + buffer.begin(7, VertexFormats.POSITION); + buffer.vertex(matrix, entryLeft, entryTop + entryHeight + 2, 0.0F).next(); + buffer.vertex(matrix, selectionRight, entryTop + entryHeight + 2, 0.0F).next(); + buffer.vertex(matrix, selectionRight, entryTop - 2, 0.0F).next(); + buffer.vertex(matrix, entryLeft, entryTop - 2, 0.0F).next(); + t_1.draw(); + RenderSystem.color4f(0.0F, 0.0F, 0.0F, 1.0F); + buffer.begin(7, VertexFormats.POSITION); + buffer.vertex(matrix, entryLeft + 1, entryTop + entryHeight + 1, 0.0F).next(); + buffer.vertex(matrix, selectionRight, entryTop + entryHeight + 1, 0.0F).next(); + buffer.vertex(matrix, selectionRight, entryTop - 1, 0.0F).next(); + buffer.vertex(matrix, entryLeft + 1, entryTop - 1, 0.0F).next(); + t_1.draw(); + RenderSystem.enableTexture(); + } + + entryLeft = this.getRowLeft(); + entry.render(matrices, + index, + entryTop, + entryLeft, + rowWidth, + entryHeight, + mouseX, + mouseY, + this.isMouseOver(mouseX, mouseY) && Objects.equals(this.getEntryAtPos(mouseX, mouseY), entry), + delta); + } + } + } + + @Override + protected void updateScrollingState(double mouseX, double mouseY, int button) { + super.updateScrollingState(mouseX, mouseY, button); + this.scrolling = button == 0 && + mouseX >= (double) this.getScrollbarPositionX() && + mouseX < (double) (this.getScrollbarPositionX() + 6); + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + this.updateScrollingState(mouseX, mouseY, button); + if (!this.isMouseOver(mouseX, mouseY)) { + return false; + } else { + POptionEntry entry = this.getEntryAtPos(mouseX, mouseY); + if (entry != null) { + if (entry.mouseClicked(mouseX, mouseY, button)) { + this.setFocused(entry); + this.setDragging(true); + return true; + } else if (button == 0) { + this.clickedHeader((int) (mouseX - (double) (this.left + this.width / 2 - this.getRowWidth() / 2)), + (int) (mouseY - (double) this.top) + (int) this.getScrollAmount() - 4); + } + } + } + + return this.scrolling; + } + + /** + * Gets entry at pos. + * + * @param x the x + * @param y the y + * @return the entry at pos + */ + public final POptionEntry getEntryAtPos(double x, double y) { + int i = MathHelper.floor(y - (double) this.top) - this.headerHeight + (int) this.getScrollAmount() - 4; + int index = i / this.itemHeight; + return x < (double) this.getScrollbarPositionX() && + x >= (double) getRowLeft() && + x <= (double) (getRowLeft() + getRowWidth()) && + index >= 0 && i >= 0 && + index < this.getItemCount() ? this.children().get(index) : null; + } + + @Override + protected int getScrollbarPositionX() { + return this.width - 6; + } + + @Override + public int getRowWidth() { + return this.width - (Math.max(0, this.getMaxPosition() - (this.bottom - this.top - 4)) > 0 ? 18 : 12); + } + + @Override + public int getRowLeft() { + return left + 6; + } + + /** + * Gets width. + * + * @return the width + */ + public int getWidth() { + return width; + } + + /** + * Gets top. + * + * @return the top + */ + public int getTop() { + return this.top; + } + + /** + * Gets parent. + * + * @return the parent + */ + public POptionsScreen getParent() { + return parent; + } + + @Override + protected int getMaxPosition() { + return super.getMaxPosition() + 4; + } + + /** + * Gets displayed count. + * + * @return the displayed count + */ + public int getDisplayedCount() { + return children().size(); + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/PMovableButton.java b/src/main/java/pm/j4/petroleum/gui/PMovableButton.java new file mode 100644 index 0000000..6965b19 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/PMovableButton.java @@ -0,0 +1,42 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.widget.AbstractButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.math.MathHelper; +import pm.j4.petroleum.modules.base.ModuleBase; + +public class PMovableButton extends AbstractButtonWidget { + public PMovableButton(int x, int y, int width, int height, ModuleBase module) { + super(x, y, width, height, module.getReadableName()); + } + + @Override + protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) { + System.out.println(mouseX + "/" + mouseY + "/" + deltaX + "/" + deltaY); + this.x += (int)deltaX; + this.y += (int)deltaY; + } + + @Override + public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { + // CURRENT BUTTON RENDERING + //TODO just do some shit with Tessellator and BufferBuilder to draw the lines around the button + MinecraftClient minecraftClient = MinecraftClient.getInstance(); + TextRenderer textRenderer = minecraftClient.textRenderer; + minecraftClient.getTextureManager().bindTexture(WIDGETS_LOCATION); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); + int i = this.getYImage(this.isHovered()); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.enableDepthTest(); + this.drawTexture(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height); + this.drawTexture(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height); + this.renderBg(matrices, minecraftClient, mouseX, mouseY); + int j = this.active ? 16777215 : 10526880; + drawCenteredText(matrices, textRenderer, this.getMessage(), this.x + this.width / 2, this.y + (this.height - 8) / 2, j | MathHelper.ceil(this.alpha * 255.0F) << 24); + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/POptionEntry.java b/src/main/java/pm/j4/petroleum/gui/POptionEntry.java new file mode 100644 index 0000000..ad5fdb7 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/POptionEntry.java @@ -0,0 +1,94 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.StringVisitable; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Language; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type P option entry. + */ +public class POptionEntry extends AlwaysSelectedEntryListWidget.Entry { + + /** + * The Module. + */ + protected final ModuleBase module; + /** + * The Client. + */ + protected final MinecraftClient client; + /** + * The List. + */ + private final PModuleConfigurationWidget list; + + /** + * Instantiates a new P option entry. + * + * @param mod the mod + * @param list the list + */ + public POptionEntry(ModuleBase mod, PModuleConfigurationWidget list) { + this.module = mod; + this.client = MinecraftClient.getInstance(); + this.list = list; + } + + //TODO TEST move text to be centered + @Override + public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + x += getXOffset(); + entryWidth -= getXOffset(); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + Text name = this.getModName(); + StringVisitable nameString = name; + int maxNameWidth = entryWidth - 32 - 3; + TextRenderer font = this.client.textRenderer; + if (font.getWidth(name) > maxNameWidth) { + StringVisitable ellipse = StringVisitable.plain("..."); + nameString = StringVisitable.concat(font.trimToWidth(nameString, maxNameWidth - font.getWidth(ellipse)), ellipse); + } + + font.draw(matrices, Language.getInstance().reorder(nameString), x + 32 + 3, y + (entryHeight / 2), 0xFFFFFF); + } + + @Override + public boolean mouseClicked(double x, double y, int b) { + this.list.select(this); + return true; + } + + /** + * Gets mod id. + * + * @return the mod id + */ + public String getModId() { + return module.getModuleName(); + } + + /** + * Gets mod name. + * + * @return the mod name + */ + public TranslatableText getModName() { + return module.getReadableName(); + } + + /** + * Gets x offset. + * + * @return the x offset + */ + public int getXOffset() { + return 0; + } +} diff --git a/src/main/java/pm/j4/petroleum/gui/POptionsScreen.java b/src/main/java/pm/j4/petroleum/gui/POptionsScreen.java new file mode 100644 index 0000000..1f3ee35 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/gui/POptionsScreen.java @@ -0,0 +1,224 @@ +package pm.j4.petroleum.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ScreenTexts; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.render.BufferBuilder; +import net.minecraft.client.render.Tessellator; +import net.minecraft.client.render.VertexFormats; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.LiteralText; +import net.minecraft.text.StringVisitable; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.util.config.ConfigManager; + +/** + * The type P options screen. + */ +@SuppressWarnings("deprecation") +public class POptionsScreen extends Screen { + /** + * The Previous screen. + */ + private final Screen previousScreen; + /** + * The Scroll percent. + */ + private double scrollPercent = 0; + /** + * The Modules. + */ + private PModuleConfigurationWidget modules; + /** + * The Config pane. + */ + private PModuleConfigPane configPane; + /** + * The Selected. + */ + private POptionEntry selected; + /** + * The Tooltip. + */ + private Text tooltip; + + /** + * The Pane y. + */ + private int paneY; + /** + * The Right pane x. + */ + private int rightPaneX; + + /** + * Instantiates a new P options screen. + * + * @param previousScreen the previous screen + */ + public POptionsScreen(Screen previousScreen) { + super(new TranslatableText("petroleum.options")); + this.previousScreen = previousScreen; + } + + @Override + public void onClose() { + super.onClose(); + assert this.client != null; + this.client.openScreen(previousScreen); + } + + protected void init() { + paneY = 48; + int paneWidth = this.width / 2 - 8; + rightPaneX = width - paneWidth; + this.modules = new PModuleConfigurationWidget(this.client, + this.width - paneWidth, + this.height, + paneY + 19, + this.height - 36, + 36, + this.modules, + this); + this.modules.setLeftPos(0); + this.children.add(this.modules); + this.configPane = new PModuleConfigPane(this.client, + paneWidth, + this.height, + paneY + 19, + this.height - 36, + 48, + this); + this.configPane.setLeftPos(paneWidth); + this.children.add(this.configPane); + List configurableModules = new ArrayList<>(); + if (ConfigManager.getConfig().isPresent()) { + configurableModules.addAll(PetroleumMod.getActiveMods() + .stream().filter(ModuleBase::configurable) + .collect(Collectors.toList())); + } + configurableModules.forEach(module -> this.modules.addEntry(new POptionEntry(module, this.modules))); + this.addButton(new ButtonWidget(this.width / 2 - 75, this.height - 30, 150, 20, ScreenTexts.DONE, (buttonWidget) -> { + ConfigManager.save(); + assert this.client != null; + this.client.openScreen(this.previousScreen); + })); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + + this.modules.render(matrices, mouseX, mouseY, delta); + if (selected != null) { + this.configPane.render(matrices, mouseX, mouseY, delta); + } + RenderSystem.disableBlend(); + drawTextWithShadow(matrices, this.textRenderer, this.title, this.modules.getWidth() / 2, 8, 16777215); + super.render(matrices, mouseX, mouseY, delta); + + if (selected != null) { + int offset = 36; + int x = rightPaneX; + int maxNameWidth = this.width - (x + offset); + int lineSpacing = textRenderer.fontHeight + 1; + Text name = selected.getModName(); + + StringVisitable trimmedName = name; + + if (textRenderer.getWidth(name) > maxNameWidth) { + StringVisitable ellipsis = StringVisitable.plain("..."); + trimmedName = StringVisitable.concat(textRenderer.trimToWidth(name, maxNameWidth - textRenderer.getWidth(ellipsis)), ellipsis); + } + if (mouseX > x + offset && mouseY > paneY + 1 && mouseY < paneY + 1 + textRenderer.fontHeight && mouseX < x + offset + textRenderer.getWidth(trimmedName)) { + setTooltip(new LiteralText("Configure " + selected.getModName())); + } + textRenderer.draw(matrices, selected.getModName(), x + offset, paneY + 2 + lineSpacing, 0x808080); + + if (this.tooltip != null) { + this.renderOrderedTooltip(matrices, textRenderer.wrapLines(this.tooltip, Integer.MAX_VALUE), mouseX, mouseY); + } + } + } + + /** + * Sets tooltip. + * + * @param tooltip the tooltip + */ + private void setTooltip(Text tooltip) { + this.tooltip = tooltip; + } + + @Override + public void renderBackground(MatrixStack matrices) { + POptionsScreen.overlayBackground(this.width, this.height); + } + + /** + * Overlay background. + * + * @param x2 the x 2 + * @param y2 the y 2 + */ + static void overlayBackground(int x2, int y2) { + Tessellator t_1 = Tessellator.getInstance(); + BufferBuilder buffer = t_1.getBuffer(); + Objects.requireNonNull(MinecraftClient.getInstance()).getTextureManager().bindTexture(DrawableHelper.OPTIONS_BACKGROUND_TEXTURE); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + buffer.begin(7, VertexFormats.POSITION_TEXTURE_COLOR); + buffer.vertex(0, y2, 0.0D).texture(0 / 32.0F, y2 / 32.0F).color(64, 64, 64, 255).next(); + buffer.vertex(x2, y2, 0.0D).texture(x2 / 32.0F, y2 / 32.0F).color(64, 64, 64, 255).next(); + buffer.vertex(x2, 0, 0.0D).texture(x2 / 32.0F, 0 / 32.0F).color(64, 64, 64, 255).next(); + buffer.vertex(0, 0, 0.0D).texture(0 / 32.0F, 0 / 32.0F).color(64, 64, 64, 255).next(); + t_1.draw(); + } + + /** + * Gets scroll percent. + * + * @return the scroll percent + */ + double getScrollPercent() { + return scrollPercent; + } + + /** + * Update scroll percent. + * + * @param scrollPercent the scroll percent + */ + void updateScrollPercent(double scrollPercent) { + this.scrollPercent = scrollPercent; + } + + /** + * Gets selected. + * + * @return the selected + */ + POptionEntry getSelected() { + return selected; + } + + /** + * Update selected. + * + * @param entry the entry + */ + void updateSelected(POptionEntry entry) { + if (entry != null) { + this.selected = entry; + } + } +} diff --git a/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java b/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java new file mode 100644 index 0000000..6e29426 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java @@ -0,0 +1,38 @@ +package pm.j4.petroleum.mixin; + +import java.util.List; +import java.util.Optional; +import net.minecraft.client.gui.hud.DebugHud; +import net.minecraft.client.util.math.MatrixStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.j4.petroleum.util.config.ConfigHolder; +import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.petroleum.modules.splash.SplashText; + +/** + * The type Debug hud mixin. + */ +@Mixin(DebugHud.class) +public class DebugHudMixin { + /** + * Render text right. + * + * @param matrices the matrices + * @param ci the ci + * @param list the list + */ + @Inject(method = "renderLeftText", + at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/gui/hud/DebugHud;getLeftText()Ljava/util/List;"), + locals = LocalCapture.CAPTURE_FAILSOFT) + protected void renderTextRight(MatrixStack matrices, CallbackInfo ci, List list) { + Optional config = ConfigManager.getConfig(); + if (config.isPresent() && config.get().isModuleEnabled("petroleum.splashtext")) { + list.add("[Petroleum] " + SplashText.get() + " loaded"); + } + + } +} diff --git a/src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java b/src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java new file mode 100644 index 0000000..eea68ab --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java @@ -0,0 +1,19 @@ +package pm.j4.petroleum.mixin; + +import net.minecraft.client.gui.widget.EntryListWidget; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +/** + * The interface Entry list widget accessor. + */ +@Mixin(EntryListWidget.class) +public interface EntryListWidgetAccessor { + /** + * Is render selection boolean. + * + * @return the boolean + */ + @Accessor("renderSelection") + boolean isRenderSelection(); +} diff --git a/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java b/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java new file mode 100644 index 0000000..968fe2c --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java @@ -0,0 +1,89 @@ +package pm.j4.petroleum.mixin; + + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.TranslatableText; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.util.config.ConfigHolder; +import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.petroleum.modules.list.ModList; + +/** + * The type Mod list mixin. + */ +@Mixin(InGameHud.class) +public abstract class ModListMixin extends DrawableHelper { + /** + * The Scaled height. + */ + @Shadow + private int scaledHeight; + /** + * The Client. + */ + private final MinecraftClient client; + + /** + * Gets font renderer. + * + * @return the font renderer + */ + @Shadow + public abstract TextRenderer getFontRenderer(); + + + /** + * Instantiates a new Mod list mixin. + * + * @param client the client + */ + public ModListMixin(MinecraftClient client) { + this.client = client; + } + + /** + * Render. + * + * @param matrices the matrices + * @param tickDelta the tick delta + * @param ci the ci + */ + @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;F)V", + at = @At("HEAD")) + public void render(MatrixStack matrices, float tickDelta, CallbackInfo ci) { + Optional config = ConfigManager.getConfig(); + if (config.isPresent() && + config.get().isModuleEnabled("petroleum.modlist") && + !this.client.options.hudHidden && + !this.client.options.debugEnabled) { + renderModuleList(matrices); + } + } + + /** + * Render module list. + * + * @param matrices the matrices + */ + private void renderModuleList(MatrixStack matrices) { + List modules = ModList.getActive(); + List activeModuleList = modules.stream().map(module -> module.getReadableName()).collect(Collectors.toList()); + int fontHeight = this.getFontRenderer().fontHeight; + int startHeight = this.scaledHeight - (activeModuleList.size() * (fontHeight + 4)); + for (int i = 0; i < activeModuleList.size(); i++) { + this.getFontRenderer().drawWithShadow(matrices, activeModuleList.get(i), 10, 10 + (i * (fontHeight + 4)), -1); + } + } +} diff --git a/src/main/java/pm/j4/petroleum/mixin/ModMenuMixin.java b/src/main/java/pm/j4/petroleum/mixin/ModMenuMixin.java new file mode 100644 index 0000000..36b9851 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/ModMenuMixin.java @@ -0,0 +1,11 @@ +package pm.j4.petroleum.mixin; + +/** + * Mixin for in-game module management menu. + * Includes module activation/deactivation, as well as some configuration options. + * A separate menu for advanced configurations should also be added eventually. + * This module should handle the rendering of the menu and all of its buttons, + * while delegating button presses to @link pm.j4.petroleum.modules.menu.ModMenu + */ +public class ModMenuMixin { +} diff --git a/src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java b/src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java new file mode 100644 index 0000000..be27f25 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java @@ -0,0 +1,42 @@ +package pm.j4.petroleum.mixin; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.options.OptionsScreen; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.text.Text; +import net.minecraft.text.TranslatableText; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import pm.j4.petroleum.gui.POptionsScreen; + +/** + * The type Options menu mixin. + */ +@Mixin(OptionsScreen.class) +public class OptionsMenuMixin extends Screen { + + /** + * Instantiates a new Options menu mixin. + * + * @param title the title + */ + protected OptionsMenuMixin(Text title) { + super(title); + } + + /** + * Init. + * + * @param ci the ci + */ + @Inject(at = @At(value = "TAIL"), + method = "init()V") + protected void init(CallbackInfo ci) { + this.addButton(new ButtonWidget(this.width / 2 - 75, this.height / 6 + 140, 150, 20, new TranslatableText("petroleum.options"), (buttonWidget) -> { + assert this.client != null; + this.client.openScreen(new POptionsScreen(this)); + })); + } +} diff --git a/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java b/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java new file mode 100644 index 0000000..9be245b --- /dev/null +++ b/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java @@ -0,0 +1,132 @@ +package pm.j4.petroleum.mixin; + +import java.util.Optional; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import pm.j4.petroleum.util.config.ConfigHolder; +import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.petroleum.modules.splash.SplashText; + + +/** + * Mixin attached to the TitleScreen. + * Currently, it is only used to display a string of text with the mod's version. + * Any other modules will likely extend the options screen or pause screen, + * so the module is unlikely to be used elsewhere. + */ +@Mixin(TitleScreen.class) +public class TitleScreenMixin extends Screen { + /** + * The Opacity. + */ + private double opacity = 0; + /** + * The Ascending. + */ + private boolean ascending = false; + + /** + * Stub method. + * Since the mixin injects itself into the *actual* TitleScreen used by the game, + * this should never run. + * + * @param title the title + */ + protected TitleScreenMixin(Text title) { + super(title); + } + + /** + * Mixin injection into the render method. + * It captures locals so that the text can be rendered alongside the + * screen fade-in. + * It injects before the call to @link com.mojang.bridge.game.GameVersion#getName() using INVOKE_ASSIGN, + * because attempting to use a regular invoke statement on @link net.minecraft.client.gui.DrawHelper#drawStringWithShadow() + * repeatedly failed. + *

+ * + * @param matrices the matrices + * @param mouseX the mouse x + * @param mouseY the mouse y + * @param delta the delta + * @param ci the ci + * @param f the f + * @param i the + * @param j the j + * @param g the g + * @param l the l + */ + @Inject(method = "render", + at = @At( + value = "INVOKE_ASSIGN", + target = "Lcom/mojang/bridge/game/GameVersion;getName()Ljava/lang/String;", + ordinal = 0), + locals = LocalCapture.CAPTURE_FAILSOFT) + private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci, float f, int i, int j, float g, int l) { + Optional config = ConfigManager.getConfig(); + if (config.isPresent() && config.get().isModuleEnabled("petroleum.splashtext")) { + drawStringWithShadow(matrices, this.textRenderer, SplashText.get(), 2, this.height - 20, blink(13108374) | l); + } + } + + /** + * fades an integer color based on the values declared at the top of the class. + * + * @param color the integer representation of the color to fade. this should generally remain constant. + * @return the color, adjusted for "opacity". It's RGB and not RGBA, so it just lowers all color values. + */ + @SuppressWarnings("SameParameterValue") + private int blink(int color) { + /* + The Speed. + */ + int speed = 3; + /* + The Opacity max. + */ + double opacity_max = 1000; + if (ascending) { + opacity += speed; + if (opacity > opacity_max) { + opacity = opacity_max; + ascending = false; + } + } else { + opacity -= speed; + /* + The Opacity min. + */ + double opacity_min = 500; + if (opacity < opacity_min) { + opacity = opacity_min; + ascending = true; + } + } + double opacityD = (opacity / opacity_max); + /* + The R mask. + */ + int r_mask = 16711680; + int r = ((color & r_mask) / Integer.parseInt("010000", 16)); + /* + The G mask. + */ + int g_mask = 65280; + int g = ((color & g_mask) / Integer.parseInt("000100", 16)); + /* + The B mask. + */ + int b_mask = 255; + int b = ((color & b_mask)); + return ((int) (r * opacityD) * Integer.parseInt("010000", 16)) | + ((int) (g * opacityD) * Integer.parseInt("000100", 16)) | + ((int) (b * opacityD)); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/ExampleModule.java b/src/main/java/pm/j4/petroleum/modules/ExampleModule.java new file mode 100644 index 0000000..e3ace8e --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/ExampleModule.java @@ -0,0 +1,34 @@ +package pm.j4.petroleum.modules; + +import java.util.HashMap; +import java.util.Map; +import net.minecraft.client.MinecraftClient; +import pm.j4.petroleum.modules.base.ConfigurationOption; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.modules.base.option.BooleanValue; + +/** + * The type Example module. + */ +public class ExampleModule extends ModuleBase { + /** + * example mod + */ + public ExampleModule() { + super("petroleum.example", true, false, true); + } + + @Override + protected Map getDefaultConfig() { + Map options = new HashMap<>(); + ConfigurationOption option = new ConfigurationOption<>(new BooleanValue(false)); + options.put("petroleum.example_b_one", option); + options.put("petroleum.example_b_two", option); + return options; + } + + @Override + public void activate(MinecraftClient client) { + System.out.println("Example Mod Keybind Activate"); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/ConfigurationOption.java b/src/main/java/pm/j4/petroleum/modules/base/ConfigurationOption.java new file mode 100644 index 0000000..8216dfe --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/ConfigurationOption.java @@ -0,0 +1,68 @@ +package pm.j4.petroleum.modules.base; + +/** + * The type Configuration option. + * + * @param the type parameter + */ +public class ConfigurationOption { + + /** + * The Value. + */ + private T value; + + /** + * Instantiates a new Configuration option. + * + * @param initialValue the initial value + */ + public ConfigurationOption(T initialValue) { + this.value = initialValue; + } + + /** + * Sets value. + * + * @param value the value + */ + public void setValue(T value) { + this.value = value; + } + + /** + * Gets value. + * + * @return the value + */ + public T getValue() { + return this.value; + } + + /** + * To string value string. + * + * @return the string + */ + public String toStringValue() { + return this.value.getStringValue(); + } + + /** + * Sets from string value. + * + * @param value the value + */ + public void setFromStringValue(String value) { + this.value.toStringValue(value); + } + + /** + * Gets value type. + * + * @return the value type + */ + public String getValueType() { + return this.value.getType(); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/ModuleBase.java b/src/main/java/pm/j4/petroleum/modules/base/ModuleBase.java new file mode 100644 index 0000000..8f37768 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/ModuleBase.java @@ -0,0 +1,210 @@ +package pm.j4.petroleum.modules.base; + +import java.util.*; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.TranslatableText; +import pm.j4.petroleum.gui.PModuleConfigEntry; +import pm.j4.petroleum.util.config.ConfigHolder; +import pm.j4.petroleum.util.config.ConfigManager; + +/** + * The Basis for all mods, used so that modules all have a common activation point and settings. + */ +public abstract class ModuleBase { + + /** + * Instantiates a new Module base. + * Parameters should be constant across restarts. + * + * @param name The name of the module + * @param activatable Whether a module can be activated, or if it will remain in the state it was upon startup + * @param hidden Whether the module will show up in @link pm.j4.petroleum.modules.menu.ModMenu or the active module list + * @param hasConfigMenu whether a button in the configuration menu will show + */ + public ModuleBase(String name, boolean activatable, boolean hidden, boolean hasConfigMenu) { + this.moduleName = name; + this.readableName = new TranslatableText(name); + this.activatable = activatable; + this.hidden = hidden; + this.hasConfigMenu = hasConfigMenu; + this.moduleOptions = this.getDefaultConfig(); + } + + /** + * Init. + */ + public void init() { + } + + /** + * Activate. Should be overridden. + */ + public void activate(MinecraftClient client) { + this.toggle(); + } + + /** + * Toggle mod. + */ + public void toggle() { + Optional config = ConfigManager.getConfig(); + config.ifPresent(configHolder -> configHolder.toggleModule(this.moduleName)); + } + + /** + * The Module's name. + */ + private final String moduleName; + + /** + * Gets module name. + * + * @return the module name + */ + public String getModuleName() { + return this.moduleName; + } + + /** + * The Readable name. + */ + private final TranslatableText readableName; + + /** + * Gets readable name. + * + * @return the readable name + */ + public TranslatableText getReadableName() { + return this.readableName; + } + + /** + * The Activatable. + */ + private final boolean activatable; + + /** + * Is activatable boolean. + * + * @return the boolean + */ + public boolean isActivatable() { + return activatable; + } + + /** + * The Hidden. + */ + private final boolean hidden; + + /** + * Is hidden boolean. + * + * @return the boolean + */ + public boolean isHidden() { + return hidden; + } + + + /** + * The Has config menu. + */ + private final boolean hasConfigMenu; + + /** + * Configurable boolean. + * + * @return the boolean + */ + public boolean configurable() { + return hasConfigMenu; + } + + /** + * The Module options. + */ + private final Map moduleOptions; + + /** + * Gets module configuration. + * + * @return the module configuration + */ + public Map getModuleConfiguration() { + return moduleOptions; + } + + /** + * Sets config option. + * This will fail if the option is not already present in a module. + *

+ * + * @param key the key + * @param value the value + * @return whether the operation was successful. + */ + public boolean setConfigOption(String key, ConfigurationOption value) { + if (moduleOptions.containsKey(key)) { + moduleOptions.replace(key, value); + return true; + } + return false; + } + + /** + * Gets default config. + * + * @return the default config + */ + protected Map getDefaultConfig() { + return new HashMap<>(); + } + + /** + * Add config option. + * + * @param key the key + * @param value the value + */ + protected void addConfigOption(String key, ConfigurationOption value) { + if (!this.setConfigOption(key, value)) { + moduleOptions.put(key, value); + } + } + + /** + * Gets config option. + * + * @param key the key + * @return the config option + */ + public Optional getConfigOption(String key) { + if (moduleOptions.containsKey(key)) { + return Optional.of(moduleOptions.get(key)); + } + return Optional.empty(); + } + + /** + * Gets config entries. + * + * @return the config entries + */ + public List getConfigEntries() { + List entries = new ArrayList<>(); + this.getModuleConfiguration().forEach((name, option) -> entries.add(new PModuleConfigEntry(option, new TranslatableText(name)))); + return entries; + } + + /** + * Equals boolean. + * + * @param other the other + * @return the boolean + */ + public boolean equals(ModuleBase other) { + return Objects.equals(this.moduleName, other.getModuleName()); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/StringWritable.java b/src/main/java/pm/j4/petroleum/modules/base/StringWritable.java new file mode 100644 index 0000000..73ff278 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/StringWritable.java @@ -0,0 +1,48 @@ +package pm.j4.petroleum.modules.base; + +/** + * The type String writable. + * + * @param the type parameter + */ +public class StringWritable> { + /** + * The Value. + */ + public T value; + + /** + * Gets type. + * + * @return the type + */ + public String getType() { + return ""; + } + + /** + * Gets value. + * + * @return the value + */ + public T getValue() { + return this.value; + } + + /** + * Gets string value. + * + * @return the string value + */ + public String getStringValue() { + return ""; + } + + /** + * To string value. + * + * @param value the value + */ + public void toStringValue(String value) { + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/BooleanValue.java b/src/main/java/pm/j4/petroleum/modules/base/option/BooleanValue.java new file mode 100644 index 0000000..e262a6c --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/BooleanValue.java @@ -0,0 +1,41 @@ +package pm.j4.petroleum.modules.base.option; + +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type Boolean value. + */ +public class BooleanValue extends StringWritable { + /** + * Instantiates a new Boolean value. + * + * @param value the value + */ + public BooleanValue(String value) { + this.value = Boolean.valueOf(value); + } + + /** + * Instantiates a new Boolean value. + * + * @param value the value + */ + public BooleanValue(boolean value) { + this.value = Boolean.valueOf(value); + } + + @Override + public String getType() { + return "B"; + } + + @Override + public String getStringValue() { + return value.toString(); + } + + @Override + public void toStringValue(String value) { + this.value = Boolean.valueOf(value); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/DummyValue.java b/src/main/java/pm/j4/petroleum/modules/base/option/DummyValue.java new file mode 100644 index 0000000..fd26c81 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/DummyValue.java @@ -0,0 +1,9 @@ +package pm.j4.petroleum.modules.base.option; + +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type Dummy value. + */ +public class DummyValue extends StringWritable { +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/IntegerValue.java b/src/main/java/pm/j4/petroleum/modules/base/option/IntegerValue.java new file mode 100644 index 0000000..450e605 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/IntegerValue.java @@ -0,0 +1,46 @@ +package pm.j4.petroleum.modules.base.option; + +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type Integer value. + */ +public class IntegerValue extends StringWritable { + /** + * The Type. + */ + public final String type = "I"; + + /** + * Instantiates a new Integer value. + * + * @param value the value + */ + public IntegerValue(String value) { + this.value = Integer.valueOf(value); + } + + /** + * Instantiates a new Integer value. + * + * @param value the value + */ + public IntegerValue(int value) { + this.value = Integer.valueOf(value); + } + + @Override + public String getType() { + return "I"; + } + + @Override + public String getStringValue() { + return value.toString(); + } + + @Override + public void toStringValue(String value) { + this.value = Integer.valueOf(value); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/KeybindValue.java b/src/main/java/pm/j4/petroleum/modules/base/option/KeybindValue.java new file mode 100644 index 0000000..b54723e --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/KeybindValue.java @@ -0,0 +1,39 @@ +package pm.j4.petroleum.modules.base.option; + +import net.minecraft.client.options.KeyBinding; +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type Keybind value. + */ +public class KeybindValue extends StringWritable { + /** + * Instantiates a new Keybind value. + * + * @param translationKey the translation key + * @param code the code + * @param category the category + */ + public KeybindValue(String translationKey, int code, String category) { + this.value = new KeyBinding(translationKey, code, category); + } + + /** + * Instantiates a new Keybind value. + * + * @param binding the binding + */ + public KeybindValue(KeyBinding binding) { + this.value = binding; + } + + @Override + public String getType() { + return "KB"; + } + + @Override + public String getStringValue() { + return this.value.getDefaultKey().getLocalizedText().getString(); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/OptionTypeMatcher.java b/src/main/java/pm/j4/petroleum/modules/base/option/OptionTypeMatcher.java new file mode 100644 index 0000000..d388449 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/OptionTypeMatcher.java @@ -0,0 +1,29 @@ +package pm.j4.petroleum.modules.base.option; + +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type Option type matcher. + */ +public class OptionTypeMatcher { + /** + * Match string writable. + * + * @param type the type + * @param value the value + * @return the string writable + */ + public static StringWritable match(String type, String value) { + if (type == null || type.isEmpty()) { + return new DummyValue(); + } + switch (type) { + case "I": + return new IntegerValue(value); + case "B": + return new BooleanValue(value); + default: + return new DummyValue(); + } + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/base/option/StringValue.java b/src/main/java/pm/j4/petroleum/modules/base/option/StringValue.java new file mode 100644 index 0000000..17bffff --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/base/option/StringValue.java @@ -0,0 +1,32 @@ +package pm.j4.petroleum.modules.base.option; + +import pm.j4.petroleum.modules.base.StringWritable; + +/** + * The type String value. + */ +public class StringValue extends StringWritable { + /** + * Instantiates a new String value. + * + * @param value the value + */ + public StringValue(String value) { + this.value = value; + } + + @Override + public String getType() { + return "S"; + } + + @Override + public String getStringValue() { + return this.value; + } + + @Override + public void toStringValue(String value) { + this.value = value; + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java b/src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java new file mode 100644 index 0000000..c147d8a --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java @@ -0,0 +1,30 @@ +package pm.j4.petroleum.modules.bindings; + +import net.minecraft.client.util.InputUtil; + +/** + * The type Binding info. + */ +public class BindingInfo { + /** + * The Translation key. + */ + public String translationKey; + /** + * The Type. + */ + public InputUtil.Type type; + /** + * The Key. + */ + public int key; + /** + * The Category. + */ + public String category; + + /** + * The Attached function id. + */ + public String attachedModuleName; +} diff --git a/src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java b/src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java new file mode 100644 index 0000000..3dbc6bc --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java @@ -0,0 +1,92 @@ +package pm.j4.petroleum.modules.bindings; + +import java.util.*; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.util.InputUtil; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.TranslatableText; +import org.lwjgl.glfw.GLFW; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.gui.PModuleConfigEntry; +import pm.j4.petroleum.modules.base.ConfigurationOption; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.modules.base.option.KeybindValue; +import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.petroleum.util.config.GlobalConfig; + +/** + * The type Binding manager. + */ +public class BindingManager extends ModuleBase { + /** + * Instantiates a new Module base. + * Parameters should be constant across restarts. + */ + public BindingManager() { + super("petroleum.bindings", + false, + true, + true); + } + + @Override + public void init() { + registerBindings(); + super.init(); + } + + @Override + public List getConfigEntries() { + List entries = new ArrayList<>(); + + Map, ModuleBase> mapped = new HashMap<>(); + if (ConfigManager.getConfig().isPresent()) { + Map binds = ConfigManager.getConfig().get().globalConfig.bindings; + System.out.println("Number of bindings: " + binds.size()); + binds.forEach((key, func) -> mapped.put(new ConfigurationOption<>(new KeybindValue(key)), func)); + } + mapped.forEach((bind, module) -> { + PModuleConfigEntry entry = new PModuleConfigEntry(bind, new TranslatableText(module.getModuleName())) { + //TODO keybinding. most likely involves mixin to take direct key input + // look into how keybinding in regular options screen works + @Override + public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + if (this.displayText != null) { + MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, displayText, x, y, 0xAAAAAA); + } + if (this.option != null) { + int fontHeight = MinecraftClient.getInstance().textRenderer.fontHeight; + MinecraftClient.getInstance().textRenderer.drawWithShadow(matrices, "Key Value: " + this.option.toStringValue(), x, y + fontHeight + 4, 0xFFFFFF); + } + } + }; + entries.add(entry); + }); + return entries; + } + + /** + * Register bindings. + */ + private void registerBindings() { + if (!ConfigManager.getConfig().isPresent()) { + return; + } + GlobalConfig c = ConfigManager.getConfig().get().globalConfig; + Optional mod = PetroleumMod.getMod("petroleum.modmenu"); + if (mod.isPresent() && !c.isBound(mod.get())) { + //TODO + // the only explicit keybinding (for now.) + // once the binding manager has been completed, + // this should be migrated there, as a default binding + KeyBinding binding = new KeyBinding( + "key.petroleum.togglemodmenu", + InputUtil.Type.KEYSYM, + GLFW.GLFW_KEY_RIGHT_CONTROL, + "category.petroleum" + ); + ConfigManager.getConfig().get().globalConfig.setBinding(binding, mod.get()); + } + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/list/ModList.java b/src/main/java/pm/j4/petroleum/modules/list/ModList.java new file mode 100644 index 0000000..44f4573 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/list/ModList.java @@ -0,0 +1,36 @@ +package pm.j4.petroleum.modules.list; + +import java.util.ArrayList; +import java.util.List; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type Mod list. + */ +public class ModList extends ModuleBase { + /** + * Instantiates a new Mod list. + */ + public ModList() { + super("petroleum.modlist", + true, + true, + true); + } + + /** + * Gets active. + * + * @return the active + */ + public static List getActive() { + List result = new ArrayList<>(); + PetroleumMod.getActiveMods().forEach((mod) -> { + if (!mod.isHidden()) { + result.add(mod); + } + }); + return result; + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java b/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java new file mode 100644 index 0000000..fd87943 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java @@ -0,0 +1,32 @@ +package pm.j4.petroleum.modules.menu; + +import net.minecraft.client.MinecraftClient; +import pm.j4.petroleum.gui.PModMenuScreen; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.util.config.ConfigManager; + +/** + * The type Mod menu. + */ +public class ModMenu extends ModuleBase { + + /** + * Instantiates a new Mod menu. + */ + public ModMenu() { + super("petroleum.modmenu", + true, + true, + true); + } + + @Override + public void activate(MinecraftClient client) { + this.toggle(); + if (ConfigManager.getConfig().get().isModuleEnabled(this.getModuleName())) { + client.openScreen(new PModMenuScreen()); + } else { + client.openScreen(null); + } + } +} \ No newline at end of file diff --git a/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java b/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java new file mode 100644 index 0000000..d998642 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java @@ -0,0 +1,31 @@ +package pm.j4.petroleum.modules.splash; + +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type Splash text. + */ +public class SplashText extends ModuleBase { + /** + * Instantiates a new Splash text. + */ + public SplashText() { + super("petroleum.splashtext", + true, + true, + false); + } + + /** + * Get string. + * + * @return the string + */ + public static String get() { + if (PetroleumMod.modData != null) { + return "Petroleum v" + PetroleumMod.modData.getVersion().getFriendlyString(); + } + return "Petroleum vUnknown"; + } +} diff --git a/src/main/java/pm/j4/petroleum/util/config/Config.java b/src/main/java/pm/j4/petroleum/util/config/Config.java new file mode 100644 index 0000000..c2697d3 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/Config.java @@ -0,0 +1,59 @@ +package pm.j4.petroleum.util.config; + +import java.util.ArrayList; +import java.util.List; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type Config. + */ +public abstract class Config { + /** + * The Enabled modules. + */ + public List enabledModules = new ArrayList<>(); + + /** + * Is enabled boolean. + * + * @param mod the mod + * @return the boolean + */ + public boolean isEnabled(String mod) { + return enabledModules.contains(mod); + } + + + /** + * Disable module. + * + * @param mod the mod + */ + public void disableModule(String mod) { + if (isEnabled(mod) && PetroleumMod.isActive(mod) && PetroleumMod.getMod(mod).isPresent()) { + ModuleBase moduleInfo = PetroleumMod.getMod(mod).get(); + if (moduleInfo.isActivatable()) { + enabledModules.remove(mod); + } + } + } + + /** + * Toggle module. + * + * @param mod the mod + */ + public void toggleModule(String mod) { + if (PetroleumMod.isActive(mod) && PetroleumMod.getMod(mod).isPresent()) { + ModuleBase moduleInfo = PetroleumMod.getMod(mod).get(); + if (moduleInfo.isActivatable()) { + if (isEnabled(mod)) { + enabledModules.remove(mod); + } else { + enabledModules.add(mod); + } + } + } + } +} diff --git a/src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java b/src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java new file mode 100644 index 0000000..8b214f9 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java @@ -0,0 +1,93 @@ +package pm.j4.petroleum.util.config; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ModuleBase; + +/** + * The type Config holder. + */ +public class ConfigHolder { + /** + * The Global config. + */ + public GlobalConfig globalConfig; + /** + * The Server configs. + */ + public Map serverConfigs; + + /** + * Is module enabled boolean. + * + * @param module the module + * @return the boolean + */ + public boolean isModuleEnabled(String module) { + + if (!PetroleumMod.isActive(module)) { + return false; + } + if (globalConfig.isEnabled(module)) { + return true; + } + String server = this.getServer(); + if (serverConfigs.containsKey(server)) { + return serverConfigs.get(server).isEnabled(module); + } + return false; + } + + /** + * Gets enabled modules. + * + * @return the enabled modules + */ + public List getEnabledModules() { + List modules = PetroleumMod.getActiveMods(); + return modules.stream().filter(module -> + isModuleEnabled(module.getModuleName()) + ).collect(Collectors.toList()); + } + + /** + * Gets server. + * + * @return the server + */ + public String getServer() { + return PetroleumMod.getServerAddress(); + } + + /** + * Toggle module. + * + * @param module the module + */ + public void toggleModule(String module) { + String server = this.getServer(); + if (serverConfigs.containsKey(server)) { + System.out.println("Toggling module " + module + " on server " + server); + serverConfigs.get(server).toggleModule(module); + } else { + globalConfig.toggleModule(module); + } + } + + /** + * Disable module. + * + * @param module the module + */ + public void disableModule(String module) { + String server = this.getServer(); + if (serverConfigs.containsKey(server)) { + System.out.println("disabling module " + module + " on server " + server); + serverConfigs.get(server).disableModule(module); + } else { + globalConfig.disableModule(module); + } + } +} diff --git a/src/main/java/pm/j4/petroleum/util/config/ConfigManager.java b/src/main/java/pm/j4/petroleum/util/config/ConfigManager.java new file mode 100644 index 0000000..99dc427 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/ConfigManager.java @@ -0,0 +1,191 @@ +package pm.j4.petroleum.util.config; + +import com.google.common.reflect.TypeToken; +import com.google.gson.*; +import java.io.*; +import java.lang.reflect.Type; +import java.util.*; +import net.fabricmc.loader.api.FabricLoader; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.bindings.BindingInfo; + +/** + * The type Config manager. + */ +public class ConfigManager { + /** + * The constant GSON. + */ + public static final Gson GSON = new GsonBuilder() + .registerTypeAdapter(GlobalConfig.class, SerializationHelper.getSerializer()) + .registerTypeAdapter(GlobalConfig.class, SerializationHelper.getDeserializer()) + .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).setPrettyPrinting().create(); + /** + * The constant file. + */ + private static File file; + /** + * The constant config. + */ + private static ConfigHolder config; + + /** + * Prepare config file. + */ + private static void prepareConfigFile() { + if (file != null) { + return; + } + file = new File(FabricLoader.getInstance().getConfigDir().toString(), "petroleum.json"); + } + + /** + * Init config. + */ + public static void initConfig() { + if (config != null) { + return; + } + + config = new ConfigHolder(); + config.globalConfig = new DefaultConfig(); + config.serverConfigs = new HashMap<>(); + + load(); + } + + /** + * Load. + */ + private static void load() { + prepareConfigFile(); + + try { + if (!file.exists()) { + save(); + } + if (file.exists()) { + BufferedReader reader = new BufferedReader(new FileReader(file)); + ConfigHolder parsedConfig = null; + try { + parsedConfig = GSON.fromJson(reader, ConfigHolder.class); + } catch (Exception e) { + System.out.println("Couldn't parse config file"); + e.printStackTrace(); + } + if (parsedConfig != null) { + config = parsedConfig; + } + } + } catch (FileNotFoundException e) { + System.out.println("Couldn't load Petroleum configuration"); + e.printStackTrace(); + } + } + + /** + * Save. + */ + public static void save() { + prepareConfigFile(); + + String json = GSON.toJson(config); + + try (FileWriter fileWriter = new FileWriter(file)) { + fileWriter.write(json); + } catch (IOException e) { + System.out.println("Couldn't save Petroleum configuration"); + e.printStackTrace(); + } + } + + /** + * Gets config. + * + * @return the config + */ + public static Optional getConfig() { + if (config == null) { + return Optional.empty(); + } + return Optional.of(config); + } +} + +/** + * The type Serialization helper. + */ +class SerializationHelper { + + /** + * The constant s. + */ + private static final JsonSerializer s = (src, typeOfSrc, ctx) -> { + JsonObject jsonConfig = new JsonObject(); + + JsonArray bindings = ctx.serialize(src.serializeBindings()).getAsJsonArray(); + jsonConfig.add("bindings", bindings); + + JsonArray modules = ctx.serialize(src.enabledModules).getAsJsonArray(); + jsonConfig.add("enabled_modules", modules); + + JsonObject moduleConfigs = new JsonObject(); + PetroleumMod.getActiveMods().forEach(module -> { + moduleConfigs.add(module.getModuleName(), ctx.serialize(src.serializeModuleConfiguration(module))); + }); + jsonConfig.add("module_configuration", moduleConfigs); + + return jsonConfig; + }; + + /** + * The constant ds. + */ + private static final JsonDeserializer ds = ((json, typeOfT, ctx) -> { + JsonObject obj = json.getAsJsonObject(); + + List bindings = new ArrayList<>(); + if (obj.has("bindings")) { + obj.get("bindings").getAsJsonArray().forEach(b -> bindings.add(ctx.deserialize(b, BindingInfo.class))); + } + List modules = new ArrayList<>(); + if (obj.has("enabled_modules")) { + obj.get("enabled_modules").getAsJsonArray().forEach(m -> modules.add(m.getAsString())); + } + GlobalConfig cfg = new GlobalConfig(); + Map> options; + Type type = new TypeToken>>() { + }.getType(); + if (obj.has("module_configuration")) { + options = ctx.deserialize(obj.get("module_configuration"), type); + } else { + options = new HashMap<>(); + } + PetroleumMod.getActiveMods().forEach(module -> { + if (options.containsKey(module.getModuleName())) { + cfg.deserializeModuleConfiguration(options.get(module.getModuleName()), module); + } + }); + cfg.deserializeBindings(bindings); + cfg.enabledModules = modules; + return cfg; + }); + + /** + * Gets serializer. + * + * @return the serializer + */ + public static JsonSerializer getSerializer() { + return s; + } + + /** + * Gets deserializer. + * + * @return the deserializer + */ + public static JsonDeserializer getDeserializer() { + return ds; + } +} \ No newline at end of file diff --git a/src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java b/src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java new file mode 100644 index 0000000..f50bea2 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java @@ -0,0 +1,15 @@ +package pm.j4.petroleum.util.config; + +import java.util.Collections; + +/** + * The type Default config. + */ +public class DefaultConfig extends GlobalConfig { + /** + * Instantiates a new Default config. + */ + public DefaultConfig() { + this.enabledModules = Collections.singletonList("petroleum.splashtext"); + } +} diff --git a/src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java b/src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java new file mode 100644 index 0000000..0d38215 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java @@ -0,0 +1,143 @@ +package pm.j4.petroleum.util.config; + +import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; +import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.util.InputUtil; +import pm.j4.petroleum.PetroleumMod; +import pm.j4.petroleum.modules.base.ConfigurationOption; +import pm.j4.petroleum.modules.base.ModuleBase; +import pm.j4.petroleum.modules.base.option.OptionTypeMatcher; +import pm.j4.petroleum.modules.bindings.BindingInfo; + +/** + * The type Global config. + */ +public class GlobalConfig extends Config { + /** + * The Bindings. + */ + public final Map bindings = new HashMap<>(); + + /** + * Is bound boolean. + * + * @param func the func + * @return the boolean + */ + public boolean isBound(ModuleBase func) { + AtomicBoolean found = new AtomicBoolean(false); + bindings.forEach((key, binding) -> { + if (binding.equals(func)) { + found.set(true); + } + }); + return found.get(); + } + + /** + * Sets binding. + * + * @param bind the bind + * @param func the func + */ + public void setBinding(KeyBinding bind, ModuleBase func) { + if (bindings.containsValue(func)) { + bindings.forEach((key, binding) -> { + if (binding.equals(func)) { + PetroleumMod.removeBind(key); + bindings.remove(key); + } + }); + } + + if (PetroleumMod.isActive(func.getModuleName())) { + PetroleumMod.addBind(bind); + bindings.put(bind, func); + } + } + + /** + * Convert binding. + * + * @param info the info + */ + private void convertBinding(BindingInfo info) { + Optional match = PetroleumMod.getMod(info.attachedModuleName); + match.ifPresent(moduleBase -> setBinding(new KeyBinding( + info.translationKey, + info.type, + info.key, + info.category + ), + moduleBase)); + } + + /** + * Extract binding binding info. + * + * @param b the b + * @param f the f + * @return the binding info + */ + private BindingInfo extractBinding(KeyBinding b, ModuleBase f) { + BindingInfo res = new BindingInfo(); + res.attachedModuleName = f.getModuleName(); + + res.translationKey = b.getTranslationKey(); + InputUtil.Key k = b.getDefaultKey(); + res.type = k.getCategory(); + res.key = k.getCode(); + res.category = b.getCategory(); + + return res; + } + + /** + * Serialize bindings list. + * + * @return the list + */ + public List serializeBindings() { + List b = new ArrayList<>(); + bindings.forEach((k, f) -> b.add(extractBinding(k, f))); + return b; + } + + /** + * Deserialize bindings. + * + * @param info the info + */ + public void deserializeBindings(List info) { + info.forEach(this::convertBinding); + } + + /** + * Serialize module configuration list. + * + * @param module the module + * @return the list + */ + public List serializeModuleConfiguration(ModuleBase module) { + List opts = new ArrayList<>(); + Map configuration = module.getModuleConfiguration(); + configuration.forEach((key, value) -> { + opts.add(new OptionSerializiable(value.getValueType(), value.toStringValue(), key)); + }); + return opts; + } + + /** + * Deserialize module configuration. + * + * @param opts the opts + * @param module the module + */ + public void deserializeModuleConfiguration(List opts, ModuleBase module) { + opts.forEach(option -> { + module.setConfigOption(option.key, new ConfigurationOption<>(OptionTypeMatcher.match(option.type, option.value))); + }); + } +} + diff --git a/src/main/java/pm/j4/petroleum/util/config/OptionSerializiable.java b/src/main/java/pm/j4/petroleum/util/config/OptionSerializiable.java new file mode 100644 index 0000000..0ef5c37 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/OptionSerializiable.java @@ -0,0 +1,32 @@ +package pm.j4.petroleum.util.config; + +/** + * The type Option serializiable. + */ +public class OptionSerializiable { + /** + * Instantiates a new Option serializiable. + * + * @param type the type + * @param value the value + * @param key the key + */ + public OptionSerializiable(String type, String value, String key) { + this.type = type; + this.value = value; + this.key = key; + } + + /** + * The Type. + */ + public final String type; + /** + * The Value. + */ + public final String value; + /** + * The Key. + */ + public final String key; +} diff --git a/src/main/java/pm/j4/petroleum/util/config/ServerConfig.java b/src/main/java/pm/j4/petroleum/util/config/ServerConfig.java new file mode 100644 index 0000000..9df6464 --- /dev/null +++ b/src/main/java/pm/j4/petroleum/util/config/ServerConfig.java @@ -0,0 +1,11 @@ +package pm.j4.petroleum.util.config; + +/** + * The type Server config. + */ +public class ServerConfig extends Config { + /** + * The Address. + */ + public String address = ""; +} diff --git a/src/main/resources/assets/petroleum/icon.png b/src/main/resources/assets/petroleum/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5980ba8d6283c8f503eb97fd955cea2ea09dde8c GIT binary patch literal 2695 zcmZ8jc~sNa68=Rb$Zm>(AbX_6XV`+GAQ}iJB5ef}$xAS7ff5T95~u|UYgh~+m{KT< zMZnl2P$P?qfb5U}BFjS%u&iN~H7v3S3B1^zBYp3Wd+)h_-1+W&GxN zl$t&*P)lHe4*6Q zOfg4P6jx-MFPg$m?aH9_Pv|wnpsas!daVx=S3s)ADj0ol9&q+RzJ96n;?;bQy#(k= zx4;=OckiXB$BC&P9n=n_c_VEUeXVIHw?q*U5nM(iF&>IcvFcz}+~yGb`v+WssZ7xE z76ltiRjEU5DX;O^IjBeUA@Qt+JP&HIhT3C?^pd{~i}Eqn_WRHAl;WBGbQq3OAPL z6CkDXCZ5;|qbFQO@2;53s7y5=Ksx>{^u%&^h9}7D+XVT)$dK?yez&V1TBH?AUp*qv zarIp}%F%I?y@!XSu)B=sv(5T{K6yPdjsXDI4ry&dh9 z7Y+k*o_+Ah5&X^BmZ<0DjVmooX&gqsubx>EFr&p~B=V3r9>p&XO0};}hC=*#FyErM z+zbfvlHXyrM{*niBJe#|_mz%^&~hjc8BN_Vm2$c(Nt}@nFq_#Nkfnje+MeP-=>XHEwWx8PI#oOM7Uueyz!@VpNWZ75R3|ql%L~i;u}4BwNX#?Rz5 zG+iG{r*e5~C1Y^y=FB|uaseM`*7%g+zCc@H70f1R%)lbht0@C-I{3m%;Xf0gom8(5)wXWU;iBL{3TNK(9LqXnxTWkGx!&`vuXWj zlZuO9j@NJ*D|M(QCc}Np0mlp7L*p=E#!bva@ByJxk{Ae=3Ep}9_4^4eq^iK;{p6J5 zCm0Mr3|z}b+HTg5&&%Tf2V?fWhm-*!Yi~2mEWZ?Naw2FxvrswSS4JXQkFHjz2DKjnSm)-1>HiZROop66mMHb?YV$xx3{f1x*R3+62~ zsma<11B+Mc-Ni&+9I!IaB6m8Yg<%`92!#4F|2qupe599EHY2&B5@ll3|S z8I5T^SVoGLM#gVdS8SoaM0N?@#DFaR5oFa6r&~62GMh0O2x#|gyrY+*$DViHcUT|( z0J;Lb6)tdY%52NsEZx$1W7og>s*D796e;WOx?i1NN-$#&YFr6o;|G)Sn@f+JI9ssmDFj=?vyrYshwlkW&n;6KdsPetF( zWg+W>)_~VfWbl+~(`JlUX$@VasWdH#JvM~i|6X1b9>lW#aGt{XvJ~t{Sg83e{D3#T zvDXk`>mD7C5-l_XYgfQ~`aX4T+SUde1eScRiM3-9_1gOe^HgJ@*eX14zdnAC{e$K( za%UYRu!xNR1s@n?%L96jJ>)Wi?0>j+yl-VK!cvX0LcTb?>dyyK4r^N@HndnwSPTC_ zl9RvHlF?AvUh6MQh5H6^L-%b4%3##gcS#`DnNJEJY3a|# zy@6NlQuvd2s5$jyO+~=idp)9tMcM_O#l*1ucR)Vi4P1Dn9nS+P6j8}eLBk#A7+C| zPe_&?9`G6Mv!v06#|c!$+~DMY{9y;?xzMbYsdmFnQss{*qYaZ$o2Bqo^>+Ezd#HD8 zWz0z4iRt-V)#9jyZ?}zVWcm*LHLOUa+)^lEq3HIRj#Za{t=`LAMt2R30Ldymg|O|D zX@%uoZCu&QyKRmj^(h&ynrji|gI;l#9%sck{re7G=&3WGvUZDizUa{-SkbSX%s^Szs`0SaV?Snl~F}iRs TT|c@;GCTtISO-jzttb7zd>#Y~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/petroleum/textures/options_background.png b/src/main/resources/assets/petroleum/textures/options_background.png new file mode 100644 index 0000000000000000000000000000000000000000..d2f690bfc5d13d6bdfde5b91deb853defd7af81d GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;R0X`wFK0ZDU4i4$eiyVL=oCO|{#S9F5he4R}c>anMprDASi(`n!`Q!uv j7uLm0i=0.7.4", + "fabric": "*", + "minecraft": "1.16.x" + }, + "suggests": { + "flamingo": "*" + } +} diff --git a/src/main/resources/petroleum.mixins.json b/src/main/resources/petroleum.mixins.json new file mode 100644 index 0000000..2c458f3 --- /dev/null +++ b/src/main/resources/petroleum.mixins.json @@ -0,0 +1,18 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "pm.j4.petroleum.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + ], + "client": [ + "TitleScreenMixin", + "OptionsMenuMixin", + "EntryListWidgetAccessor", + "DebugHudMixin", + "ModListMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}