From 79fa4fbabc5bd4d31726711be00b7d7fd8c1dbc4 Mon Sep 17 00:00:00 2001 From: Jonas_Jones <91549607+J-onasJones@users.noreply.github.com> Date: Fri, 24 Jun 2022 23:56:39 +0200 Subject: [PATCH] Added Board Pixelart and did some code Cleanup and package management Introduction of Board Pixel-Art of Arduino Nano, Uno and Pro Mini Code Cleanup and Verbose Logger management --- .../arduinoctrls/boards/arduino-nano.png | Bin 0 -> 2000 bytes .../arduinoctrls/boards/arduino-pro_mini.png | Bin 0 -> 2471 bytes .../arduinoctrls/boards/arduino-uno.png | Bin 0 -> 3723 bytes .../arduinoctrls/ArduinoControls.class | Bin 1101 -> 1000 bytes .../arduinoctrls/config/ModConfigs.class | Bin 7022 -> 7270 bytes .../config/SimpleConfig$ConfigRequest.class | Bin 2194 -> 2194 bytes .../config/SimpleConfig$DefaultConfig.class | Bin 478 -> 478 bytes .../arduinoctrls/config/SimpleConfig.class | Bin 5804 -> 5939 bytes .../gui/{ => screens}/GuiHome.class | Bin 3408 -> 3440 bytes .../gui/screens/ModSettings.class | Bin 3173 -> 3181 bytes .../gui/{ => screens}/SelectDevice.class | Bin 8625 -> 8665 bytes .../arduinoctrls/mixin/ArduinoMixin.class | Bin 3188 -> 3196 bytes .../mixin/GameMenuScreenMixin.class | Bin 3257 -> 3265 bytes .../arduinoctrls/ArduinoControls.java | 7 ++----- .../arduinoctrls/config/ModConfigs.java | 12 +++++++++--- .../arduinoctrls/config/SimpleConfig.java | 11 ++++++----- .../gui/{ => screens}/GuiHome.java | 3 +-- .../arduinoctrls/gui/screens/ModSettings.java | 2 -- .../gui/{ => screens}/SelectDevice.java | 2 +- .../arduinoctrls/mixin/ArduinoMixin.java | 3 +-- .../mixin/GameMenuScreenMixin.java | 2 +- .../arduinoctrls/boards/arduino-nano.png | Bin 0 -> 2000 bytes .../arduinoctrls/boards/arduino-pro_mini.png | Bin 0 -> 2471 bytes .../arduinoctrls/boards/arduino-uno.png | Bin 0 -> 3723 bytes 24 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png create mode 100644 production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-pro_mini.png create mode 100644 production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png rename production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/{ => screens}/GuiHome.class (64%) rename production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/{ => screens}/SelectDevice.class (90%) rename src/main/java/me/jonasjones/arduinoctrls/gui/{ => screens}/GuiHome.java (93%) rename src/main/java/me/jonasjones/arduinoctrls/gui/{ => screens}/SelectDevice.java (99%) create mode 100644 src/main/resources/assets/arduinoctrls/boards/arduino-nano.png create mode 100644 src/main/resources/assets/arduinoctrls/boards/arduino-pro_mini.png create mode 100644 src/main/resources/assets/arduinoctrls/boards/arduino-uno.png diff --git a/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png new file mode 100644 index 0000000000000000000000000000000000000000..092d2b7aa02789500760e955c3c32948a96aa1ac GIT binary patch literal 2000 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 literal 0 HcmV?d00001 diff --git a/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png new file mode 100644 index 0000000000000000000000000000000000000000..9050ec20378b658306340c5408e3699fa16dfa73 GIT binary patch literal 3723 zcmV;64s`K}P)Px@MM*?KRCt{2U0rM(#U20c-Z?ekhp5gqN@`3ZP$gm$jN`-(l|YF>5j<2PrBGov zv?4f(9GsF06x(U3qWFv=K57#a9D*p7pC~Hu1kQINK|<^VXl%b#`6x;R7q?LqAa%~W zeK^nE?Ci|$?Ci%av47G@JF_#hv-|(e|6^u$PlHEPwf37{>&&3I7~R>DfTkI|b9&UB znL+fZ+PHfXrpc9cGV0DaVYF|ZMvjT58QZl1rokmI06^1q$MaD`({(J`unPb%+PALA zy_tfhqY9WDHBFl)@J)ctwF%F4UO6>s%cF%)(u4#{m(~FQRsju$JUb)k!Py6l@K`16*;g)p%_{@tP!gAL#=TVxf1OPnt7~e@D=ERUBYsfys2^qWoAUz{r>y!d0qG1Pq%U}yzqkZHCSk_B^a<#0BZth;S;bVpiKZx z0-FzD7?WfDtqEFiafha9c^_bG*9PD11#<6N0#zIO0Mj%^Utez#m@)ynr&M?*^G*I7 zPx#5qII^j73kg^sfF?mP!Rtp5eT&Qe@d)5643uF{HdXFgrZiQFYnk(Yx-tVrgdPSO zx(3~FS7W8AN>qJ42u)7{Ffo#P0M(iO$kB|So`HWTYk>B_i`X)F(UQk=_;kZ`bOdQ= zdIBpOS6cE!=^2d?3<3`WSz+^p&kF+y_73i~qz@fDWJw=9a1cQ7W+OIsI%0%k0?zH& zY6+V}AOfTxd@`9c0R&M*0Mk|YfDZz+PpN<2OrV?aiRmB@-70`+L%!)Od_a)^^vLB+ z>w0a&iky=d1)>ms+zIB(1cc#;t!!M0g9i>sr&Tc{{2XGp988=%*)$6oQqBm!0A&pz zx;Z~ufsO4)QV&=jB%2mp+pQ0>f>9OX4@LNZA_2(Fv7y|S!HY`a8Ly7Y10?MP@$jdE z@BtqhfEUN7SIt8QGdbi2^1y_}oJx6T$s-s^<+w`t!u;sn{@O-rW?Kt;(BRgAcIa z%PUvCaW}UQys|0~weJV9+7hM$)e*<5M+8Mb=#iZ*_`G+mEss}jWM_*_NW45%1lblr z?4ke`ey4n&|LB5L9#5!rnw*y{$7?^K7asQ)y-(Z9v&ZBY7&Of$@7NN67QE zJ-GCit-T56F(b)33F_G=WpE zJ|)%eq+p6XX#$BvK@``s)^b^i<#aEgNf5aY;57!PLp#xN(2yO;cRiCEowd)t1ppQm z@9BD*-n5V{nY6Z()ID$9az#~Zzd72sPK%rXG9x!=!LwnY$P9>_EL!!m&K_O<%iguZ zKCr5s=R=V5ce#`e3RSKBrluMOs-W`LO8oxAGp^-m0n2PXXE&zM*zwSOG%UZ@l6U;r zr_zp~*Sy7Tdn~J=MUMhZ6VSA&4Y#HSXeMm}A}0WE9)JeDMEr77J-XBOtg0LUe8+W55p~D1_ofPkDsNT36x~}8;m#sXAkP`6N9pH1Yw<Z;GJPrrAKBT0#cg{~ zlF;+#a(;l-{wHe-9;{cSFqt7EAa}?G=v%CS+dUExHEafgU|u1}{oIM8CpUH3M#=zF3+-18`^N zkV6R*W2u!$&YnFRvuDqiYP1w;FM+6ljSN^gnGM+mC%U|~pL?l4|t#i5T9t@F)-z0fH1r)Fg0g z$1nhy?FqiW5fmim-du_|o?h-=Py&ziIN85&oU^D%AX8t1i90ig9m|ZRRs`z=I@xSD zWDOH_dAtK z1&XM`F*i-X>xY*}L8gob6CIm&BHe8OQjuyUjuL!!u|vM@jzoRU;p}e@MAPJ zH5YX%*2|ngu_lZ{Sq{GWCzag2ac+40@n7S}(IZmd7ZSlR3>-dk7)?#h%54M*FAiTZ z$QsI2uwmv#d>NI;GXeAsKhkpu?{8Xx)vJGrci#D{uj@bg)9&mhK7 zCVY=8+3nnXzB#m2@}9R~@w{g4Do1TakC-#X_#I1K=TTM#0SW4g=!8TyXS z+$U%|2EQ))Mv%C{%l#=4pkr@A$g&s9LPrwf@Q%;exvuTf*LPz5oO6X~(J}xy=i2lS z7QFkrTE~BdJ#Z(mI>Y~n<8bO>>{wOUctWBAKujW1rp$K69#zPifUQ%1sssSryS4|G zHVgyl?zFG=+B@3Oo$d~_e{S%-9Lx$&M1Uunp8x>p&|$#9=7AxL@OXlJrFkg;cN4(Y z<6+LZeOS0)VI&`)jvLONJ1f)xk-Zo~1Z7N_0jJe0`h^V<^r@~#F~M>pBQO(?UNsjw zbPNpe&tJojENVZW@8Cn^%X8Qp)$XGk9g*z{F2(=yUOk}Zy#wms6r2Gcz6ns6=XUnk ziSUUJpt2k)vkOKQXV0C@A1}CVf$#RhhD?9yG9m=x1IUcR&4ZT#hb%O*7o+2#f$kxYZ72SRX(IrKw8W{D5ew zIjUvYVk4W)D%Xun1JJ?;{Eg1n*3@It0Jcx9j;|W zh>QT62QT9lY9`Q+-G1()TnNb10IKcMj#Qk5Paxx{k}^(22%G?-ov1QC03fFsUi(cw zCMJPyMgz>iI~)m6U%$*U6h8axL>Mc+dC02m=RTgA1QJYd&OjbQ0xVm$)LhNNTa?s1c z(-EGRgGF1j%ZA?qM>BZBzU-p>v1kUcxnewjJn&WSFX-vNl;jD&xndlsxCOvC2EHn{ z5aH5o4+7xtzjsQ99Y%WXk4oAJLIPwb)niLHJeVBIlYo5yMDW#Bg&Bori~uMQK|~f& z9dV{3%x0Ic zFxt0HBR`TC8v=xlYnk&lK?X?z8R4_nj1sia0pM4oKPv%>_?bAHYOJ^g1ETFj6l(6N zv7}||umU1NWz#B-q0{^W&jiF_Tl$|5ugF$a^%qYA(CV->Rf$)RU$zOCMa?}mc=h<@ zd|IUrZ#0YSv=>d_G$+BTem{F3f`$?S{Jg#$2l!bg_PfL^Lma<-;`LGVp8-lH;Ka}g zG}PPwlh+S)J%OGRSFmYW4U)+uhKCAYmsouFV(7YV8Of@3;sm#uOc8jKM{Xtz;D6yw zi2$Z)Lf7>`H9`6O1sK0@20bUPK-Yn1>I$m8=fo8NfUfH(pTE#oo#_Oc1ib$&@b$le zpM3fWCMG6u|9$uS?kE8f6cH*Rn3E98=PyL&tA7E|rRz*b@PrTei~?rOnuTM>k9n?F zlKl>7D69wk^roB2_P(^{TOg;Vyb3N=aXUAEY*(x2zFD9dko?w?BTU0URcqm^YGb=L z_-|AJi#F^6U=0a{PT;JPoN(!1Q21}dGx_7uzI7TAKHE9JFpVtgmeinbNe$9n+c2vn zVaqd(tT?Z>7IjN%k?z_K(=cEf2I`i0&$IW-em;sk07%|sebdr&6mYffDc`@SF+@3s z#m@8FjyCllg(pv*^4^|l8ehKDWEo&W0`PYKguNpuEOd9zXOwsmgz29Dk7XCg2W6NqcfW5Ly|Vk#uCB(SWpf)GQ|=d^Qai4=pr zodNC!PN%Q1hIN6ohJ}nfWmhccMtC+Qv8l1;EfKw`HP0H?waZ4mUTX^Mj4wE2RS6D; zZ3M_-7kSbJdIv|6YFeIj*t<_TK(io16pQY2An{V7o>u`1dla>=gD7L4Du#pES<)xI z2VjgK;?XJQI3`$pr3r^eF^CO%sv^%QGXH4CFHNHIM=SY0gpb9O6ReJjnf3FAM`S)x Q5gGKI5;5u=lIA%20Sw+X4*&oF delta 514 zcmYk2+fEa45XOJA9Co|i<*-#0ity*4VzE^4Ou~hbhLDgDAaKWphuSnL-DJ0fOP--L z@imNcLGgkIF!4RS@C{6ivs(h(%*>aW@B3!vxBbg;fByS%39PW(a!Xkkhm4Kuk!}55 z8_M7_U^D13#IR5}m3;e)HQ0*Hd`=kKJKi&&qwvtYi#{FI8lhPW8_g)J$5UDEGGcSj z<36LU%cYV-UYOXgL?6PqVm8BSwGx?HY#QOQsVk~AstYa;64HcFRHMbCX02YjVsr@( zM)2Nu%|14xdh9aIjLodaLmsscWLxIiUu8P)Q}CEicJ}wnJF8o}<;|`2_41BQ@$8R? zocLG>Pw8Ql1xi{!(=S*|D%M-I&Ln)zJ=*J|U*n>pWKuNu70!`wT39S;Oxob`T%*?= z-~}%g39qin8>uPeIw#oQ@q*xjI~KuMhw&S&fL`T|q^tRi6EJ&AH+QA$@cLS}m^#96 fFxg@1Oobn(`AH%w>4L6Wqn9~)lklcrfyLYZc1}%8 diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class index d1ff69e914e8574ba6e4bef654eb20c7d98802cf..7a530c7fa4a47cbe87b1428259a8b097256124cb 100644 GIT binary patch delta 2974 zcmZ8jX<$@W75+{#nT@YUysRSgRx$(x50>t01+wc0s9awN&lq+Sa9d?i=3l;K$r^zwexL&w2Np zcjmpe^ra^E@pq<=09Zkb54aEJzuSprgvwq$(H~FhT3dW*NKa^yq!x=`r$re>VnYEp zF2!XITrRMj{jgBpL}lgaR3y6StY6lRV2i{C&3fwgFH zpjBWU*2~NNRSpCNuE0h);9rvOK)XDeU!!#ry#1kMWFQbpw#GvJQ9bO&W^_5wEzpB4 zvcPt!vkiR$1$eJqXIns5%A~E{ezm~+uua};Yo{IZb=zD|Kf&I-Fcyl%oe0aaf)lla zoLMNmGZY)p!+~f#J{pXr^u*3k)Qw?89C*J9aEcmF~XZnWq)UYl~oG;Qx^7;J3yOCbQ4+ zWx^}6&{-*qXPmTsg%gx>J*5tnwG&^J`J%@5HBL*BaM*JV)D(l_L&sI?s+)XQ5v zbL2tcvrQ1@vDIvO$~D9GEkc8#aeIpBkSzC9)1z{=r_pwpP@$|GZTcWT@pt52PlN5d zggHillO6{hl}~%>>^~5A3_p|wg$wLI68JHW$z_GLuAeCO1ffa26LPGu!TwW$Cvj3f zRJhpwbEW)+JY85}|CPY6@suR*tnJSTJd0xlv8J=RtEIiQttZ&A-h~ zwWhPXRdLS={0=9%zgk;@J)K>OdO_etMTxarx_dg?&nf;O@DiuB%{$ZnvcMmCdxN*a z{%3(#c)QO#*Y%pf>ncE{e8W3ap7IL&Uj+Wj%2&O$uD=WXLn+IY(%ThWzoAD(dsE;o zwrKWM+5aW*Z{803Dr^2L@QyMrY6*64YHQxw+R@XsHQ3$U*2X@Z8W9`r_f@B*#$Y2mnLs4x`^Y?aFa`rTTxX8wX#S!NC@(<$L6AH2YChgc)zP?UN!jz6)V%( z=f^a{cXfBPHgA;A`lkx#x=Eud2hHQ*L)G%0;>T9aCv>&NLt#Cv4a8%Eks)m`64kY} zogM3f>)V@y9a=IyFrX)sgXw5=>@tnAR_R126^X}^a-^im*1#_<55|Ceszl?dg!%GB z@qD|30_r+X6j#cYQa_c+zS8Op_Xba3mudq;a^VfhRW~FT*^pdVLvl3@$;C4ySI&@J zHbZjF49S%;B$vsMTo*%fQ4GlyQ8J@0Uv1RI8GkbKjI7npY>y$VIcW&Vs=M$m10lmb+&z&-j;4p=liM zNvwPnYY5ZW02q|-LP|vuPv#=QTco+XyUBdrUOVNyFJkOgj#EcuI zX5x9>{1EDp=Q!YDv~BfwWNcH|bO^ovt&_OQWVic6iW;y`x^Kx8h7=pMu(ABJ-lG;W zVUj5exzm5Wa=yVr?e^bz2$^302Mx|=`(X=ti<#rcEaV=O{G^54Ym%R_khhuS zXD#IIXUUBJ3l{c^rs{O$?q|Fu37q_T5tuo!AfqDRlKf7H@CSIPZY&t10x zPaudF_{-!?Y$Sm;szN(0MJH{ zWnJTF^mo`M@qO-+2|TVKx7H+%Pv8j!xT!Le_}K)0sZcE6w0v5@L=K)(kQ>NwJgoq? zjscz@$727@Im6#8cuOwe83p&`;GY!Sn}e?^cv~ii-%$AW9Q@n)@Sh6amD9eh;C;Ek z|55P4oc4bT?l&RjDfmbZ7AQD=7G@^Msqkb@Jww6i94u7uNDdZVSl27z#Z@TB)o9?a zz$R?tLT=}me+NS7$0!DnL6}RdV;=_bFpq@8T>0aO;2B(lmotcRtw+d?7*Ccs)nJq^ z!L_so3EGS#PqR5@U7;B>jVGMy{Rx~pmr8c>6(gU@xbk^aP8BSjJgqAES3|Xo=5SY3 Wp^WNy8rHLHw7ckHDp*L1F#G?y3Je4Q delta 2773 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 delta 2029 zcmZ`)4Qx|Y6#j1a*4Mtic3sOhHWZ3u8J3Mn_%SR%AjaUL45LvKP?9prQowbT4rY`T zO^gyq1fR;U1N*WfQL`hj=Vh6_!j*CSH?F#;j;)S~pL#HOkS?{)UNGv{@m?P=C8TdJS~o zO&yy}yoI-|M#o6+76C0Dt0U4BY&G$ob;^Urw)CK>vqqeY=c=OGYAxmVuvuT#h#L(9)TPYm>!DE3Qr5f zqk-yhO*lqP`#XeJAiL))DFMws>x5^%mM2hT9dhSc8?towfZL+cnRT_g$QS6FvKAKZ zVL5Hs3m*zGK%Ez1F?SPA?8B!J*l(T58aDg@Z3aDoseDs~&v?pJ&xLpbOZenO0Y1kU zykV1t=epmz&wIy2d9wg^t`T@JgY~)}Lr{ZJh+-^e_dptlFYy)qhQN!j@ePr_<&(y} zfoLqT!o27mSuHVhk;yfVEYzVl=Au9MV$>_V02?!#9tUxVcYuK@sn0(ts@Z-ufY z_@gQBBsPBt8%QP7y_<3XkCC>B@)n~P9;a{%*&>NWC}n?)V9m?%6t6D97%atjJc&wJ zxRdia2`dQJK)99cl~tID)rhep=3!l0qcJ2nj-N?4Rh@oO8r7#Ys#o18xZZ^mZAWeP!d16{Zez2DPJQE2dBY+GKimrG8V7 z&NI`@CVo}bIY~d@x0Ltq+yzeIk3_O6Y+suyiZ@8~jg_T4p_ep5E0rWk4U@ytPO?pk zD46t56M0iaV9=*kigpgzpFCxBH)j_-%yF#BljLW}osikprpQf2-hoX`mDe<>oE)6O z?jm}WrrT)QPTpz>0 za{S#X3AQztYXh7AM}x!E;0Pz|XgUH;o6{6>+tyyZ#4hTQ56tF>D2#8*kr;B@z N-6?WKZ&85!{{Y$zm>d8A diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/GuiHome.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/GuiHome.class similarity index 64% rename from production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/GuiHome.class rename to production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/GuiHome.class index 892dff2e3b381139bc28b2e42042eeb3219728d7..1a1a6d05bbd1d1779839b857271e7c455366878e 100644 GIT binary patch delta 163 zcmca0^+9UFXGXor`E2s+#mPmfsd>edg&5B==1hLTs0b6;#Kg+NXpEvph0T-EVDdvo z1(=%6y=;$}IRzLv83Y;l7=$KQa-HK9V=!QlWQb#sW$0m0m>j|#!>i1|%Amp^&7cY- q)h6%d&SsTk;AW7YtjiO~D#gIhAU*jekIdxxJf^JTK%NAUR}KJRpeg78 delta 130 zcmew$bwO&vXGXQjuNdVgOEaEfOqu+GQE{^%6AKHYHdxS>%>yj7j_naMryv6-gAfBB zgYe{;T<3Vj84MVt7~&Y@7|0GpI4BFsM(y%bm?C&%n)~Fxi(U bkX4$2pFw8wPac`c`*}=RC4f9hAg>$%Cc_`~ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class index 881ef92fac30d5a365b961c9f2e9e07f75714eeb..c3deed3f62b3c0576a43e83bfc3e8253080b3e40 100644 GIT binary patch delta 84 zcmaDV@m6BPR#ryi$?q7|H(zCSV&N2I;A9YD;A0S;tiZK^Q=GwoL7E|sL2mL%t{7fL o237_oAYYk5g+XPq5qCDL3b%7 delta 83 zcmaDW@l;~NR#rys$?q8DH{WG-V&N2K;A9YC;A0S-tiiQ_Qv-hZi<65|Q}c>9OEJD;VhowQhDQ-5H2DmV@@5Yf9cIQtWZ}(I d*~M56Uc#!QgV=5_3%tPt7F UZ+X5mG3rj{V^P@5D{w{-0RJKseE-07v6`o+mbsi}Fzo7GuV*;s`bSQ&&T2XZYIm0;jykYbQv pkY%;}|>oAp^#*;s`cSQ$hnM{+F|m1N*$kY@J)YQD<&C^(vIRKrc3G)B| delta 18 ZcmX>oxl?jOISZrOA$1+4%8 diff --git a/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java b/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java index 1075052..a983af9 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java +++ b/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java @@ -18,14 +18,11 @@ public class ArduinoControls implements ClientModInitializer { @Override public void onInitializeClient() { - // register configs - ModConfigs.registerConfigs(); - //message from mod to confirm that it has been loaded LOGGER.info("UwU from Arduino Controls!"); - //make verbose logger show that it is active - VerboseLogger.info("Verbose Logger is now logging."); + // register configs + ModConfigs.registerConfigs(); //blink LED on startup /*try { diff --git a/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java b/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java index 8157803..951d0f4 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java +++ b/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java @@ -3,6 +3,7 @@ package me.jonasjones.arduinoctrls.config; import com.mojang.datafixers.util.Pair; import me.jonasjones.arduinoctrls.ArduinoControls; +import me.jonasjones.arduinoctrls.util.VerboseLogger; public class ModConfigs { public static SimpleConfig CONFIGMAIN; @@ -17,6 +18,7 @@ public class ModConfigs { public static Boolean BOARDMELTING; public static Boolean VERBOSE = false; //needs to be set to false since the verbose logger is called before config file is fully loaded public static String EDITOR; + public static String CUSTOMEDITOR; //configList public static Boolean DISPLAYENTRYALL; @@ -47,6 +49,11 @@ public class ModConfigs { CONFIGLISTS = SimpleConfig.of(ArduinoControls.MOD_ID + "-lists").provider(configLists).request(); assignConfigs(); + + //make verbose logger show that it is active and print configs to logger + VerboseLogger.info("Verbose Logger is now logging."); + VerboseLogger.info("Loaded config file CONFIGMAIN successfully: " + configMain.getConfigsList().size() + " configurations have been set properly"); + VerboseLogger.info("Loaded config file CONFIGMAIN successfully: " + configLists.getConfigsList().size() + " configurations have been set properly"); } private static void createConfigs() { @@ -57,6 +64,7 @@ public class ModConfigs { configMain.addKeyValuePair(new Pair<>("fun.boardMelting", false), "Whether or not the board should have a flame overlay instead of being greyed out when not connected."); configMain.addKeyValuePair(new Pair<>("debug.verbose", false), "Toggle verbose console output."); configMain.addKeyValuePair(new Pair<>("editor.default", "ingame"), "The default editor for the board program. All valid default Editors can be found at: https://github.com/J-onasJones/MicrocontrollerMC/wiki/Board-Program-Editors#available-editors"); + configMain.addKeyValuePair(new Pair<>("editor.custom", "None"), "The editor to choose if 'editor.default' is set to 'custom'."); //configLists configLists.addKeyValuePair(new Pair<>("displayEntry.all", false), "Whether or not to display all entries. This overrides all other states except for debug and experimental entries. More infos can be found at: https://github.com/J-onasJones/MicrocontrollerMC/wiki/Pin-Map-Entries#list-of-all-entries"); @@ -76,7 +84,6 @@ public class ModConfigs { configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerWalkRight", true), "Display Is Player Walking Right Entry"); configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerWalkLeft", true), "Display Is Player Walking Left Entry"); configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerSneak", true), "Display Is Player Sneaking Entry"); - } private static void assignConfigs() { @@ -86,6 +93,7 @@ public class ModConfigs { BOARDMELTING = CONFIGMAIN.getOrDefault("fun.boardMelting", false); VERBOSE = CONFIGMAIN.getOrDefault("debug.verbose", false); EDITOR = CONFIGMAIN.getOrDefault("editor.default", "ingame"); + CUSTOMEDITOR = CONFIGMAIN.getOrDefault("editor.custom", "None"); DISPLAYENTRYALL = CONFIGLISTS.getOrDefault("displayEntry.all", false); DISPLAYENTRYPLAYERJUMP = CONFIGLISTS.getOrDefault("displayEntry.playerJump", true); @@ -104,7 +112,5 @@ public class ModConfigs { DISPLAYENTRYISPLAYERWALKRIGHT = CONFIGLISTS.getOrDefault("displayEntryIs.playerWalkRight", true); DISPLAYENTRYISPLAYERWALKLEFT = CONFIGLISTS.getOrDefault("displayEntryIs.playerWalkLeft", true); DISPLAYENTRYISPLAYERSNEAK = CONFIGLISTS.getOrDefault("displayEntryIs.playerSneak", true); - - System.out.println("All " + configMain.getConfigsList().size() + " have been set properly"); } } diff --git a/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java b/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java index d41e360..0a2fea9 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java +++ b/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java @@ -22,6 +22,7 @@ package me.jonasjones.arduinoctrls.config; * THE SOFTWARE. */ +import me.jonasjones.arduinoctrls.ArduinoControls; import me.jonasjones.arduinoctrls.util.VerboseLogger; import net.fabricmc.loader.api.FabricLoader; @@ -137,13 +138,13 @@ public class SimpleConfig { String identifier = "Config '" + request.filename + "'"; if( !request.file.exists() ) { - VerboseLogger.info( identifier + " is missing, generating default one..." ); + ArduinoControls.LOGGER.info( identifier + " is missing, generating default one..." ); try { createConfig(); } catch (IOException e) { - VerboseLogger.error( identifier + " failed to generate!" ); - VerboseLogger.trace(String.valueOf(e)); + ArduinoControls.LOGGER.error( identifier + " failed to generate!" ); + ArduinoControls.LOGGER.trace(String.valueOf(e)); broken = true; } } @@ -152,8 +153,8 @@ public class SimpleConfig { try { loadConfig(); } catch (Exception e) { - VerboseLogger.error( identifier + " failed to load!" ); - VerboseLogger.trace(String.valueOf(e)); + ArduinoControls.LOGGER.error( identifier + " failed to load!" ); + ArduinoControls.LOGGER.trace(String.valueOf(e)); broken = true; } } diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java similarity index 93% rename from src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java rename to src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java index 20a14a4..e99dd71 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java @@ -1,6 +1,5 @@ -package me.jonasjones.arduinoctrls.gui; +package me.jonasjones.arduinoctrls.gui.screens; -import me.jonasjones.arduinoctrls.gui.screens.ModSettings; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java index f1d4087..52fdd0c 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java @@ -1,10 +1,8 @@ package me.jonasjones.arduinoctrls.gui.screens; -import me.jonasjones.arduinoctrls.gui.SelectDevice; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.option.SoundOptionsScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.ScreenTexts; diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java similarity index 99% rename from src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java rename to src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java index 12d8429..0254bcf 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java @@ -1,4 +1,4 @@ -package me.jonasjones.arduinoctrls.gui; +package me.jonasjones.arduinoctrls.gui.screens; import com.mojang.logging.LogUtils; import net.fabricmc.api.EnvType; diff --git a/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java b/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java index 0ee2ce4..3d062b4 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java +++ b/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java @@ -1,7 +1,6 @@ package me.jonasjones.arduinoctrls.mixin; -import me.jonasjones.arduinoctrls.gui.GuiHome; -import me.jonasjones.arduinoctrls.gui.SelectDevice; +import me.jonasjones.arduinoctrls.gui.screens.GuiHome; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java b/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java index 4a7f753..861fb39 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java +++ b/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java @@ -1,6 +1,6 @@ package me.jonasjones.arduinoctrls.mixin; -import me.jonasjones.arduinoctrls.gui.GuiHome; +import me.jonasjones.arduinoctrls.gui.screens.GuiHome; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/resources/assets/arduinoctrls/boards/arduino-nano.png b/src/main/resources/assets/arduinoctrls/boards/arduino-nano.png new file mode 100644 index 0000000000000000000000000000000000000000..092d2b7aa02789500760e955c3c32948a96aa1ac GIT binary patch literal 2000 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arduinoctrls/boards/arduino-uno.png b/src/main/resources/assets/arduinoctrls/boards/arduino-uno.png new file mode 100644 index 0000000000000000000000000000000000000000..9050ec20378b658306340c5408e3699fa16dfa73 GIT binary patch literal 3723 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