From 45c1016105ad28640db2de8d3f5e1e04be01401b Mon Sep 17 00:00:00 2001 From: Ayutac Date: Mon, 31 Jan 2022 18:15:48 +0100 Subject: [PATCH 01/11] Removed unused GUI textures. (#2778) --- .../assets/techreborn/textures/gui/aesu.png | Bin 1855 -> 0 bytes .../techreborn/textures/gui/alloy_furnace.png | Bin 918 -> 0 bytes .../textures/gui/assembling_machine.png | Bin 1347 -> 0 bytes .../textures/gui/autocraftingtable.png | Bin 956 -> 0 bytes .../assets/techreborn/textures/gui/batbox.png | Bin 1516 -> 0 bytes .../techreborn/textures/gui/chargebench.png | Bin 1075 -> 0 bytes .../techreborn/textures/gui/chemical_reactor.png | Bin 1037 -> 0 bytes .../techreborn/textures/gui/compressor.png | Bin 1388 -> 0 bytes .../techreborn/textures/gui/destructopack.png | Bin 673 -> 0 bytes .../techreborn/textures/gui/diesel_generator.png | Bin 899 -> 0 bytes .../textures/gui/distillation_tower.png | Bin 1028 -> 0 bytes .../textures/gui/electric_alloy_furnace.png | Bin 1413 -> 0 bytes .../textures/gui/electric_crafting_table.png | Bin 1046 -> 0 bytes .../assets/techreborn/textures/gui/farm.png | Bin 1076 -> 0 bytes .../techreborn/textures/gui/fusion_reactor.png | Bin 1185 -> 0 bytes .../techreborn/textures/gui/gas_generator.png | Bin 1372 -> 0 bytes .../assets/techreborn/textures/gui/generator.png | Bin 1497 -> 0 bytes .../assets/techreborn/textures/gui/grinder.png | Bin 1093 -> 0 bytes .../assets/techreborn/textures/gui/idsu.png | Bin 1855 -> 0 bytes .../textures/gui/implosion_compressor.png | Bin 1034 -> 0 bytes .../textures/gui/industrial_blast_furnace.png | Bin 1028 -> 0 bytes .../textures/gui/industrial_centrifuge.png | Bin 1459 -> 0 bytes .../textures/gui/industrial_chunkloader.png | Bin 915 -> 0 bytes .../textures/gui/industrial_electrolyzer.png | Bin 1355 -> 0 bytes .../textures/gui/industrial_grinder.png | Bin 1517 -> 0 bytes .../textures/gui/industrial_sawmill.png | Bin 1546 -> 0 bytes .../assets/techreborn/textures/gui/jei.png | Bin 1034 -> 0 bytes .../textures/gui/jei_fluid_generator.png | Bin 1352 -> 0 bytes .../assets/techreborn/textures/gui/lathe.png | Bin 1302 -> 0 bytes .../assets/techreborn/textures/gui/lesu.png | Bin 1856 -> 0 bytes .../assets/techreborn/textures/gui/manual.png | Bin 904 -> 0 bytes .../techreborn/textures/gui/matterfabricator.png | Bin 952 -> 0 bytes .../assets/techreborn/textures/gui/mfe.png | Bin 1823 -> 0 bytes .../assets/techreborn/textures/gui/mfsu.png | Bin 1823 -> 0 bytes .../textures/gui/plate_cutting_machine.png | Bin 1318 -> 0 bytes .../techreborn/textures/gui/rolling_machine.png | Bin 1058 -> 0 bytes .../techreborn/textures/gui/rollingmachine.png | Bin 956 -> 0 bytes .../techreborn/textures/gui/scrapboxinator.png | Bin 981 -> 0 bytes .../textures/gui/semifluid_generator.png | Bin 966 -> 0 bytes .../textures/gui/slot_sprites/armour_chest.png | Bin 239 -> 0 bytes .../textures/gui/slot_sprites/armour_feet.png | Bin 242 -> 0 bytes .../textures/gui/slot_sprites/armour_head.png | Bin 258 -> 0 bytes .../textures/gui/slot_sprites/armour_legs.png | Bin 226 -> 0 bytes .../textures/gui/slot_sprites/armour_offhand.png | Bin 249 -> 0 bytes .../textures/gui/slot_sprites/cells.png | Bin 1458 -> 0 bytes .../textures/gui/slot_sprites/upgrade.png | Bin 310 -> 0 bytes .../textures/gui/thermal_generator.png | Bin 966 -> 0 bytes .../techreborn/textures/gui/vacuum_freezer.png | Bin 1416 -> 0 bytes 48 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/gui/aesu.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/alloy_furnace.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/assembling_machine.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/batbox.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/chargebench.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/compressor.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/destructopack.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/diesel_generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/distillation_tower.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/electric_alloy_furnace.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/farm.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/fusion_reactor.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/gas_generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/grinder.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/idsu.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_blast_furnace.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_centrifuge.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_chunkloader.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_electrolyzer.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_grinder.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/industrial_sawmill.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/jei.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/jei_fluid_generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/lathe.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/lesu.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/manual.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/matterfabricator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/mfe.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/mfsu.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/plate_cutting_machine.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/rolling_machine.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/rollingmachine.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/scrapboxinator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_chest.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_feet.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_head.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_legs.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_offhand.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/cells.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/slot_sprites/upgrade.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/thermal_generator.png delete mode 100644 src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png diff --git a/src/main/resources/assets/techreborn/textures/gui/aesu.png b/src/main/resources/assets/techreborn/textures/gui/aesu.png deleted file mode 100644 index d3c7436e1cea8a3272be2465c0b2cff3d1c1ea9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1855 zcmaJ>X;4#H7Je_hz#|wTIb#B!; z%Lxm>Vn`SO0I=*pziWmji&2xT5w?o*E$zCxq*d#bPxz>+9=9MMW(wEfEnB39i)*>FYlAbh1!C#}AjGJ%%bS(Xz zgJoxi@Btb57fG+i%y1DwEr=4Ii;_PfT1%q%H3U^nHJY&}y`mtKMD%z@O3zWzM+BwD zqiQnKr)iXTMD6+`qG^KGTe89IcAL9SR$Vs6_bre|;N4GY!xT4=mh{k)@G|dc z_fgRlQM)!n^eA1}o0j+{HC~Mel~#mms`13iy3!QaZ)^U7YVzEYIAe@`VL|LO$A2){ ztVZA_`ql+wY>x$@#{%i4n#>z*S|;c=?_#uiY;OzpZ)t8;SdoGc3N+T@?WQ8?b#1d9 zB^gYaY<_Q|uP{d>5=nl3enCM&Wo2bvUS4^5d2w-ZPEJmCcJ}e($2HCDST)~hI+z(A z_Gf@O-kZ1)#03ZV0R?FDKuw@44&0Xk0D6WS8+x}4_8QPfooDR~{ zd~7@0kHyXDpT3x!t?)D6oxskz(2NnfjT*Qde4r`qrxuji;CHQQ{uR%r|a08CnJyMlp=h zlcxSC{qS9X{sUEi-@C@>gV*JcC8LuMy)L^qoO$F`CS?rebtr00Fgdwj${u7cn9mN> zEk+OJ&UV0VYfpT*D?5mz)X)59MTN?dfDTvGwwRcLLgn&hIJU5m$JL65e)FFj-CqTt z2$%m;;v2x^Lf+pM@fr?7-g-sKiGz9eR?4gU<|7?Yws(lkMo-=H*Kvo0Q2gwJmZV+i z0rj$J8mRE-N1e}}A-O{pahScf%CHa7zUT_Gv&~wU7cZv!&&jsGZi7ER?pc2G^a>wU zA-Hx0eRw!^dO*#NYV696o^ke2wCK9o`gLH$vvv9wI}R*BvRSV};URsYS!J&Tyt(o@ z5|6Iwp5Aj2L9eQEKNMdn^&vAvDi||nsIsPOo!T& zPUQyCpS)`31mw9`%Si~16C&%#4ladVpg>tjCH$rBx-#U&Qk|DvZo3K5!hLI?ja8>$ z3Q#A7yQLiJ*ixu{WU7a0XJEE^6=Je-^1tz z@MH=Vv7R;xm7Ox)d)nG(W4#7m`q}ka{p5z<8m(t1EG;D(ghF*qxw58YafuQ6Ucgn$ zLd-1A0eAU(m;ha!#yMaNF6jIX<^;*wb2sjP$}hQ8^qb6(;vIH+`Bt?yTQ-KL+$(-& zzD|gP4Tzi@7OikW_ies)S-s#o-1-~}Ruls}!JZLDP?fG*E0^^R_$Fb6JgB>A*k;Fo z-TN)5sVO^J?oVU9odd&meR2zxx~f(1!g2XY{#}j$M6@FcUx-NCAip zfL~qS{I$920~A~w{KxFq0z--+CI7!!nsYLaR|twCd{mv$9@o)KtN&x|Uv#WQHLl(NTew4cEJCo+sH(f4e4l*$b=F?0FCLa?BrCa2_bXo3hiCX$Q;P zJKvtYv&-XUu;W#jzx$3Y7vu876)ZhI>^o-dbpLI2fpOXNy%S^4mNc-Re!tfKI^!u% zyDcjPK2*x_A8z-SU0`n`yECXl%qP7v^KvI&0E_q<4yyxM7vk$Y8SDHHd|tJ@YJ>WM zJHj7C;&!iO|IM^VD&Q1j9P^9+v*b=P#_>jYFg&+kwQu^sW!TC{~fH z-^3EK95RFj%F|lce&2KIO2Y*?g>?npI}Tm_%lfFlfBph%wrSP>c`rPR+)#7kL6^cF zz7U3|Q#VwdN!nF?@Rg;%Y28nS^27hLor<>AUb`)n@SBfe$D^~_T8s(LFYy3l3J5G% z7Tl=Yp3VLteEnO9NW*uASE)a?GxNUL+wisa|LI0HIfw+qhxLp=nGX)k=X*GyLI-*} zBn6@D21&v9yo?6gY*4;|cA6i@fxD*cC4TRMuE2OC7#SE^=o*;o8d-!GT38vITN#;a8yHv_7>Lg9 zo`a$xH$NpatrE9}lw-yUKn)Tg8-nxGO3D+9QW**oGxJLH@={9_O!N%&EOU(O{D5j0 NJYD@<);T3K0RS27Rbv1E diff --git a/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png b/src/main/resources/assets/techreborn/textures/gui/assembling_machine.png deleted file mode 100644 index 54894684f0c4526b46e38c102d418d658a20b985..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1347 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2jR8I(uGQ7mK<2Sy z$NvBS|3F&smYVDZCCPL0V(%n)LqkI^$cf#Q6@D$r_fLf5kg?8Z3Er!6qF3caZYW8b zo11rccYhM+`6bGE)Xw~bwMk7)%}H<9V@HqPR+gGMbLNa0GmhC?d=ulIHEY&+J+;SD z0&gVwUP|)cmKB*keR^$e?ZJZwfwqge=12iuz*rLG7tG-B>_!@hljQC0!qCAg>jC6& z7I;J!GcX7hfiPoSYV>2EAbW|YuPgf_b{Qd6X{Tl{ZUzSCxt=bLAr-gY&WS9)tsvkg z==EAP&|LFwdep9)fB)BS;Lr3|;;!1$!1L(dV)eN{8l?{y&!5n1=xZsF{DwogahY!W zv-u6P)6XY!YGnRdoBNL|V(ntC4NEuNG`SX)y?uMR*&>GMISsepxn5-oyXzgjwIMwA z`>(TQH<^Apx4AQ}{+(C*x$GrV8}lu9#`o{6e%I}d+SS0XJdbOG{M+T{qjy&@F8Wlk z@>N8`*7$v43I|rM3jWIZd}+VhRn%#^g|nj14EZ9m2wp6f`lq=3J>xwW4RgkYzV=NF^-5EwH$3=}%mLIY%K5?EIg*p3-@d8A z!FtZjhT07AJs}PTf~Pzk?0MeW8F1>&V_fK>q0g9GAbMpZ%eQOaa?j3Acw}{8HpkO% zrWPvEOpPuYnZZ=A^98#U7Q8Wb zn$E59uqVKa(RGfXm*#>NW2esV4S&vasEP(0dHnI`JcX-j3p$LQJ~uP4C@4&ANUoE9 zysJEj+u~8`g4g#P8JGkbfD#Oh91d{iMpl{6wzm0Xkxq!^403@vmG%yo?{LJTdejLof#%(V>+ ltPBi9XLrv*(U6;;l9^VCTSLk*V+D}2JYD@<);T3K0RVb6?ot2% diff --git a/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png b/src/main/resources/assets/techreborn/textures/gui/autocraftingtable.png deleted file mode 100644 index 1b6ee5dcfc6b6cddece9dab9a060b95bdcf699b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 956 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K588}#g)VJz{w?K*|-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5n3BBRT^Rni_n+Ah z4nJ2!SzUkJ3(dpdfpRr>`sfBX$`fRcWVYFK(cwZci7-kcwMx?{4fpY{26X zm^anaNOZZ^>w$I{frDBq!<|LSs5PGGBE5B=4d$2#PEXu!Q;yg(vII4b66N3n1Ws5 z@b~q!RoCSieq>4DbyY*}0&DXo1`QS@pCLR7a%LLCyFaJC2cI`#FSwun$KMtd8ic`S z#vPxv@B7;(E1z(i;NIX)SO-YO4USEMDJ1I%;XCkSejQ#g(&k<-8n_WI-&bt_5husTH+c}l9E`GYL#4+3Zxi}3=A!F4a{|oEJ6$|tc=aA zjLfwS46F~ XdIoxyImUHGqBngvVvOaTG~z2bTx^*AW4+sg)W*7wboQ> zV>#69RF;;RiduQ8yfm4*Udq(nB+JzGl6lDu7Z!iImmmAgoO#akKJR9=NT&!W?YA=kfK*2SWTyc5 zstd`+060PiU?LI#&q4r*NmuH2Y|<^{9ke}!Bb7>ZIa;k&E|<5owCvioi@{(_I}$55 zP(GSSDItn}sLkng|wTS=T#;nAaG-_ospDL=_Kxt1- zR8ryB7Dkn1+yac86UKH31@kcUMHurZj4ZV!POrDJ99Id)+NjW(=#l^)P6vDJQrpub} z#>(t>l8FX3c;fCnXO8K!#`jsn{kEjfMB}e`!{*J5HZPCo+c+)F&4YFpEnAq21fx!x zCcH+aIliu6q&3k-@qSBE&lbg8^%_KXyg@xXsrGA;$)$1_i-AEFe>b={bpA z71#53o5Gw;L8ih-yo>qlN1y6>8ZCvszEZEdmo(lHUooT3x(7E;!1XuBnFF4n~}@nr-2HqB2Z3F;gd( zex`wSfyFqxtP@P7X-+jq2 zh_{EVaL@P_ESwGSjgw)tRRcgeQh*Gad&|5Hg$&$L7|WFP+UfN0DB0(M(5ebALwnF$ zy}Z!3_7D`}b@aHNEU&13PVo4~XBTX{rs7#aQ)frPy(5p`>ZhsiGFjzo+8(0FA6tLW z?g^hF1)cYTCU_0_2Gr#3p_g5hKF0Uml9Sv9NYMZ!%XU)|?b6s_2bz`V{E$xr7Qo(m ztoAaL^edMEdOV6$%B$5!8y0%&%PaJ;`!!F!6Mb7LwQXcp!K{+cidmL!@qos*YdScu zK;7BQEsdJlqBqdNXM36mjS}&)lt_XMB6>@?@wiFn6X$J-m!a~yA=Fi#f@GEHE(d{h zb@)aBhMA=1>=d8IP2J_!LSyM05UE4LrCG5l|OJb8cXOmpIk9S0$J!t0f;PA%>)GCfN}8LtUhx5 zIo0-mAVF>9WHR)dD<=PpZVv}BXRkOWN_@aG`tSiA0XMoU(}m7(abt$KGCkcHo^Fhd mbh;;nYe~L;A{>W|bv{e*UX>HQDkpM7N%E68 z&o5EVqju&etW8dOyB<4w^tQ6pF?)+|V%+ET)E-L-ypiO4Dan6ZR>a)gyt})*va+(R zt*xV@W8S=Zb+xr_5rIrViy2FT{DK)Ap4~_Tagw~Fdh=h+RfVRobc9i<^OgsmRmCF{I+w+uJ9LZaIiJTnszS*}T^0oQ z<^TT^&Dul)mU?Vj5b%BH>Fq`G-flL|91CaoDYjIENGx15$M2}zgLhY7Z)8|j^3O=@ zJj3RnD;Ns3bj4hI439ni>ntOv;K%o1U)5yO18b_JH?viQhrYMh`OG@QHth56eo5w< zsuho(|I~RL{lNRruiTkmS3CUqr<~s~fB&lcr`N1+c=|Z_-gbvSliwCQNLT}1&%j`? z<=2*Fr&UxNo-NsQTE(&9YF2I0oo$|7471<9ER0rr$tZKK%p&hKi$fN}|8v{y^L_)> zeEp{%b2D|4)PbzcH`mRtKbSh*vx?#NVbQpxAhCTjsH_+p?={5m@>AZv$su zOBwUJhAn1J%yKO`a2RxxgLgNR&@B$$Ki?~iq!s7$GfepI_Tm~SvEl>|jxrp!`&M)I z|VIQB9e_|C@2@ZoG=bmDnXra=Y` zYd5UjFjs+rVSDL6ZiW^mJ+&*W3{De&{&dz@7Cb@4a}r(@wCyizBmd8*MjX4cfTpUJ zxJHzuB$lLFB^RXvDF!10LknF4b6q2g5JL+qV{ diff --git a/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png b/src/main/resources/assets/techreborn/textures/gui/chemical_reactor.png deleted file mode 100644 index 0da07bb4d32ace43101f42245c578e6b074e6654..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1037 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2`2jv5uGQ7mK<2Sy z$NvBS|3F&smYVDZCCPL0V(%n)LqkI^$cf#Q6@D$r_fLf5kg?8Z3Er!6qF3caZYW8b zo11rccYhM+`6bGE)Xw~bwaH0u*JDSI-d2`6W^eILjQhNv+G8n!HzA7e?7UoeBivm0q3PLj8~3quF1tOt<8S>O=~R3TIZ!i;gL(T{?NMQ zuI!K4WrS3votnM485o!)iCMWeYelz2^;5#D0pRV z%~DcIs;w0kW^yTHxPEu_Dn_xpuUAMt@V&mbcKg1ZhO?JH@g)@A)?I%u-pZjaXgBkZ zg3CvbKV1~p@Iz$&{xyq}8ameBf5rBr?)u+|@LIMt`SsWKvOWqA;Vamn#c-?r`Sica zK+iB(*gM=`?EU}onTiHwB4-^v2CsVfujsOG4=1k zX1`(FcG!;fyt$CI<^i?mWwYDk#fs1U{17O}@b*D$fgr=i-WxqT^tI#_+~zU_Gs(>1 znES_QM*1dJKHnC>k-mWmfwHY&YgRclv03^js|>Md|GlqSpo$#bY9?K*e}h( za6sSPxAiVNiX@P;?9j49X-y0aXR`mQGkEx};d;fwuySS1Urp1eQ&c=B;YT64`x(tv z_P>q~t$7DDOSQx`q9i4;B-JXpC>2OC7#SE^=o*;o8d-!GT38vITN#;a8yHv_7>Lg9 fo`a$xH$NpatrE9}lw-yUKn)C@u6{1-oD!MnYe~L;A{>W|bv{e*UX>HQDkpM7Nz&Zh zyt}*mlQ_>WQO=`w<|nL8YHDgudb=Jwdi1uk)XbSPXUv#!%--Ug827AMv(D?OJ(d!9 zBgywtlK-}>$n@#cGcq#jYHJT3JZM}TVGMKuV@Z%-FoVOh8)+a;lDE4HvmlSpCm@Hj zz$3Dlfr0NJ2s7@OnEe(g$X?><>&pI!T}DV%+Ns%#n}LCOk*AAeNX4zUvu~E&G7w?N zwbbS8+`X`5zj^5P8UOyXe`{2`5}{;hwn^vw9Gj0VYLj$$14LXc<+~Oc=ynNeto|8b z$FZa0W04MHu~dEPsd}cc>5I7xiXXmOWpYen^S*tC%3KDUg$rW$M{Q{c{d-F%>cH$> zb-(lGZf`iNSf-y)8XX_E=X`8~?Sfm}KMI0p_fKDahqWf_<9>$EH*0?GGP}twF!k>I zRohr4iofSFGR;|K6*|A+z5T2Cum7Ysblm>?f3Ec$#@Dywxg(es?GjdyWqh_hvVlQe zt7`qKOE;P2Rrxi2M^z-YdVC4h8{g>$QZhf zX->x~D^W|m1*b~+1wz%e{QC48=QhU3H$S?v^*rOhkSWjQ7F6jg-Lm6kOS)O4=X~#@ zd79<*hs%y0{;^p&!S=Mx4o)-6ye9Xq3kw_6&L2_G*sOnY|3s3#!rtwT`JJGTu{~($%nh*#{1$Kdu^*jQ%_c zER6q@OpF=JCNRVc&YI0&?a;8D!&Q94%^Y^l4a?sHHHgGF)MuO*PhhuYvv$?k)^Om* zZ;lP>?-}r_w$pk^e?lJ}Z1l-*P+Qmg|ZCbK(L7yCxjDq~|2avLv=;5r@Z4j-vt-+yt$D zAHVm{*JQ4e$;0$!PmzV3tV;r0CjG9cv1GcmgU{bh$u;AUBv4%v=LSx-@3IS7IX#we z_*M$}Eavd77CHCM+NqW$C9?)FK#IZ0z|cb1z+BhJ zBE-$XwgNz{-L1P>`6J fSE84fTB2a0XP{@9V_fG4RKwuu>gTe~DWM4fpyB8R diff --git a/src/main/resources/assets/techreborn/textures/gui/destructopack.png b/src/main/resources/assets/techreborn/textures/gui/destructopack.png deleted file mode 100644 index f2038bbe409fd5733664843b336f0eb108c44c5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 673 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+Jfy-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{53<7*YT!AzY{Qv*| z*s)`wp`i;IH2yPKb$56Fj|eX+Dw;EAPG4VNLqo%=RjX=hYRt{e8O?&dff^V~g8YIR z9G=}s196hP-CdZ{xNA~?9L@rd$YKTtAuwj_QQFB46l5>)^mS!_#4aPGD(%$l#SPS> z;pyTSQgQ3;osGGN92nXzer8iU#q^-bh?T{w6o<;Lo4k9fj`gr<9;V z8#;89pqjf+d~ah2GlcLOLUV+fe8N69B<=DFv{AUD#yI6;gVM?UDQupTR8UY*jy+QX zE0_4;Q*(h@RZCnWN>UO_QmvAUQh^kMk%6Iwu7SC(kwu81g_W_nm65r&fq|8Qf#~e+ zIVc)(^HVa@DsgK_IcBT?)F1(}Aviy+q&%@Gm7yRpGp|H1FSSI$M9)CaGRL^i52%L0 M)78&qol`;+0L&=S-~a#s diff --git a/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png b/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png deleted file mode 100644 index 9d0c356944a1413ba1cf3f8404c6dec8e73c22d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 899 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 diff --git a/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png b/src/main/resources/assets/techreborn/textures/gui/electric_crafting_table.png deleted file mode 100644 index c2438c072bcee8cbc39fd96f882a08a90c89d654..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1046 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 z zADOkDR5qd>-pA3DUsa#=rV2M((Y>02O;)Du;PF2=rR~(sZnYjcOc)%T;qQjjds?E< zX#G)y{%vFstX}2VP9>dO`IJVj<)YE44tL~s;lG8lE1~u#aeV^hFsQX|NISCC@fKQP zSyVfhEZn=RDyLMMS7CTI8-Ep3(d$6FaD1+lF#XFtB6Vq57R)hGqtz|fmjdtlr~T*9 z&Ib&({|mT93YW=Su3JfGjsge~&UXS=+Z+S9A^gu#rco=_+*Temo)1?V(;HQ)Cv+C-Dw|*@9*fAdOW5j0RVe$$D$PQh3z`>%Js$#i^dT_psTc~5^dx-D zOubN_h5cywKHC(GF2)IhIDw(_INW(bp~-=vykIUbi2E6b!{czA ztIKPqG~~)eQpx83ZV6;hO-P}C5^Lr`)dghvD+1*9-( z)oN8*lp=~#D53&FP^rPO&`uSkJd7Z36a~Udu+X5lmzjQ8oqlx9oLPIHz1H4y&c`kc z=K2}vS?B=(3mB3`z_nw<6@fOE(}eyzf&e&V2Y@UW zfMpcp=K!QI0GNmbfL#QD8FGUE%T`P~8yv{vV2lApQMp{+($W$d8p>j^rZ<|^InX+7 zOvmGeQzUH#4eqwke{BL#k+9a%|Z|F#b;@>J^NuvNfBwxA?;bo*-*KO^)wQMdo1KYg1gEBuUM% zc}6DO5+iC7{t3-!hG|#pxW3)ayxtmaOiWP2TJ03W%M|0s39$+)sUtJBGZmR46K*6U zjY%R^Ld@`isMn^@(0Wppt@*eHRRwaSQfYpEK3We73JOX}N>G%#jW5J-W=SQ$9t=r# za6^FCQ&r4rvTvK8FD{0d8HFWl68*!I0U+wH9>~+n_E+puM-mXk(HYUPG_j-j&;8=RreW$bTWW!c(Xm8KqvFMuG#056;OXH7#!@qd|?_zDJMmAtLPWp?{8K~ z2R&lsX^)?r|E=d>ddavmw`9C9T#6Puli#zW#Xh;S#2G4vbjjuAcDG%Aq600t*40}z zy}KijBb0|__k*pN4PDKP6js9?NRgu9DtZPU>3VEu-Rk?uLlwC69+5i#+<5U{w5ilGvy4{1w%w33zsYbd7giQ8b|$LF z5)_M0Y=gnDX_)QcZ5AdS-9IGbTglkzFA0F%bj{$}`~Ss{6sCBhFiS`bKw` zzhlo=m)OYmUO{weg?_@dBfh=*40kszqYcetzweV}t`IJHRh~Y@v_9OZdwf4QyyjwI z6Br-8Vof87nJCA>k?`!Zoz0cd2(u%^>!S_vhGBXSDEe)Gjmk^oWxjV^3lvWBlhJ&op)4MXT6RW>3V4ZFfWFNyIS&3u(?wh<3XW|o#tDM!YP z{|COQeWmTBnk^JZV+33oF7A#DmZPgX&&8eX#$vm&=nMv% z!5|gO&;HAhfJDW`NdMaq)#66O4Cbp7LXa3qnm`;45(RN0iIXT=LSs5HoVFZv%i>}h N5WwO3R{KQe{0&ZSC}#iw diff --git a/src/main/resources/assets/techreborn/textures/gui/grinder.png b/src/main/resources/assets/techreborn/textures/gui/grinder.png deleted file mode 100644 index 4878d08b9250f9797e54b5f3cb00888ba20a7c78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1093 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2`2jv5t~E6^K<2Sy z$NvBS|3F&smYVDZCCPL0V(%n)LqkI^$cf#Q6@D$r_fLf5kg?8Z3Er!6qF3caZYW8b zo11rccYhM+`6bGE)Xw~bwaH0u*P};|-d2`6W^eILjQhNv+G8n!HP1n%tR>`56z_=A`_K^POW9+k?##YrMXmS=UUMXGkIP5rUd1^<=Me5pxtonT*I8t zQVOmoEzK*~)^J?wZ@6}@;o;$;UDYfmzvL!-{!qJ0-zl|PY0qol4;=bOw)(d0N)Ep* z1`IBTs|=NEE^#?XYBH|iPPi{L&+foH=?sYn#toT_PxjOt6Vni8xKW$^o53rxR+nF3 z6|=<7|F#UNwa-%>GPn~;6MuxgiepUvZqHXxuDFOtdtqL~(|5ri3>glGS!A&G__h4g zb7KT{)aM4nxhIRRW{_S43e!1Ty6;J%= z>^FARk5w<)^$p$w4O1;~jVMV;EJ?LWE=mPb3`Pcq7PmdKI;Vst0CFaQOaK4? diff --git a/src/main/resources/assets/techreborn/textures/gui/idsu.png b/src/main/resources/assets/techreborn/textures/gui/idsu.png deleted file mode 100644 index b45cd63a65a79bfe2b4786576884ed413bb64540..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1855 zcmaJ>X;4#H7Je_hz#|wT17kty|wY=brDox6Z9P zr#KNoSPTgR005R991sZrpwGmu~@9OW^HY)q@<*+tt~1liosya z*qhWjk$Wll$uz+<0ez2*^pQ4bjDa=b>tLC_&jFfxUgl7eZ zdk>4IiMsV!qWhV`{*2^T>4_RVsI(!}QcWjU)|BSBL3_)mRI?}6#2HiUQ!C zh`$2NiT>pEAR#m;04PFR25SR-aqylj05Hy8-{5evb)GhT)Jwy4J(ocg7}}Koz$yFB=O(;e)@bT_Q%se zZoEfMO{7n;8`RA)FnD}u9u;wZPfXn2YZB*OeLY8BJsiD1r+mB6Q%j~6fhT)z}ICJ_m)YFZ|ylFUHYYDtG8t+CNcKV~59g&%l5PLi`Y-{*$r{(6#L zAx-~D`tIAo!n^9hfj7;u`>)6!NXDk_`CRa9I(grxLdqB}=u*_1Ve;}nRou;9u$&!g zSd1OcpY4J@K0oy1u52TYQ9tq@mlP{UgSy;NTjJu1ij~V3;P~QV9#49 zXgs>ESGDULf?ieUzbn01?nCa=jPGI_9vEKf{VJ-NKk4i3h*N4_pV>@SXbu|Q(1?=R zOs|)k@qnF7ucOgZ0l(_~QvZ!t4%Lp#Sp5fNaSM5FL>t@-fQ1-wL_e3;C@sfR=xD^G z`SnUjH-Q76=o;g*z=nqWQIy)t6SZ1-TKb#X8J=svH8G=@^3N~h5Aw+5RQYLXd_?o` z4NM3OJ2T6OHyY$41LoN%G^iP&uy!&h#Yiwl+%hazJi83CSkgbdn@g>wtQog^u5_p~ z<#>Jw{o(UgPEdiHt(=75IAOA`+|Y8^4GNZpRl}b;t|-HvE;abb<@Os89o#oYx>!vb zrU-RRxKqlZjxW{wA4vs0PnDe)$`h!_hfe5#o!?7aljtzn@xRB!IpL;Cj~(2+<$D<2 z1RhJHBDN}%aM^Lw-6w4Q*4GQ*S%AZU&CeeA&9Md!!t!#WQ8?7lk}qpX6_=TiZwFnn zF2>B_oNyPuhY8Rn70wA`bXM;>m=hxF%wNC%5x?ww$?q~_if_b;Cy6}h(f>UJ~A-mL_zo1W-b?q2%hM54$ND4q? z0Q}uXB!B7ZqY16xj_n~%-QHg~f6|ZSNAlfS z5SiCD=nI0o?UvN>C$GPQ9T*XC I&5w8d-vO}Lxc~qF diff --git a/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png b/src/main/resources/assets/techreborn/textures/gui/implosion_compressor.png deleted file mode 100644 index 7807506387354161a81491a745dcb131aebebd60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1034 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 BOyK|k diff --git a/src/main/resources/assets/techreborn/textures/gui/jei.png b/src/main/resources/assets/techreborn/textures/gui/jei.png deleted file mode 100644 index f39c055d9ad8c5496d00d9b7442842be5d2cf0c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1034 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+Jfy-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5L<4+6T!Hj|FzD{? zX4u1EZf@S+-!B(?@+MG%sU*lRn1P{e@>vTYk1@&H-G%W#lkPnrhqJ&VvY3HEC>Mko z6Zbzg1`4v5c>21sKVp{=Qk8aU_TmPbaNg6!F{I+w+c~~@hYSSVVtIZSF}obS*L79; z34=$6+=A|V|2bj>wsZP0&6`>A>GR%HmWzjz``>!@6eoY!mj95)K)hgfvXaH~Ik&I9 ziH?=lt7I}Poc3>;ck$w^JSN}6H#zU@3wL~=wqb2{OTrXoz(< zUSTryc+Mp6%4FB&EYQ4y|HuT*2f@oM|NLj0=kUv6nZxa+JDq2&WH4som+X^m`scUf z>@4n-xfA5tEEhYN@w^olR9pOr=}4Dna{Px0awolAueI=$uu6m)z2QE?8X(``uqp7SNSwBy) zoN+ej_0y1Uv+H7Q>C|8=f=6y5)MyO~rsX;b-Me zsf~XUE$$f3vs*k-eUYJ-hCsssAJ(!pRSnA+R?9hXg}gOMQarGl-@zfU;kXa0$m*BB z@{NFwO1+W zcUPOA#m>Zxc^wAgC7UlFKfQj6UXCXlBZmV6lj_IE>d_9HER8PSTAp7wW6pHtg4Bf? zACCU~dtab|fkk113gf+$9ZOE0h&T{GGlLVD*nq%6$tHKXf`WA}J7e6A!`e*NfBPnW zulmnnS_^bagI#KIb@sjvhT3x)ZAFR;{Gyh!X(&0&HTC8-*yQj&bN9jev(b|pDmj*2 z`Ne$0gOTkEbUm+5$&WsS4XWrx^;AZOU_cRt9PAkFFrO!^F}C9V-ADTyVi zR>?)FK#IZ0z|cb1z+BhJBE-$XwgNz{*?y}vd$@?2>|sef7}27 diff --git a/src/main/resources/assets/techreborn/textures/gui/jei_fluid_generator.png b/src/main/resources/assets/techreborn/textures/gui/jei_fluid_generator.png deleted file mode 100644 index 6118ffee9afb9527333340be9900e504a9a780ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1352 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 K@~v}7#(w|{!S0R# diff --git a/src/main/resources/assets/techreborn/textures/gui/manual.png b/src/main/resources/assets/techreborn/textures/gui/manual.png deleted file mode 100644 index 2724bea30907ea5331edfba06b5b497b56d4477a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fq6j;1lBNUf=^{&YCsr*s)_A z92`PILO`yvvN8`350C)_|NsA=IdkUu^XCs8I&|mGouHr~F)^{o$Ve|QFB21!V+&x0jTZBqk=-8y?yO)WcO0Z8zk5&3-N?Yebl=m(F{I+w+ncw` zW;rl81V*WBxiaIUkjel5i*vIgnqov2nWlcLyrend%sURJNh*;~j585&<@D+ImRgRaw&7!gc$3h!;=$g<<6duxPL&w;cc?* zp8D#^7ot-CDwngon0d*fVawmnok^1gl^GanavKUH6=DqUe&A@>H@WV9=RdLVMzaH^ z;`ghWMdq_`)Uxj>Nz`4p=LgdV!2+QYNfw3&+4p#sZr>^Cwf~6t!oux`nbp4-Za>V= zwBsQ2#Al~Z^1H~f6g0ahrRy)Z6Z+lGa5jDR{927$zm8|}yPoH}{5RNEj2#?ZgNis{ zd;0p{x2HH5t{ruFZB*2tq_51b@#zNRH3o(=G6_Ee>*jpeR#o4@x*)53&WG%;`+CF^ zLicS4lHb2aCkX00$X)l`kj%=^A(Ie4|G&|()edp<>wE4qfBX9LI7fhPqw~yToIom8 zO55RUXo94!LoKHZ=Z00fjTZ0Ovb_~9-F|pks6*tz78WJu3h&w83G%!LzWq49!1-%k zea-%_+YeqXX?SkA~bp9zYIffk$L90|U1p2s75F#7_hY zvX^-Jy0SlFml0Bxc53$GW?*1a^mK6yskrs__Q{~z4k8X0uVr`SHX2Qw*t6x+|NAq1 z_b|-v5eD#Bw*DMR4DD~j0$=*uqXRHx-eO`B$cQW3K_y3r<*QH*BkZvWDU7 z6^6HtrQc6fGG4SjID+_G{U6mr2*w!JGfW zCFU((7(h(c4d35fVm1kHNN?EQP}(qc!CnWhhWN5(H75{cV37Ie@pC%+Nn-|!Uza6- zA&dZDECgTiKkx*lCj{VTmiZ+5XOFudZ^40W|M$2fWS}f>r~;psJ4_go!ivI*+c88B zxV+$C_|MD4@Zfx4aN=up`2!(0LT>m7Ff=SL{in{L;hbajiiIK7qwXIlB2_#m;YU-p z-Pd~*vPeltC<YKdz^NlIc#s#S7PDv)9@GBC8zH89sTvIsG>urfBcGBVdTFt9Q( i5S`sU2Sr0}eoAIqC2kEV$BY#~PWN>6b6Mw<&;$S+6GEQ= diff --git a/src/main/resources/assets/techreborn/textures/gui/mfe.png b/src/main/resources/assets/techreborn/textures/gui/mfe.png deleted file mode 100644 index 95786b7c041da50ad0d13c6f77019361286e5291..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1823 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 LtDnm{r-UW|Z&%n| diff --git a/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png b/src/main/resources/assets/techreborn/textures/gui/rolling_machine.png deleted file mode 100644 index 0393182c90fd2dc0574b1c4b14dd7702bed4ad05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1058 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 A4FCWD diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_chest.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_chest.png deleted file mode 100644 index ae52fd808d2ec1a286f569c4516d5cc403303a88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=BerAk6srPE{XJkiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`IgB!CEe^13*QQo-U3d7XEj80=W(-@Hp>Hd0#)J$3k~5%gSB-8`%XjFNZV8 zxblS;*)tj+)>#`?$r0ixSgm(LrtiZu=O()q^I7)(Ue}PKvhlM!<4n(Eb43KiLT}wF dJXjZ?_nlwk+2oLU3xJj|c)I$ztaD0e0st)iN;d!i diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_feet.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_feet.png deleted file mode 100644 index 774a4147186179cae18bdf6eafd4627751c59017..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=BerAk6srPE{XJkiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`IgB!CEe^13*PFo-U3d7XEL0Zu1^c;9-t5`rV(DV(OyNf9a6Ex@4p0Iz|hx zsDCGmb0%@Quqa0@mE~mGzvTL-I#xe}`UzQ`J=;0|FjNW)lr2qARdFgTe~DWM4fzMDwM diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_head.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_head.png deleted file mode 100644 index d2d2f4df1b8d1d758e87a45ffe569bf316db4d0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o3$K$tNuHTp47kiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}z zd16s2LqTF@UWr~_YKel0o`IgB!CEe^13*Rbo-U3d7XD{@xVah(c$~{m-utgH^~9>g zV;eM^_?@=b#hpGAKJo0-IsL9{6qJIN_Lt|eK2|zxtXXi}_3fXShEqoW!nZQDi!!J` vyjjk)KqdJ+7XzQg-r52|o8Fvr>bKcgWBVGkYi*VStzz(W^>bP0l+XkK_vBG6 diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_legs.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/armour_legs.png deleted file mode 100644 index 6ebae576a2b96e54a3fc412f51e58c65f55af1f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=BerAk6srPE{XJkiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`IgB!CEe^13*PSo-U3d7XHaU{{Odkl~}EyDKV9qW#Phw|34;9kP@*yAv1%i zhG7X?-}^+%XiJA8 P&|C&jS3j3^P6!lvI6;>1s;*b z3=BdAAk3&Zdqx&ekiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`IgB!CEe^13*Q|o-U3d7XDj%4)PvQ;9-uO^w-^UYWqatJ0>e06$)AA@EiYb zosw`a)9>3EwSY&9iV|$^G0mJ4EwqT+>Y;@q&xRKVA~pB#Fn&jV&bErx?aEU_dV+SzB`@G z%g2wMI;Lsb@%Bb@OU@_M_+(lB&%8WBa{4si_^#Bn&xIOGzb9wLn)dN&*4-7m@fC=9 zY9hjW)EuX|L~GiGwQ-K{9u=TR`z#CfzkYtI14cr9XEnCtJfZ`(aahpp!_6)}+`|FU z*Dit!V<-tyDi9c_!>okkP@nKZxmL%P4ki$>7wYRuA=r&OAmRlDtEO*Yr{;osU^>1X zxV5i=Yddwzu3L_0*bcOP=mlW*=~7!k61dg;W~NK-LVX}a4lQdm8kr-{7N6KHH?<;t9)NlRR?Tri#i#fW-*Uxd1}bm~HySF~9<3zH0(HAcDRn6`3h z0wlP?<@?2OqMTrh4rxj=QA(^+VeB+v?Wa|6{Tq1kZ#NZ z@sz}0!4|yRKOY6MF^L7+<3ZAf`yePLWUjpq`(fBhYtTF!HGT5 z{@a4dDn!E%=25k&(g$v^Qah4Kx?;WV<>YRm#OH9?H`KCfSaMUfJetWqSICC; zcYWusYKHCRdbjZ_esy%T_R-m|e!4aoytw)O{U4T|fAQzNA0ID0f4KRZMp`eHPkg!j oXu0!DyZh++AKUsb5AJk7(+u|X>Zy|}w^dhdw>FzkE?v9z4}P=AP5=M^ diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/upgrade.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/upgrade.png deleted file mode 100644 index 0f69c497bb7d607aee8d4245669be854fcca4014..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=BdAAk3&Zdqx&ekiEpy*OmPNmmoi%%Ed@=X`ql~iEBhjaDG}zd16s2LqTF@UWr~_ zYKel0o`IgB!CEe^13*O!JY5_^Ec~}la^yR#z{4{6(z3sz;dTdRO5cC*a-H~1Eupf2 z=+vd6DI1S|f3eS)f}PJYD@<);T3K0RWPi BZ%64nJa0`Gi<67mtr9eUU5>H=O_DAe8LaNeE&0gF-`)z(NXB3+pT~aA0kvu_uY3212soiQyN^J^zmrZGw zIrHCX`L+fYvt{*~)0Nh(IV*8sx1{$Q3Bl!W)-%mE_#1lLf|bdEfrEijfq|ugL4bkD zfnm*Ev-gK@|F>M!JvY)v@_^lBW@+_pzmxAAl#X1vo}pHZz07puJ4Ucln7$Qe4R*g? zB-d=+WM03O^+H|k%s;QDH-s^j>M?G=|M%J()eX9DzyJHUn{Grna5u7mj_j2a1<@Uj6MHl@2 zIGNogf@y_%L*1vju5s)qY8f-?BZVST8RiLwR5HX(FX4xJ56P;8zLT>Z&)3NO&N*|~ zaQ7tUif4~+q$kVuX}<<{rA2&<$oh8xM@!prGjODDn@jDJH zw==v^x3x-aW#k8HQ!R0g zC`m~yNwrEYN(E93Mh1o!x(4RDMiwE47FNdQRz~L91_o9J2BNdO=b&iF%}>cptHiA# z<(RPoP=f@>hT#0PlJdl&REC1Y%)Ao4ywnl}6Fmbx%N*l6KcE^0Pgg&ebxsLQ0GeMU A4FCWD diff --git a/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png b/src/main/resources/assets/techreborn/textures/gui/vacuum_freezer.png deleted file mode 100644 index 9b17dedd0050d60387fe85fc33c17ef9d6b90f4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1416 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2)d4;su0R?HjvYJp z|Ns97(t@|tWG^U5o|6}QC&3#U8hSxa?53>nYe~L;A{>W|bv{e*UX>HQDkpM7Nz&Zh zyt}*mlQ_>WQO=`w<|nL8YHDgudb=Jydi1uk)XbSPXUv#!%--Ug827AMv(D?OJ(d!9 zBgywtlK-}>$n@#c>uPH^AFYo7+Ra!J@q^C(oW4@+zbrNM?75|Ln>~)ogH0#%Rs>GZD^E`P}Ss1 z(W`u~M*sM~e*?eS!=%as2{xNb&ZQ(A^M8@Db&{P+Xz16P6|20yt#Dgl_IcqwjvbYs z%XAovrS?zUCAwjUY-q!o*4?|KTwJDo=Qmo!FmrCh@2k5PvFe1qUz))vAGW%G{f5v8cT9H})3hI)KJ2yco?emohur>H#!s>H>U31A8RKd{FJJYW$z@)> zn1aHJtbkt5A787#rq8Trt&pGfzn-IAbVJRb=mR1jR`oL67gYGagn{wk>g(d6U+2ng zI2f}|@u{3Z$kl4ziCh_WTMfgGJkfIa>e~EEU?oFxkD#Ga*b#}@YZ=zBTJ@^=zVHRP z-rkMJB-G7rb8*~TofYuDoF!*7(T1nFT*K>wb7pW%RZ*D5u~g|n z1ZTejP+C>_!3hR80RjJ(OX43)<~2kpg-mM5P%_!ckbPa;hq2s~zeCOGGIt06+Zhbc zXN8w5B)%}Z;n}iG?1J$>Wu`l6Pu5K>h~w{2bt)FPV3TqG&P~w?M-o@$|M|-lC*QGS zo6tGo3C9X=>?+;EJx^)DT(0y`hkPZIwG6N4M7noBXwg)-9a-SUx@00pWO`NFK~CR- z<$~wRxz@P8xp_JvopVN_uuZl6h3&#poA^DH1UK0x&wgMq#Y1U}TomKtxvW8+Ep2%% zZXy$kltki}b9=R@bsV|m*PZy5!OF zqiPPfQ0HAitz}F*l#j?NzT+r#*EnwN)LhnNc~4Mkm*}~7eHR26Bh{Rms~q||FDy75 z03;O{E!CWySyEk#l#m&L2ZyM~`>PP0ptJx From 7082238357e6f38b69f4678bfe85104ac6d6ad88 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 31 Jan 2022 18:24:51 +0000 Subject: [PATCH 02/11] Fix rolling machine crash. --- .../tier1/RollingMachineBlockEntity.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index e401bfe48..0dad494e5 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -70,6 +70,8 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity public RebornInventory inventory = new RebornInventory<>(12, "RollingMachineBlockEntity", 64, this); public boolean isRunning; public int tickTime; + // Only synced to the client + public int currentRecipeTime; @NotNull public ItemStack currentRecipeOutput; public RollingMachineRecipe currentRecipe; @@ -392,7 +394,21 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity .onCraft(inv -> this.inventory.setStack(1, findMatchingRecipeOutput(getCraftingMatrix(), this.world))) .outputSlot(9, 124, 40) .energySlot(10, 8, 70) - .syncEnergyValue().sync(this::getBurnTime, this::setBurnTime).sync(this::getLockedInt, this::setLockedInt).addInventory().create(this, syncID); + .syncEnergyValue().sync(this::getBurnTime, this::setBurnTime).sync(this::getLockedInt, this::setLockedInt) + .sync(this::getCurrentRecipeTime, this::setCurrentRecipeTime).addInventory().create(this, syncID); + } + + public int getCurrentRecipeTime() { + if (currentRecipe != null) { + return currentRecipe.getTime(); + } + + return 0; + } + + public RollingMachineBlockEntity setCurrentRecipeTime(int currentRecipeTime) { + this.currentRecipeTime = currentRecipeTime; + return this; } //Easyest way to sync back to the client @@ -405,8 +421,8 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity } public int getProgressScaled(final int scale) { - if (tickTime != 0 && Math.max((int) (currentRecipe.getTime() * (1.0 - getSpeedMultiplier())), 1) != 0) { - return tickTime * scale / Math.max((int) (currentRecipe.getTime() * (1.0 - getSpeedMultiplier())), 1); + if (tickTime != 0 && Math.max((int) (currentRecipeTime * (1.0 - getSpeedMultiplier())), 1) != 0) { + return tickTime * scale / Math.max((int) (currentRecipeTime * (1.0 - getSpeedMultiplier())), 1); } return 0; } From 831dcf0ccb4381fcbcb3a1923e0f8cdebbcfa0d6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 31 Jan 2022 18:25:24 +0000 Subject: [PATCH 03/11] Beta 8 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f00992680..618315052 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G # Mod properties - mod_version=5.1.0-beta.7 + mod_version=5.1.0-beta.8 # Fabric Properties # check these on https://modmuss50.me/fabric.html From 100579c288614a75289ae583ba0398f44581b3d4 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Tue, 1 Feb 2022 11:53:11 +0100 Subject: [PATCH 04/11] Added two storage blocks, textures by Xanthian. Thanks to Ayutac. * Half of 2 new blocks, other half is a lot of data/model files * Rest of the data/asset changes for new storage blocks. * Bugfixes * made hot tungstensteel storage block opaque --- .../techreborn/blocks/misc/BlockStorage.java | 10 +- src/main/java/techreborn/init/TRContent.java | 16 +- .../advanced_alloy_storage_block.json | 5 + .../advanced_alloy_storage_block_slab.json | 13 ++ .../advanced_alloy_storage_block_stairs.json | 209 ++++++++++++++++++ .../advanced_alloy_storage_block_wall.json | 90 ++++++++ .../hot_tungstensteel_storage_block.json | 5 + .../hot_tungstensteel_storage_block_slab.json | 13 ++ ...ot_tungstensteel_storage_block_stairs.json | 209 ++++++++++++++++++ .../hot_tungstensteel_storage_block_wall.json | 90 ++++++++ .../assets/techreborn/lang/en_us.json | 8 + .../storage/advanced_alloy_storage_block.json | 6 + .../advanced_alloy_storage_block_slab.json | 8 + ...advanced_alloy_storage_block_slab_top.json | 8 + .../advanced_alloy_storage_block_stairs.json | 8 + ...nced_alloy_storage_block_stairs_inner.json | 8 + ...nced_alloy_storage_block_stairs_outer.json | 8 + ...ed_alloy_storage_block_wall_inventory.json | 6 + ...dvanced_alloy_storage_block_wall_post.json | 6 + ...dvanced_alloy_storage_block_wall_side.json | 6 + ...ed_alloy_storage_block_wall_side_tall.json | 6 + .../hot_tungstensteel_storage_block.json | 6 + .../hot_tungstensteel_storage_block_slab.json | 8 + ..._tungstensteel_storage_block_slab_top.json | 8 + ...ot_tungstensteel_storage_block_stairs.json | 8 + ...gstensteel_storage_block_stairs_inner.json | 8 + ...gstensteel_storage_block_stairs_outer.json | 8 + ...tensteel_storage_block_wall_inventory.json | 6 + ...tungstensteel_storage_block_wall_post.json | 6 + ...tungstensteel_storage_block_wall_side.json | 6 + ...tensteel_storage_block_wall_side_tall.json | 6 + .../item/advanced_alloy_storage_block.json | 3 + .../advanced_alloy_storage_block_slab.json | 3 + .../advanced_alloy_storage_block_stairs.json | 3 + .../advanced_alloy_storage_block_wall.json | 3 + .../item/hot_tungstensteel_storage_block.json | 3 + .../hot_tungstensteel_storage_block_slab.json | 3 + ...ot_tungstensteel_storage_block_stairs.json | 3 + .../hot_tungstensteel_storage_block_wall.json | 3 + .../storage/advanced_alloy_storage_block.png | Bin 0 -> 435 bytes .../hot_tungstensteel_storage_block.png | Bin 0 -> 426 bytes .../data/minecraft/tags/blocks/slabs.json | 2 + .../data/minecraft/tags/blocks/stairs.json | 2 + .../data/minecraft/tags/blocks/walls.json | 2 + .../blocks/advanced_alloy_storage_block.json | 19 ++ .../advanced_alloy_storage_block_slab.json | 19 ++ .../advanced_alloy_storage_block_stairs.json | 19 ++ .../advanced_alloy_storage_block_wall.json | 19 ++ .../hot_tungstensteel_storage_block.json | 19 ++ .../hot_tungstensteel_storage_block_slab.json | 19 ++ ...ot_tungstensteel_storage_block_stairs.json | 19 ++ .../hot_tungstensteel_storage_block_wall.json | 19 ++ 52 files changed, 983 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block.json create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_wall.json create mode 100644 src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block.json create mode 100644 src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_wall.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab_top.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_inner.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_outer.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_inventory.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_post.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side_tall.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab_top.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_inner.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_outer.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_inventory.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_post.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side.json create mode 100644 src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side_tall.json create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block.json create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_wall.json create mode 100644 src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block.json create mode 100644 src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_slab.json create mode 100644 src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_stairs.json create mode 100644 src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_wall.json create mode 100644 src/main/resources/assets/techreborn/textures/block/storage/advanced_alloy_storage_block.png create mode 100644 src/main/resources/assets/techreborn/textures/block/storage/hot_tungstensteel_storage_block.png create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/advanced_alloy_storage_block.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/advanced_alloy_storage_block_slab.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/advanced_alloy_storage_block_stairs.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/advanced_alloy_storage_block_wall.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/hot_tungstensteel_storage_block.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/hot_tungstensteel_storage_block_slab.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/hot_tungstensteel_storage_block_stairs.json create mode 100644 src/main/resources/data/techreborn/loot_tables/blocks/hot_tungstensteel_storage_block_wall.json diff --git a/src/main/java/techreborn/blocks/misc/BlockStorage.java b/src/main/java/techreborn/blocks/misc/BlockStorage.java index a11a9170c..6e86f1086 100644 --- a/src/main/java/techreborn/blocks/misc/BlockStorage.java +++ b/src/main/java/techreborn/blocks/misc/BlockStorage.java @@ -31,7 +31,15 @@ import reborncore.common.BaseBlock; public class BlockStorage extends BaseBlock { + public BlockStorage(boolean isHot) { + super(isHot ? getDefaultSettings().luminance(15).nonOpaque() : getDefaultSettings()); + } + public BlockStorage() { - super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL)); + this(false); + } + + public static FabricBlockSettings getDefaultSettings() { + return FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL); } } diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 59ad2c61b..1531fbe32 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -491,10 +491,10 @@ public class TRContent { public static final Tag.Identified STORAGE_BLOCK_TAG = TagFactory.ITEM.create(new Identifier(TechReborn.MOD_ID, "storage_blocks")); public enum StorageBlocks implements ItemConvertible, TagConvertible { - ALUMINUM, BRASS, BRONZE, CHROME, ELECTRUM, INVAR, IRIDIUM, IRIDIUM_REINFORCED_STONE, - IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, PERIDOT, PLATINUM, RAW_IRIDIUM, RAW_LEAD, RAW_SILVER, RAW_TIN, - RAW_TUNGSTEN, RED_GARNET, REFINED_IRON, RUBY, SAPPHIRE, SILVER, STEEL, TIN, TITANIUM, TUNGSTEN, TUNGSTENSTEEL, - YELLOW_GARNET, ZINC; + ADVANCED_ALLOY, ALUMINUM, BRASS, BRONZE, CHROME, ELECTRUM, HOT_TUNGSTENSTEEL(true), INVAR, IRIDIUM, + IRIDIUM_REINFORCED_STONE, IRIDIUM_REINFORCED_TUNGSTENSTEEL, LEAD, NICKEL, PERIDOT, PLATINUM, RAW_IRIDIUM, + RAW_LEAD, RAW_SILVER, RAW_TIN, RAW_TUNGSTEN, RED_GARNET, REFINED_IRON, RUBY, SAPPHIRE, SILVER, STEEL, TIN, + TITANIUM, TUNGSTEN, TUNGSTENSTEEL, YELLOW_GARNET, ZINC; private final String name; private final Block block; @@ -503,9 +503,9 @@ public class TRContent { private final WallBlock wallBlock; private final Tag.Identified tag; - StorageBlocks() { + StorageBlocks(boolean isHot) { name = this.toString().toLowerCase(Locale.ROOT); - block = new BlockStorage(); + block = new BlockStorage(isHot); InitUtils.setup(block, name + "_storage_block"); tag = TagFactory.ITEM.create(new Identifier("c", name + "_blocks")); @@ -519,6 +519,10 @@ public class TRContent { InitUtils.setup(wallBlock, name + "_storage_block_wall"); } + StorageBlocks() { + this(false); + } + @Override public Item asItem() { return block.asItem(); diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block.json b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block.json new file mode 100644 index 000000000..2c1d6f58b --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/storage/advanced_alloy_storage_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_slab.json b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_slab.json new file mode 100644 index 000000000..f9bb2bd9a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_slab" + }, + "type=double": { + "model": "techreborn:block/storage/advanced_alloy_storage_block" + }, + "type=top": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_stairs.json b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_stairs.json new file mode 100644 index 000000000..92baa53f1 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_stairs", + "x": 180, + "y": 180, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_wall.json b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_wall.json new file mode 100644 index 000000000..007293cf5 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/advanced_alloy_storage_block_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "techreborn:block/storage/advanced_alloy_storage_block_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block.json b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block.json new file mode 100644 index 000000000..c0b2e085f --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/storage/hot_tungstensteel_storage_block" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_slab.json b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_slab.json new file mode 100644 index 000000000..0503ae55e --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_slab" + }, + "type=double": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block" + }, + "type=top": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_stairs.json b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_stairs.json new file mode 100644 index 000000000..8c0cf5b38 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=top,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs", + "x": 180, + "y": 180, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_wall.json b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_wall.json new file mode 100644 index 000000000..a1eda937a --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/hot_tungstensteel_storage_block_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index e07304ac0..e92dec290 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -150,6 +150,10 @@ "_comment3": "Storage", + "block.techreborn.advanced_alloy_storage_block": "Block of Advanced Alloy", + "block.techreborn.advanced_alloy_storage_block_stairs": "Advanced Alloy Stairs", + "block.techreborn.advanced_alloy_storage_block_slab": "Advanced Alloy Slab", + "block.techreborn.advanced_alloy_storage_block_wall": "Advanced Alloy Wall", "block.techreborn.aluminum_storage_block": "Block of Aluminium", "block.techreborn.aluminum_storage_block_stairs": "Aluminium Stairs", "block.techreborn.aluminum_storage_block_slab": "Aluminium Slab", @@ -171,6 +175,10 @@ "block.techreborn.electrum_storage_block_stairs": "Electrum Stairs", "block.techreborn.electrum_storage_block_slab": "Electrum Slab", "block.techreborn.electrum_storage_block_wall": "Electrum Wall", + "block.techreborn.hot_tungstensteel_storage_block": "Block of Hot Tungstensteel", + "block.techreborn.hot_tungstensteel_storage_block_stairs": "Hot Tungstensteel Stairs", + "block.techreborn.hot_tungstensteel_storage_block_slab": "Hot Tungstensteel Slab", + "block.techreborn.hot_tungstensteel_storage_block_wall": "Hot Tungstensteel Wall", "block.techreborn.invar_storage_block": "Block of Invar", "block.techreborn.invar_storage_block_stairs": "Invar Stairs", "block.techreborn.invar_storage_block_slab": "Invar Slab", diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block.json new file mode 100644 index 000000000..39854c224 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab.json new file mode 100644 index 000000000..0a52367e3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "techreborn:block/storage/advanced_alloy_storage_block", + "top": "techreborn:block/storage/advanced_alloy_storage_block", + "side": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab_top.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab_top.json new file mode 100644 index 000000000..9aebbff8f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "techreborn:block/storage/advanced_alloy_storage_block", + "top": "techreborn:block/storage/advanced_alloy_storage_block", + "side": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs.json new file mode 100644 index 000000000..74dc2f6b6 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "techreborn:block/storage/advanced_alloy_storage_block", + "top": "techreborn:block/storage/advanced_alloy_storage_block", + "side": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_inner.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_inner.json new file mode 100644 index 000000000..9787e3f41 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "techreborn:block/storage/advanced_alloy_storage_block", + "top": "techreborn:block/storage/advanced_alloy_storage_block", + "side": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_outer.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_outer.json new file mode 100644 index 000000000..fba4edbde --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "techreborn:block/storage/advanced_alloy_storage_block", + "top": "techreborn:block/storage/advanced_alloy_storage_block", + "side": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_inventory.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_inventory.json new file mode 100644 index 000000000..018aba3be --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_post.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_post.json new file mode 100644 index 000000000..b5682bd99 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side.json new file mode 100644 index 000000000..ec8ed9cee --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side_tall.json b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side_tall.json new file mode 100644 index 000000000..7b719afad --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/advanced_alloy_storage_block_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "techreborn:block/storage/advanced_alloy_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block.json new file mode 100644 index 000000000..71a326662 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab.json new file mode 100644 index 000000000..67463c2d3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "techreborn:block/storage/hot_tungstensteel_storage_block", + "top": "techreborn:block/storage/hot_tungstensteel_storage_block", + "side": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab_top.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab_top.json new file mode 100644 index 000000000..e1eb0d2f5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "techreborn:block/storage/hot_tungstensteel_storage_block", + "top": "techreborn:block/storage/hot_tungstensteel_storage_block", + "side": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs.json new file mode 100644 index 000000000..3f386dd6e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "techreborn:block/storage/hot_tungstensteel_storage_block", + "top": "techreborn:block/storage/hot_tungstensteel_storage_block", + "side": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_inner.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_inner.json new file mode 100644 index 000000000..75fe3c6b9 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "techreborn:block/storage/hot_tungstensteel_storage_block", + "top": "techreborn:block/storage/hot_tungstensteel_storage_block", + "side": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_outer.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_outer.json new file mode 100644 index 000000000..8428b6f84 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "techreborn:block/storage/hot_tungstensteel_storage_block", + "top": "techreborn:block/storage/hot_tungstensteel_storage_block", + "side": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_inventory.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_inventory.json new file mode 100644 index 000000000..153d5f4f0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_post.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_post.json new file mode 100644 index 000000000..23f7044fb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side.json new file mode 100644 index 000000000..81635393a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side_tall.json b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side_tall.json new file mode 100644 index 000000000..c6e99b0db --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/storage/hot_tungstensteel_storage_block_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "techreborn:block/storage/hot_tungstensteel_storage_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block.json b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block.json new file mode 100644 index 000000000..35ca032db --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/advanced_alloy_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_slab.json b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_slab.json new file mode 100644 index 000000000..e27ced6ea --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/advanced_alloy_storage_block_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_stairs.json b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_stairs.json new file mode 100644 index 000000000..30e6fd424 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/advanced_alloy_storage_block_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_wall.json b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_wall.json new file mode 100644 index 000000000..9f55bbbd9 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_alloy_storage_block_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/advanced_alloy_storage_block_wall_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block.json b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block.json new file mode 100644 index 000000000..fceb67494 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/hot_tungstensteel_storage_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_slab.json b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_slab.json new file mode 100644 index 000000000..df35c466b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/hot_tungstensteel_storage_block_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_stairs.json b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_stairs.json new file mode 100644 index 000000000..9be9d6b69 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/hot_tungstensteel_storage_block_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_wall.json b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_wall.json new file mode 100644 index 000000000..674cbc8d3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/hot_tungstensteel_storage_block_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/storage/hot_tungstensteel_storage_block_wall_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/storage/advanced_alloy_storage_block.png b/src/main/resources/assets/techreborn/textures/block/storage/advanced_alloy_storage_block.png new file mode 100644 index 0000000000000000000000000000000000000000..0becb4dee08937986792ef87eda24ea4b0e88d74 GIT binary patch literal 435 zcmV;k0ZjghP)Px$ZAnByR5(v{QawupQ4riKL<=Kmz$8QjQEbFmgfx;gVj&1xMSp^=zd-+jU~OY% zthBHbo7jnkn$jQyB_9w4((R=&UY&t*Ts;sfV zJJbUZl&TvtGL_Q%pZ9^DevVqJey4Zy+iQAW9Grv%t9w;xUfyUivoIs$ON)*Opl+ux zR#~CEqW{DQeDHU>E#2o=C13!I7|rG6>gZg8<6>dBxxXX$8AXN<&ScZ74gu2HN-0WU zjZ6XqKp*&|!N=F12Q-gLNCHq281)!I64=V77cdl~Y&Lpv4{T=(#`ojxgL^4FdAfgz z63`%ylR3aJPV-J*FbU+2V7WM_4)Z7bW?QEpPzg2e33v}AB^jn_vT5y%jkObs5&Y*i z8gPNQSP>7Ng+2LtOz@Px$WJyFpR5(v{Qn4;XQ4pOQ#4c9IZljUt6;>popdyPY@ZgQVSif;mENq^|PbeoCOFo3Y43x~h7og|Wc@1$V Date: Wed, 2 Feb 2022 21:21:06 +0000 Subject: [PATCH 05/11] Update Energy API and deps. --- RebornCore/src/main/resources/fabric.mod.json | 4 ++-- gradle.properties | 4 ++-- src/main/resources/fabric.mod.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RebornCore/src/main/resources/fabric.mod.json b/RebornCore/src/main/resources/fabric.mod.json index c1c2bf8b5..d1604270c 100644 --- a/RebornCore/src/main/resources/fabric.mod.json +++ b/RebornCore/src/main/resources/fabric.mod.json @@ -25,9 +25,9 @@ "reborncore.common.mixins.json" ], "depends": { - "fabricloader": ">=0.12.0", + "fabricloader": ">=0.12.12", "fabric": ">=0.40.0", - "team_reborn_energy": ">=2.0.0-beta1", + "team_reborn_energy": ">=2.2.0", "fabric-biome-api-v1": ">=3.0.0" }, "authors": [ diff --git a/gradle.properties b/gradle.properties index 618315052..cb0d3943c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,10 +9,10 @@ org.gradle.jvmargs=-Xmx2G minecraft_version=1.18.1 yarn_version=1.18.1+build.18 loader_version=0.12.12 - fapi_version=0.46.1+1.18 + fapi_version=0.46.4+1.18 # Dependencies - energy_version=2.1.0 + energy_version=2.2.0 rei_version=7.1.361 trinkets_version=3.0.2 autoswitch_version=-SNAPSHOT diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b12dabec6..fd42a35b8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -33,10 +33,10 @@ ] }, "depends": { - "fabricloader": ">=0.12.0", + "fabricloader": ">=0.12.12", "fabric": ">=0.46.1", "reborncore": "*", - "team_reborn_energy": ">=2.0.0-beta1", + "team_reborn_energy": ">=2.2.0", "fabric-biome-api-v1": ">=3.0.0" }, "accessWidener": "techreborn.accesswidener", From 1fcf18707b10edec26129d4a6dfda40356b3774d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 3 Feb 2022 11:20:37 +0000 Subject: [PATCH 06/11] Handle the world not existing for some reason when calculating the ore depth. --- src/main/java/techreborn/world/OreDepth.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/techreborn/world/OreDepth.java b/src/main/java/techreborn/world/OreDepth.java index 68e9cb2d1..980a16248 100644 --- a/src/main/java/techreborn/world/OreDepth.java +++ b/src/main/java/techreborn/world/OreDepth.java @@ -33,6 +33,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.World; import net.minecraft.world.gen.HeightContext; +import org.jetbrains.annotations.Nullable; import techreborn.init.TRContent; import java.util.ArrayList; @@ -64,6 +65,10 @@ public record OreDepth(Identifier identifier, int minY, int maxY, TargetDimensio final Identifier blockId = Registry.BLOCK.getId(ore.block); final HeightContext heightContext = getHeightContext(server, ore.distribution.dimension); + if (heightContext == null) { + continue; + } + final int minY = ore.distribution.minOffset.getY(heightContext); final int maxY = ore.distribution.maxY; @@ -80,6 +85,7 @@ public record OreDepth(Identifier identifier, int minY, int maxY, TargetDimensio return Collections.unmodifiableList(depths); } + @Nullable private static HeightContext getHeightContext(MinecraftServer server, TargetDimension dimension) { RegistryKey key = switch (dimension) { case OVERWORLD -> World.OVERWORLD; @@ -88,6 +94,11 @@ public record OreDepth(Identifier identifier, int minY, int maxY, TargetDimensio }; final ServerWorld world = server.getWorld(key); + + if (world == null) { + return null; + } + return new HeightContext(world.getChunkManager().getChunkGenerator(), world); } } From 30dcd5dfa878263e4578ba727d5c6aa8e3571043 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 3 Feb 2022 11:35:39 +0000 Subject: [PATCH 07/11] Depend on the reborn core version it was built against. --- build.gradle | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build.gradle b/build.gradle index 443ef92fd..5994cdb7d 100644 --- a/build.gradle +++ b/build.gradle @@ -137,6 +137,20 @@ allprojects { } } +processResources { + doLast { + // Depend on the reborn core version it was built against + fileTree(dir: outputs.files.asPath, include: "fabric.mod.json").each { + def jsonSlurper = new JsonSlurper() + def modJson = jsonSlurper.parseText(it.text) + + modJson.depends.reborncore = "~${project.version}" + + it.text = JsonOutput.toJson(modJson) + } + } +} + loom { accessWidenerPath = file("src/main/resources/techreborn.accesswidener") } From 378df75c802046dca546dac9815e88e36e4e2eb3 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 3 Feb 2022 11:35:57 +0000 Subject: [PATCH 08/11] Beta 9 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index cb0d3943c..68ea789b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2G # Mod properties - mod_version=5.1.0-beta.8 + mod_version=5.1.0-beta.9 # Fabric Properties # check these on https://modmuss50.me/fabric.html From 8ed5082d819280d6f5ecbb4daef948b6d9c020f6 Mon Sep 17 00:00:00 2001 From: Ayutac Date: Sun, 6 Feb 2022 14:14:32 +0100 Subject: [PATCH 09/11] Fixed datagen related bug (#2790) Raw metals thought the ingot storage block variant was their variant. THIS AFFECTS STORAGE RECIPES! Effectively means 9 raw variants can be combined to one ingot storage block, so maybe quickly new beta? --- src/main/java/techreborn/init/TRContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 1531fbe32..9b916d4ae 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -729,7 +729,7 @@ public class TRContent { item = new Item(new Item.Settings().group(TechReborn.ITEMGROUP)); ItemConvertible blockVariant = null; try { - blockVariant = StorageBlocks.valueOf(this.toString()); + blockVariant = StorageBlocks.valueOf("RAW_" + this.toString()); } catch (IllegalArgumentException ex) { TechReborn.LOGGER.warn("Raw metal {} has no storage block equivalent!", name); From bd971c12bdf4b29ffe5d00fa2cbab119a5e5fb82 Mon Sep 17 00:00:00 2001 From: bvoo <60059541+bvoo@users.noreply.github.com> Date: Sun, 6 Feb 2022 05:14:47 -0800 Subject: [PATCH 10/11] Add death.attack.shock.player message (#2785) --- src/main/resources/assets/techreborn/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index e92dec290..c8eb88ed7 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -856,6 +856,7 @@ "_comment20": "Death Messages", "death.attack.shock": "%s was electrocuted", + "death.attack.shock.player": "%s was electrocuted trying to outrun %s", "_comment21": "Entities", "entity.nuke": "Nuke", From 43c0fa9e892606b4dafcc5d9f8bd0d18a1005c49 Mon Sep 17 00:00:00 2001 From: Foo <34515228+fooooooooooooooo@users.noreply.github.com> Date: Sun, 6 Feb 2022 05:14:56 -0800 Subject: [PATCH 11/11] Fix spelling, grammar, javadocs, and similar issues (#2784) * fix naming in ModelSantaHat.java * Fix grammar, spelling, and javadocs in RebornCore * Fix spelling error in datagen * fix missed variable name * fix grammar, spelling, and javadoc errors * fix grammar and spelling errors in project files * specify indent_size in .editorconfig --- .editorconfig | 1 + .github/CONTRIBUTING.md | 6 +- README.md | 2 +- .../libcd/api/CustomOutputRecipe.java | 3 +- .../src/main/java/reborncore/RebornCore.java | 4 +- .../main/java/reborncore/RebornRegistry.java | 43 ++-- .../java/reborncore/api/IToolHandler.java | 17 +- .../api/blockentity/IUpgradeable.java | 2 +- .../events/ApplyArmorToDamageCallback.java | 14 +- .../reborncore/api/items/InventoryBase.java | 2 +- .../reborncore/client/ClientChunkManager.java | 2 +- .../reborncore/client/ItemStackRenderer.java | 3 +- .../java/reborncore/client/ModelSantaHat.java | 216 +++++++++--------- .../client/gui/GuiButtonCustomTexture.java | 10 +- .../client/gui/builder/GuiBase.java | 18 +- .../gui/builder/slot/SlotConfigGui.java | 2 +- .../elements/FluidConfigPopupElement.java | 24 +- .../slot/elements/SlotConfigPopupElement.java | 20 +- .../client/gui/componets/GuiHiddenButton.java | 4 +- .../client/gui/guibuilder/GuiBuilder.java | 201 ++++++++-------- .../reborncore/client/gui/slots/SlotFake.java | 8 +- .../multiblock/MultiblockComponent.java | 4 +- .../BlockEntityScreenHandlerBuilder.java | 11 +- .../screen/builder/BuiltScreenHandler.java | 6 +- .../builder/PlayerScreenHandlerBuilder.java | 4 +- .../screen/builder/ScreenHandlerBuilder.java | 2 +- .../screen/builder/slot/FilteredSlot.java | 1 - .../screen/builder/slot/SpriteSlot.java | 8 +- .../blockentity/FluidConfiguration.java | 14 +- .../blockentity/MachineBaseBlockEntity.java | 54 +++-- .../common/blockentity/MultiblockWriter.java | 50 ++-- .../blockentity/RedstoneConfiguration.java | 6 +- .../common/blockentity/SlotConfiguration.java | 28 +-- .../common/blocks/BlockMachineBase.java | 6 +- .../blocks/BlockWrenchEventHandler.java | 5 +- .../chunkloading/ChunkLoaderManager.java | 6 +- .../java/reborncore/common/config/Config.java | 11 +- .../common/config/Configuration.java | 6 +- .../common/crafting/RebornRecipe.java | 21 +- .../crafting/ingredient/StackIngredient.java | 4 +- .../crafting/ingredient/TagIngredient.java | 2 +- .../crafting/serde/RecipeSerdeException.java | 2 +- .../reborncore/common/fluid/FluidValue.java | 2 +- .../fluid/RebornFluidRenderManager.java | 5 +- .../reborncore/common/misc/ModSounds.java | 1 - .../common/misc/TagConvertible.java | 6 +- .../common/multiblock/IMultiblockPart.java | 71 +++--- .../multiblock/MultiblockBlockEntityBase.java | 50 ++-- .../multiblock/MultiblockControllerBase.java | 193 ++++++++-------- .../multiblock/MultiblockEventHandler.java | 2 +- .../common/multiblock/MultiblockRegistry.java | 32 +-- .../multiblock/MultiblockWorldRegistry.java | 19 +- .../RectangularMultiblockBlockEntityBase.java | 2 +- .../RectangularMultiblockControllerBase.java | 4 +- .../common/network/ExtendedPacketBuffer.java | 2 +- .../common/network/ServerBoundPackets.java | 9 +- .../powerSystem/PowerAcceptorBlockEntity.java | 77 ++++--- .../common/powerSystem/RcEnergyItem.java | 11 +- ...Hanlder.java => ICrafterSoundHandler.java} | 2 +- .../common/recipes/IUpgradeHandler.java | 10 +- .../common/recipes/RecipeCrafter.java | 37 +-- .../reborncore/common/util/CalenderUtils.java | 2 +- .../reborncore/common/util/ChatUtils.java | 7 +- .../java/reborncore/common/util/Color.java | 2 +- .../common/util/DefaultedListCollector.java | 8 +- .../common/util/FluidTextHelper.java | 12 +- .../reborncore/common/util/InventoryItem.java | 2 +- .../common/util/ItemHandlerUtils.java | 2 +- .../reborncore/common/util/ItemNBTHelper.java | 36 +-- .../reborncore/common/util/ItemUtils.java | 41 ++-- .../reborncore/common/util/MachineFacing.java | 4 +- .../common/util/RebornInventory.java | 8 +- .../reborncore/common/util/StringUtils.java | 4 +- .../java/reborncore/common/util/Tank.java | 2 +- .../java/reborncore/common/util/Torus.java | 12 +- .../common/util/TranslationTools.java | 6 +- .../reborncore/common/util/WorldUtils.java | 6 +- .../serialization/ItemStackSerializer.java | 2 +- .../util/serialization/SerializationUtil.java | 2 +- build.gradle | 4 +- .../machine/MachineRecipeJsonFactory.groovy | 2 +- src/main/java/techreborn/TechReborn.java | 2 +- .../api/events/CableElectrocutionEvent.java | 2 +- .../api/generator/GeneratorRecipeHelper.java | 35 +-- .../api/recipe/ScrapboxRecipeCrafter.java | 8 +- .../blockentity/cable/CableBlockEntity.java | 3 +- .../cable/OfferedEnergyStorage.java | 2 +- .../data/DataDrivenBEProvider.java | 3 +- .../blockentity/data/DataDrivenSlot.java | 2 +- .../techreborn/blockentity/data/SlotType.java | 2 +- .../BaseFluidGeneratorBlockEntity.java | 2 +- .../generator/SolarPanelBlockEntity.java | 2 +- .../basic/SolidFuelGeneratorBlockEntity.java | 2 +- .../generator/basic/WaterMillBlockEntity.java | 10 +- .../blockentity/lighting/LampBlockEntity.java | 2 +- .../machine/GenericMachineBlockEntity.java | 15 +- .../iron/AbstractIronMachineBlockEntity.java | 16 +- .../iron/IronAlloyFurnaceBlockEntity.java | 4 +- .../FusionControlComputerBlockEntity.java | 33 +-- .../tier1/AutoCraftingTableBlockEntity.java | 2 +- .../tier1/ElectricFurnaceBlockEntity.java | 4 +- .../GreenhouseControllerBlockEntity.java | 2 +- .../tier1/RollingMachineBlockEntity.java | 14 +- ...va => SolidCanningMachineBlockEntity.java} | 4 +- .../machine/tier3/ChunkLoaderBlockEntity.java | 12 +- .../energy/AdjustableSUBlockEntity.java | 12 +- .../idsu/InterdimensionalSUBlockEntity.java | 14 +- .../techreborn/blocks/cable/CableBlock.java | 6 +- .../techreborn/blocks/lighting/LampBlock.java | 4 +- .../techreborn/blocks/misc/BlockAlarm.java | 12 +- .../storage/energy/EnergyStorageBlock.java | 4 +- .../storage/energy/LSUStorageBlock.java | 4 +- .../blocks/transformers/BlockTransformer.java | 4 +- src/main/java/techreborn/client/GuiType.java | 4 +- .../client/gui/GuiSolidCanningMachine.java | 6 +- .../techreborn/client/render/ModelHelper.java | 4 +- .../compat/autoswitch/AutoSwitchApiImpl.java | 2 +- .../techreborn/config/TechRebornConfig.java | 8 +- .../java/techreborn/events/ModRegistry.java | 4 +- .../techreborn/events/UseBlockHandler.java | 4 +- src/main/java/techreborn/init/ModLoot.java | 16 +- src/main/java/techreborn/init/ModSounds.java | 4 +- .../java/techreborn/init/TRBlockEntities.java | 4 +- .../techreborn/init/TRCauldronBehavior.java | 4 +- src/main/java/techreborn/init/TRContent.java | 6 +- .../java/techreborn/init/TRToolMaterials.java | 1 - src/main/java/techreborn/init/TRToolTier.java | 2 +- .../techreborn/items/DynamicCellItem.java | 2 +- .../items/armor/CloakingDeviceItem.java | 3 +- .../techreborn/items/armor/TRArmourItem.java | 2 +- .../techreborn/items/tool/ChainsawItem.java | 4 +- .../techreborn/items/tool/DebugToolItem.java | 6 +- .../java/techreborn/items/tool/DrillItem.java | 2 +- .../techreborn/items/tool/JackhammerItem.java | 2 +- .../items/tool/basic/RockCutterItem.java | 4 +- .../items/tool/industrial/OmniToolItem.java | 4 +- src/main/java/techreborn/utils/ToolsUtil.java | 34 ++- ...Source.java => ElectricalShockSource.java} | 4 +- 138 files changed, 1007 insertions(+), 924 deletions(-) rename RebornCore/src/main/java/reborncore/common/recipes/{ICrafterSoundHanlder.java => ICrafterSoundHandler.java} (97%) rename src/main/java/techreborn/blockentity/machine/tier1/{SoildCanningMachineBlockEntity.java => SolidCanningMachineBlockEntity.java} (95%) rename src/main/java/techreborn/utils/damageSources/{ElectrialShockSource.java => ElectricalShockSource.java} (93%) diff --git a/.editorconfig b/.editorconfig index f29a94248..618e76e1a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,6 +3,7 @@ root = true [*] charset = utf-8 tab_width = 4 +indent_size = 4 [*.java] indent_style = tab diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3aba40d94..e20e8e9df 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,8 +1,8 @@ -First of all, thank you for you efforts in contributing to TechReborn project +First of all, thank you for your efforts in contributing to TechReborn project In order to ease code review of your pull request, please, go through this checklist. - * The code compiles )). + * The code compiles. * The code has been developer-tested. * The code includes javadoc where appropriate. * The code is tidy (indentation, line length, no commented-out code, no spelling mistakes, etc). @@ -15,5 +15,3 @@ In order to ease code review of your pull request, please, go through this check * Are there any hardcoded, development only things still in the code? * Was performance considered? * Corner cases well documented or any workarounds for a known limitation of the MC, Fabric, RC, etc used. - - diff --git a/README.md b/README.md index 51407ec35..f9264fbfb 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ To report an issue or make a suggestion, please head up to the `Issues` tab up a # Translation -Techreborn is available in a range of diffrent languages, if you want to help out translate the mod please see our crowdin project at [https://translate.techreborn.ovh/](https://translate.techreborn.ovh/) The translations are automaticly included in the jar files at build time. +Techreborn is available in a range of different languages, if you want to help out translate the mod please see our crowdin project at [https://translate.techreborn.ovh/](https://translate.techreborn.ovh/) The translations are automatically included in the jar files at build time. # Screenshots diff --git a/RebornCore/src/main/java/io/github/cottonmc/libcd/api/CustomOutputRecipe.java b/RebornCore/src/main/java/io/github/cottonmc/libcd/api/CustomOutputRecipe.java index 6588e5b71..11a986e95 100644 --- a/RebornCore/src/main/java/io/github/cottonmc/libcd/api/CustomOutputRecipe.java +++ b/RebornCore/src/main/java/io/github/cottonmc/libcd/api/CustomOutputRecipe.java @@ -25,11 +25,12 @@ package io.github.cottonmc.libcd.api; import net.minecraft.item.Item; +import net.minecraft.recipe.Recipe; import java.util.Collection; /** - * A recipe that has output behavior that cannot be described by just the Recipe#getOutput() method. + * A recipe that has output behavior that cannot be described by just the {@link Recipe#getOutput()} method. * Used for RecipeTweaker remove-by-output code. */ public interface CustomOutputRecipe { diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index c8cec9c7a..66c1b69a6 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -33,8 +33,8 @@ import net.fabricmc.fabric.api.event.world.WorldTickCallback; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import reborncore.api.ToolManager; import reborncore.api.blockentity.UnloadHandler; import reborncore.common.RebornCoreCommands; @@ -77,7 +77,7 @@ public class RebornCore implements ModInitializer { public void onInitialize() { new Configuration(RebornCoreConfig.class, MOD_ID); PowerSystem.init(); - CalenderUtils.loadCalender(); //Done early as some features need this + CalenderUtils.loadCalender(); // Done early as some features need this ToolManager.INSTANCE.customToolHandlerList.add(new GenericWrenchHelper(new Identifier("ic2:wrench"), true)); ToolManager.INSTANCE.customToolHandlerList.add(new GenericWrenchHelper(new Identifier("forestry:wrench"), false)); diff --git a/RebornCore/src/main/java/reborncore/RebornRegistry.java b/RebornCore/src/main/java/reborncore/RebornRegistry.java index 3be543b2b..d068b7bd8 100644 --- a/RebornCore/src/main/java/reborncore/RebornRegistry.java +++ b/RebornCore/src/main/java/reborncore/RebornRegistry.java @@ -44,11 +44,11 @@ public class RebornRegistry { private static final HashMap objIdentMap = new HashMap<>(); /** - * Registers Block and BlockItem in vanilla registries + * Registers {@link Block} and {@link BlockItem} in vanilla registries * - * @param block Block Block to register - * @param builder Item.Settings Settings builder for BlockItem - * @param name Identifier Registry name for block and item + * @param block {@link Block} Block to register + * @param builder {@link Item.Settings} Settings builder for {@link BlockItem} + * @param name {@link Identifier} Registry name for block and item */ public static void registerBlock(Block block, Item.Settings builder, Identifier name) { Registry.register(Registry.BLOCK, name, block); @@ -63,11 +63,11 @@ public class RebornRegistry { } /** - * Registers Block and BlockItem in vanilla registries. + * Registers Block and BlockItem in vanilla registries. * Block should have registered identifier in RebornRegistry via {@link #registerIdent registerIdent} method * - * @param block Block Block to register - * @param itemGroup Item.Settings Settings builder for BlockItem + * @param block {@link Block} Block to register + * @param itemGroup {@link Item.Settings} Settings builder for {@link BlockItem} */ public static void registerBlock(Block block, Item.Settings itemGroup) { Validate.isTrue(objIdentMap.containsKey(block)); @@ -80,9 +80,11 @@ public class RebornRegistry { } /** - * Register only Block, without BlockItem in vanilla registries - * Block should have registered identifier in RebornRegistry via {@link #registerIdent registerIdent} method - * @param block Block Block to register + * Register only {@link Block}, without {@link BlockItem} in vanilla registries + * Block should have registered identifier in {@link RebornRegistry} via + * {@link #registerIdent registerIdent} method + * + * @param block {@link Block} Block to register */ public static void registerBlockNoItem(Block block) { Validate.isTrue(objIdentMap.containsKey(block)); @@ -91,20 +93,23 @@ public class RebornRegistry { /** - * Register Item in vanilla registries + * Register {@link Item} in vanilla registries * - * @param item Item Item to register - * @param name Identifier Registry name for item + * @param item {@link Item} Item to register + * @param name {@link Identifier} Registry name for item */ public static void registerItem(Item item, Identifier name) { Registry.register(Registry.ITEM, name, item); } /** - * Register Item in vanilla registries - * Item should have registered identifier in RebornRegistry via {@link #registerIdent registerIdent} method + *

Register {@link Item} in vanilla registries

+ *

+ * {@link Item} should have registered identifier in {@link RebornRegistry} + * via {@link #registerIdent registerIdent} method + *

* - * @param item Item Item to register + * @param item {@link Item} Item to register */ public static void registerItem(Item item){ Validate.isTrue(objIdentMap.containsKey(item)); @@ -112,10 +117,10 @@ public class RebornRegistry { } /** - * Registers Identifier in internal RebornCore map + * Registers {@link Identifier} in internal RebornCore map * - * @param object Object Item, Block or whatever to be put into map - * @param identifier Identifier Registry name for object + * @param object {@link Object}, {@link Item}, {@link Block} or whatever to be put into map + * @param identifier {@link Identifier} Registry name for object */ public static void registerIdent(Object object, Identifier identifier){ objIdentMap.put(object, identifier); diff --git a/RebornCore/src/main/java/reborncore/api/IToolHandler.java b/RebornCore/src/main/java/reborncore/api/IToolHandler.java index d3f6aaeb4..7750545f1 100644 --- a/RebornCore/src/main/java/reborncore/api/IToolHandler.java +++ b/RebornCore/src/main/java/reborncore/api/IToolHandler.java @@ -36,15 +36,16 @@ import net.minecraft.world.World; public interface IToolHandler { /** - * Called when a machine is actived with the item that has IToolHandler on it + * Called when a machine is activated with the item that has {@link IToolHandler} on it * - * @param stack the held itemstack - * @param pos the pos of the block - * @param world the world of the block - * @param player the player that actived the block - * @param side the side that the player actived - * @param damage if the tool should be damged, or power taken - * @return If the tool can handle being actived on the block, return false when the tool is broken or out of power for example. + * @param stack {@link ItemStack} The held itemstack + * @param pos {@link BlockPos} The pos of the block + * @param world {@link World} The world of the block + * @param player {@link PlayerEntity} The player that activated the block + * @param side {@link Direction} The side that the player activated + * @param damage {@code boolean} If the tool should be damaged, or power taken + * @return {@code boolean} If the tool can handle being activated on the block, + * return false when the tool is broken or out of power for example. */ boolean handleTool(ItemStack stack, BlockPos pos, World world, PlayerEntity player, Direction side, boolean damage); diff --git a/RebornCore/src/main/java/reborncore/api/blockentity/IUpgradeable.java b/RebornCore/src/main/java/reborncore/api/blockentity/IUpgradeable.java index 84538497c..0342023dc 100644 --- a/RebornCore/src/main/java/reborncore/api/blockentity/IUpgradeable.java +++ b/RebornCore/src/main/java/reborncore/api/blockentity/IUpgradeable.java @@ -33,7 +33,7 @@ public interface IUpgradeable { return true; } - Inventory getUpgradeInvetory(); + Inventory getUpgradeInventory(); int getUpgradeSlotCount(); diff --git a/RebornCore/src/main/java/reborncore/api/events/ApplyArmorToDamageCallback.java b/RebornCore/src/main/java/reborncore/api/events/ApplyArmorToDamageCallback.java index 0ac2dea1e..b0c8387fd 100644 --- a/RebornCore/src/main/java/reborncore/api/events/ApplyArmorToDamageCallback.java +++ b/RebornCore/src/main/java/reborncore/api/events/ApplyArmorToDamageCallback.java @@ -41,13 +41,15 @@ public interface ApplyArmorToDamageCallback { }); /** - * Apply armor to amount of damage inflicted. Decreases it in most cases unless armor should increase damage inflicted. - * Event is called after damage is being reduced by armor already and before damage reduction from enchants. + *

Apply armor to amount of damage inflicted.

+ * Decreases it in most cases unless armor should increase damage inflicted. * - * @param player PlayerEntity Player being damaged - * @param source DamageSource Type of damage - * @param amount float Current amount of damage - * @return float Amount of damage after reduction + *

Event is called after damage is being reduced by armor already and before damage reduction from enchants.

+ * + * @param player {@link PlayerEntity} Player being damaged + * @param source {@link DamageSource} Type of damage + * @param amount {@code float} Current amount of damage + * @return {@code float} Amount of damage after reduction */ float applyArmorToDamage(PlayerEntity player, DamageSource source, float amount); } diff --git a/RebornCore/src/main/java/reborncore/api/items/InventoryBase.java b/RebornCore/src/main/java/reborncore/api/items/InventoryBase.java index 3173c05aa..d6b56ecee 100644 --- a/RebornCore/src/main/java/reborncore/api/items/InventoryBase.java +++ b/RebornCore/src/main/java/reborncore/api/items/InventoryBase.java @@ -94,7 +94,7 @@ public abstract class InventoryBase implements Inventory { @Override public void markDirty() { - //Stuff happens in the super methods + // Stuff happens in the super methods } @Override diff --git a/RebornCore/src/main/java/reborncore/client/ClientChunkManager.java b/RebornCore/src/main/java/reborncore/client/ClientChunkManager.java index 9e1db20cd..ee41d7e0d 100644 --- a/RebornCore/src/main/java/reborncore/client/ClientChunkManager.java +++ b/RebornCore/src/main/java/reborncore/client/ClientChunkManager.java @@ -50,7 +50,7 @@ public class ClientChunkManager { public static void toggleLoadedChunks(BlockPos chunkLoader) { if (loadedChunks.size() == 0) { - NetworkManager.sendToServer(ServerBoundPackets.requestChunkloaderChunks(chunkLoader)); + NetworkManager.sendToServer(ServerBoundPackets.requestChunkLoaderChunks(chunkLoader)); } else { loadedChunks.clear(); } diff --git a/RebornCore/src/main/java/reborncore/client/ItemStackRenderer.java b/RebornCore/src/main/java/reborncore/client/ItemStackRenderer.java index 8d44ff3a6..9792f7cc0 100644 --- a/RebornCore/src/main/java/reborncore/client/ItemStackRenderer.java +++ b/RebornCore/src/main/java/reborncore/client/ItemStackRenderer.java @@ -44,7 +44,8 @@ import java.nio.file.Files; import java.nio.file.Path; /** - * Initially take from https://github.com/JamiesWhiteShirt/developer-mode/tree/experimental-item-render and then ported to 1.15 + * Initially taken from https://github.com/JamiesWhiteShirt/developer-mode/tree/experimental-item-render + * and then ported to 1.15 * Thanks 2xsaiko for fixing the lighting + odd issues above */ public class ItemStackRenderer implements HudRenderCallback { diff --git a/RebornCore/src/main/java/reborncore/client/ModelSantaHat.java b/RebornCore/src/main/java/reborncore/client/ModelSantaHat.java index c17acfbb3..479d8f0ab 100644 --- a/RebornCore/src/main/java/reborncore/client/ModelSantaHat.java +++ b/RebornCore/src/main/java/reborncore/client/ModelSantaHat.java @@ -40,151 +40,151 @@ import java.util.Arrays; import java.util.Collections; public class ModelSantaHat extends EntityModel { - private final ModelPart hatband1; - private final ModelPart hatband2; - private final ModelPart hatband3; - private final ModelPart hatband4; - private final ModelPart hatbase1; - private final ModelPart hatband5; - private final ModelPart hatband6; - private final ModelPart hatbase2; - private final ModelPart hatextension1; - private final ModelPart hatextension2; - private final ModelPart hatextension3; - private final ModelPart hatextension4; - private final ModelPart hatball1; - private final ModelPart hatball2; - private final ModelPart hatball3; - private final ModelPart hatball4; - private final ModelPart hatball5; - private final ModelPart hatball6; + private final ModelPart hatBand1; + private final ModelPart hatBand2; + private final ModelPart hatBand3; + private final ModelPart hatBand4; + private final ModelPart hatBase1; + private final ModelPart hatBand5; + private final ModelPart hatBand6; + private final ModelPart hatBase2; + private final ModelPart hatExtension1; + private final ModelPart hatExtension2; + private final ModelPart hatExtension3; + private final ModelPart hatExtension4; + private final ModelPart hatBall1; + private final ModelPart hatBall2; + private final ModelPart hatBall3; + private final ModelPart hatBall4; + private final ModelPart hatBall5; + private final ModelPart hatBall6; public ModelSantaHat() { - ModelPart.Cuboid[] hatband1Cuboids = { + ModelPart.Cuboid[] hatBand1Cuboids = { new ModelPart.Cuboid(0, 32, -4F, -8F, -5F, 8F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband1 = new ModelPart(Arrays.asList(hatband1Cuboids), Collections.emptyMap()); - hatband1.setPivot(0F, 0F, 0F); - setRotation(hatband1, 0F, 0F, 0F); + hatBand1 = new ModelPart(Arrays.asList(hatBand1Cuboids), Collections.emptyMap()); + hatBand1.setPivot(0F, 0F, 0F); + setRotation(hatBand1, 0F, 0F, 0F); - ModelPart.Cuboid[] hatband2Cuboids = { + ModelPart.Cuboid[] hatBand2Cuboids = { new ModelPart.Cuboid(0, 32, -4F, -8F, 4F, 8F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband2 = new ModelPart(Arrays.asList(hatband2Cuboids), Collections.emptyMap()); - hatband2.setPivot(0F, 0F, 0F); - setRotation(hatband2, 0F, 0F, 0F); + hatBand2 = new ModelPart(Arrays.asList(hatBand2Cuboids), Collections.emptyMap()); + hatBand2.setPivot(0F, 0F, 0F); + setRotation(hatBand2, 0F, 0F, 0F); - ModelPart.Cuboid[] hatband3Cuboids = { + ModelPart.Cuboid[] hatBand3Cuboids = { new ModelPart.Cuboid(0, 34, -5F, -8F, -4F, 1F, 1F, 8F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband3 = new ModelPart(Arrays.asList(hatband3Cuboids), Collections.emptyMap()); - hatband3.setPivot(0F, 0F, 0F); - setRotation(hatband3, 0F, 0F, 0F); + hatBand3 = new ModelPart(Arrays.asList(hatBand3Cuboids), Collections.emptyMap()); + hatBand3.setPivot(0F, 0F, 0F); + setRotation(hatBand3, 0F, 0F, 0F); - ModelPart.Cuboid[] hatband4Cuboids = { + ModelPart.Cuboid[] hatBand4Cuboids = { new ModelPart.Cuboid(0, 34, 4F, -8F, -4F, 1F, 1F, 8F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband4 = new ModelPart(Arrays.asList(hatband4Cuboids), Collections.emptyMap()); - hatband4.setPivot(0F, 0F, 0F); - setRotation(hatband4, 0F, 0F, 0F); + hatBand4 = new ModelPart(Arrays.asList(hatBand4Cuboids), Collections.emptyMap()); + hatBand4.setPivot(0F, 0F, 0F); + setRotation(hatBand4, 0F, 0F, 0F); - ModelPart.Cuboid[] hatbase1Cuboids = { + ModelPart.Cuboid[] hatBase1Cuboids = { new ModelPart.Cuboid(0, 43, -4F, -9F, -4F, 8F, 1F, 8F, 0F, 0F, 0F, true, 64F, 64F) }; - hatbase1 = new ModelPart(Arrays.asList(hatbase1Cuboids), Collections.emptyMap()); - hatbase1.setPivot(0F, 0F, 0F); - setRotation(hatbase1, 0F, 0F, 0F); + hatBase1 = new ModelPart(Arrays.asList(hatBase1Cuboids), Collections.emptyMap()); + hatBase1.setPivot(0F, 0F, 0F); + setRotation(hatBase1, 0F, 0F, 0F); - ModelPart.Cuboid[] hatband5Cuboids = { + ModelPart.Cuboid[] hatBand5Cuboids = { new ModelPart.Cuboid(18, 41, 0F, -7F, -5F, 4F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband5 = new ModelPart(Arrays.asList(hatband5Cuboids), Collections.emptyMap()); - hatband5.setPivot(0F, 0F, 0F); - setRotation(hatband5, 0F, 0F, 0F); + hatBand5 = new ModelPart(Arrays.asList(hatBand5Cuboids), Collections.emptyMap()); + hatBand5.setPivot(0F, 0F, 0F); + setRotation(hatBand5, 0F, 0F, 0F); - ModelPart.Cuboid[] hatband6Cuboids = { + ModelPart.Cuboid[] hatBand6Cuboids = { new ModelPart.Cuboid(18, 41, -4F, -7F, 0F, 4F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatband6 = new ModelPart(Arrays.asList(hatband6Cuboids), Collections.emptyMap()); - hatband6.setPivot(0F, 0F, 4F); - setRotation(hatband6, 0F, 0F, 0F); + hatBand6 = new ModelPart(Arrays.asList(hatBand6Cuboids), Collections.emptyMap()); + hatBand6.setPivot(0F, 0F, 4F); + setRotation(hatBand6, 0F, 0F, 0F); - ModelPart.Cuboid[] hatbase2Cuboids = { + ModelPart.Cuboid[] hatBase2Cuboids = { new ModelPart.Cuboid(18, 34, -3F, -10F, -3F, 6F, 1F, 6F, 0F, 0F, 0F, true, 64F, 64F) }; - hatbase2 = new ModelPart(Arrays.asList(hatbase2Cuboids), Collections.emptyMap()); - hatbase2.setPivot(0F, 0F, 0F); - setRotation(hatbase2, 0F, 0.1115358F, 0F); + hatBase2 = new ModelPart(Arrays.asList(hatBase2Cuboids), Collections.emptyMap()); + hatBase2.setPivot(0F, 0F, 0F); + setRotation(hatBase2, 0F, 0.1115358F, 0F); - ModelPart.Cuboid[] hatextension1Cuboids = { + ModelPart.Cuboid[] hatExtension1Cuboids = { new ModelPart.Cuboid(0, 52, -3F, -11F, -2F, 4F, 2F, 4F, 0F, 0F, 0F, true, 64F, 64F) }; - hatextension1 = new ModelPart(Arrays.asList(hatextension1Cuboids), Collections.emptyMap()); - hatextension1.setPivot(0F, 0F, 0F); - setRotation(hatextension1, 0F, -0.0371786F, 0.0743572F); + hatExtension1 = new ModelPart(Arrays.asList(hatExtension1Cuboids), Collections.emptyMap()); + hatExtension1.setPivot(0F, 0F, 0F); + setRotation(hatExtension1, 0F, -0.0371786F, 0.0743572F); - ModelPart.Cuboid[] hatextension2Cuboids = { + ModelPart.Cuboid[] hatExtension2Cuboids = { new ModelPart.Cuboid(16, 52, -2.4F, -12F, -1.5F, 3F, 2F, 3F, 0F, 0F, 0F, true, 64F, 64F) }; - hatextension2 = new ModelPart(Arrays.asList(hatextension2Cuboids), Collections.emptyMap()); - hatextension2.setPivot(0F, 0F, 0F); - setRotation(hatextension2, 0F, 0.0743572F, 0.0743572F); + hatExtension2 = new ModelPart(Arrays.asList(hatExtension2Cuboids), Collections.emptyMap()); + hatExtension2.setPivot(0F, 0F, 0F); + setRotation(hatExtension2, 0F, 0.0743572F, 0.0743572F); - ModelPart.Cuboid[] hatextension3Cuboids = { + ModelPart.Cuboid[] hatExtension3Cuboids = { new ModelPart.Cuboid(28, 52, -3.5F, -13F, -1F, 2F, 2F, 2F, 0F, 0F, 0F, true, 64F, 64F) }; - hatextension3 = new ModelPart(Arrays.asList(hatextension3Cuboids), Collections.emptyMap()); - hatextension3.setPivot(0F, 0F, 0F); - setRotation(hatextension3, 0F, 0F, 0.2230717F); + hatExtension3 = new ModelPart(Arrays.asList(hatExtension3Cuboids), Collections.emptyMap()); + hatExtension3.setPivot(0F, 0F, 0F); + setRotation(hatExtension3, 0F, 0F, 0.2230717F); - ModelPart.Cuboid[] hatextension4Cuboids = { + ModelPart.Cuboid[] hatExtension4Cuboids = { new ModelPart.Cuboid(0, 58, -13F, -6.6F, -1F, 2F, 3F, 2F, 0F, 0F, 0F, true, 64F, 64F) }; - hatextension4 = new ModelPart(Arrays.asList(hatextension4Cuboids), Collections.emptyMap()); - hatextension4.setPivot(0F, 0F, 0F); - setRotation(hatextension4, 0F, 0F, 1.264073F); + hatExtension4 = new ModelPart(Arrays.asList(hatExtension4Cuboids), Collections.emptyMap()); + hatExtension4.setPivot(0F, 0F, 0F); + setRotation(hatExtension4, 0F, 0F, 1.264073F); - ModelPart.Cuboid[] hatball1Cuboids = { + ModelPart.Cuboid[] hatBall1Cuboids = { new ModelPart.Cuboid(8, 58, 2F, -14.4F, -1.001F, 2F, 2F, 2F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball1 = new ModelPart(Arrays.asList(hatball1Cuboids), Collections.emptyMap()); - hatball1.setPivot(0F, 0F, 0F); - setRotation(hatball1, 0F, 0F, 0F); + hatBall1 = new ModelPart(Arrays.asList(hatBall1Cuboids), Collections.emptyMap()); + hatBall1.setPivot(0F, 0F, 0F); + setRotation(hatBall1, 0F, 0F, 0F); - ModelPart.Cuboid[] hatball2Cuboids = { + ModelPart.Cuboid[] hatBall2Cuboids = { new ModelPart.Cuboid(16, 57, 2.5F, -14.8F, -0.5F, 1F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball2 = new ModelPart(Arrays.asList(hatball2Cuboids), Collections.emptyMap()); - hatball2.setPivot(0F, 0F, 0F); - setRotation(hatball2, 0F, 0F, 0F); + hatBall2 = new ModelPart(Arrays.asList(hatBall2Cuboids), Collections.emptyMap()); + hatBall2.setPivot(0F, 0F, 0F); + setRotation(hatBall2, 0F, 0F, 0F); - ModelPart.Cuboid[] hatball3Cuboids = { + ModelPart.Cuboid[] hatBall3Cuboids = { new ModelPart.Cuboid(16, 57, 2.5F, -13F, -0.5F, 1F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball3 = new ModelPart(Arrays.asList(hatball3Cuboids), Collections.emptyMap()); - hatball3.setPivot(0F, 0F, 0F); - setRotation(hatball3, 0F, 0F, 0F); + hatBall3 = new ModelPart(Arrays.asList(hatBall3Cuboids), Collections.emptyMap()); + hatBall3.setPivot(0F, 0F, 0F); + setRotation(hatBall3, 0F, 0F, 0F); - ModelPart.Cuboid[] hatball4Cuboids = { + ModelPart.Cuboid[] hatBall4Cuboids = { new ModelPart.Cuboid(16, 57, 3.4F, -14F, -0.5F, 1F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball4 = new ModelPart(Arrays.asList(hatball4Cuboids), Collections.emptyMap()); - hatball4.setPivot(0F, 0F, 0F); - setRotation(hatball4, 0F, 0F, 0F); + hatBall4 = new ModelPart(Arrays.asList(hatBall4Cuboids), Collections.emptyMap()); + hatBall4.setPivot(0F, 0F, 0F); + setRotation(hatBall4, 0F, 0F, 0F); - ModelPart.Cuboid[] hatball5Cuboids = { + ModelPart.Cuboid[] hatBall5Cuboids = { new ModelPart.Cuboid(16, 57, 2.5F, -14F, 0.4F, 1F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball5 = new ModelPart(Arrays.asList(hatball5Cuboids), Collections.emptyMap()); - hatball5.setPivot(0F, 0F, 0F); - setRotation(hatball5, 0F, 0F, 0F); + hatBall5 = new ModelPart(Arrays.asList(hatBall5Cuboids), Collections.emptyMap()); + hatBall5.setPivot(0F, 0F, 0F); + setRotation(hatBall5, 0F, 0F, 0F); - ModelPart.Cuboid[] hatball6Cuboids = { + ModelPart.Cuboid[] hatBall6Cuboids = { new ModelPart.Cuboid(16, 57, 2.5F, -14F, -1.4F, 1F, 1F, 1F, 0F, 0F, 0F, true, 64F, 64F) }; - hatball6 = new ModelPart(Arrays.asList(hatball6Cuboids), Collections.emptyMap()); - hatball6.setPivot(0F, 0F, 0F); - setRotation(hatball6, 0F, 0F, 0F); + hatBall6 = new ModelPart(Arrays.asList(hatBall6Cuboids), Collections.emptyMap()); + hatBall6.setPivot(0F, 0F, 0F); + setRotation(hatBall6, 0F, 0F, 0F); } @Override @@ -194,24 +194,24 @@ public class ModelSantaHat extends EntityModel { @Override public void render(MatrixStack matrixStack, VertexConsumer vertexConsumer, int light, int overlay, float r, float g, float b, float f) { - hatband1.render(matrixStack, vertexConsumer, light, overlay); - hatband2.render(matrixStack, vertexConsumer, light, overlay); - hatband3.render(matrixStack, vertexConsumer, light, overlay); - hatband4.render(matrixStack, vertexConsumer, light, overlay); - hatbase1.render(matrixStack, vertexConsumer, light, overlay); - hatband5.render(matrixStack, vertexConsumer, light, overlay); - hatband6.render(matrixStack, vertexConsumer, light, overlay); - hatbase2.render(matrixStack, vertexConsumer, light, overlay); - hatextension1.render(matrixStack, vertexConsumer, light, overlay); - hatextension2.render(matrixStack, vertexConsumer, light, overlay); - hatextension3.render(matrixStack, vertexConsumer, light, overlay); - hatextension4.render(matrixStack, vertexConsumer, light, overlay); - hatball1.render(matrixStack, vertexConsumer, light, overlay); - hatball2.render(matrixStack, vertexConsumer, light, overlay); - hatball3.render(matrixStack, vertexConsumer, light, overlay); - hatball4.render(matrixStack, vertexConsumer, light, overlay); - hatball5.render(matrixStack, vertexConsumer, light, overlay); - hatball6.render(matrixStack, vertexConsumer, light, overlay); + hatBand1.render(matrixStack, vertexConsumer, light, overlay); + hatBand2.render(matrixStack, vertexConsumer, light, overlay); + hatBand3.render(matrixStack, vertexConsumer, light, overlay); + hatBand4.render(matrixStack, vertexConsumer, light, overlay); + hatBase1.render(matrixStack, vertexConsumer, light, overlay); + hatBand5.render(matrixStack, vertexConsumer, light, overlay); + hatBand6.render(matrixStack, vertexConsumer, light, overlay); + hatBase2.render(matrixStack, vertexConsumer, light, overlay); + hatExtension1.render(matrixStack, vertexConsumer, light, overlay); + hatExtension2.render(matrixStack, vertexConsumer, light, overlay); + hatExtension3.render(matrixStack, vertexConsumer, light, overlay); + hatExtension4.render(matrixStack, vertexConsumer, light, overlay); + hatBall1.render(matrixStack, vertexConsumer, light, overlay); + hatBall2.render(matrixStack, vertexConsumer, light, overlay); + hatBall3.render(matrixStack, vertexConsumer, light, overlay); + hatBall4.render(matrixStack, vertexConsumer, light, overlay); + hatBall5.render(matrixStack, vertexConsumer, light, overlay); + hatBall6.render(matrixStack, vertexConsumer, light, overlay); } private void setRotation(ModelPart model, float x, float y, float z) { diff --git a/RebornCore/src/main/java/reborncore/client/gui/GuiButtonCustomTexture.java b/RebornCore/src/main/java/reborncore/client/gui/GuiButtonCustomTexture.java index 94308faee..80051b08f 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/GuiButtonCustomTexture.java +++ b/RebornCore/src/main/java/reborncore/client/gui/GuiButtonCustomTexture.java @@ -37,10 +37,10 @@ import reborncore.common.util.Color; public class GuiButtonCustomTexture extends ButtonWidget { public int textureU; public int textureV; - public String texturename; + public String textureName; public String linkedPage; public Text name; - public String imageprefix = "techreborn:textures/manual/elements/"; + public String imagePrefix = "techreborn:textures/manual/elements/"; public int buttonHeight; public int buttonWidth; public int buttonU; @@ -49,11 +49,11 @@ public class GuiButtonCustomTexture extends ButtonWidget { public int textureW; public GuiButtonCustomTexture(int xPos, int yPos, int u, int v, int buttonWidth, int buttonHeight, - String texturename, String linkedPage, Text name, int buttonU, int buttonV, int textureH, int textureW, ButtonWidget.PressAction pressAction) { + String textureName, String linkedPage, Text name, int buttonU, int buttonV, int textureH, int textureW, ButtonWidget.PressAction pressAction) { super(xPos, yPos, buttonWidth, buttonHeight, LiteralText.EMPTY, pressAction); this.textureU = u; this.textureV = v; - this.texturename = texturename; + this.textureName = textureName; this.name = name; this.linkedPage = linkedPage; this.buttonHeight = height; @@ -87,7 +87,7 @@ public class GuiButtonCustomTexture extends ButtonWidget { } public void renderImage(MatrixStack matrixStack, int offsetX, int offsetY) { - RenderSystem.setShaderTexture(0, new Identifier(imageprefix + this.texturename + ".png")); + RenderSystem.setShaderTexture(0, new Identifier(imagePrefix + this.textureName + ".png")); RenderSystem.enableBlend(); RenderSystem.blendFunc(GlStateManager.SrcFactor.SRC_ALPHA, GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA); diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java b/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java index f1ef1fb55..33b5d8402 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java @@ -389,13 +389,13 @@ public class GuiBase extends HandledScreen { } /** - * @param rectX int Top left corner of region - * @param rectY int Top left corner of region - * @param rectWidth int Width of region - * @param rectHeight int Height of region - * @param pointX int Mouse pointer - * @param pointY int Mouse pointer - * @return boolean Returns true if mouse pointer is in region specified + * @param rectX {@code int} Top left corner of region + * @param rectY {@code int} Top left corner of region + * @param rectWidth {@code int} Width of region + * @param rectHeight {@code int} Height of region + * @param pointX {@code int} Mouse pointer + * @param pointY {@code int} Mouse pointer + * @return {@code boolean} Returns true if mouse pointer is in region specified */ public boolean isPointInRect(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY) { return super.isPointWithinBounds(rectX, rectY, rectWidth, rectHeight, pointX, pointY); @@ -422,7 +422,7 @@ public class GuiBase extends HandledScreen { } public MinecraftClient getMinecraft() { - // Just to stop complains from IDEA + // Just to stop complaints from IDEA if (client == null) { throw new NullPointerException("Minecraft client is null."); } @@ -454,7 +454,7 @@ public class GuiBase extends HandledScreen { @Override protected boolean isClickOutsideBounds(double mouseX, double mouseY, int left, int top, int mouseButton) { - // Upgrades are normally outside of the bounds, so let's pretend we are within the bounds if there is a slot here. + // Upgrades are normally outside the bounds, so let's pretend we are within the bounds if there is a slot here. return getSlotAt(mouseX, mouseY) == null && super.isClickOutsideBounds(mouseX, mouseY, left, top, mouseButton); } diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/SlotConfigGui.java b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/SlotConfigGui.java index 4b1060a6c..18667c951 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/SlotConfigGui.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/SlotConfigGui.java @@ -109,7 +109,7 @@ public class SlotConfigGui { } String json = machine.getSlotConfiguration().toJson(machine.getClass().getCanonicalName()); MinecraftClient.getInstance().keyboard.setClipboard(json); - MinecraftClient.getInstance().player.sendSystemMessage(new LiteralText("Slot configuration copyied to clipboard"), Util.NIL_UUID); + MinecraftClient.getInstance().player.sendSystemMessage(new LiteralText("Slot configuration copied to clipboard"), Util.NIL_UUID); } public static void pasteFromClipboard() { diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java index fdc9c2605..327e71d89 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/FluidConfigPopupElement.java @@ -55,7 +55,7 @@ public class FluidConfigPopupElement extends ElementBase { public boolean filter = false; ConfigFluidElement fluidElement; - double lastMousex, lastMousey; + double lastMouseX, lastMouseY; public FluidConfigPopupElement(int x, int y, ConfigFluidElement fluidElement) { super(x, y, Sprite.SLOT_CONFIG_POPUP); @@ -93,24 +93,24 @@ public class FluidConfigPopupElement extends ElementBase { @Override public boolean onRelease(MachineBaseBlockEntity provider, GuiBase gui, double mouseX, double mouseY) { if (isInBox(23, 4, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.UP.getFacing(provider), gui); + cycleConfig(MachineFacing.UP.getFacing(provider), gui); } else if (isInBox(23, 23, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.FRONT.getFacing(provider), gui); + cycleConfig(MachineFacing.FRONT.getFacing(provider), gui); } else if (isInBox(42, 23, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.RIGHT.getFacing(provider), gui); + cycleConfig(MachineFacing.RIGHT.getFacing(provider), gui); } else if (isInBox(4, 23, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.LEFT.getFacing(provider), gui); + cycleConfig(MachineFacing.LEFT.getFacing(provider), gui); } else if (isInBox(23, 42, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.DOWN.getFacing(provider), gui); + cycleConfig(MachineFacing.DOWN.getFacing(provider), gui); } else if (isInBox(42, 42, 16, 16, mouseX, mouseY, gui)) { - cyleConfig(MachineFacing.BACK.getFacing(provider), gui); + cycleConfig(MachineFacing.BACK.getFacing(provider), gui); } else { return false; } return true; } - public void cyleConfig(Direction side, GuiBase guiBase) { + public void cycleConfig(Direction side, GuiBase guiBase) { FluidConfiguration.FluidConfig config = guiBase.getMachine().fluidConfiguration.getSideDetail(side); FluidConfiguration.ExtractConfig fluidIO = config.getIoConfig().getNext(); @@ -137,8 +137,8 @@ public class FluidConfigPopupElement extends ElementBase { @Override public boolean onHover(MachineBaseBlockEntity provider, GuiBase gui, double mouseX, double mouseY) { - lastMousex = mouseX; - lastMousey = mouseY; + lastMouseX = mouseX; + lastMouseY = mouseY; return super.onHover(provider, gui, mouseX, mouseY); } @@ -148,7 +148,7 @@ public class FluidConfigPopupElement extends ElementBase { int sy = iny + getY() + gui.getGuiTop(); FluidConfiguration fluidConfiguration = machineBase.fluidConfiguration; if (fluidConfiguration == null) { - RebornCore.LOGGER.debug("Humm, this isnt suppoed to happen"); + RebornCore.LOGGER.debug("Hmm, this isn't supposed to happen"); return; } FluidConfiguration.FluidConfig fluidConfig = fluidConfiguration.getSideDetail(side); @@ -197,4 +197,4 @@ public class FluidConfigPopupElement extends ElementBase { matrixStack.pop(); } -} \ No newline at end of file +} diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java index a4187c637..1d7956d74 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/slot/elements/SlotConfigPopupElement.java @@ -97,27 +97,27 @@ public class SlotConfigPopupElement extends ElementBase { @Override public boolean onRelease(MachineBaseBlockEntity provider, GuiBase gui, double mouseX, double mouseY) { if (isInBox(23, 4, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.UP.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.UP.getFacing(provider), gui); } else if (isInBox(23, 23, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.FRONT.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.FRONT.getFacing(provider), gui); } else if (isInBox(42, 23, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.RIGHT.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.RIGHT.getFacing(provider), gui); } else if (isInBox(4, 23, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.LEFT.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.LEFT.getFacing(provider), gui); } else if (isInBox(23, 42, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.DOWN.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.DOWN.getFacing(provider), gui); } else if (isInBox(42, 42, 16, 16, mouseX, mouseY, gui)) { - cyleSlotConfig(MachineFacing.BACK.getFacing(provider), gui); + cycleSlotConfig(MachineFacing.BACK.getFacing(provider), gui); } else { return false; } return true; } - public void cyleSlotConfig(Direction side, GuiBase guiBase) { + public void cycleSlotConfig(Direction side, GuiBase guiBase) { SlotConfiguration.SlotConfig currentSlot = guiBase.getMachine().getSlotConfiguration().getSlotDetails(id).getSideDetail(side); - //Bit of a mess, in the future have a way to remove config options from this list + // A bit of a mess, in the future have a way to remove config options from this list SlotConfiguration.ExtractConfig nextConfig = currentSlot.getSlotIO().getIoConfig().getNext(); if (!allowInput && nextConfig == SlotConfiguration.ExtractConfig.INPUT) { nextConfig = SlotConfiguration.ExtractConfig.OUTPUT; @@ -154,7 +154,7 @@ public class SlotConfigPopupElement extends ElementBase { int sy = iny + getY() + gui.getGuiTop(); SlotConfiguration.SlotConfigHolder slotConfigHolder = machineBase.getSlotConfiguration().getSlotDetails(slotID); if (slotConfigHolder == null) { - RebornCore.LOGGER.debug("Humm, this isnt suppoed to happen"); + RebornCore.LOGGER.debug("Hmm, this isn't supposed to happen"); return; } SlotConfiguration.SlotConfig slotConfig = slotConfigHolder.getSideDetail(side); @@ -206,4 +206,4 @@ public class SlotConfigPopupElement extends ElementBase { public void drawState(GuiBase gui, World world, BakedModel model, BlockState actualState, BlockPos pos, BlockRenderManager dispatcher, int x, int y) { drawState(gui, world, model, actualState, pos, dispatcher, x, y, null); } -} \ No newline at end of file +} diff --git a/RebornCore/src/main/java/reborncore/client/gui/componets/GuiHiddenButton.java b/RebornCore/src/main/java/reborncore/client/gui/componets/GuiHiddenButton.java index 8f3cf61ac..f1e2f962e 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/componets/GuiHiddenButton.java +++ b/RebornCore/src/main/java/reborncore/client/gui/componets/GuiHiddenButton.java @@ -47,7 +47,7 @@ public class GuiHiddenButton extends ButtonWidget { @Override public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { if (this.visible) { - TextRenderer fontrenderer = MinecraftClient.getInstance().textRenderer; + TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; RenderSystem.setShaderTexture(0, WIDGETS_TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); this.hovered = mouseX >= this.x && mouseY >= this.y @@ -63,7 +63,7 @@ public class GuiHiddenButton extends ButtonWidget { l = 16777120; } - this.drawTextWithShadow(matrixStack, fontrenderer, this.getMessage(), this.x + this.width / 2, + this.drawTextWithShadow(matrixStack, textRenderer, this.getMessage(), this.x + this.width / 2, this.y + (this.height - 8) / 2, l); } } diff --git a/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java b/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java index a4a53e92b..ecf976d43 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/gui/guibuilder/GuiBuilder.java @@ -136,10 +136,10 @@ public class GuiBuilder { /** * Draws button with JEI icon in the given coords. * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place button - * @param y int Top left corner where to place button - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place button + * @param y {@code int} Top left corner where to place button + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawJEIButton(MatrixStack matrixStack, GuiBase gui, int x, int y, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -156,13 +156,13 @@ public class GuiBuilder { /** * Draws lock button in either locked or unlocked state * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place button - * @param y int Top left corner where to place button - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param layer Layer Layer to draw on - * @param locked boolean Set to true if it is in locked state + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place button + * @param y {@code int} Top left corner where to place button + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param layer {@link GuiBase.Layer} The layer to draw on + * @param locked {@code boolean} Set to true if it is in locked state */ public void drawLockButton(MatrixStack matrixStack, GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer, boolean locked) { if (gui.hideGuiElements()) return; @@ -188,12 +188,12 @@ public class GuiBuilder { /** * Draws hologram toggle button * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place button - * @param y int Top left corner where to place button - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place button + * @param y {@code int} Top left corner where to place button + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawHologramButton(MatrixStack matrixStack, GuiBase gui, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer) { if (gui.isTabOpen()) return; @@ -223,12 +223,12 @@ public class GuiBuilder { /** * Draws big horizontal bar for heat value * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place bar - * @param y int Top left corner where to place bar - * @param value int Current heat value - * @param max int Maximum heat value - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place bar + * @param y {@code int} Top left corner where to place bar + * @param value {@code int} Current heat value + * @param max {@code int} Maximum heat value + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawBigHeatBar(MatrixStack matrixStack, GuiBase gui, int x, int y, int value, int max, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -255,17 +255,17 @@ public class GuiBuilder { /** * Draws big horizontal blue bar * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place bar - * @param y int Top left corner where to place bar - * @param value int Current value - * @param max int Maximum value - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param suffix String String to put on the bar and tooltip after percentage value - * @param line2 String String to put into tooltip as a second line - * @param format String Formatted value to put on the bar - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place bar + * @param y {@code int} Top left corner where to place bar + * @param value {@code int} Current value + * @param max {@code int} Maximum value + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param suffix {@link String} String to put on the bar and tooltip after percentage value + * @param line2 {@link String} String to put into tooltip as a second line + * @param format {@link String} Formatted value to put on the bar + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawBigBlueBar(MatrixStack matrixStack, GuiBase gui, int x, int y, int value, int max, int mouseX, int mouseY, String suffix, Text line2, String format, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -343,8 +343,8 @@ public class GuiBuilder { /** * Shades GUI and draw gray bar on top of GUI * - * @param gui GuiBase GUI to draw on - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawMultiblockMissingBar(MatrixStack matrixStack, GuiBase gui, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -369,9 +369,9 @@ public class GuiBuilder { * Draws upgrade slots on the left side of machine GUI. Draws on the background * level. * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place slots - * @param y int Top left corner where to place slots + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place slots + * @param y {@code int} Top left corner where to place slots */ public void drawUpgrades(MatrixStack matrixStack, GuiBase gui, int x, int y) { RenderSystem.setShaderTexture(0, resourceLocation); @@ -381,10 +381,10 @@ public class GuiBuilder { /** * Draws tab on the left side of machine GUI. Draws on the background level. * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place tab - * @param y int Top left corner where to place tab - * @param stack ItemStack Item to show as tab icon + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place tab + * @param y {@code int} Top left corner where to place tab + * @param stack {@link ItemStack} Item to show as tab icon */ public void drawSlotTab(MatrixStack matrixStack, GuiBase gui, int x, int y, ItemStack stack) { RenderSystem.setShaderTexture(0, resourceLocation); @@ -396,11 +396,11 @@ public class GuiBuilder { /** * Draws Slot Configuration tips instead of player inventory * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place tips list - * @param y int Top left corner where to place tips list - * @param mouseX int Mouse cursor position - * @param mouseY int Mouse cursor position + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place tips list + * @param y {@code int} Top left corner where to place tips list + * @param mouseX {@code int} Mouse cursor position + * @param mouseY {@code int} Mouse cursor position */ public void drawSlotConfigTips(MatrixStack matrixStack, GuiBase gui, int x, int y, int mouseX, int mouseY, GuiTab guiTab) { List tips = guiTab.getTips().stream() @@ -468,15 +468,16 @@ public class GuiBuilder { } } - //TODO: change to double + // TODO: change to double + /** * Draws energy output value and icon * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place energy output - * @param y int Top left corner where to place energy output - * @param maxOutput int Energy output value - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place energy output + * @param y {@code int} Top left corner where to place energy output + * @param maxOutput {@code int} Energy output value + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawEnergyOutput(MatrixStack matrixStack, GuiBase gui, int x, int y, int maxOutput, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -498,15 +499,15 @@ public class GuiBuilder { /** * Draws progress arrow in direction specified. * - * @param gui GuiBase GUI to draw on - * @param progress int Current progress - * @param maxProgress int Maximum progress - * @param x int Top left corner where to place progress arrow - * @param y int Top left corner where to place progress arrow - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param direction ProgressDirection Direction of progress arrow - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param progress {@code int} Current progress + * @param maxProgress {@code int} Maximum progress + * @param x {@code int} Top left corner where to place progress arrow + * @param y {@code int} Top left corner where to place progress arrow + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param direction {@link ProgressDirection} Direction of the progress arrow + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawProgressBar(MatrixStack matrixStack, GuiBase gui, int progress, int maxProgress, int x, int y, int mouseX, int mouseY, ProgressDirection direction, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -560,15 +561,15 @@ public class GuiBuilder { /** * Draws multi-energy bar * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place energy bar - * @param y int Top left corner where to place energy bar - * @param energyStored int Current amount of energy - * @param maxEnergyStored int Maximum amount of energy - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param buttonID int Button ID used to switch energy systems - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place energy bar + * @param y {@code int} Top left corner where to place energy bar + * @param energyStored {@code int} Current amount of energy + * @param maxEnergyStored {@code int} Maximum amount of energy + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param buttonID {@code int} Button ID used to switch energy systems + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawMultiEnergyBar(MatrixStack matrixStack, GuiBase gui, int x, int y, int energyStored, int maxEnergyStored, int mouseX, int mouseY, int buttonID, GuiBase.Layer layer) { @@ -641,15 +642,15 @@ public class GuiBuilder { /** * Draws tank and fluid inside it * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner of tank - * @param y int Top left corner of tank - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param fluid FluidStack Fluid to draw in tank - * @param maxCapacity int Maximum tank capacity - * @param isTankEmpty boolean True if tank is empty - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner of tank + * @param y {@code int} Top left corner of tank + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param fluid {@link FluidInstance} to draw in tank + * @param maxCapacity {@code int} Maximum tank capacity + * @param isTankEmpty {@code boolean} True if tank is empty + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawTank(MatrixStack matrixStack, GuiBase gui, int x, int y, int mouseX, int mouseY, FluidInstance fluid, FluidValue maxCapacity, boolean isTankEmpty, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -704,13 +705,13 @@ public class GuiBuilder { /** * Draws fluid in tank * - * @param gui GuiBase GUI to draw on - * @param fluid FluidStack Fluid to draw - * @param x int Top left corner of fluid - * @param y int Top left corner of fluid - * @param width int Width of fluid to draw - * @param height int Height of fluid to draw - * @param maxCapacity int Maximum capacity of tank + * @param gui {@link GuiBase} The GUI to draw on + * @param fluid {@link FluidInstance} Fluid to draw + * @param x {@code int} Top left corner of fluid + * @param y {@code int} Top left corner of fluid + * @param width {@code int} Width of fluid to draw + * @param height {@code int} Height of fluid to draw + * @param maxCapacity {@code int} Maximum capacity of tank */ public void drawFluid(MatrixStack matrixStack, GuiBase gui, FluidInstance fluid, int x, int y, int width, int height, long maxCapacity) { if (fluid.getFluid() == Fluids.EMPTY) { @@ -746,14 +747,14 @@ public class GuiBuilder { /** * Draws burning progress, similar to vanilla furnace * - * @param gui GuiBase GUI to draw on - * @param progress int Current progress - * @param maxProgress int Maximum progress - * @param x int Top left corner where to place burn bar - * @param y int Top left corner where to place burn bar - * @param mouseX int Mouse cursor position to check for tooltip - * @param mouseY int Mouse cursor position to check for tooltip - * @param layer Layer Layer to draw on + * @param gui {@link GuiBase} The GUI to draw on + * @param progress {@code int} Current progress + * @param maxProgress {@code int} Maximum progress + * @param x {@code int} Top left corner where to place burn bar + * @param y {@code int} Top left corner where to place burn bar + * @param mouseX {@code int} Mouse cursor position to check for tooltip + * @param mouseY {@code int} Mouse cursor position to check for tooltip + * @param layer {@link GuiBase.Layer} The layer to draw on */ public void drawBurnBar(MatrixStack matrixStack, GuiBase gui, int progress, int maxProgress, int x, int y, int mouseX, int mouseY, GuiBase.Layer layer) { if (gui.hideGuiElements()) return; @@ -785,10 +786,10 @@ public class GuiBuilder { /** * Draws bar containing output slots * - * @param gui GuiBase GUI to draw on - * @param x int Top left corner where to place slots bar - * @param y int Top left corner where to place slots bar - * @param count int Number of output slots + * @param gui {@link GuiBase} The GUI to draw on + * @param x {@code int} Top left corner where to place slots bar + * @param y {@code int} Top left corner where to place slots bar + * @param count {@code int} Number of output slots */ public void drawOutputSlotBar(MatrixStack matrixStack, GuiBase gui, int x, int y, int count) { RenderSystem.setShaderTexture(0, resourceLocation); diff --git a/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFake.java b/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFake.java index 5e72e922b..5795c8ace 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFake.java +++ b/RebornCore/src/main/java/reborncore/client/gui/slots/SlotFake.java @@ -31,14 +31,14 @@ public class SlotFake extends BaseSlot { public boolean mCanInsertItem; public boolean mCanStackItem; - public int mMaxStacksize = 127; + public int mMaxStackSize = 127; public SlotFake(Inventory itemHandler, int par2, int par3, int par4, boolean aCanInsertItem, - boolean aCanStackItem, int aMaxStacksize) { + boolean aCanStackItem, int aMaxStackSize) { super(itemHandler, par2, par3, par4); this.mCanInsertItem = aCanInsertItem; this.mCanStackItem = aCanStackItem; - this.mMaxStacksize = aMaxStacksize; + this.mMaxStackSize = aMaxStackSize; } @Override @@ -48,7 +48,7 @@ public class SlotFake extends BaseSlot { @Override public int getMaxItemCount() { - return this.mMaxStacksize; + return this.mMaxStackSize; } @Override diff --git a/RebornCore/src/main/java/reborncore/client/multiblock/MultiblockComponent.java b/RebornCore/src/main/java/reborncore/client/multiblock/MultiblockComponent.java index 1ceed613f..5e5fec467 100644 --- a/RebornCore/src/main/java/reborncore/client/multiblock/MultiblockComponent.java +++ b/RebornCore/src/main/java/reborncore/client/multiblock/MultiblockComponent.java @@ -22,9 +22,9 @@ * SOFTWARE. */ -/** +/* * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: + * part of the Botania Mod. Get the Source Code in GitHub: * https://github.com/Vazkii/Botania *

* Botania is Open Source and distributed under the diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java b/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java index e89b83091..5c0b58d33 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/BlockEntityScreenHandlerBuilder.java @@ -130,17 +130,18 @@ public class BlockEntityScreenHandlerBuilder { private BlockEntityScreenHandlerBuilder upgradeSlots(IUpgradeable upgradeable) { if (upgradeable.canBeUpgraded()) { for (int i = 0; i < upgradeable.getUpgradeSlotCount(); i++) { - this.parent.slots.add(new UpgradeSlot(upgradeable.getUpgradeInvetory(), i, -18, i * 18 + 12)); + this.parent.slots.add(new UpgradeSlot(upgradeable.getUpgradeInventory(), i, -18, i * 18 + 12)); } } return this; } /** - * @param supplier The supplier it can supply a variable holding in an Object it - * will be synced with a custom packet - * @param setter The setter to call when the variable has been updated. - * @return ContainerTileInventoryBuilder Inventory which will do the sync + * @param The type of the block entity + * @param supplier {@link Supplier} The supplier it can supply a variable holding in an Object. + * it will be synced with a custom packet + * @param setter {@link Consumer} The setter to call when the variable has been updated. + * @return {@link BlockEntityScreenHandlerBuilder} Inventory which will do the sync */ public BlockEntityScreenHandlerBuilder sync(final Supplier supplier, final Consumer setter) { this.parent.objectValues.add(Pair.of(supplier, setter)); diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java index 076d8e6aa..83206005d 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/BuiltScreenHandler.java @@ -37,8 +37,8 @@ import net.minecraft.screen.slot.Slot; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.network.ClientBoundPackets; import reborncore.common.network.NetworkManager; @@ -62,7 +62,7 @@ public class BuiltScreenHandler extends ScreenHandler { private final List> playerSlotRanges; private final List> blockEntitySlotRanges; - // Holds the syncpair along with the last value + // Holds the SyncPair along with the last value private final Map syncPairCache = new HashMap<>(); private final Int2ObjectMap syncPairIdLookup = new Int2ObjectOpenHashMap<>(); @@ -257,7 +257,7 @@ public class BuiltScreenHandler extends ScreenHandler { } } - //If we moved some, but still have more left over lets try again + // If we moved some, but still have more left over lets try again if (!stackToShift.isEmpty() && stackToShift.getCount() != inCount) { shiftItemStack(stackToShift, start, end); } diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/PlayerScreenHandlerBuilder.java b/RebornCore/src/main/java/reborncore/client/screen/builder/PlayerScreenHandlerBuilder.java index 0147309cd..3fb42d806 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/PlayerScreenHandlerBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/PlayerScreenHandlerBuilder.java @@ -86,7 +86,7 @@ public final class PlayerScreenHandlerBuilder { this.parent.addPlayerInventoryRange(this.main); } if (this.armor != null) { - this.parent.addBlockEnityInventoryRange(this.armor); + this.parent.addBlockEntityInventoryRange(this.armor); } return this.parent; @@ -139,4 +139,4 @@ public final class PlayerScreenHandlerBuilder { return this.parent; } } -} \ No newline at end of file +} diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/ScreenHandlerBuilder.java b/RebornCore/src/main/java/reborncore/client/screen/builder/ScreenHandlerBuilder.java index b21663a82..5c2171dc4 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/ScreenHandlerBuilder.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/ScreenHandlerBuilder.java @@ -76,7 +76,7 @@ public class ScreenHandlerBuilder { this.playerInventoryRanges.add(range); } - void addBlockEnityInventoryRange(final Range range) { + void addBlockEntityInventoryRange(final Range range) { this.blockEntityInventoryRanges.add(range); } diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/slot/FilteredSlot.java b/RebornCore/src/main/java/reborncore/client/screen/builder/slot/FilteredSlot.java index c7133af10..4ed15d5e4 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/slot/FilteredSlot.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/slot/FilteredSlot.java @@ -28,7 +28,6 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import reborncore.client.gui.slots.BaseSlot; -import java.util.function.BiPredicate; import java.util.function.Predicate; public class FilteredSlot extends BaseSlot { diff --git a/RebornCore/src/main/java/reborncore/client/screen/builder/slot/SpriteSlot.java b/RebornCore/src/main/java/reborncore/client/screen/builder/slot/SpriteSlot.java index 1ade6e48b..4c58ad3d1 100644 --- a/RebornCore/src/main/java/reborncore/client/screen/builder/slot/SpriteSlot.java +++ b/RebornCore/src/main/java/reborncore/client/screen/builder/slot/SpriteSlot.java @@ -35,12 +35,12 @@ import org.jetbrains.annotations.Nullable; public class SpriteSlot extends FilteredSlot { private final Identifier spriteName; - int stacksize; + int stackSize; - public SpriteSlot(final Inventory inventory, final int index, final int xPosition, final int yPosition, final Identifier sprite, final int stacksize) { + public SpriteSlot(final Inventory inventory, final int index, final int xPosition, final int yPosition, final Identifier sprite, final int stackSize) { super(inventory, index, xPosition, yPosition); this.spriteName = sprite; - this.stacksize = stacksize; + this.stackSize = stackSize; } public SpriteSlot(final Inventory inventory, final int index, final int xPosition, final int yPosition, final Identifier sprite) { @@ -49,7 +49,7 @@ public class SpriteSlot extends FilteredSlot { @Override public int getMaxItemCount() { - return this.stacksize; + return this.stackSize; } @Override diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java b/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java index 94946ed6c..d61a58a0e 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/FluidConfiguration.java @@ -89,7 +89,7 @@ public class FluidConfiguration implements NBTSerializable { if (autoInput() && fluidConfig.getIoConfig().isInsert()) { StorageUtil.move(tank, machineBase.getTank(), fv -> true, machineBase.fluidTransferAmount().getRawValue(), null); } - if (autoOutput() && fluidConfig.getIoConfig().isExtact()) { + if (autoOutput() && fluidConfig.getIoConfig().isExtract()) { StorageUtil.move(machineBase.getTank(), tank, fv -> true, machineBase.fluidTransferAmount().getRawValue(), null); } } @@ -187,16 +187,16 @@ public class FluidConfiguration implements NBTSerializable { OUTPUT(true, false), ALL(true, true); - boolean extact; + boolean extract; boolean insert; - ExtractConfig(boolean extact, boolean insert) { - this.extact = extact; + ExtractConfig(boolean extract, boolean insert) { + this.extract = extract; this.insert = insert; } - public boolean isExtact() { - return extact; + public boolean isExtract() { + return extract; } public boolean isInsert() { @@ -204,7 +204,7 @@ public class FluidConfiguration implements NBTSerializable { } public boolean isEnabled() { - return extact || insert; + return extract || insert; } public FluidConfiguration.ExtractConfig getNext() { diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/MachineBaseBlockEntity.java b/RebornCore/src/main/java/reborncore/common/blockentity/MachineBaseBlockEntity.java index d94c19e30..72e72f7c5 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/MachineBaseBlockEntity.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/MachineBaseBlockEntity.java @@ -75,19 +75,31 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi public boolean renderMultiblock = false; - private int ticktime = 0; + private int tickTime = 0; /** - * This is used to change the speed of the crafting operation. + *

+ * This is used to change the speed of the crafting operation. *

- * 0 = none; 0.2 = 20% speed increase 0.75 = 75% increase + * + *

    + *
  • 0 = Normal speed
  • + *
  • 0.2 = 20% increase
  • + *
  • 0.75 = 75% increase
  • + *
*/ double speedMultiplier = 0; /** - * This is used to change the power of the crafting operation. + *

+ * This is used to change the power of the crafting operation. *

- * 1 = none; 1.2 = 20% speed increase 1.75 = 75% increase 5 = uses 5 times - * more power + * + *

    + *
  • 1 = Normal power
  • + *
  • 1.2 = 20% increase
  • + *
  • 1.75 = 75% increase
  • + *
  • 5 = 500% increase
  • + *
*/ double powerMultiplier = 1; @@ -139,10 +151,10 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi @Override public void tick(World world, BlockPos pos, BlockState state, MachineBaseBlockEntity blockEntity) { - if (ticktime == 0) { + if (tickTime == 0) { onLoad(); } - ticktime++; + tickTime++; @Nullable RecipeCrafter crafter = null; if (getOptionalCrafter().isPresent()) { @@ -151,7 +163,7 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi if (canBeUpgraded()) { resetUpgrades(); for (int i = 0; i < getUpgradeSlotCount(); i++) { - ItemStack stack = getUpgradeInvetory().getStack(i); + ItemStack stack = getUpgradeInventory().getStack(i); if (!stack.isEmpty() && stack.getItem() instanceof IUpgrade) { ((IUpgrade) stack.getItem()).process(this, this, stack); } @@ -173,8 +185,8 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } public void resetUpgrades() { - resetPowerMulti(); - resetSpeedMulti(); + resetPowerMultiplier(); + resetSpeedMultiplier(); } protected void afterUpgradesApplication() { @@ -289,10 +301,10 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } return true; } - //Inventory end + // Inventory end @Override - public Inventory getUpgradeInvetory() { + public Inventory getUpgradeInventory() { return upgradeInventory; } @@ -306,7 +318,7 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } @Override - public void resetSpeedMulti() { + public void resetSpeedMultiplier() { speedMultiplier = 0; } @@ -316,12 +328,12 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } @Override - public void addPowerMulti(double amount) { + public void addPowerMultiplier(double amount) { powerMultiplier = powerMultiplier * (1f + amount); } @Override - public void resetPowerMulti() { + public void resetPowerMultiplier() { powerMultiplier = 1; } @@ -336,7 +348,7 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } @Override - public void addSpeedMulti(double amount) { + public void addSpeedMultiplier(double amount) { if (speedMultiplier + amount <= 0.99) { speedMultiplier += amount; } else { @@ -357,12 +369,12 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi return getTank() != null; } - //The amount of ticks between a slot tranfer atempt, less is faster + //The amount of ticks between a slot transfer attempt, less is faster public int slotTransferSpeed() { return 4; } - //The amount of fluid transfured each tick buy the fluid config + //The amount of fluid transferred each tick buy the fluid config public FluidValue fluidTransferAmount() { return FluidValue.BUCKET_QUARTER; } @@ -459,7 +471,7 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi @Override public int[] getAvailableSlots(Direction side) { if(slotConfiguration == null){ - return new int[]{}; //I think should be ok, if needed this can return all the slots + return new int[]{}; // I think should be ok, if needed this can return all the slots } return slotConfiguration.getSlotsForSide(side).stream() .filter(Objects::nonNull) @@ -491,7 +503,7 @@ public class MachineBaseBlockEntity extends BlockEntity implements BlockEntityTi } SlotConfiguration.SlotConfigHolder slotConfigHolder = slotConfiguration.getSlotDetails(index); SlotConfiguration.SlotConfig slotConfig = slotConfigHolder.getSideDetail(direction); - return slotConfig.getSlotIO().ioConfig.isExtact(); + return slotConfig.getSlotIO().ioConfig.isExtract(); } public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState){ diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/MultiblockWriter.java b/RebornCore/src/main/java/reborncore/common/blockentity/MultiblockWriter.java index fee068b38..b3c9fbf8d 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/MultiblockWriter.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/MultiblockWriter.java @@ -50,36 +50,36 @@ import java.util.function.BiPredicate; /** * Writes a multiblock for either verification or hologram rendering * + * @author ramidzkh * @see MultiblockVerifier * @see HologramRenderer - * @author ramidzkh */ public interface MultiblockWriter { /** * Adds a block to the multiblock * - * @param x X - * @param y Y - * @param z Z - * @param predicate Predicate of the position - * @param state The state for the hologram - * @return This. Useful for chaining + * @param x {@code int} X + * @param y {@code int} Y + * @param z {@code int} Z + * @param predicate {@link BiPredicate} Predicate of the position + * @param state {@link BlockState} The state for the hologram + * @return {@link MultiblockWriter} This. Useful for chaining */ MultiblockWriter add(int x, int y, int z, BiPredicate predicate, BlockState state); /** * Fills a section between (ax, ay, az) to (bx, by, bz) * - * @param ax X of the first point - * @param ay Y of the first point - * @param az Z of the first point - * @param bx X of the second point - * @param by X of the second point - * @param bz Z of the second point - * @param predicate Predicate of the position - * @param state The state for the hologram - * @return This. Useful for chaining + * @param ax {@code int} X of the first point + * @param ay {@code int} Y of the first point + * @param az {@code int} Z of the first point + * @param bx {@code int} X of the second point + * @param by {@code int} X of the second point + * @param bz {@code int} Z of the second point + * @param predicate {@link BiPredicate} Predicate of the position + * @param state {@link BlockState} The state for the hologram + * @return {@link MultiblockWriter} This. Useful for chaining */ default MultiblockWriter fill(int ax, int ay, int az, int bx, int by, int bz, BiPredicate predicate, BlockState state) { for (int x = ax; x < bx; x++) { @@ -97,15 +97,15 @@ public interface MultiblockWriter { * Fills the outer ring of (0, 0, 0) to (pX, pY, pZ) through the axis, using the predicate and * state. The inside of the ring uses holePredicate and holeHologramState * - * @param through The axis to go through - * @param pX Size on the X axis - * @param pY Size on the Y axis - * @param pZ Size on the Z axis - * @param predicate Predicate for the ring - * @param state The ring state for the hologram - * @param holePredicate Predicate for the hole - * @param holeHologramState The hole state for the hologram - * @return This. Useful for chaining + * @param through {@link Direction.Axis} The axis to go through + * @param pX {@code int} Size on the X axis + * @param pY {@code int} Size on the Y axis + * @param pZ {@code int} Size on the Z axis + * @param predicate {@link BiPredicate} Predicate for the ring + * @param state {@link BlockState} The state for the hologram + * @param holePredicate {@link BiPredicate} Predicate for the hole + * @param holeHologramState {@link BlockState} The hole state for the hologram + * @return {@link MultiblockWriter} This. Useful for chaining */ default MultiblockWriter ring(Direction.Axis through, int pX, int pY, int pZ, BiPredicate predicate, BlockState state, BiPredicate holePredicate, BlockState holeHologramState) { if (holePredicate == null) { diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/RedstoneConfiguration.java b/RebornCore/src/main/java/reborncore/common/blockentity/RedstoneConfiguration.java index fdda3eaeb..4f234fc37 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/RedstoneConfiguration.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/RedstoneConfiguration.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; public class RedstoneConfiguration implements NBTSerializable, Syncable { - //Set in TR to be a better item such as a battery or a cell + // Set in TR to be a better item such as a battery or a cell public static ItemStack powerStack = new ItemStack(Items.CARROT_ON_A_STICK); public static ItemStack fluidStack = new ItemStack(Items.BUCKET); @@ -168,7 +168,7 @@ public class RedstoneConfiguration implements NBTSerializable, Syncable { stateMap.put(element, state); } - //Ensure all active states are in the map, will happen if a new state is added when the world is upgraded + // Ensure all active states are in the map, will happen if a new state is added when the world is upgraded for (Element element : getElements()) { if (!stateMap.containsKey(element)) { stateMap.put(element, State.IGNORED); @@ -185,7 +185,7 @@ public class RedstoneConfiguration implements NBTSerializable, Syncable { return ELEMENT_MAP.get(name); } - //Could be power input/output, item/fluid io, machine processing + // Could be power input/output, item/fluid io, machine processing public static class Element { private final String name; private final BooleanFunction isApplicable; diff --git a/RebornCore/src/main/java/reborncore/common/blockentity/SlotConfiguration.java b/RebornCore/src/main/java/reborncore/common/blockentity/SlotConfiguration.java index 0edf015c1..57fd7f60d 100644 --- a/RebornCore/src/main/java/reborncore/common/blockentity/SlotConfiguration.java +++ b/RebornCore/src/main/java/reborncore/common/blockentity/SlotConfiguration.java @@ -67,7 +67,7 @@ public class SlotConfiguration implements NBTSerializable { SlotConfigHolder holder = getSlotDetails(i); if (holder == null) { RebornCore.LOGGER.debug("Fixed slot " + i + " in " + machineBase); - //humm somthing has gone wrong + // hmm, something has gone wrong updateSlotDetails(new SlotConfigHolder(i)); } } @@ -88,8 +88,8 @@ public class SlotConfiguration implements NBTSerializable { /** * Replaces or adds a slot detail for the slot id * - * @param slotConfigHolder - * @return SlotConfigHolder + * @param slotConfigHolder {@link SlotConfigHolder} + * @return {@link SlotConfigHolder} Updated SlotConfigHolder */ public SlotConfigHolder updateSlotDetails(SlotConfigHolder slotConfigHolder) { SlotConfigHolder lookup = getSlotDetails(slotConfigHolder.slotID); @@ -209,7 +209,7 @@ public class SlotConfiguration implements NBTSerializable { this.output = output; } - public void setfilter(boolean filter) { + public void setFilter(boolean filter) { this.filter = filter; } @@ -236,7 +236,7 @@ public class SlotConfiguration implements NBTSerializable { }); input = nbt.getBoolean("input"); output = nbt.getBoolean("output"); - if (nbt.contains("filter")) { //Was added later, this allows old saves to be upgraded + if (nbt.contains("filter")) { // Was added later, this allows old saves to be upgraded filter = nbt.getBoolean("filter"); } } @@ -367,16 +367,16 @@ public class SlotConfiguration implements NBTSerializable { INPUT(false, true), OUTPUT(true, false); - boolean extact; + boolean extract; boolean insert; - ExtractConfig(boolean extact, boolean insert) { - this.extact = extact; + ExtractConfig(boolean extract, boolean insert) { + this.extract = extract; this.insert = insert; } - public boolean isExtact() { - return extact; + public boolean isExtract() { + return extract; } public boolean isInsert() { @@ -404,7 +404,7 @@ public class SlotConfiguration implements NBTSerializable { try { compound = StringNbtReader.parse(json); } catch (CommandSyntaxException e) { - throw new UnsupportedOperationException("Clipboard conetents isnt a valid slot configuation"); + throw new UnsupportedOperationException("Clipboard contents isn't a valid slot configuration"); } if (!compound.contains("machine") || !compound.getString("machine").equals(machineIdent)) { throw new UnsupportedOperationException("Machine config is not for this machine."); @@ -412,7 +412,7 @@ public class SlotConfiguration implements NBTSerializable { read(compound.getCompound("data")); } - //DO NOT CALL THIS, use the inventory access on the inventory + // DO NOT CALL THIS, use the inventory access on the inventory public static boolean canInsertItem(int index, ItemStack itemStackIn, Direction direction, MachineBaseBlockEntity blockEntity) { if(itemStackIn.isEmpty()){ return false; @@ -430,11 +430,11 @@ public class SlotConfiguration implements NBTSerializable { return false; } - //DO NOT CALL THIS, use the inventory access on the inventory + // DO NOT CALL THIS, use the inventory access on the inventory public static boolean canExtractItem(int index, ItemStack stack, Direction direction, MachineBaseBlockEntity blockEntity) { SlotConfiguration.SlotConfigHolder slotConfigHolder = blockEntity.getSlotConfiguration().getSlotDetails(index); SlotConfiguration.SlotConfig slotConfig = slotConfigHolder.getSideDetail(direction); - if (slotConfig.getSlotIO().getIoConfig().isExtact()) { + if (slotConfig.getSlotIO().getIoConfig().isExtract()) { return true; } return false; diff --git a/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java b/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java index 69ebeddca..a72edc0af 100644 --- a/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java +++ b/RebornCore/src/main/java/reborncore/common/blocks/BlockMachineBase.java @@ -83,7 +83,7 @@ public abstract class BlockMachineBase extends BaseBlockEntityProvider implement this.setDefaultState( this.getStateManager().getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false)); } - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } public void setFacing(Direction facing, World world, BlockPos pos) { @@ -180,7 +180,7 @@ public abstract class BlockMachineBase extends BaseBlockEntityProvider implement ItemStack stack = playerIn.getStackInHand(hand); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BlockTileBase. Thus we should always have blockEntity entity. I hope. + // We extended BlockTileBase. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.PASS; } @@ -200,7 +200,7 @@ public abstract class BlockMachineBase extends BaseBlockEntityProvider implement } else if (stack.getItem() instanceof IUpgrade && blockEntity instanceof IUpgradeable upgradeableEntity) { if (upgradeableEntity.canBeUpgraded()) { int inserted = (int) insertItemStacked( - InventoryStorage.of(upgradeableEntity.getUpgradeInvetory(), null), + InventoryStorage.of(upgradeableEntity.getUpgradeInventory(), null), ItemVariant.of(stack), stack.getCount() ); diff --git a/RebornCore/src/main/java/reborncore/common/blocks/BlockWrenchEventHandler.java b/RebornCore/src/main/java/reborncore/common/blocks/BlockWrenchEventHandler.java index 36b3200b1..a038fdc65 100644 --- a/RebornCore/src/main/java/reborncore/common/blocks/BlockWrenchEventHandler.java +++ b/RebornCore/src/main/java/reborncore/common/blocks/BlockWrenchEventHandler.java @@ -36,7 +36,7 @@ import java.util.List; public class BlockWrenchEventHandler { - public static List wrenableBlocks = new ArrayList<>(); + public static List wrenchableBlocks = new ArrayList<>(); public static void setup() { @@ -47,7 +47,7 @@ public class BlockWrenchEventHandler { } if (ToolManager.INSTANCE.canHandleTool(playerEntity.getStackInHand(Hand.MAIN_HAND))) { BlockState state = world.getBlockState(blockHitResult.getBlockPos()); - if (wrenableBlocks.contains(state.getBlock())) { + if (wrenchableBlocks.contains(state.getBlock())) { Block block = state.getBlock(); block.onUse(state, world, blockHitResult.getBlockPos(), playerEntity, hand, blockHitResult); return ActionResult.SUCCESS; @@ -57,5 +57,4 @@ public class BlockWrenchEventHandler { }); } - } diff --git a/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java b/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java index 1083d5a60..af4119d10 100644 --- a/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java +++ b/RebornCore/src/main/java/reborncore/common/chunkloading/ChunkLoaderManager.java @@ -47,7 +47,7 @@ import reborncore.common.network.NetworkManager; import java.util.*; import java.util.stream.Collectors; -//This does not do the actual chunk loading, just keeps track of what chunks the chunk loader has loaded +// This does not do the actual chunk loading, just keeps track of what chunks the chunk loader has loaded public class ChunkLoaderManager extends PersistentState { public static Codec> CODEC = Codec.list(LoadedChunk.CODEC); @@ -103,10 +103,10 @@ public class ChunkLoaderManager extends PersistentState { .findFirst(); } - public List getLoadedChunks(World world, BlockPos chunkloader){ + public List getLoadedChunks(World world, BlockPos chunkLoader){ return loadedChunks.stream() .filter(loadedChunk -> loadedChunk.getWorld().equals(getWorldName(world))) - .filter(loadedChunk -> loadedChunk.getChunkLoader().equals(chunkloader)) + .filter(loadedChunk -> loadedChunk.getChunkLoader().equals(chunkLoader)) .collect(Collectors.toList()); } diff --git a/RebornCore/src/main/java/reborncore/common/config/Config.java b/RebornCore/src/main/java/reborncore/common/config/Config.java index 7fb549afc..9ef6b92d0 100644 --- a/RebornCore/src/main/java/reborncore/common/config/Config.java +++ b/RebornCore/src/main/java/reborncore/common/config/Config.java @@ -36,28 +36,29 @@ public @interface Config { /** * This the category of the config * - * @return + * @return {@link String} */ String category() default "config"; /** * This is the key for the config, the default is the field name. * - * @return + * @return {@link String} */ String key() default ""; /** * This is a comment that will be supplied along with the config, use this to explain what the config does * - * @return + * @return {@link String} */ String comment() default ""; /** - * this is the config file name, the default is just config.cgf, use this is you whish to split the config into more than one file. + * This is the config file name, the default is {@code config.cgf}, + * use this if you wish to split the config into more than one file. * - * @return + * @return {@link String} */ String config() default "config"; diff --git a/RebornCore/src/main/java/reborncore/common/config/Configuration.java b/RebornCore/src/main/java/reborncore/common/config/Configuration.java index 80fb6aa8c..f8ba127ca 100644 --- a/RebornCore/src/main/java/reborncore/common/config/Configuration.java +++ b/RebornCore/src/main/java/reborncore/common/config/Configuration.java @@ -76,7 +76,7 @@ public class Configuration { readFromJson(configs); } - //Save the configs + // Save the configs for (Map.Entry entry : toJson().entrySet()) { final File configFile = new File(configDir, entry.getKey() + ".json"); final String jsonStr = GSON.toJson(entry.getValue()); @@ -123,7 +123,7 @@ public class Configuration { String key = annotation.key().isEmpty() ? field.getName() : annotation.key(); if (categoryObject.has(key)) { - throw new UnsupportedOperationException("Some bad happened, duplicate key found: " + key); + throw new UnsupportedOperationException("Something bad happened, duplicate key found: " + key); } JsonObject fieldObject = new JsonObject(); @@ -155,7 +155,7 @@ public class Configuration { final JsonObject config = configs.get(annotation.config()); if (config == null) { - continue; //Could be possible if a new config is added + continue; // Could be possible if a new config is added } JsonObject categoryObject = config.getAsJsonObject(annotation.category()); diff --git a/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipe.java b/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipe.java index 87071e275..0c5b17539 100644 --- a/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipe.java +++ b/RebornCore/src/main/java/reborncore/common/crafting/RebornRecipe.java @@ -81,7 +81,9 @@ public class RebornRecipe implements Recipe, CustomOutputRecipe { return type; } - // use the RebornIngredient version to ensure stack sizes are checked + /** + * use the {@link RebornIngredient} version to ensure stack sizes are checked + */ @Deprecated @Override public DefaultedList getIngredients() { @@ -105,8 +107,8 @@ public class RebornRecipe implements Recipe, CustomOutputRecipe { } /** - * @param blockEntity the blockEntity that is doing the crafting - * @return if true the recipe will craft, if false it will not + * @param blockEntity {@link BlockEntity} The blockEntity that is doing the crafting + * @return {@code boolean} If true, the recipe will craft, if false it will not */ public boolean canCraft(BlockEntity blockEntity) { if (blockEntity instanceof IRecipeCrafterProvider) { @@ -116,14 +118,14 @@ public class RebornRecipe implements Recipe, CustomOutputRecipe { } /** - * @param blockEntity the blockEntity that is doing the crafting - * @return return true if fluid was taken and should craft + * @param blockEntity {@link BlockEntity} The blockEntity that is doing the crafting + * @return {@code boolean} Returns true if fluid was taken and should craft */ public boolean onCraft(BlockEntity blockEntity) { return true; } - //Done as our recipes do not support these functions, hopefully nothing blidly calls them + // Done as our recipes do not support these functions, hopefully nothing blindly calls them @Deprecated @Override @@ -143,7 +145,10 @@ public class RebornRecipe implements Recipe, CustomOutputRecipe { throw new UnsupportedOperationException(); } - // Do not call directly, this is implemented only as a fallback. getOutputs() will return all of the outputs + /** + * Do not call directly, this is implemented only as a fallback. + * {@link RebornRecipe#getOutputs()} will return all the outputs + */ @Deprecated @Override public ItemStack getOutput() { @@ -158,7 +163,7 @@ public class RebornRecipe implements Recipe, CustomOutputRecipe { throw new UnsupportedOperationException(); } - //Done to try and stop the table from loading it + // Done to try and stop the table from loading it @Override public boolean isIgnoredInRecipeBook() { return true; diff --git a/RebornCore/src/main/java/reborncore/common/crafting/ingredient/StackIngredient.java b/RebornCore/src/main/java/reborncore/common/crafting/ingredient/StackIngredient.java index cdbc8e77b..661fbd0fa 100644 --- a/RebornCore/src/main/java/reborncore/common/crafting/ingredient/StackIngredient.java +++ b/RebornCore/src/main/java/reborncore/common/crafting/ingredient/StackIngredient.java @@ -107,8 +107,8 @@ public class StackIngredient extends RebornIngredient { return false; } - //Bit of a meme here, as DataFixer likes to use the most basic primative type over using an int. - //So we have to go to json and back on the incoming stack to be sure its using types that match our input. + // A bit of a meme here, as DataFixer likes to use the most basic primitive type over using an int. + // So we have to go to json and back on the incoming stack to be sure it's using types that match our input. NbtCompound compoundTag = itemStack.getNbt(); JsonElement jsonElement = Dynamic.convert(NbtOps.INSTANCE, JsonOps.INSTANCE, compoundTag); diff --git a/RebornCore/src/main/java/reborncore/common/crafting/ingredient/TagIngredient.java b/RebornCore/src/main/java/reborncore/common/crafting/ingredient/TagIngredient.java index fadfa8781..7a88649fa 100644 --- a/RebornCore/src/main/java/reborncore/common/crafting/ingredient/TagIngredient.java +++ b/RebornCore/src/main/java/reborncore/common/crafting/ingredient/TagIngredient.java @@ -114,7 +114,7 @@ public class TagIngredient extends RebornIngredient { } private JsonObject toItemJsonObject() { - //Tags are not synced across the server so we sync all the items + // Tags are not synced across the server, so we sync all the items JsonObject jsonObject = new JsonObject(); jsonObject.addProperty("tag_server_sync", true); diff --git a/RebornCore/src/main/java/reborncore/common/crafting/serde/RecipeSerdeException.java b/RebornCore/src/main/java/reborncore/common/crafting/serde/RecipeSerdeException.java index ad47a1126..c9492a411 100644 --- a/RebornCore/src/main/java/reborncore/common/crafting/serde/RecipeSerdeException.java +++ b/RebornCore/src/main/java/reborncore/common/crafting/serde/RecipeSerdeException.java @@ -33,7 +33,7 @@ public class RecipeSerdeException extends RuntimeException { public RecipeSerdeException(Identifier identifier, Throwable cause) { super("Failed to ser/de " + identifier, cause); - // Dont trust minecraft to log this. + // Don't trust minecraft to log this. LOGGER.error(getMessage(), this); } } diff --git a/RebornCore/src/main/java/reborncore/common/fluid/FluidValue.java b/RebornCore/src/main/java/reborncore/common/fluid/FluidValue.java index 6c597b8d0..1b26e2f9c 100644 --- a/RebornCore/src/main/java/reborncore/common/fluid/FluidValue.java +++ b/RebornCore/src/main/java/reborncore/common/fluid/FluidValue.java @@ -129,7 +129,7 @@ public final class FluidValue { return fromRaw(droplets); } } else if (jsonElement.isJsonPrimitive() && jsonElement.getAsJsonPrimitive().isNumber()) { - //TODO add a warning here + // TODO add a warning here return fromMillibuckets(jsonElement.getAsJsonPrimitive().getAsInt()); } throw new JsonSyntaxException("Could not parse fluid value"); diff --git a/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidRenderManager.java b/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidRenderManager.java index d37929c28..39e884b87 100644 --- a/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidRenderManager.java +++ b/RebornCore/src/main/java/reborncore/common/fluid/RebornFluidRenderManager.java @@ -56,7 +56,8 @@ public class RebornFluidRenderManager implements ClientSpriteRegistryCallback, S } private static void setupFluidRenderer(RebornFluid fluid) { - //Done lazy as we want to ensure we get the sprite at the correct time, but also dont want to be making these calls every time its required. + // Done lazy as we want to ensure we get the sprite at the correct time, + // but also don't want to be making these calls every time its required. TemporaryLazy sprites = new TemporaryLazy<>(() -> { FluidSettings fluidSettings = fluid.getFluidSettings(); return new Sprite[]{RenderUtil.getSprite(fluidSettings.getStillTexture()), RenderUtil.getSprite(fluidSettings.getFlowingTexture())}; @@ -81,7 +82,7 @@ public class RebornFluidRenderManager implements ClientSpriteRegistryCallback, S @Override public void reload(ResourceManager manager) { - //Reset the cached fluid sprites + // Reset the cached fluid sprites spriteMap.forEach((key, value) -> value.reset()); } diff --git a/RebornCore/src/main/java/reborncore/common/misc/ModSounds.java b/RebornCore/src/main/java/reborncore/common/misc/ModSounds.java index 99c4226b2..d561d053a 100644 --- a/RebornCore/src/main/java/reborncore/common/misc/ModSounds.java +++ b/RebornCore/src/main/java/reborncore/common/misc/ModSounds.java @@ -31,7 +31,6 @@ import net.minecraft.util.registry.Registry; /** * @author drcrazy */ - public class ModSounds { public static SoundEvent BLOCK_DISMANTLE; diff --git a/RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java b/RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java index 89070f702..4653368c3 100644 --- a/RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java +++ b/RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java @@ -24,17 +24,21 @@ package reborncore.common.misc; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.tag.Tag; /** * Tells if an item, block etc. has a tag solely for compatibility with other mods. * For example, several mods have bronze ingots, so TechReborn will tag its bronze ingot with a common tag. - * @param The type of the object, like {@link net.minecraft.item.Item} or {@link net.minecraft.block.Block}. + * + * @param The type of the object, like {@link Item} or {@link Block}. */ public interface TagConvertible { /** * Returns the common tag of this object. + * * @return the common tag of this object */ Tag.Identified asTag(); diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java b/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java index 2a6c200c2..b7130220b 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/IMultiblockPart.java @@ -34,11 +34,11 @@ import java.util.Set; /** * Basic interface for a multiblock machine part. This is defined as an abstract - * class as we need the basic functionality of a BlockEntity as well. Preferably, - * you should derive from MultiblockBlockEntityBase, which does all the hard work + * class as we need the basic functionality of a {@link BlockEntity} as well. Preferably, + * you should derive from {@link MultiblockBlockEntityBase}, which does all the hard work * for you. - *

- * {@link MultiblockBlockEntityBase} + * + *

{@link MultiblockBlockEntityBase}

*/ public abstract class IMultiblockPart extends BlockEntity { public static final int INVALID_DISTANCE = Integer.MAX_VALUE; @@ -48,22 +48,22 @@ public abstract class IMultiblockPart extends BlockEntity { } /** - * @return True if this block is connected to a multiblock controller. False + * @return {@code boolean} True if this block is connected to a multiblock controller. False * otherwise. */ public abstract boolean isConnected(); /** - * @return The attached multiblock controller for this blockEntity entity. + * @return {@link MultiblockControllerBase} The attached multiblock controller for this {@link BlockEntity} entity. */ public abstract MultiblockControllerBase getMultiblockController(); /** - * Returns the location of this blockEntity entity in the world, in BlockPos + * Returns the location of this {@link BlockEntity} entity in the world, in {@link BlockPos} * form. * - * @return A BlockPos with its x,y,z members set to the location of this - * blockEntity entity in the world. + * @return A {@link BlockPos} with its x,y,z members set to the location of this + * {@link BlockEntity} entity in the world. */ public abstract BlockPos getWorldLocation(); @@ -72,16 +72,16 @@ public abstract class IMultiblockPart extends BlockEntity { /** * Called after this block has been attached to a new multiblock controller. * - * @param newController The new multiblock controller to which this blockEntity entity is - * attached. + * @param newController {@link MultiblockControllerBase} The new multiblock controller to which this + * {@link BlockEntity} entity is attached. */ public abstract void onAttached(MultiblockControllerBase newController); /** * Called after this block has been detached from a multiblock controller. * - * @param multiblockController The multiblock controller that no longer controls this blockEntity - * entity. + * @param multiblockController {@link MultiblockControllerBase} The multiblock controller that no longer + * controls this blockEntity entity. */ public abstract void onDetached(MultiblockControllerBase multiblockController); @@ -91,11 +91,11 @@ public abstract class IMultiblockPart extends BlockEntity { * NOT mark the part as disconnected. onDetached will be called immediately * afterwards. * - * @param oldController The controller which is orphaning this block. - * @param oldControllerSize The number of connected blocks in the controller prior to - * shedding orphans. - * @param newControllerSize The number of connected blocks in the controller after - * shedding orphans. + * @param oldController {@link MultiblockControllerBase} The controller which is orphaning this block. + * @param oldControllerSize {@code int} The number of connected blocks in the controller prior to + * shedding orphans. + * @param newControllerSize {@code int} The number of connected blocks in the controller after + * shedding orphans. * @see #onDetached(MultiblockControllerBase) */ public abstract void onOrphaned(MultiblockControllerBase oldController, int oldControllerSize, @@ -108,7 +108,7 @@ public abstract class IMultiblockPart extends BlockEntity { * not attach this blockEntity entity to it. Override this in your game code! * * @return A new Multiblock Controller, derived from - * MultiblockControllerBase. + * {@link MultiblockControllerBase}. */ public abstract MultiblockControllerBase createNewMultiblock(); @@ -116,7 +116,7 @@ public abstract class IMultiblockPart extends BlockEntity { * Retrieve the type of multiblock controller which governs this part. Used * to ensure that incompatible multiblocks are not merged. * - * @return The class/type of the multiblock controller which governs this + * @return {@link Class} The class/type of the multiblock controller which governs this * type of part. */ public abstract Class getMultiblockControllerType(); @@ -126,8 +126,8 @@ public abstract class IMultiblockPart extends BlockEntity { * controller. A special case of attach/detach, done here for efficiency to * avoid triggering lots of recalculation logic. * - * @param newController The new controller into which this blockEntity entity is being - * merged. + * @param newController {@link MultiblockControllerBase} The new controller into which this + * {@link BlockEntity} entity is being merged. */ public abstract void onAssimilated(MultiblockControllerBase newController); @@ -146,7 +146,7 @@ public abstract class IMultiblockPart extends BlockEntity { public abstract void setUnvisited(); /** - * @return True if this block has been visited by your validation algorithms + * @return {@code boolean} True if this block has been visited by your validation algorithms * since the last reset. */ public abstract boolean isVisited(); @@ -166,22 +166,22 @@ public abstract class IMultiblockPart extends BlockEntity { /** * Is this block the designated save/load & network delegate? * - * @return Boolean + * @return {@code boolean} */ public abstract boolean isMultiblockSaveDelegate(); /** - * Returns an array containing references to neighboring IMultiblockPart - * blockEntity entities. Primarily a utility method. Only works after blockentity + * Returns an array containing references to neighboring {@link IMultiblockPart} + * {@link BlockEntity} entities. Primarily a utility method. Only works after {@link BlockEntity} * construction, so it cannot be used in - * MultiblockControllerBase::attachBlock. + * {@link MultiblockControllerBase#attachBlock}. *

* This method is chunk-safe on the server; it will not query for parts in * chunks that are unloaded. Note that no method is chunk-safe on the * client, because ChunkProviderClient is stupid. + *

* - * @return An array of references to neighboring IMultiblockPart blockEntity - * entities. + * @return An array of references to neighboring {@link IMultiblockPart} {@link BlockEntity} entities. */ public abstract IMultiblockPart[] getNeighboringParts(); @@ -194,7 +194,8 @@ public abstract class IMultiblockPart extends BlockEntity { * actually be part of the machine! They form an outer bounding box for the * whole machine itself. * - * @param multiblockControllerBase The controller to which this part is being assembled. + * @param multiblockControllerBase {@link MultiblockControllerBase} The controller to + * which this part is being assembled. */ public abstract void onMachineAssembled(MultiblockControllerBase multiblockControllerBase); @@ -221,12 +222,12 @@ public abstract class IMultiblockPart extends BlockEntity { /** * Called when this part should check its neighbors. This method MUST NOT * cause additional chunks to load. ALWAYS check to see if a chunk is loaded - * before querying for its blockEntity entity This part should inform the + * before querying for its {@link BlockEntity} entity This part should inform the * controller that it is attaching at this time. * - * @return A Set of multiblock controllers to which this object would like + * @return A Set of {@link MultiblockControllerBase} to which this object would like * to attach. It should have attached to one of the controllers in - * this list. Return null if there are no compatible controllers + * this list. Return {@code null} if there are no compatible controllers * nearby. */ public abstract Set attachToNeighbors(); @@ -238,12 +239,12 @@ public abstract class IMultiblockPart extends BlockEntity { public abstract void assertDetached(); /** - * @return True if a part has multiblock game-data saved inside it. + * @return {@code boolean} True if a part has multiblock game-data saved inside it. */ public abstract boolean hasMultiblockSaveData(); /** - * @return The part's saved multiblock game-data in NBT format, or null if + * @return {@link NbtCompound} The part's saved multiblock game-data in NBT format, or null if * there isn't any. */ public abstract NbtCompound getMultiblockSaveData(); diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java index 7bfb7ddc0..7d9da6844 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockBlockEntityBase.java @@ -41,7 +41,7 @@ import java.util.List; import java.util.Set; /** - * Base logic class for Multiblock-connected blockEntity entities. Most multiblock + * Base logic class for Multiblock-connected {@link BlockEntity} entities. Most multiblock * machines should derive from this and implement their game logic in certain * abstract methods. */ @@ -117,7 +117,7 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen // We can't directly initialize a multiblock controller yet, so we cache // the data here until - // we receive a validate() call, which creates the controller and hands + // we receive a "validate()" call, which creates the controller and hands // off the cached data. if (data.contains("multiblockData")) { this.cachedMultiblockData = data.getCompound("multiblockData"); @@ -142,10 +142,9 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen } /** - * Called from Minecraft's blockEntity entity loop, after all blockEntity entities have - * been ticked, as the chunk in which this blockEntity entity is contained is + * Called from Minecraft's {@link BlockEntity} entity loop, after all {@link BlockEntity} entities have + * been ticked, as the chunk in which this {@link BlockEntity} entity is contained is * unloading. - * */ @Override public void onUnload() { @@ -153,15 +152,20 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen } /** - * This is called when a block is being marked as valid by the chunk, but - * has not yet fully been placed into the world's BlockEntity cache. - * this.worldObj, xCoord, yCoord and zCoord have been initialized, but any - * attempts to read data about the world can cause infinite loops - if you - * call getBlockEntity on this BlockEntity's coordinate from within - * validate(), you will blow your call stack. *

- * TL;DR: Here there be dragons. + * This is called when a block is being marked as valid by the chunk, but + * has not yet fully been placed into the world's {@link BlockEntity} cache. + *

* + *

+ * {@code this.worldObj}, {@code xCoord}, {@code yCoord} and {@code zCoord} + * have been initialized, but any attempts to read data about the world can + * cause infinite loops - if you call {@code getBlockEntity} on this + * {@link BlockEntity}'s coordinate from within {@code validate()}, you will + * blow your call stack. + *

+ * + *

TL;DR: Here there be dragons.

*/ @Override public void cancelRemoval() { @@ -182,10 +186,10 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen /** * Override this to easily modify the description packet's data without * having to worry about sending the packet itself. Decode this data in - * decodeDescriptionPacket. + * {@link #decodeDescriptionPacket}. * - * @param packetData An NBT compound tag into which you should write your custom - * description data. + * @param packetData {@link NbtCompound} An NBT compound tag into which + * you should write your custom description data. */ protected void encodeDescriptionPacket(NbtCompound packetData) { if (this.isMultiblockSaveDelegate() && isConnected()) { @@ -196,10 +200,11 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen } /** - * Override this to easily read in data from a BlockEntity's description - * packet. Encoded in encodeDescriptionPacket. + * Override this to easily read in data from a {@link BlockEntity}'s description + * packet. Encoded in {@link #encodeDescriptionPacket}. * - * @param packetData The NBT data from the blockEntity entity's description packet. + * @param packetData {@link NbtCompound} The NBT data from the {@link BlockEntity} + * entity's description packet. */ protected void decodeDescriptionPacket(NbtCompound packetData) { if (packetData.contains("multiblockData")) { @@ -334,7 +339,7 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen getWorld().markDirty(getPos()); } - // // Helper functions for notifying neighboring blocks + // /// Helper functions for notifying neighboring blocks protected void notifyNeighborsOfBlockChange() { world.updateNeighborsAlways(getPos(), getCachedState().getBlock()); } @@ -344,9 +349,10 @@ public abstract class MultiblockBlockEntityBase extends IMultiblockPart implemen } // /// Private/Protected Logic Helpers - /* - * Detaches this block from its controller. Calls detachBlock() and clears - * the controller member. + + /** + * Detaches this block from its controller. Calls {@link MultiblockControllerBase#detachBlock} + * and clears the controller member. */ protected void detachSelf(boolean chunkUnloading) { if (this.controller != null) { diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockControllerBase.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockControllerBase.java index 18c4cbd3b..bd2252477 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockControllerBase.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockControllerBase.java @@ -41,8 +41,9 @@ import java.util.Set; * Conceptually, they are meta-TileEntities. They govern the logic for an * associated group of TileEntities. *

- * Subordinate TileEntities implement the IMultiblockPart class and, generally, - * should not have an update() loop. + * Subordinate TileEntities implement the {@link IMultiblockPart} class and, generally, + * should not have an update() loop. + *

*/ public abstract class MultiblockControllerBase { public static final short DIMENSION_UNBOUNDED = -1; @@ -124,16 +125,16 @@ public abstract class MultiblockControllerBase { * multiblock. The part will be notified that the data has been used after * this call completes. * - * @param part Attached part - * @param data The NBT tag containing this controller's data. + * @param part {@link IMultiblockPart} Attached part + * @param data {@link NbtCompound} The NBT tag containing this controller's data. */ public abstract void onAttachedPartWithMultiblockData(IMultiblockPart part, NbtCompound data); /** * Check if a block is being tracked by this machine. * - * @param blockCoord Coordinate to check. - * @return True if the blockEntity entity at blockCoord is being tracked by this + * @param blockCoord {@link BlockPos} Coordinate to check. + * @return {@code boolean} True if the blockEntity entity at blockCoord is being tracked by this * machine, false otherwise. */ public boolean hasBlock(BlockPos blockCoord) { @@ -143,7 +144,7 @@ public abstract class MultiblockControllerBase { /** * Attach a new part to this machine. * - * @param part The part to add. + * @param part {@link IMultiblockPart} The part to add. */ public void attachBlock(IMultiblockPart part) { //IMultiblockPart candidate; @@ -218,7 +219,7 @@ public abstract class MultiblockControllerBase { * Called when a new part is added to the machine. Good time to register * things into lists. * - * @param newPart The part being added. + * @param newPart {@link IMultiblockPart} The part being added. */ protected abstract void onBlockAdded(IMultiblockPart newPart); @@ -226,7 +227,7 @@ public abstract class MultiblockControllerBase { * Called when a part is removed from the machine. Good time to clean up * lists. * - * @param oldPart The part being removed. + * @param oldPart {@link IMultiblockPart} The part being removed. */ protected abstract void onBlockRemoved(IMultiblockPart oldPart); @@ -257,7 +258,7 @@ public abstract class MultiblockControllerBase { * Callback whenever a part is removed (or will very shortly be removed) * from a controller. Do housekeeping/callbacks, also nulls min/max coords. * - * @param part The part being removed. + * @param part {@link IMultiblockPart} The part being removed. */ private void onDetachBlock(IMultiblockPart part) { // Strip out this part @@ -276,11 +277,11 @@ public abstract class MultiblockControllerBase { /** * Call to detach a block from this machine. Generally, this should be - * called when the blockEntity entity is being released, e.g. on block destruction. + * called when the {@link BlockEntity} entity is being released, e.g. on block destruction. * - * @param part The part to detach from this machine. - * @param chunkUnloading Is this entity detaching due to the chunk unloading? If true, - * the multiblock will be paused instead of broken. + * @param part {@link IMultiblockPart} The part to detach from this machine. + * @param chunkUnloading {@code boolean} Is this entity detaching due to the chunk unloading? If true, + * the multiblock will be paused instead of broken. */ public void detachBlock(IMultiblockPart part, boolean chunkUnloading) { if (chunkUnloading && this.assemblyState == AssemblyState.Assembled) { @@ -316,7 +317,7 @@ public abstract class MultiblockControllerBase { * blocks to actually assemble it. This isn't as simple as xmax*ymax*zmax * for non-cubic machines or for machines with hollow/complex interiors. * - * @return The minimum number of blocks connected to the machine for it to + * @return {@code int} The minimum number of blocks connected to the machine for it to * be assembled. */ protected abstract int getMinimumNumberOfBlocksForAssembledMachine(); @@ -326,7 +327,7 @@ public abstract class MultiblockControllerBase { * (DIMENSION_UNBOUNDED) to disable dimension checking in X. (This is not * recommended.) * - * @return The maximum X dimension size of the machine, or -1 + * @return {@code int} The maximum X dimension size of the machine, or -1 */ protected abstract int getMaximumXSize(); @@ -335,7 +336,7 @@ public abstract class MultiblockControllerBase { * (DIMENSION_UNBOUNDED) to disable dimension checking in X. (This is not * recommended.) * - * @return The maximum Z dimension size of the machine, or -1 + * @return {@code int} The maximum Z dimension size of the machine, or -1 */ protected abstract int getMaximumZSize(); @@ -344,7 +345,7 @@ public abstract class MultiblockControllerBase { * (DIMENSION_UNBOUNDED) to disable dimension checking in X. (This is not * recommended.) * - * @return The maximum Y dimension size of the machine, or -1 + * @return {@code int} The maximum Y dimension size of the machine, or -1 */ protected abstract int getMaximumYSize(); @@ -352,7 +353,7 @@ public abstract class MultiblockControllerBase { * Returns the minimum X dimension size of the machine. Must be at least 1, * because nothing else makes sense. * - * @return The minimum X dimension size of the machine + * @return {@code int} The minimum X dimension size of the machine */ protected int getMinimumXSize() { return 1; @@ -362,7 +363,7 @@ public abstract class MultiblockControllerBase { * Returns the minimum Y dimension size of the machine. Must be at least 1, * because nothing else makes sense. * - * @return The minimum Y dimension size of the machine + * @return {@code int} The minimum Y dimension size of the machine */ protected int getMinimumYSize() { return 1; @@ -372,15 +373,15 @@ public abstract class MultiblockControllerBase { * Returns the minimum Z dimension size of the machine. Must be at least 1, * because nothing else makes sense. * - * @return The minimum Z dimension size of the machine + * @return {@code int} The minimum Z dimension size of the machine */ protected int getMinimumZSize() { return 1; } /** - * @return An exception representing the last error encountered when trying - * to assemble this multiblock, or null if there is no error. + * @return {@link MultiblockValidationException} An exception representing the last error encountered when trying + * to assemble this multiblock, or {@code null} if there is no error. */ public MultiblockValidationException getLastValidationException() { return lastValidationException; @@ -389,6 +390,8 @@ public abstract class MultiblockControllerBase { /** * Checks if a machine is whole. If not, throws an exception with the reason * why. + * + * @throws MultiblockValidationException if the machine is not whole. */ protected abstract void isMachineWhole() throws MultiblockValidationException; @@ -396,7 +399,6 @@ public abstract class MultiblockControllerBase { * Check if the machine is whole or not. If the machine was not whole, but * now is, assemble the machine. If the machine was whole, but no longer is, * disassemble the machine. - * */ public void checkIfMachineIsWhole() { AssemblyState oldState = this.assemblyState; @@ -422,8 +424,10 @@ public abstract class MultiblockControllerBase { /** * Called when a machine becomes "whole" and should begin functioning as a - * game-logically finished machine. Calls onMachineAssembled on all attached + * game-logically finished machine. Calls {@link #onMachineAssembled} on all attached * parts. + * + * @param oldState {@link AssemblyState} The previous state of the machine. */ private void assembleMachine(AssemblyState oldState) { for (IMultiblockPart part : connectedParts) { @@ -441,7 +445,7 @@ public abstract class MultiblockControllerBase { /** * Called when the machine needs to be disassembled. It is not longer * "whole" and should not be functional, usually as a result of a block - * being removed. Calls onMachineBroken on all attached parts. + * being removed. Calls {@link IMultiblockPart#onMachineBroken} on all attached parts. */ private void disassembleMachine() { for (IMultiblockPart part : connectedParts) { @@ -453,10 +457,12 @@ public abstract class MultiblockControllerBase { } /** - * Assimilate another controller into this controller. Acquire all of the + * Assimilate another controller into this controller. Acquire all the * other controller's blocks and attach them to this one. * - * @param other The controller to merge into this one. + * @param other {@link MultiblockControllerBase} The controller to merge into this one. + * @throws IllegalArgumentException if the controller with the lowest minimum-coord value does not consume + * the one with the higher value. */ public void assimilate(MultiblockControllerBase other) { BlockPos otherReferenceCoord = other.getReferenceCoord(); @@ -467,7 +473,7 @@ public abstract class MultiblockControllerBase { Set partsToAcquire = new HashSet<>(other.connectedParts); - // releases all blocks and references gently so they can be incorporated into another multiblock + // releases all blocks and references gently, so they can be incorporated into another multiblock other._onAssimilated(this); for (IMultiblockPart acquiredPart : partsToAcquire) { @@ -489,7 +495,7 @@ public abstract class MultiblockControllerBase { * Called when this machine is consumed by another controller. Essentially, * forcibly tear down this object. * - * @param otherController The controller consuming this controller. + * @param otherController {@link MultiblockControllerBase} The controller consuming this controller. */ private void _onAssimilated(MultiblockControllerBase otherController) { if (referenceCoord == null) { return; } @@ -509,7 +515,7 @@ public abstract class MultiblockControllerBase { * Callback. Called after this controller assimilates all the blocks from * another controller. Use this to absorb that controller's game data. * - * @param assimilated The controller whose uniqueness was added to our own. + * @param assimilated {@link MultiblockControllerBase} The controller whose uniqueness was added to our own. */ protected abstract void onAssimilate(MultiblockControllerBase assimilated); @@ -518,7 +524,7 @@ public abstract class MultiblockControllerBase { * controller. All blocks have been stripped out of this object and handed * over to the other controller. This is intended primarily for cleanup. * - * @param assimilator The controller which has assimilated this controller. + * @param assimilator {@link MultiblockControllerBase} The controller which has assimilated this controller. */ protected abstract void onAssimilated(MultiblockControllerBase assimilator); @@ -553,7 +559,7 @@ public abstract class MultiblockControllerBase { for (int x = minChunkX; x <= maxChunkX; x++) { for (int z = minChunkZ; z <= maxChunkZ; z++) { - // Ensure that we save our data, even if the our save + // Ensure that we save our data, even if our save // delegate is in has no TEs. WorldChunk chunkToSave = this.worldObj.getChunk(x, z); chunkToSave.needsSaving(); @@ -565,12 +571,12 @@ public abstract class MultiblockControllerBase { } /** - * The server-side update loop! Use this similarly to a BlockEntity's update - * loop. You do not need to call your superclass' update() if you're - * directly derived from MultiblockControllerBase. This is a callback. Note + * The server-side update loop! Use this similarly to a {@link BlockEntity}'s update + * loop. You do not need to call your superclass' {@code update()} if you're + * directly derived from {@link MultiblockControllerBase}. This is a callback. Note * that this will only be called when the machine is assembled. * - * @return True if the multiblock should save data, i.e. its internal game + * @return {@code boolean} True if the multiblock should save data, i.e. its internal game * state has changed. False otherwise. */ protected abstract boolean updateServer(); @@ -586,11 +592,11 @@ public abstract class MultiblockControllerBase { /** * The "frame" consists of the outer edges of the machine, plus the corners. * - * @param world World object for the world in which this controller is - * located. - * @param x X coordinate of the block being tested - * @param y Y coordinate of the block being tested - * @param z Z coordinate of the block being tested + * @param world {@link World} The object for the world in which this controller is + * located. + * @param x {@code int} X coordinate of the block being tested + * @param y {@code int} Y coordinate of the block being tested + * @param z {@code int} Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed on the machine's frame */ protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException { @@ -601,11 +607,11 @@ public abstract class MultiblockControllerBase { /** * The top consists of the top face, minus the edges. * - * @param world World object for the world in which this controller is - * located. - * @param x X coordinate of the block being tested - * @param y Y coordinate of the block being tested - * @param z Z coordinate of the block being tested + * @param world {@link World} The object for the world in which this controller is + * located. + * @param x {@code int} X coordinate of the block being tested + * @param y {@code int} Y coordinate of the block being tested + * @param z {@code int} Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed on the machine's top face */ protected void isBlockGoodForTop(World world, int x, int y, int z) throws MultiblockValidationException { @@ -616,13 +622,13 @@ public abstract class MultiblockControllerBase { /** * The bottom consists of the bottom face, minus the edges. * - * @param world World object for the world in which this controller is - * located. - * @param x X coordinate of the block being tested - * @param y Y coordinate of the block being tested - * @param z Z coordinate of the block being tested + * @param world {@link World} The object for the world in which this controller is + * located. + * @param x {@code int} X coordinate of the block being tested + * @param y {@code int} Y coordinate of the block being tested + * @param z {@code int} Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed on the machine's bottom - * face + * face */ protected void isBlockGoodForBottom(World world, int x, int y, int z) throws MultiblockValidationException { throw new MultiblockValidationException( @@ -630,15 +636,15 @@ public abstract class MultiblockControllerBase { } /** - * The sides consists of the N/E/S/W-facing faces, minus the edges. + * The sides consist of the N/E/S/W-facing faces, minus the edges. * - * @param world World object for the world in which this controller is - * located. - * @param x X coordinate of the block being tested - * @param y Y coordinate of the block being tested - * @param z Z coordinate of the block being tested + * @param world {@link World} The object for the world in which this controller is + * located. + * @param x {@code int} X coordinate of the block being tested + * @param y {@code int} Y coordinate of the block being tested + * @param z {@code int} Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed on the machine's side - * faces + * faces */ protected void isBlockGoodForSides(World world, int x, int y, int z) throws MultiblockValidationException { throw new MultiblockValidationException( @@ -648,11 +654,11 @@ public abstract class MultiblockControllerBase { /** * The interior is any block that does not touch blocks outside the machine. * - * @param world World object for the world in which this controller is - * located. - * @param x X coordinate of the block being tested - * @param y Y coordinate of the block being tested - * @param z Z coordinate of the block being tested + * @param world {@link World} The object for the world in which this controller is + * located. + * @param x {@code int} X coordinate of the block being tested + * @param y {@code int} Y coordinate of the block being tested + * @param z {@code int} Z coordinate of the block being tested * @throws MultiblockValidationException if the tested block is not allowed in the machine's interior */ protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException { @@ -661,7 +667,7 @@ public abstract class MultiblockControllerBase { } /** - * @return The reference coordinate, the block with the lowest x, y, z + * @return {@link BlockPos} The reference coordinate, the block with the lowest x, y, z * coordinates, evaluated in that order. */ public BlockPos getReferenceCoord() { @@ -672,7 +678,7 @@ public abstract class MultiblockControllerBase { } /** - * @return The number of blocks connected to this controller. + * @return {@code int} The number of blocks connected to this controller. */ public int getNumConnectedBlocks() { return connectedParts.size(); @@ -718,7 +724,7 @@ public abstract class MultiblockControllerBase { } /** - * @return The minimum bounding-box coordinate containing this machine's + * @return {@link BlockPos} The minimum bounding-box coordinate containing this machine's * blocks. */ public BlockPos getMinimumCoord() { @@ -729,7 +735,7 @@ public abstract class MultiblockControllerBase { } /** - * @return The maximum bounding-box coordinate containing this machine's + * @return {@link BlockPos} The maximum bounding-box coordinate containing this machine's * blocks. */ public BlockPos getMaximumCoord() { @@ -740,23 +746,23 @@ public abstract class MultiblockControllerBase { } /** - * Called when the save delegate's blockEntity entity is being asked for its + * Called when the save delegate's {@link BlockEntity} entity is being asked for its * description packet * - * @param data A fresh compound tag to write your multiblock data into + * @param data {@link NbtCompound} A fresh compound tag to write your multiblock data into */ public abstract void formatDescriptionPacket(NbtCompound data); /** - * Called when the save delegate's blockEntity entity receiving a description + * Called when the save delegate's {@link BlockEntity} entity receiving a description * packet * - * @param data A compound tag containing multiblock data to import + * @param data {@link NbtCompound} A compound tag containing multiblock data to import */ public abstract void decodeDescriptionPacket(NbtCompound data); /** - * @return True if this controller has no associated blocks, false otherwise + * @return {@code boolean} True if this controller has no associated blocks, false otherwise */ public boolean isEmpty() { return connectedParts.isEmpty(); @@ -767,9 +773,12 @@ public abstract class MultiblockControllerBase { * become the new multiblock master when the two multiblocks are adjacent. * Assumes both multiblocks are the same type. * - * @param otherController The other multiblock controller. - * @return True if this multiblock should consume the other, false + * @param otherController {@link MultiblockControllerBase} The other multiblock controller. + * @return {@code boolean} True if this multiblock should consume the other, false * otherwise. + * @throws IllegalArgumentException The two multiblocks have different master classes + * @throws IllegalArgumentException The two controllers with the same reference coord both + * have valid parts */ public boolean shouldConsume(MultiblockControllerBase otherController) { if (!otherController.getClass().equals(getClass())) { @@ -840,7 +849,7 @@ public abstract class MultiblockControllerBase { } /** - * Checks all of the parts in the controller. If any are dead or do not + * Checks all the parts in the controller. If any are dead or do not * exist in the world, they are removed. */ private void auditParts() { @@ -861,7 +870,7 @@ public abstract class MultiblockControllerBase { * Called when this machine may need to check for blocks that are no longer * physically connected to the reference coordinate. * - * @return Set with removed parts + * @return {@link Set} Set with removed {@link IMultiblockPart}s. */ public Set checkForDisconnections() { if (!this.shouldCheckForDisconnections) { @@ -980,10 +989,10 @@ public abstract class MultiblockControllerBase { } /** - * Detach all parts. Return a set of all parts which still have a valid blockEntity + * Detach all parts. Return a set of all parts which still have a valid {@link BlockEntity} * entity. Chunk-safe. * - * @return A set of all parts which still have a valid blockEntity entity. + * @return {@link Set} A set of all {@link IMultiblockPart}s which still have a valid {@link BlockEntity} entity. */ public Set detachAllBlocks() { if (worldObj == null) { @@ -1002,7 +1011,7 @@ public abstract class MultiblockControllerBase { } /** - * @return True if this multiblock machine is considered assembled and ready + * @return {@code boolean} True if this multiblock machine is considered assembled and ready * to go. */ public boolean isAssembled() { @@ -1035,12 +1044,12 @@ public abstract class MultiblockControllerBase { /** * Marks the reference coord dirty & updateable. *

- * On the server, this will mark the for a data-update, so that nearby - * clients will receive an updated description packet from the server after - * a short time. The block's chunk will also be marked dirty and the block's - * chunk will be saved to disk the next time chunks are saved. - *

- * On the client, this will mark the block for a rendering update. + * On the server, this will mark the for a data-update, so that nearby + * clients will receive an updated description packet from the server after + * a short time. The block's chunk will also be marked dirty and the block's + * chunk will be saved to disk the next time chunks are saved. + *

+ *

On the client, this will mark the block for a rendering update.

*/ protected void markReferenceCoordForUpdate() { BlockPos rc = getReferenceCoord(); @@ -1053,11 +1062,11 @@ public abstract class MultiblockControllerBase { /** * Marks the reference coord dirty. *

- * On the server, this marks the reference coord's chunk as dirty; the block - * (and chunk) will be saved to disk the next time chunks are saved. This - * does NOT mark it dirty for a description-packet update. - *

- * On the client, does nothing. + * On the server, this marks the reference coord's chunk as dirty; the block + * (and chunk) will be saved to disk the next time chunks are saved. This + * does NOT mark it dirty for a description-packet update. + *

+ *

On the client, does nothing.

* * @see MultiblockControllerBase#markReferenceCoordForUpdate() */ diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockEventHandler.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockEventHandler.java index 87f3093f9..58c0fc0d2 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockEventHandler.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockEventHandler.java @@ -25,7 +25,7 @@ package reborncore.common.multiblock; /** - * In your mod, subscribe this on both the client and server sides side to + * In your mod, subscribe this on both the client and server sides to * handle chunk load events for your multiblock machines. Chunks can load * asynchronously in environments like MCPC+, so we cannot behavior any blocks * that are in chunks which are still loading. diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockRegistry.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockRegistry.java index da9e2afda..7b4f301ed 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockRegistry.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockRegistry.java @@ -44,7 +44,7 @@ public class MultiblockRegistry { /** * Called before Tile Entities are ticked in the world. Do bookkeeping here. * - * @param world The world being ticked + * @param world {@link World} The world being ticked */ public static void tickStart(World world) { if (registries.containsKey(world)) { @@ -57,8 +57,8 @@ public class MultiblockRegistry { /** * Called when the world has finished loading a chunk. * - * @param world The world which has finished loading a chunk - * @param chunk Loaded chunk + * @param world {@link World} The world which has finished loading a chunk + * @param chunk {@link Chunk} Loaded chunk */ public static void onChunkLoaded(World world, Chunk chunk) { if (registries.containsKey(world)) { @@ -70,8 +70,8 @@ public class MultiblockRegistry { * Register a new part in the system. The part has been created either * through user action or via a chunk loading. * - * @param world The world into which this part is loading. - * @param part The part being loaded. + * @param world {@link World} The world into which this part is loading. + * @param part {@link IMultiblockPart} The part being loaded. */ public static void onPartAdded(World world, IMultiblockPart part) { MultiblockWorldRegistry registry = getOrCreateRegistry(world); @@ -81,8 +81,8 @@ public class MultiblockRegistry { /** * Call to remove a part from world lists. * - * @param world The world from which a multiblock part is being removed. - * @param part The part being removed. + * @param world {@link World} The world from which a multiblock part is being removed. + * @param part {@link IMultiblockPart} The part being removed. */ public static void onPartRemovedFromWorld(World world, IMultiblockPart part) { if (registries.containsKey(world)) { @@ -95,7 +95,7 @@ public class MultiblockRegistry { * Called whenever a world is unloaded. Unload the relevant registry, if we * have one. * - * @param world The world being unloaded. + * @param world {@link World} The world being unloaded. */ public static void onWorldUnloaded(World world) { if (registries.containsKey(world)) { @@ -108,14 +108,14 @@ public class MultiblockRegistry { * Call to mark a controller as dirty. Dirty means that parts have been * added or removed this tick. * - * @param world The world containing the multiblock - * @param controller The dirty controller + * @param world {@link World} The world containing the multiblock + * @param controller {@link MultiblockControllerBase} The dirty controller */ public static void addDirtyController(World world, MultiblockControllerBase controller) { if (registries.containsKey(world)) { registries.get(world).addDirtyController(controller); } else { - RebornCore.LOGGER.error("Adding a dirty controller to a world that has no registered controllers! This is most likey not an issue with reborn core, please check the full log file for more infomation!"); + RebornCore.LOGGER.error("Adding a dirty controller to a world that has no registered controllers! This is most likely not an issue with reborn core, please check the full log file for more information!"); } } @@ -123,8 +123,8 @@ public class MultiblockRegistry { * Call to mark a controller as dead. It should only be marked as dead when * it has no connected parts. It will be removed after the next world tick. * - * @param world The world formerly containing the multiblock - * @param controller The dead controller + * @param world {@link World} The world formerly containing the multiblock + * @param controller {@link MultiblockControllerBase} The dead controller */ public static void addDeadController(World world, MultiblockControllerBase controller) { if (registries.containsKey(world)) { @@ -137,9 +137,9 @@ public class MultiblockRegistry { } /** - * @param world The world whose controllers you wish to retrieve. - * @return An unmodifiable set of controllers active in the given world, or - * null if there are none. + * @param world {@link World} The world whose controllers you wish to retrieve. + * @return {@link Set} An unmodifiable set of {@link MultiblockControllerBase} + * controllers active in the given world, or null if there are none. */ public static Set getControllersFromWorld(World world) { if (registries.containsKey(world)) { diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java index 9eff7fdfc..d7a687631 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/MultiblockWorldRegistry.java @@ -311,7 +311,7 @@ public class MultiblockWorldRegistry { * during the next tick. If the chunk is not loaded, it will be added to a * list of objects waiting for a chunkload. * - * @param part The part which is being added to this world. + * @param part {@link IMultiblockPart} The part which is being added to this world. */ public void onPartAdded(IMultiblockPart part) { BlockPos pos = part.getWorldLocation(); @@ -342,7 +342,7 @@ public class MultiblockWorldRegistry { * chunk unloads. This part is removed from any lists in which it may be, * and its machine is marked for recalculation. * - * @param part The part which is being removed. + * @param part {@link IMultiblockPart} The part which is being removed. */ public void onPartRemovedFromWorld(IMultiblockPart part) { BlockPos pos = part.getWorldLocation(); @@ -394,12 +394,11 @@ public class MultiblockWorldRegistry { } /** - * Called when a chunk has finished loading. Adds all of the parts which are + * Called when a chunk has finished loading. Adds all the parts which are * awaiting load to the list of parts which are orphans and therefore will - * be added to machines after the next world tick. + * be added to the machines after the next world tick. * - * @param chunk Chunk that was - * loaded + * @param chunk {@link Chunk} Chunk that was loaded */ public void onChunkLoaded(Chunk chunk) { int chunkHash = chunk.getPos().hashCode(); @@ -418,7 +417,7 @@ public class MultiblockWorldRegistry { * next world tick. Note that a controller must shed all of its blocks * before being marked as dead, or the system will complain at you. * - * @param deadController The controller which is dead. + * @param deadController {@link MultiblockControllerBase} The controller which is dead. */ public void addDeadController(MultiblockControllerBase deadController) { this.deadControllers.add(deadController); @@ -429,7 +428,7 @@ public class MultiblockWorldRegistry { * changed, and it must be re-checked for assembly and, possibly, for * orphans. * - * @param dirtyController The dirty controller. + * @param dirtyController {@link MultiblockControllerBase} The dirty controller. */ public void addDirtyController(MultiblockControllerBase dirtyController) { this.dirtyControllers.add(dirtyController); @@ -439,8 +438,8 @@ public class MultiblockWorldRegistry { * Use this only if you know what you're doing. You should rarely need to * iterate over all controllers in a world! * - * @return An (unmodifiable) set of controllers which are active in this - * world. + * @return {@link Set} An (unmodifiable) set of {@link MultiblockControllerBase} + * controllers which are active in this world. */ public Set getControllers() { return Collections.unmodifiableSet(controllers); diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockBlockEntityBase.java b/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockBlockEntityBase.java index 92270850b..7f6699264 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockBlockEntityBase.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockBlockEntityBase.java @@ -121,7 +121,7 @@ public abstract class RectangularMultiblockBlockEntityBase extends MultiblockBlo } } - // /// Validation Helpers (IMultiblockPart) + // Validation Helpers (IMultiblockPart) public abstract void isGoodForFrame() throws MultiblockValidationException; public abstract void isGoodForSides() throws MultiblockValidationException; diff --git a/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockControllerBase.java b/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockControllerBase.java index ed4c092fa..54149810c 100644 --- a/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockControllerBase.java +++ b/RebornCore/src/main/java/reborncore/common/multiblock/rectangular/RectangularMultiblockControllerBase.java @@ -37,8 +37,8 @@ public abstract class RectangularMultiblockControllerBase extends MultiblockCont } /** - * @return True if the machine is "whole" and should be assembled. False - * otherwise. + * @throws MultiblockValidationException If the machine is not "whole" and + * should not be assembled. */ @Override protected void isMachineWhole() throws MultiblockValidationException { diff --git a/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java b/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java index 6e5d29f62..251e17f6b 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java +++ b/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java @@ -52,7 +52,7 @@ public class ExtendedPacketBuffer extends PacketByteBuf { return ObjectBufferUtils.readObject(this); } - // Supports reading and writing list codec's + // Supports reading and writing list codecs public void writeCodec(Codec codec, T object) { DataResult dataResult = codec.encodeStart(NbtOps.INSTANCE, object); if (dataResult.error().isPresent()) { diff --git a/RebornCore/src/main/java/reborncore/common/network/ServerBoundPackets.java b/RebornCore/src/main/java/reborncore/common/network/ServerBoundPackets.java index 2849b678a..37d505d12 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ServerBoundPackets.java +++ b/RebornCore/src/main/java/reborncore/common/network/ServerBoundPackets.java @@ -54,7 +54,8 @@ public class ServerBoundPackets { IdentifiedPacket packetFluidConfigSync = ClientBoundPackets.createPacketFluidConfigSync(pos, legacyMachineBase.fluidConfiguration); NetworkManager.sendToTracking(packetFluidConfigSync, legacyMachineBase); - //We update the block to allow pipes that are connecting to detctect the update and change their connection status if needed + // We update the block to allow pipes that are connecting to detect the update and change their + // connection status if needed World world = legacyMachineBase.getWorld(); BlockState blockState = world.getBlockState(legacyMachineBase.getPos()); world.updateNeighborsAlways(legacyMachineBase.getPos(), blockState.getBlock()); @@ -89,7 +90,7 @@ public class ServerBoundPackets { config.setInput(input); config.setOutput(output); - //Syncs back to the client + // Syncs back to the client IdentifiedPacket packetFluidConfigSync = ClientBoundPackets.createPacketFluidConfigSync(pos, legacyMachineBase.fluidConfiguration); NetworkManager.sendToTracking(packetFluidConfigSync, legacyMachineBase); }); @@ -112,7 +113,7 @@ public class ServerBoundPackets { holder.setInput(input); holder.setOutput(output); - holder.setfilter(filter); + holder.setFilter(filter); //Syncs back to the client IdentifiedPacket packetSlotSync = ClientBoundPackets.createPacketSlotSync(pos, machineBase.getSlotConfiguration()); @@ -204,7 +205,7 @@ public class ServerBoundPackets { }); } - public static IdentifiedPacket requestChunkloaderChunks(BlockPos pos) { + public static IdentifiedPacket requestChunkLoaderChunks(BlockPos pos) { return NetworkManager.createServerBoundPacket(new Identifier("reborncore", "chunk_loader_request"), packetBuffer -> { packetBuffer.writeBlockPos(pos); }); diff --git a/RebornCore/src/main/java/reborncore/common/powerSystem/PowerAcceptorBlockEntity.java b/RebornCore/src/main/java/reborncore/common/powerSystem/PowerAcceptorBlockEntity.java index 817a07900..98242e410 100644 --- a/RebornCore/src/main/java/reborncore/common/powerSystem/PowerAcceptorBlockEntity.java +++ b/RebornCore/src/main/java/reborncore/common/powerSystem/PowerAcceptorBlockEntity.java @@ -26,13 +26,10 @@ package reborncore.common.powerSystem; import net.fabricmc.fabric.api.transfer.v1.context.ContainerItemContext; import net.fabricmc.fabric.api.transfer.v1.item.InventoryStorage; -import net.fabricmc.fabric.api.transfer.v1.item.ItemVariant; -import net.fabricmc.fabric.api.transfer.v1.storage.base.SingleSlotStorage; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.inventory.Inventory; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; @@ -43,6 +40,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IListInfoProvider; +import reborncore.client.screen.builder.BlockEntityScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.util.StringUtils; @@ -77,7 +75,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im public int extraTier; public long powerChange; public long powerLastTick; - public boolean checkOverfill = true; // Set to false to disable the overfill check. + public boolean checkOverfill = true; // Set false to disable overfill check. public PowerAcceptorBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); @@ -99,7 +97,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Get amount of missing energy * - * @return double Free space for energy in internal buffer + * @return {@code long} Free space for energy in internal buffer */ public long getFreeSpace() { return getMaxStoredPower() - getStored(); @@ -108,7 +106,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Adds energy to block entity * - * @param amount double Amount to add + * @param amount {@code long} Amount to add */ public void addEnergy(long amount){ setStored(getEnergy() + amount); @@ -127,7 +125,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Use energy from block entity * - * @param amount double Amount of energy to use + * @param amount {@code long} Amount of energy to use */ public void useEnergy(long amount){ if (getEnergy() > amount) { @@ -140,7 +138,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Charge machine from battery placed inside inventory slot * - * @param slot int Slot ID for battery slot + * @param slot {@code int} Slot ID for battery slot */ public void charge(int slot) { if (world == null) { @@ -170,7 +168,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Charge battery placed inside inventory slot from machine * - * @param slot int Slot ID for battery slot + * @param slot {@code int} Slot ID for battery slot */ public void discharge(int slot) { if (world == null) { @@ -197,10 +195,13 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Calculates the comparator output of a powered BE with the formula - * {@code ceil(blockEntity.getStored() * 15.0 / storage.getMaxPower())}. + *
+	 *  ceil(blockEntity.getStored() * 15.0 / storage.getMaxPower())
+	 * 
* - * @param blockEntity the powered BE - * @return the calculated comparator output or 0 if {@code blockEntity} is not a {@code PowerAcceptorBlockEntity} + * @param blockEntity {@link BlockEntity} the powered BE + * @return {@code int} the calculated comparator output or 0 if {@link BlockEntity} + * is not a {@link PowerAcceptorBlockEntity} */ public static int calculateComparatorOutputFromEnergy(@Nullable BlockEntity blockEntity) { if (blockEntity instanceof PowerAcceptorBlockEntity storage) { @@ -213,7 +214,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Check if machine should load energy data from NBT * - * @return boolean Returns true if machine should load energy data from NBT + * @return {@code boolean} Returns true if machine should load energy data from NBT */ protected boolean shouldHandleEnergyNBT() { return true; @@ -222,8 +223,8 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Check if block entity can accept energy from a particular side * - * @param side EnergySide Machine side - * @return boolean Returns true if machine can accept energy from side provided + * @param side {@link Direction} Machine side + * @return {@code boolean} Returns true if machine can accept energy from side provided */ protected boolean canAcceptEnergy(@Nullable Direction side){ return true; @@ -232,62 +233,68 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Check if block entity can provide energy via a particular side * - * @param side EnergySide Machine side - * @return boolean Returns true if machine can provide energy via particular side + * @param side {@link Direction} Machine side + * @return {@code boolean} Returns true if machine can provide energy via particular side */ protected boolean canProvideEnergy(@Nullable Direction side){ return true; } /** - * Wrapper method used to sync additional energy storage values with client via BlockEntityScreenHandlerBuilder + * Wrapper method used to sync additional energy storage values with client via + * {@link BlockEntityScreenHandlerBuilder} * - * @return double Size of additional energy buffer + * @return {@code long} Size of additional energy buffer */ public long getExtraPowerStorage(){ return extraPowerStorage; } /** - * Wrapper method used to sync additional energy storage values with client via BlockEntityScreenHandlerBuilder + * Wrapper method used to sync additional energy storage values with client via + * {@link BlockEntityScreenHandlerBuilder} * - * @param extraPowerStorage double Size of additional energy buffer + * @param extraPowerStorage {@code long} Size of additional energy buffer */ public void setExtraPowerStorage(long extraPowerStorage) { this.extraPowerStorage = extraPowerStorage; } /** - * Wrapper method used to sync energy change values with client via BlockEntityScreenHandlerBuilder + * Wrapper method used to sync energy change values with client via + * {@link BlockEntityScreenHandlerBuilder} * - * @return double Energy change per tick + * @return {@code long} Energy change per tick */ public long getPowerChange() { return powerChange; } /** - * Wrapper method used to sync energy change values with client via BlockEntityScreenHandlerBuilder + * Wrapper method used to sync energy change values with client via + * {@link BlockEntityScreenHandlerBuilder} * - * @param powerChange double Energy change per tick + * @param powerChange {@code long} Energy change per tick */ public void setPowerChange(long powerChange) { this.powerChange = powerChange; } /** - * Wrapper method used to sync energy values with client via BlockEntityScreenHandlerBuilder + * Wrapper method used to sync energy values with client via + * {@link BlockEntityScreenHandlerBuilder} * - * @return double Energy stored in block entity + * @return {@code long} Energy stored in block entity */ - public long getEnergy() { - return getStored(); + return getStored(); } /** - * Wrapper method used to sync energy values with client via BlockEntityScreenHandlerBuilder - * @param energy double Energy stored in block entity + * Wrapper method used to sync energy values with client via + * {@link BlockEntityScreenHandlerBuilder} + * + * @param energy {@code long} Energy stored in block entity */ public void setEnergy(long energy) { setStored(energy); @@ -296,21 +303,21 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im /** * Returns base size of internal Energy buffer of a particular machine before any upgrades applied * - * @return double Size of internal Energy buffer + * @return {@code long} Size of internal Energy buffer */ public abstract long getBaseMaxPower(); /** * Returns base output rate or zero if machine doesn't output energy * - * @return double Output rate, E\t + * @return {@code long} Output rate, E\t */ public abstract long getBaseMaxOutput(); /** * Returns base input rate or zero if machine doesn't accept energy * - * @return double Input rate, E\t + * @return {@code long} Input rate, E\t */ public abstract long getBaseMaxInput(); @@ -346,7 +353,7 @@ public abstract class PowerAcceptorBlockEntity extends MachineBaseBlockEntity im super.readNbt(tag); NbtCompound data = tag.getCompound("PowerAcceptor"); if (shouldHandleEnergyNBT()) { - // Bypass the overfill check in setStored() because upgrades have not yet been applied. + // Bypass overfill check in setStored() because upgrades have not yet been applied. this.energyContainer.amount = data.getLong("energy"); } } diff --git a/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java b/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java index 6bc5c9f12..9c8bd1908 100644 --- a/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java +++ b/RebornCore/src/main/java/reborncore/common/powerSystem/RcEnergyItem.java @@ -5,13 +5,16 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import reborncore.common.util.ItemUtils; +import team.reborn.energy.api.EnergyStorage; import team.reborn.energy.api.base.SimpleBatteryItem; /** - * Implement on simple energy-containing items and (on top of what SimpleBatteryItem does): + * Implement on simple energy-containing items and (on top of what {@link SimpleBatteryItem} does): *
    - *
  • A tooltip will be added for the item, indicating the stored power, the max power and the extraction rates.
  • - *
  • Any RcEnergyItem input in a crafting recipe input will automatically give its energy to the output if the output implements RcEnergyItem.
  • + *
  • A tooltip will be added for the item, indicating the stored power, + * the max power and the extraction rates.
  • + *
  • Any {@link RcEnergyItem} input in a crafting recipe input will automatically + * give its energy to the output if the output implements {@link RcEnergyItem}.
  • *
* TODO: consider moving this functionality to the energy API? */ @@ -19,7 +22,7 @@ public interface RcEnergyItem extends SimpleBatteryItem, FabricItem { long getEnergyCapacity(); /** - * @return the tier of this EnergyStorage, used to have standard I/O rates. + * @return {@link RcEnergyTier} the tier of this {@link EnergyStorage}, used to have standard I/O rates. */ RcEnergyTier getTier(); diff --git a/RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHanlder.java b/RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHandler.java similarity index 97% rename from RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHanlder.java rename to RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHandler.java index d61768e71..e433bdc64 100644 --- a/RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHanlder.java +++ b/RebornCore/src/main/java/reborncore/common/recipes/ICrafterSoundHandler.java @@ -29,7 +29,7 @@ import net.minecraft.block.entity.BlockEntity; /** * Created by Mark on 01/07/2017. */ -public interface ICrafterSoundHanlder { +public interface ICrafterSoundHandler { void playSound(boolean firstRun, BlockEntity blockEntity); diff --git a/RebornCore/src/main/java/reborncore/common/recipes/IUpgradeHandler.java b/RebornCore/src/main/java/reborncore/common/recipes/IUpgradeHandler.java index 06ce115e8..f08da4267 100644 --- a/RebornCore/src/main/java/reborncore/common/recipes/IUpgradeHandler.java +++ b/RebornCore/src/main/java/reborncore/common/recipes/IUpgradeHandler.java @@ -25,22 +25,22 @@ package reborncore.common.recipes; /** - * This class isnt designed to be used by other mods, if you want to have upgrades have your + * This class isn't designed to be used by other mods, if you want to have upgrades have your */ public interface IUpgradeHandler { - void resetSpeedMulti(); + void resetSpeedMultiplier(); double getSpeedMultiplier(); - void addPowerMulti(double amount); + void addPowerMultiplier(double amount); - void resetPowerMulti(); + void resetPowerMultiplier(); double getPowerMultiplier(); long getEuPerTick(long baseEu); - void addSpeedMulti(double amount); + void addSpeedMultiplier(double amount); } diff --git a/RebornCore/src/main/java/reborncore/common/recipes/RecipeCrafter.java b/RebornCore/src/main/java/reborncore/common/recipes/RecipeCrafter.java index f748f2358..f045166b2 100644 --- a/RebornCore/src/main/java/reborncore/common/recipes/RecipeCrafter.java +++ b/RebornCore/src/main/java/reborncore/common/recipes/RecipeCrafter.java @@ -98,7 +98,7 @@ public class RecipeCrafter implements IUpgradeHandler { int ticksSinceLastChange; @Nullable - public static ICrafterSoundHanlder soundHanlder = (firstRun, blockEntity) -> { + public static ICrafterSoundHandler soundHandler = (firstRun, blockEntity) -> { }; public RecipeCrafter(RebornRecipeType recipeType, BlockEntity blockEntity, int inputs, int outputs, RebornInventory inventory, @@ -172,7 +172,7 @@ public class RecipeCrafter implements IUpgradeHandler { currentRecipe = null; currentTickTime = 0; updateCurrentRecipe(); - //Update active sate if the blockEntity isnt going to start crafting again + // Update active state if the blockEntity isn't going to start crafting again if (currentRecipe == null) { setIsActive(); } @@ -181,8 +181,8 @@ public class RecipeCrafter implements IUpgradeHandler { long useRequirement = getEuPerTick(currentRecipe.getPower()); if (energy.tryUseExact(useRequirement)) { currentTickTime++; - if ((currentTickTime == 1 || currentTickTime % 20 == 0) && soundHanlder != null) { - soundHanlder.playSound(false, blockEntity); + if ((currentTickTime == 1 || currentTickTime % 20 == 0) && soundHandler != null) { + soundHandler.playSound(false, blockEntity); } } } @@ -196,11 +196,11 @@ public class RecipeCrafter implements IUpgradeHandler { public void updateCurrentRecipe() { currentTickTime = 0; for (RebornRecipe recipe : recipeType.getRecipes(blockEntity.getWorld())) { - // This checks to see if it has all of the inputs + // This checks to see if it has all the inputs if (!hasAllInputs(recipe)) continue; if (!recipe.canCraft(blockEntity)) continue; - // This checks to see if it can fit all of the outputs + // This checks to see if it can fit all the outputs boolean hasOutputSpace = true; for (int i = 0; i < recipe.getOutputs().size(); i++) { if (!canFitOutput(recipe.getOutputs().get(i), outputSlots[i])) { @@ -246,7 +246,7 @@ public class RecipeCrafter implements IUpgradeHandler { return; } for (RebornIngredient ingredient : currentRecipe.getRebornIngredients()) { - for (int inputSlot : inputSlots) {// Uses all of the inputs + for (int inputSlot : inputSlots) {// Uses all the inputs if (ingredient.test(inventory.getStack(inputSlot))) { inventory.shrinkSlot(inputSlot, ingredient.getCount()); break; @@ -354,8 +354,8 @@ public class RecipeCrafter implements IUpgradeHandler { return inventory.hasChanged(); } - public void setInvDirty(boolean isDiry) { - inventory.setHashChanged(isDiry); + public void setInvDirty(boolean isDirty) { + inventory.setHashChanged(isDirty); } public boolean isStackValidInput(ItemStack stack) { @@ -363,7 +363,8 @@ public class RecipeCrafter implements IUpgradeHandler { return false; } - //Test with a stack with the max stack size as some independents will check the stacksize. Bit of a hack but should work. + // Test with a stack with the max stack size as some independents will check the stack size. + // A bit of a hack but should work. ItemStack largeStack = stack.copy(); largeStack.setCount(largeStack.getMaxCount()); for (RebornRecipe recipe : recipeType.getRecipes(blockEntity.getWorld())) { @@ -377,8 +378,8 @@ public class RecipeCrafter implements IUpgradeHandler { } @Override - public void resetSpeedMulti() { - parentUpgradeHandler.ifPresent(IUpgradeHandler::resetSpeedMulti); + public void resetSpeedMultiplier() { + parentUpgradeHandler.ifPresent(IUpgradeHandler::resetSpeedMultiplier); } @Override @@ -387,13 +388,13 @@ public class RecipeCrafter implements IUpgradeHandler { } @Override - public void addPowerMulti(double amount) { - parentUpgradeHandler.ifPresent(iUpgradeHandler -> iUpgradeHandler.addPowerMulti(amount)); + public void addPowerMultiplier(double amount) { + parentUpgradeHandler.ifPresent(iUpgradeHandler -> iUpgradeHandler.addPowerMultiplier(amount)); } @Override - public void resetPowerMulti() { - parentUpgradeHandler.ifPresent(IUpgradeHandler::resetPowerMulti); + public void resetPowerMultiplier() { + parentUpgradeHandler.ifPresent(IUpgradeHandler::resetPowerMultiplier); } @Override @@ -408,7 +409,7 @@ public class RecipeCrafter implements IUpgradeHandler { } @Override - public void addSpeedMulti(double amount) { - parentUpgradeHandler.ifPresent(iUpgradeHandler -> iUpgradeHandler.addSpeedMulti(amount)); + public void addSpeedMultiplier(double amount) { + parentUpgradeHandler.ifPresent(iUpgradeHandler -> iUpgradeHandler.addSpeedMultiplier(amount)); } } diff --git a/RebornCore/src/main/java/reborncore/common/util/CalenderUtils.java b/RebornCore/src/main/java/reborncore/common/util/CalenderUtils.java index be84df257..20f619d7f 100644 --- a/RebornCore/src/main/java/reborncore/common/util/CalenderUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/CalenderUtils.java @@ -40,7 +40,7 @@ public class CalenderUtils { calendar.setTimeInMillis(System.currentTimeMillis()); int day = calendar.get(Calendar.DAY_OF_MONTH); - int month = calendar.get(Calendar.MONTH) + 1; //Java months start at 0 + int month = calendar.get(Calendar.MONTH) + 1; // Java months start at 0 if (month == 12) { if (day >= 24 && day <= 26) { christmas = true; diff --git a/RebornCore/src/main/java/reborncore/common/util/ChatUtils.java b/RebornCore/src/main/java/reborncore/common/util/ChatUtils.java index d10daaaef..c3b7fc348 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ChatUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/ChatUtils.java @@ -36,12 +36,13 @@ import reborncore.mixin.client.AccessorChatHud; * Class stolen from SteamAgeRevolution, which I stole from BloodMagic, which was stolen from EnderCore, which stole the * idea from ExtraUtilities, who stole it from vanilla. *

- * Original class link: - * https://github.com/SleepyTrousers/EnderCore/blob/master/src/main/java/com/enderio/core/common/util/ChatUtil.java + * Original class link: + * https://github.com/SleepyTrousers/EnderCore/blob/master/src/main/java/com/enderio/core/common/util/ChatUtil.java + *

*/ public class ChatUtils { - private static final int DELETION_ID = 1337; //MAKE THIS UNIQUE PER MOD THAT USES THIS + private static final int DELETION_ID = 1337; // MAKE THIS UNIQUE PER MOD THAT USES THIS public static void sendNoSpamMessages(int messageID, Text message) { if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { diff --git a/RebornCore/src/main/java/reborncore/common/util/Color.java b/RebornCore/src/main/java/reborncore/common/util/Color.java index f4aeddcce..83ff02ac3 100644 --- a/RebornCore/src/main/java/reborncore/common/util/Color.java +++ b/RebornCore/src/main/java/reborncore/common/util/Color.java @@ -24,7 +24,7 @@ package reborncore.common.util; -//A basic color class that is used in place of the AWT color class as it cannot be used with lwjgl 3 +// A basic color class that is used in place of the AWT color class as it cannot be used with lwjgl 3 public class Color { public final static Color WHITE = new Color(255, 255, 255); diff --git a/RebornCore/src/main/java/reborncore/common/util/DefaultedListCollector.java b/RebornCore/src/main/java/reborncore/common/util/DefaultedListCollector.java index a20666ee9..a389137da 100644 --- a/RebornCore/src/main/java/reborncore/common/util/DefaultedListCollector.java +++ b/RebornCore/src/main/java/reborncore/common/util/DefaultedListCollector.java @@ -35,7 +35,11 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collector; -//Taken from https://github.com/The-Acronym-Coders/BASE/blob/develop/1.12.0/src/main/java/com/teamacronymcoders/base/util/collections/NonnullListCollector.java, thanks for this ;) +/** + * Taken from + * here, + * thanks for this ;) + */ public class DefaultedListCollector implements Collector, DefaultedList> { private final Set CH_ID = Collections.unmodifiableSet(EnumSet.of(Characteristics.IDENTITY_FINISH)); @@ -71,4 +75,4 @@ public class DefaultedListCollector implements Collector, public Set characteristics() { return CH_ID; } -} \ No newline at end of file +} diff --git a/RebornCore/src/main/java/reborncore/common/util/FluidTextHelper.java b/RebornCore/src/main/java/reborncore/common/util/FluidTextHelper.java index 0c8bd0ece..969580ea0 100644 --- a/RebornCore/src/main/java/reborncore/common/util/FluidTextHelper.java +++ b/RebornCore/src/main/java/reborncore/common/util/FluidTextHelper.java @@ -13,6 +13,12 @@ public class FluidTextHelper { /** * Return a unicode string representing a fraction, like ¹⁄₈₁. + * + * @param numerator {@code long} The numerator of the fraction. + * @param denominator {@code long} The denominator of the fraction. + * @param simplify {@code boolean} Whether to simplify the fraction. + * @return {@link String} representing the fraction. + * @throws IllegalArgumentException if numerator or denominator is negative. */ public static String getUnicodeFraction(long numerator, long denominator, boolean simplify) { if (numerator < 0 || denominator < 0) @@ -42,15 +48,13 @@ public class FluidTextHelper { } /** - * Convert a non negative fluid amount in droplets to a unicode string + * Convert a non-negative fluid amount in droplets to a unicode string * representing the amount in millibuckets. For example, passing 163 will result * in * *
-	 * 2 ¹⁄₈₁
+	 *  2 ¹⁄₈₁
 	 * 
- * - * . */ public static String getUnicodeMillibuckets(long droplets, boolean simplify) { String result = "" + droplets / 81; diff --git a/RebornCore/src/main/java/reborncore/common/util/InventoryItem.java b/RebornCore/src/main/java/reborncore/common/util/InventoryItem.java index 2ac8fae53..9cacf3757 100644 --- a/RebornCore/src/main/java/reborncore/common/util/InventoryItem.java +++ b/RebornCore/src/main/java/reborncore/common/util/InventoryItem.java @@ -50,7 +50,7 @@ public class InventoryItem extends InventoryBase { this.stack = stack; } - public static InventoryItem getItemInvetory(ItemStack stack, int size) { + public static InventoryItem getItemInventory(ItemStack stack, int size) { return new InventoryItem(stack, size); } diff --git a/RebornCore/src/main/java/reborncore/common/util/ItemHandlerUtils.java b/RebornCore/src/main/java/reborncore/common/util/ItemHandlerUtils.java index 6dd8fd542..5979ef581 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ItemHandlerUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/ItemHandlerUtils.java @@ -45,7 +45,7 @@ public class ItemHandlerUtils { dropItemHandler(world, pos, inventory); } if (blockEntity instanceof IUpgradeable) { - dropItemHandler(world, pos, ((IUpgradeable) blockEntity).getUpgradeInvetory()); + dropItemHandler(world, pos, ((IUpgradeable) blockEntity).getUpgradeInventory()); } } diff --git a/RebornCore/src/main/java/reborncore/common/util/ItemNBTHelper.java b/RebornCore/src/main/java/reborncore/common/util/ItemNBTHelper.java index 0dd474d2a..7d8fd0d9e 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ItemNBTHelper.java +++ b/RebornCore/src/main/java/reborncore/common/util/ItemNBTHelper.java @@ -31,15 +31,15 @@ import net.minecraft.nbt.NbtList; public class ItemNBTHelper { /** - * Checks if an ItemStack has a Tag Compound + * Checks if an {@link ItemStack} has an {@link NbtCompound} **/ public static boolean detectNBT(ItemStack stack) { return stack.hasNbt(); } /** - * Tries to initialize an NBT Tag Compound in an ItemStack, this will not do - * anything if the stack already has a tag compound + * Tries to initialize an {@link NbtCompound} in an {@link ItemStack}, this will not do + * anything if the stack already has an {@link NbtCompound} **/ public static void initNBT(ItemStack stack) { if (!detectNBT(stack)) { @@ -48,7 +48,7 @@ public class ItemNBTHelper { } /** - * Injects an NBT Tag Compound to an ItemStack, no checks are made + * Injects an {@link NbtCompound} to an {@link ItemStack}, no checks are made * previously **/ public static void injectNBT(ItemStack stack, NbtCompound nbt) { @@ -56,7 +56,7 @@ public class ItemNBTHelper { } /** - * Gets the NBTTagCompound in an ItemStack. Tries to init it previously in + * Gets the {@link NbtCompound} in an {@link ItemStack}. Tries to init it previously in * case there isn't one present **/ public static NbtCompound getNBT(ItemStack stack) { @@ -113,53 +113,53 @@ public class ItemNBTHelper { // GETTERS // /////////////////////////////////////////////////////////////////// - public static boolean verifyExistance(ItemStack stack, String tag) { + public static boolean verifyExistence(ItemStack stack, String tag) { return !stack.isEmpty() && getNBT(stack).contains(tag); } public static boolean getBoolean(ItemStack stack, String tag, boolean defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getBoolean(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getBoolean(tag) : defaultExpected; } public static byte getByte(ItemStack stack, String tag, byte defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getByte(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getByte(tag) : defaultExpected; } public static short getShort(ItemStack stack, String tag, short defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getShort(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getShort(tag) : defaultExpected; } public static int getInt(ItemStack stack, String tag, int defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getInt(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getInt(tag) : defaultExpected; } public static long getLong(ItemStack stack, String tag, long defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getLong(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getLong(tag) : defaultExpected; } public static float getFloat(ItemStack stack, String tag, float defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getFloat(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getFloat(tag) : defaultExpected; } public static double getDouble(ItemStack stack, String tag, double defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getDouble(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getDouble(tag) : defaultExpected; } /** - * If nullifyOnFail is true it'll return null if it doesn't find any + * If {@code nullifyOnFail} is true it'll return null if it doesn't find any * compounds, otherwise it'll return a new one. **/ public static NbtCompound getCompound(ItemStack stack, String tag, boolean nullifyOnFail) { - return verifyExistance(stack, tag) ? getNBT(stack).getCompound(tag) + return verifyExistence(stack, tag) ? getNBT(stack).getCompound(tag) : nullifyOnFail ? null : new NbtCompound(); } public static String getString(ItemStack stack, String tag, String defaultExpected) { - return verifyExistance(stack, tag) ? getNBT(stack).getString(tag) : defaultExpected; + return verifyExistence(stack, tag) ? getNBT(stack).getString(tag) : defaultExpected; } - public static NbtList getList(ItemStack stack, String tag, int objtype, boolean nullifyOnFail) { - return verifyExistance(stack, tag) ? getNBT(stack).getList(tag, objtype) + public static NbtList getList(ItemStack stack, String tag, int objType, boolean nullifyOnFail) { + return verifyExistence(stack, tag) ? getNBT(stack).getList(tag, objType) : nullifyOnFail ? null : new NbtList(); } } diff --git a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java index 73d8b0468..bbb4fbfe7 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java @@ -147,8 +147,8 @@ public class ItemUtils { /** * Checks if powered item is active * - * @param stack ItemStack ItemStack to check - * @return True if powered item is active + * @param stack {@link ItemStack} Stack to check + * @return {@code boolean} True if powered item is active */ public static boolean isActive(ItemStack stack) { return !stack.isEmpty() && stack.getNbt() != null && stack.getNbt().getBoolean("isActive"); @@ -157,10 +157,10 @@ public class ItemUtils { /** * Check if powered item has enough energy to continue being in active state * - * @param stack ItemStack ItemStack to check - * @param cost int Cost of operation performed by tool - * @param isClient boolean Client side - * @param messageId int MessageID for sending no spam message + * @param stack {@link ItemStack} Stack to check + * @param cost {@link int} Cost of operation performed by tool + * @param isClient {@link boolean} Client side + * @param messageId {@link int} MessageID for sending no spam message */ public static void checkActive(ItemStack stack, int cost, boolean isClient, int messageId) { if (!ItemUtils.isActive(stack)) { @@ -185,10 +185,10 @@ public class ItemUtils { /** * Switch active\inactive state for powered item * - * @param stack ItemStack ItemStack to work on - * @param cost int Cost of operation performed by tool - * @param isClient boolean Are we on client side - * @param messageId MessageID for sending no spam message + * @param stack {@link ItemStack} Stack to switch state + * @param cost {@code int} Cost of operation performed by tool + * @param isClient {@code boolean} Are we on client side + * @param messageId {@code int} MessageID for sending no spam message */ public static void switchActive(ItemStack stack, int cost, boolean isClient, int messageId) { ItemUtils.checkActive(stack, cost, isClient, messageId); @@ -225,8 +225,8 @@ public class ItemUtils { /** * Adds active\inactive state to powered item tooltip * - * @param stack ItemStack ItemStack to check - * @param tooltip List Tooltip strings + * @param stack {@link ItemStack} Stack to check + * @param tooltip {@link List} List of {@link Text} tooltip strings */ public static void buildActiveTooltip(ItemStack stack, List tooltip) { if (!ItemUtils.isActive(stack)) { @@ -237,16 +237,25 @@ public class ItemUtils { } /** - * Output energy from item to other items in inventory + * Output energy from item to other items in inventory * - * @param player PlayerEntity having powered item - * @param itemStack ItemStack Powered item - * @param maxOutput int Maximum output rate of powered item + * @param player {@link PlayerEntity} Player having powered item + * @param itemStack {@link ItemStack} Powered item + * @param maxOutput {@code int} Maximum output rate of powered item */ public static void distributePowerToInventory(PlayerEntity player, ItemStack itemStack, long maxOutput) { distributePowerToInventory(player, itemStack, maxOutput, (stack) -> true); } + /** + * Output energy from item to other items in inventory + * + * @param player {@link PlayerEntity} Player having powered item + * @param itemStack {@link ItemStack} Powered item + * @param maxOutput {@code int} Maximum output rate of powered item + * @param filter {@link Predicate} Filter for items to output to + * @throws IllegalArgumentException If failed to locate stack in players inventory + */ public static void distributePowerToInventory(PlayerEntity player, ItemStack itemStack, long maxOutput, Predicate filter) { // Locate the current stack in the player inventory. PlayerInventoryStorage playerInv = PlayerInventoryStorage.of(player); diff --git a/RebornCore/src/main/java/reborncore/common/util/MachineFacing.java b/RebornCore/src/main/java/reborncore/common/util/MachineFacing.java index 69633cefd..847814d54 100644 --- a/RebornCore/src/main/java/reborncore/common/util/MachineFacing.java +++ b/RebornCore/src/main/java/reborncore/common/util/MachineFacing.java @@ -43,7 +43,7 @@ public enum MachineFacing { return machineBase.getFacing().getOpposite(); } if (this == RIGHT) { - //North -> West + // North -> West int i = machineBase.getFacing().getOpposite().getHorizontal() + 1; if (i > 3) { i = 0; @@ -54,7 +54,7 @@ public enum MachineFacing { return Direction.fromHorizontal(i); } if (this == LEFT) { - //North -> East + // North -> East int i = machineBase.getFacing().getOpposite().getHorizontal() - 1; if (i > 3) { i = 0; diff --git a/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java b/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java index ce840ee62..f2526584b 100644 --- a/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java +++ b/RebornCore/src/main/java/reborncore/common/util/RebornInventory.java @@ -43,12 +43,12 @@ public class RebornInventory extends Inventory public RebornInventory(int size, String invName, int invStackLimit, T blockEntity, IInventoryAccess access) { super(size); name = invName; - stackLimit = (invStackLimit == 64 ? Items.AIR.getMaxCount() : invStackLimit); //Blame asie for this + stackLimit = (invStackLimit == 64 ? Items.AIR.getMaxCount() : invStackLimit); // Blame asie for this this.blockEntity = blockEntity; this.inventoryAccess = access; } - //If you are using this with a machine, dont forget to set .withConfiguredAccess() + // If you are using this with a machine, don't forget to set .withConfiguredAccess() public RebornInventory(int size, String invName, int invStackLimit, T blockEntity) { this(size, invName, invStackLimit, blockEntity, (slotID, stack, facing, direction, be) -> { if (facing == null) { @@ -99,8 +99,8 @@ public class RebornInventory extends Inventory } public void read(NbtCompound data, String tag) { - NbtCompound nbttaglist = data.getCompound(tag); - deserializeNBT(nbttaglist); + NbtCompound nbtTagList = data.getCompound(tag); + deserializeNBT(nbtTagList); hasChanged = true; } diff --git a/RebornCore/src/main/java/reborncore/common/util/StringUtils.java b/RebornCore/src/main/java/reborncore/common/util/StringUtils.java index 63ac4f178..b110a684c 100644 --- a/RebornCore/src/main/java/reborncore/common/util/StringUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/StringUtils.java @@ -54,8 +54,8 @@ public class StringUtils { /** * Returns red-yellow-green text formatting depending on percentage * - * @param percentage int percentage amount - * @return TextFormatting Red or Yellow or Green + * @param percentage {@code int} percentage amount + * @return {@link Formatting} Red or Yellow or Green */ public static Formatting getPercentageColour(int percentage) { if (percentage <= 10) { diff --git a/RebornCore/src/main/java/reborncore/common/util/Tank.java b/RebornCore/src/main/java/reborncore/common/util/Tank.java index 67b251a23..dd5a34ce5 100644 --- a/RebornCore/src/main/java/reborncore/common/util/Tank.java +++ b/RebornCore/src/main/java/reborncore/common/util/Tank.java @@ -107,7 +107,7 @@ public class Tank extends SnapshotParticipant implements Syncable public final Tank read(NbtCompound nbt) { if (nbt.contains(name)) { - // allow to read empty tanks + // allow reading empty tanks setFluid(Fluids.EMPTY); NbtCompound tankData = nbt.getCompound(name); diff --git a/RebornCore/src/main/java/reborncore/common/util/Torus.java b/RebornCore/src/main/java/reborncore/common/util/Torus.java index 7b1bc2e50..782ad3b2e 100644 --- a/RebornCore/src/main/java/reborncore/common/util/Torus.java +++ b/RebornCore/src/main/java/reborncore/common/util/Torus.java @@ -38,13 +38,13 @@ public class Torus { private static final ExecutorService GEN_EXECUTOR = Executors.newSingleThreadExecutor(); private static Int2IntMap torusSizeCache; - public static List generate(BlockPos orgin, int radius) { + public static List generate(BlockPos origin, int radius) { List posLists = new ArrayList<>(); for (int x = -radius; x < radius; x++) { for (int y = -radius; y < radius; y++) { for (int z = -radius; z < radius; z++) { if (Math.pow(radius / 2 - Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)), 2) + Math.pow(z, 2) < Math.pow(radius * 0.05, 2)) { - posLists.add(orgin.add(x, z, y)); + posLists.add(origin.add(x, z, y)); } } } @@ -54,10 +54,10 @@ public class Torus { public static void genSizeMap(int maxRadius) { if (torusSizeCache != null) { - //Lets not do this again + // Let's not do this again return; } - //10 is added as the control computer has a base of around 6 less + // 10 is added as the control computer has a base of around 6 less final int sizeToCompute = maxRadius + 10; torusSizeCache = new Int2IntOpenHashMap(sizeToCompute); @@ -83,6 +83,10 @@ public class Torus { GEN_EXECUTOR.shutdown(); } + /** + * @return {@link Int2IntMap} + * @throws RuntimeException If failed to initialize the map + */ public static Int2IntMap getTorusSizeCache() { if (!GEN_EXECUTOR.isShutdown()) { try { diff --git a/RebornCore/src/main/java/reborncore/common/util/TranslationTools.java b/RebornCore/src/main/java/reborncore/common/util/TranslationTools.java index 8cbd11fac..9a9aa2f26 100644 --- a/RebornCore/src/main/java/reborncore/common/util/TranslationTools.java +++ b/RebornCore/src/main/java/reborncore/common/util/TranslationTools.java @@ -35,10 +35,10 @@ import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; -//Quick too to migrate to the new lang format, and to try and keep as many lang entrys as possible +// Quick too to migrate to the new lang format, and to try and keep as many lang entries as possible public class TranslationTools { - //Scanner used for manual matching + // Scanner used for manual matching private static final Scanner SCANNER = new Scanner(System.in); public static void main(String[] args) throws IOException { @@ -68,7 +68,7 @@ public class TranslationTools { key = keyMap.get(key); } if (!newLang.containsKey(key)) { - //Lost key, no point copying them over + // Lost key, no point copying them over continue; } output.put(key, value); diff --git a/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java b/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java index 99a186d2d..418d4fd7e 100644 --- a/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java @@ -49,9 +49,9 @@ public class WorldUtils { /** * Checks if chunk is loaded using proper chunk manager * - * @param world World object - * @param pos BlockPos X and Z coordinates to check - * @return boolean True if chunk is loaded + * @param world {@link World} World object + * @param pos {@link BlockPos} X and Z coordinates to check + * @return {@code boolean} True if chunk is loaded */ public static boolean isChunkLoaded(World world, BlockPos pos){ return world.getChunkManager().isChunkLoaded(ChunkSectionPos.getSectionCoord(pos.getX()), ChunkSectionPos.getSectionCoord(pos.getZ())); diff --git a/RebornCore/src/main/java/reborncore/common/util/serialization/ItemStackSerializer.java b/RebornCore/src/main/java/reborncore/common/util/serialization/ItemStackSerializer.java index c525c3b5b..0b53eb593 100644 --- a/RebornCore/src/main/java/reborncore/common/util/serialization/ItemStackSerializer.java +++ b/RebornCore/src/main/java/reborncore/common/util/serialization/ItemStackSerializer.java @@ -34,7 +34,7 @@ import net.minecraft.util.registry.Registry; import java.lang.reflect.Type; -//Based from ee3's code +// Based from ee3's code public class ItemStackSerializer implements JsonSerializer, JsonDeserializer { private static final String NAME = "name"; diff --git a/RebornCore/src/main/java/reborncore/common/util/serialization/SerializationUtil.java b/RebornCore/src/main/java/reborncore/common/util/serialization/SerializationUtil.java index 15de9e0f4..34d64877a 100644 --- a/RebornCore/src/main/java/reborncore/common/util/serialization/SerializationUtil.java +++ b/RebornCore/src/main/java/reborncore/common/util/serialization/SerializationUtil.java @@ -42,7 +42,7 @@ public class SerializationUtil { .registerTypeAdapter(ItemStack.class, new ItemStackSerializer()) .create(); - //Same as above, just without pretty printing + // Same as above, just without pretty printing public static final Gson GSON_FLAT = new GsonBuilder() .enableComplexMapKeySerialization() .registerTypeAdapter(ItemStack.class, new ItemStackSerializer()) diff --git a/build.gradle b/build.gradle index 5994cdb7d..322eb9324 100644 --- a/build.gradle +++ b/build.gradle @@ -251,7 +251,7 @@ loom { test.dependsOn runGametest runDatagen { - // Doesnt re-run the task when its up-to date + // Doesn't re-run the task when its up-to date outputs.dir('src/main/generated') } @@ -400,4 +400,4 @@ task checkVersion { github.mustRunAfter checkVersion publish.mustRunAfter checkVersion -project.tasks.curseforge.mustRunAfter checkVersion \ No newline at end of file +project.tasks.curseforge.mustRunAfter checkVersion diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy index 14f9a0f50..e0283c6ef 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy @@ -133,7 +133,7 @@ class MachineRecipeJsonFactory { protected void validate() { if (ingredients.isEmpty()) { - throw new IllegalStateException("recipe has no ingrendients") + throw new IllegalStateException("recipe has no ingredients") } if (outputs.isEmpty()) { diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index 31e1038af..1bb0b595a 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -81,7 +81,7 @@ public class TechReborn implements ModInitializer { if (TechRebornConfig.machineSoundVolume > 0) { if (TechRebornConfig.machineSoundVolume > 1) TechRebornConfig.machineSoundVolume = 1F; - RecipeCrafter.soundHanlder = new ModSounds.SoundHandler(); + RecipeCrafter.soundHandler = new ModSounds.SoundHandler(); } ModLoot.init(); WorldGenerator.initWorldGen(); diff --git a/src/main/java/techreborn/api/events/CableElectrocutionEvent.java b/src/main/java/techreborn/api/events/CableElectrocutionEvent.java index d7f8ad3c3..2401ceeb4 100644 --- a/src/main/java/techreborn/api/events/CableElectrocutionEvent.java +++ b/src/main/java/techreborn/api/events/CableElectrocutionEvent.java @@ -47,7 +47,7 @@ public interface CableElectrocutionEvent { /** * Fired before an entity is electrocuted * - * @return true to electrocute the entity (if not other listeners return false), false to do nothing + * @return {@code boolean} true to electrocute the entity (if not other listeners return false), false to do nothing */ boolean electrocute(LivingEntity livingEntity, TRContent.Cables cableType, BlockPos blockPos, World world, CableBlockEntity cableBlockEntity); } diff --git a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java index 3e6b65aa0..bbd0b726f 100644 --- a/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java +++ b/src/main/java/techreborn/api/generator/GeneratorRecipeHelper.java @@ -33,22 +33,24 @@ import java.util.Optional; public class GeneratorRecipeHelper { /** - * This EnumMap store all the energy recipes for the fluid generators. Each - * value of the EFluidGenerator enum is linked to an object holding a set of - * FluidGeneratorRecipe. + * This {@link EnumMap} store all the energy recipes for the fluid generators. Each + * value of the {@link EFluidGenerator} enum is linked to an object holding a set of + * {@link FluidGeneratorRecipe}. */ public static EnumMap fluidRecipes = new EnumMap<>( EFluidGenerator.class); /** - * Register a Fluid energy recipe. + * Register a {@link Fluid} energy recipe. * - * @param generatorType A value of the EFluidGenerator type in which the fluid is - * allowed to be consumed. - * @param fluidType - * @param energyPerMb Represent the energy / MILLI_BUCKET the fluid will produce. - * Some generators use this value to alter their fluid decay - * speed to match their maximum energy output. + * @param generatorType {@link EFluidGenerator} A value of the {@link EFluidGenerator} type in + * which the fluid is allowed to be consumed. + * @param fluidType {@link Fluid} The fluid type that will be registered. + * @param energyPerMb {@code int} Represent the energy / MILLI_BUCKET the fluid will produce. + *

+ * Some generators use this value to alter their fluid decay + * speed to match their maximum energy output. + *

*/ public static void registerFluidRecipe(EFluidGenerator generatorType, Fluid fluidType, int energyPerMb) { fluidRecipes.putIfAbsent(generatorType, new FluidGeneratorRecipeList()); @@ -56,10 +58,10 @@ public class GeneratorRecipeHelper { } /** - * @param generatorType A value of the EFluidGenerator type in which the fluid is - * allowed to be consumed. - * @return An object holding a set of availables recipes for this type of - * FluidGenerator. + * @param generatorType {@link EFluidGenerator} A value of the {@link EFluidGenerator} type in + * which the fluid is allowed to be consumed. + * @return {@link FluidGeneratorRecipeList} An object holding a set of available recipes + * for this type of {@link EFluidGenerator}. */ public static FluidGeneratorRecipeList getFluidRecipesForGenerator(EFluidGenerator generatorType) { return fluidRecipes.get(generatorType); @@ -68,8 +70,9 @@ public class GeneratorRecipeHelper { /** * Removes recipe * - * @param generatorType A value of the EFluidGenerator type for which we should remove recipe - * @param fluidType Fluid to remove from generator recipes + * @param generatorType {@link EFluidGenerator} A value of the {@link EFluidGenerator} type for + * which we should remove recipe + * @param fluidType {@link Fluid} Fluid to remove from generator recipes */ public static void removeFluidRecipe(EFluidGenerator generatorType, Fluid fluidType) { FluidGeneratorRecipeList recipeList = getFluidRecipesForGenerator(generatorType); diff --git a/src/main/java/techreborn/api/recipe/ScrapboxRecipeCrafter.java b/src/main/java/techreborn/api/recipe/ScrapboxRecipeCrafter.java index 3e09d1609..12dba526d 100644 --- a/src/main/java/techreborn/api/recipe/ScrapboxRecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/ScrapboxRecipeCrafter.java @@ -38,10 +38,10 @@ import java.util.List; public class ScrapboxRecipeCrafter extends RecipeCrafter { /** - * @param parent Tile having this crafter - * @param inventory Inventory from parent blockEntity - * @param inputSlots Slot IDs for input - * @param outputSlots Slot IDs for output + * @param parent {@link BlockEntity} Tile having this crafter + * @param inventory {@link RebornInventory} Inventory from parent blockEntity + * @param inputSlots {@code int[]} Slot IDs for input + * @param outputSlots {@code int[]} Slot IDs for output */ public ScrapboxRecipeCrafter(BlockEntity parent, RebornInventory inventory, int[] inputSlots, int[] outputSlots) { super(ModRecipes.SCRAPBOX, parent, 1, 1, inventory, inputSlots, outputSlots); diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index 9b299bdc9..3c49a9ea6 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -89,8 +89,9 @@ public class CableBlockEntity extends BlockEntity * This prevents double transfer rates, and back and forth between two cables. */ int blockedSides = 0; + /** - * This is only used during the cable tick, whereas blockedOperations is used between ticks. + * This is only used during the cable tick, whereas {@link #blockedSides} is used between ticks. */ boolean ioBlocked = false; diff --git a/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java b/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java index 3f561ea9e..c3a485840 100644 --- a/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java +++ b/src/main/java/techreborn/blockentity/cable/OfferedEnergyStorage.java @@ -28,7 +28,7 @@ import net.minecraft.util.math.Direction; import team.reborn.energy.api.EnergyStorage; /** - * EnergyStorage adjacent to an energy cable, with some additional info. + * {@link EnergyStorage} adjacent to an energy cable, with some additional info. */ class OfferedEnergyStorage { final CableBlockEntity sourceCable; diff --git a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java index ba7708f69..e8bd356fe 100644 --- a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java +++ b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java @@ -86,7 +86,8 @@ public class DataDrivenBEProvider extends BlockEntityType 0); //Ensure there is an energy slot, doing it here so it crashes on game load + // Ensure there is an energy slot, doing it here ensures it crashes on game load + Validate.isTrue(getEnergySlot() > 0); } @Nullable diff --git a/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java b/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java index 8fb5c129d..769f14805 100644 --- a/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java +++ b/src/main/java/techreborn/blockentity/data/DataDrivenSlot.java @@ -55,7 +55,7 @@ public record DataDrivenSlot(int id, int x, int y, @NotNull SlotType type) { @Environment(EnvType.CLIENT) public void draw(MatrixStack matrixStack, GuiBase guiBase, GuiBase.Layer layer) { - //TODO find a better way to do this + // TODO find a better way to do this if (type() == SlotType.OUTPUT) { guiBase.drawOutputSlot(matrixStack, x(), y(), layer); } else { diff --git a/src/main/java/techreborn/blockentity/data/SlotType.java b/src/main/java/techreborn/blockentity/data/SlotType.java index 0cb0ab5b9..d953b584b 100644 --- a/src/main/java/techreborn/blockentity/data/SlotType.java +++ b/src/main/java/techreborn/blockentity/data/SlotType.java @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.function.BiConsumer; public enum SlotType { - //Im really not a fan of the way I add the slots to the builder here + // I'm really not a fan of the way I add the slots to the builder here INPUT((builder, slot) -> { builder.slot(slot.id(), slot.x(), slot.y()); }), diff --git a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java index 750cbb783..90aa7e5bb 100644 --- a/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/BaseFluidGeneratorBlockEntity.java @@ -37,6 +37,7 @@ import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.RebornInventory; @@ -45,7 +46,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.FluidGeneratorRecipe; import techreborn.api.generator.FluidGeneratorRecipeList; import techreborn.api.generator.GeneratorRecipeHelper; -import reborncore.common.fluid.FluidUtils; public abstract class BaseFluidGeneratorBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider { diff --git a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java index dd85b630b..1a6cc985f 100644 --- a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java @@ -127,7 +127,7 @@ public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements I return getPanel().generationRateN; } - // At this point, we know a light source is present and it's clear weather. We need to determine + // At this point, we know a light source is present, and it's clear weather. We need to determine // the level of generation based on % of time through the day, with peak production at noon and // a smooth transition to night production as sun rises/sets float multiplier; diff --git a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java index c302a913a..142144d97 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java @@ -63,7 +63,7 @@ public class SolidFuelGeneratorBlockEntity extends PowerAcceptorBlockEntity impl ItemStack burnItem; public SolidFuelGeneratorBlockEntity(BlockPos pos, BlockState state) { - super(TRBlockEntities.SOLID_FUEL_GENEREATOR, pos, state); + super(TRBlockEntities.SOLID_FUEL_GENERATOR, pos, state); } public static int getItemBurnTime(@NotNull ItemStack stack) { diff --git a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java index 87b83c09c..1b92d2485 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java @@ -46,7 +46,7 @@ import techreborn.init.TRContent; */ public class WaterMillBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop { - int waterblocks = 0; + int waterBlocks = 0; public WaterMillBlockEntity(BlockPos pos, BlockState state) { super(TRBlockEntities.WATER_MILL, pos, state); @@ -62,8 +62,8 @@ public class WaterMillBlockEntity extends PowerAcceptorBlockEntity implements IT if (world.getTime() % 20 == 0) { checkForWater(); } - if (waterblocks > 0) { - addEnergyProbabilistic(waterblocks * TechRebornConfig.waterMillEnergyMultiplier); + if (waterBlocks > 0) { + addEnergyProbabilistic(waterBlocks * TechRebornConfig.waterMillEnergyMultiplier); world.setBlockState(pos, world.getBlockState(pos).with(BlockMachineBase.ACTIVE, true)); } else { world.setBlockState(pos, world.getBlockState(pos).with(BlockMachineBase.ACTIVE, false)); @@ -71,10 +71,10 @@ public class WaterMillBlockEntity extends PowerAcceptorBlockEntity implements IT } public void checkForWater() { - waterblocks = 0; + waterBlocks = 0; for (Direction facing : Direction.values()) { if (facing.getAxis().isHorizontal() && world.getBlockState(pos.offset(facing)).getBlock() == Blocks.WATER) { - waterblocks++; + waterBlocks++; } } } diff --git a/src/main/java/techreborn/blockentity/lighting/LampBlockEntity.java b/src/main/java/techreborn/blockentity/lighting/LampBlockEntity.java index d86a32da1..f43b9f681 100644 --- a/src/main/java/techreborn/blockentity/lighting/LampBlockEntity.java +++ b/src/main/java/techreborn/blockentity/lighting/LampBlockEntity.java @@ -95,7 +95,7 @@ public class LampBlockEntity extends PowerAcceptorBlockEntity implements IToolDr return 32; } - //MachineBaseBlockEntity + // MachineBaseBlockEntity @Override public Direction getFacing(){ if (world == null){ diff --git a/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java index 4ee5b4b56..05df28f05 100644 --- a/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/GenericMachineBlockEntity.java @@ -26,6 +26,7 @@ package techreborn.blockentity.machine; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -57,11 +58,11 @@ public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity public RecipeCrafter crafter; /** - * @param name String Name for a blockEntity. Do we need it at all? - * @param maxInput int Maximum energy input, value in EU - * @param maxEnergy int Maximum energy buffer, value in EU - * @param toolDrop Block Block to drop with wrench - * @param energySlot int Energy slot to use to charge machine from battery + * @param name {@link String} Name for a {@link BlockEntity}. Do we need it at all? + * @param maxInput {@code int} Maximum energy input, value in EU + * @param maxEnergy {@code int} Maximum energy buffer, value in EU + * @param toolDrop {@link Block} Block to drop with wrench + * @param energySlot {@code int} Energy slot to use to charge machine from battery */ public GenericMachineBlockEntity(BlockEntityType blockEntityType, BlockPos pos, BlockState state, String name, int maxInput, int maxEnergy, Block toolDrop, int energySlot) { super(blockEntityType, pos, state); @@ -76,8 +77,8 @@ public abstract class GenericMachineBlockEntity extends PowerAcceptorBlockEntity /** * Returns progress scaled to input value * - * @param scale int Maximum value for progress - * @return int Scale of progress + * @param scale {@code int} Maximum value for progress + * @return {@code int} Scale of progress */ public int getProgressScaled(int scale) { if (crafter != null && crafter.currentTickTime != 0 && crafter.currentNeededTicks != 0) { diff --git a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java index bb23956dc..055181a8f 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/AbstractIronMachineBlockEntity.java @@ -75,8 +75,8 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt * Returns the number of ticks that the supplied fuel item will keep the * furnace burning, or 0 if the item isn't fuel * - * @param stack Itemstack of fuel - * @return Integer Number of ticks + * @param stack {@link ItemStack} stack of fuel + * @return {@code int} Number of ticks */ private int getItemBurnTime(ItemStack stack) { if (stack.isEmpty()) { @@ -88,8 +88,8 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt /** * Returns remaining fraction of fuel burn time * - * @param scale Scale to use for burn time - * @return int scaled remaining fuel burn time + * @param scale {@code int} Scale to use for burn time + * @return {@code int} scaled remaining fuel burn time */ public int getBurnTimeRemainingScaled(int scale) { if (totalBurnTime == 0) { @@ -102,8 +102,8 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt /** * Returns crafting progress * - * @param scale Scale to use for crafting progress - * @return int Scaled crafting progress + * @param scale {@code int} Scale to use for crafting progress + * @return {@code int} Scaled crafting progress */ public int getProgressScaled(int scale) { if (totalCookingTime > 0) { @@ -115,7 +115,7 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt /** * Returns true if Iron Machine is burning fuel thus can do work * - * @return Boolean True if machine is burning + * @return {@code boolean} True if machine is burning */ public boolean isBurning() { return burnTime > 0; @@ -233,4 +233,4 @@ public abstract class AbstractIronMachineBlockEntity extends MachineBaseBlockEnt } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java index 5e24fe9a5..4a2f7e67b 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java @@ -57,8 +57,8 @@ public class IronAlloyFurnaceBlockEntity extends AbstractIronMachineBlockEntity } for (RebornIngredient ingredient : recipeType.getRebornIngredients()) { boolean hasItem = false; - for (int inputslot = 0; inputslot < 2; inputslot++) { - if (ingredient.test(inventory.getStack(inputslot))) { + for (int inputSlot = 0; inputSlot < 2; inputSlot++) { + if (ingredient.test(inventory.getStack(inputSlot))) { hasItem = true; } } diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java index 271acb6b9..5c88d64c1 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java @@ -25,6 +25,7 @@ package techreborn.blockentity.machine.multiblock; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; @@ -107,7 +108,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity /** * Changes size of fusion reactor ring after GUI button click * - * @param sizeDelta int Size increment + * @param sizeDelta {@code int} Size increment */ public void changeSize(int sizeDelta) { int newSize = size + sizeDelta; @@ -125,13 +126,13 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity } /** - * Checks that ItemStack could be inserted into slot provided, including check + * Checks that {@link ItemStack} could be inserted into slot provided, including check * for existing item in slot and maximum stack size * - * @param stack ItemStack ItemStack to insert - * @param slot int Slot ID to check - * @param tags boolean Should we use tags - * @return boolean Returns true if ItemStack will fit into slot + * @param stack {@link ItemStack} Stack to insert + * @param slot {@code int} Slot ID to check + * @param tags {@code boolean} Should we use tags + * @return {@code boolean} Returns true if ItemStack will fit into slot */ public boolean canFitStack(ItemStack stack, int slot, boolean tags) {// Checks to see if it can // fit the stack @@ -165,18 +166,18 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity /** * Validates if reactor has all inputs and can output result * - * @param recipe FusionReactorRecipe Recipe to validate - * @return Boolean True if we have all inputs and can fit output + * @param recipe {@link FusionReactorRecipe} Recipe to validate + * @return {@code boolean} True if we have all inputs and can fit output */ private boolean validateRecipe(FusionReactorRecipe recipe) { return hasAllInputs(recipe) && canFitStack(recipe.getOutputs().get(0), outputStackSlot, true); } /** - * Check if BlockEntity has all necessary inputs for recipe provided + * Check if {@link BlockEntity} has all necessary inputs for recipe provided * - * @param recipeType RebornRecipe Recipe to check inputs - * @return Boolean True if reactor has all inputs for recipe + * @param recipeType {@link RebornRecipe} Recipe to check inputs + * @return {@code boolean} True if reactor has all inputs for recipe */ private boolean hasAllInputs(RebornRecipe recipeType) { if (recipeType == null) { @@ -198,7 +199,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity /** * Decrease stack size on the given slot according to recipe input * - * @param slot int Slot number + * @param slot {@code int} Slot number */ private void useInput(int slot) { if (currentRecipe == null) { @@ -259,7 +260,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity return; } - //Move this to here from the nbt read method, as it now requires the world as of 1.14 + // Move this to here from the nbt read method, as it now requires the world as of 1.14 if (checkNBTRecipe) { checkNBTRecipe = false; for (final RebornRecipe reactorRecipe : ModRecipes.FUSION_REACTOR.getRecipes(getWorld())) { @@ -270,7 +271,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity } if (lastTick == world.getTime()) { - //Prevent tick accelerators, blame obstinate for this. + // Prevent tick accelerators, blame obstinate for this. return; } lastTick = world.getTime(); @@ -308,7 +309,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity if (hasStartedCrafting && craftingTickTime < currentRecipe.getTime()) { // Power gen if (currentRecipe.getPower() > 0) { - // Waste power if it has no where to go + // Waste power if it has nowhere to go long power = (long) (Math.abs(currentRecipe.getPower()) * getPowerMultiplier()); addEnergy(power); powerChange = (power); @@ -380,7 +381,7 @@ public class FusionControlComputerBlockEntity extends GenericMachineBlockEntity tagCompound.putInt("size", size); } - //MachineBaseBlockEntity + // MachineBaseBlockEntity @Override public double getPowerMultiplier() { double calc = (1F / 2F) * Math.pow(size - 5, 1.8); diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index 90dd5a4ac..21302c028 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -262,7 +262,7 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity if (balanceSlot > craftCache.size()) { balanceSlot = 0; } - //Find the best slot for each item in a recipe, and move it if needed + // Find the best slot for each item in a recipe, and move it if needed ItemStack sourceStack = inventory.getStack(balanceSlot); if (sourceStack.isEmpty()) { return Optional.empty(); diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java index 46dceca23..da2905087 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java @@ -225,8 +225,8 @@ public class ElectricFurnaceBlockEntity extends PowerAcceptorBlockEntity if (getStored() > getEuPerTick(EnergyPerTick)) { useEnergy(getEuPerTick(EnergyPerTick)); cookTime++; - if (cookTime == 1 || cookTime % 20 == 0 && RecipeCrafter.soundHanlder != null) { - RecipeCrafter.soundHanlder.playSound(false, this); + if (cookTime == 1 || cookTime % 20 == 0 && RecipeCrafter.soundHandler != null) { + RecipeCrafter.soundHandler.playSound(false, this); } } } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java index 1cf03d84d..ee762c0de 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java @@ -111,7 +111,7 @@ public class GreenhouseControllerBlockEntity extends PowerAcceptorBlockEntity || block instanceof CactusBlock || block instanceof BambooBlock ) { - // If we can break bottom block we should at least remove all of them up to top so they don't break automatically + // If we can break bottom block we should at least remove all of them up to top, so they don't break automatically boolean breakBlocks = false; for (int y = 1; (blockState = world.getBlockState(blockPos.up(y))).getBlock() == block; y++) { if (y == 1) { diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index 0dad494e5..b3643229d 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -60,7 +60,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -//TODO add tick and power bars. +// TODO add tick and power bars. public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, InventoryProvider, BuiltScreenHandlerProvider { @@ -205,7 +205,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity if (balanceSlot > craftCache.size()) { balanceSlot = 0; } - //Find the best slot for each item in a recipe, and move it if needed + // Find the best slot for each item in a recipe, and move it if needed ItemStack sourceStack = inventory.getStack(balanceSlot); if (sourceStack.isEmpty()) { return Optional.empty(); @@ -228,7 +228,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity .mapToInt(value -> inventory.getStack(value).getCount()).sum(); int slots = possibleSlots.size(); - //This makes an array of ints with the best possible slot EnvTyperibution + // This makes an array of ints with the best possible slot distribution int[] split = new int[slots]; int remainder = totalItems % slots; Arrays.fill(split, totalItems / slots); @@ -248,7 +248,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity boolean needsBalance = false; for (int required : split) { if (slotEnvTyperubution.contains(required)) { - //We need to remove the int, not at the int, this seems to work around that + // We need to remove the int, not at the int, this seems to work around that slotEnvTyperubution.remove(Integer.valueOf(required)); } else { needsBalance = true; @@ -261,7 +261,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity return Optional.empty(); } - //Slot, count + // Slot, count Pair bestSlot = null; for (Integer slot : possibleSlots) { ItemStack slotStack = inventory.getStack(slot); @@ -411,7 +411,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity return this; } - //Easyest way to sync back to the client + // Easiest way to sync back to the client public int getLockedInt() { return locked ? 1 : 0; } @@ -434,7 +434,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity } @Override - public boolean canUse(final PlayerEntity entityplayer) { + public boolean canUse(final PlayerEntity playerEntity) { return true; } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java similarity index 95% rename from src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java rename to src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java index a39b4c4f6..802786a60 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/SoildCanningMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java @@ -38,9 +38,9 @@ import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -public class SoildCanningMachineBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { +public class SolidCanningMachineBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { - public SoildCanningMachineBlockEntity(BlockPos pos, BlockState state) { + public SolidCanningMachineBlockEntity(BlockPos pos, BlockState state) { super(TRBlockEntities.SOLID_CANNING_MACHINE, pos, state, "SolidCanningMachine", TechRebornConfig.solidCanningMachineMaxInput, TechRebornConfig.solidCanningMachineMaxEnergy, TRContent.Machine.SOLID_CANNING_MACHINE.block, 3); final int[] inputs = new int[]{0, 1}; final int[] outputs = new int[]{2}; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index 055a82d46..2368e8bfd 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -133,14 +133,14 @@ public class ChunkLoaderBlockEntity extends MachineBaseBlockEntity implements IT } @Override - public void readNbt(NbtCompound nbttagcompound) { - super.readNbt(nbttagcompound); - this.radius = nbttagcompound.getInt("radius"); - this.ownerUdid = nbttagcompound.getString("ownerUdid"); + public void readNbt(NbtCompound nbtCompound) { + super.readNbt(nbtCompound); + this.radius = nbtCompound.getInt("radius"); + this.ownerUdid = nbtCompound.getString("ownerUdid"); if (!StringUtils.isBlank(ownerUdid)) { - nbttagcompound.putString("ownerUdid", this.ownerUdid); + nbtCompound.putString("ownerUdid", this.ownerUdid); } - inventory.read(nbttagcompound); + inventory.read(nbtCompound); } // IToolDrop diff --git a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java index 9718d1b93..2de31c150 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java @@ -121,7 +121,7 @@ public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements @Override public long getBaseMaxInput() { - //If we have super conductors increase the max input of the machine + // If we have super conductors increase the max input of the machine if (getMaxConfigOutput() > maxOutput) { return getMaxConfigOutput(); } @@ -147,9 +147,9 @@ public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements } @Override - public void readNbt(NbtCompound nbttagcompound) { - super.readNbt(nbttagcompound); - this.OUTPUT = nbttagcompound.getInt("output"); + public void readNbt(NbtCompound nbtCompound) { + super.readNbt(nbtCompound); + this.OUTPUT = nbtCompound.getInt("output"); } // MachineBaseBlockEntity @@ -163,14 +163,14 @@ public class AdjustableSUBlockEntity extends EnergyStorageBlockEntity implements public BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player) { return new ScreenHandlerBuilder("aesu").player(player.getInventory()).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().blockEntity(this).energySlot(0, 62, 45).energySlot(1, 98, 45) - .syncEnergyValue().sync(this::getCurrentOutput, this::setCurentOutput).addInventory().create(this, syncID); + .syncEnergyValue().sync(this::getCurrentOutput, this::setCurrentOutput).addInventory().create(this, syncID); } public int getCurrentOutput() { return OUTPUT; } - public void setCurentOutput(int output) { + public void setCurrentOutput(int output) { this.OUTPUT = output; } } diff --git a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java index 80567a518..04176eb88 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java @@ -47,7 +47,7 @@ public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity impl public String ownerUdid; - //This is the energy value that is synced to the client + // This is the energy value that is synced to the client private long clientEnergy; public InterdimensionalSUBlockEntity(BlockPos pos, BlockState state) { @@ -123,18 +123,18 @@ public class InterdimensionalSUBlockEntity extends EnergyStorageBlockEntity impl } @Override - public void readNbt(NbtCompound nbttagcompound) { - super.readNbt(nbttagcompound); - this.ownerUdid = nbttagcompound.getString("ownerUdid"); + public void readNbt(NbtCompound nbtCompound) { + super.readNbt(nbtCompound); + this.ownerUdid = nbtCompound.getString("ownerUdid"); } @Override - public void writeNbt(NbtCompound nbttagcompound) { - super.writeNbt(nbttagcompound); + public void writeNbt(NbtCompound nbtCompound) { + super.writeNbt(nbtCompound); if (ownerUdid == null || StringUtils.isEmpty(ownerUdid)) { return; } - nbttagcompound.putString("ownerUdid", this.ownerUdid); + nbtCompound.putString("ownerUdid", this.ownerUdid); } @Override diff --git a/src/main/java/techreborn/blocks/cable/CableBlock.java b/src/main/java/techreborn/blocks/cable/CableBlock.java index 3c9bcee00..54578eac0 100644 --- a/src/main/java/techreborn/blocks/cable/CableBlock.java +++ b/src/main/java/techreborn/blocks/cable/CableBlock.java @@ -63,7 +63,7 @@ import techreborn.blockentity.cable.CableBlockEntity; import techreborn.config.TechRebornConfig; import techreborn.init.ModSounds; import techreborn.init.TRContent; -import techreborn.utils.damageSources.ElectrialShockSource; +import techreborn.utils.damageSources.ElectricalShockSource; import java.util.HashMap; import java.util.Map; @@ -98,7 +98,7 @@ public class CableBlock extends BlockWithEntity implements Waterloggable { this.type = type; setDefaultState(this.getStateManager().getDefaultState().with(EAST, false).with(WEST, false).with(NORTH, false) .with(SOUTH, false).with(UP, false).with(DOWN, false).with(WATERLOGGED, false).with(COVERED, false)); - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } // BlockWithEntity @@ -233,7 +233,7 @@ public class CableBlock extends BlockWithEntity implements Waterloggable { if (type == TRContent.Cables.HV) { entity.setOnFireFor(1); } - entity.damage(new ElectrialShockSource(), 1F); + entity.damage(new ElectricalShockSource(), 1F); blockEntityCable.setEnergy(0); } if (TechRebornConfig.uninsulatedElectrocutionSound) { diff --git a/src/main/java/techreborn/blocks/lighting/LampBlock.java b/src/main/java/techreborn/blocks/lighting/LampBlock.java index 9bc0a3a34..f96c288c0 100644 --- a/src/main/java/techreborn/blocks/lighting/LampBlock.java +++ b/src/main/java/techreborn/blocks/lighting/LampBlock.java @@ -65,7 +65,7 @@ public class LampBlock extends BaseBlockEntityProvider { this.shape = genCuboidShapes(depth, width); this.cost = cost; this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false)); - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } private static ToIntFunction createLightLevelFromBlockState() { @@ -148,7 +148,7 @@ public class LampBlock extends BaseBlockEntityProvider { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope. + // We extended BaseTileBlock. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.FAIL; } diff --git a/src/main/java/techreborn/blocks/misc/BlockAlarm.java b/src/main/java/techreborn/blocks/misc/BlockAlarm.java index 6a3b8285c..d80f3e7d3 100644 --- a/src/main/java/techreborn/blocks/misc/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/misc/BlockAlarm.java @@ -63,7 +63,7 @@ public class BlockAlarm extends BaseBlockEntityProvider { super(Block.Settings.of(Material.STONE).strength(2f, 2f)); this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false)); this.shape = GenCuboidShapes(3, 10); - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } private VoxelShape[] GenCuboidShapes(double depth, double width) { @@ -113,10 +113,10 @@ public class BlockAlarm extends BaseBlockEntityProvider { @Nullable @Override public BlockState getPlacementState(ItemPlacementContext context) { - for (Direction enumfacing : context.getPlacementDirections()) { - BlockState iblockstate = this.getDefaultState().with(FACING, enumfacing.getOpposite()); - if (iblockstate.canPlaceAt(context.getWorld(), context.getBlockPos())) { - return iblockstate; + for (Direction facing : context.getPlacementDirections()) { + BlockState state = this.getDefaultState().with(FACING, facing.getOpposite()); + if (state.canPlaceAt(context.getWorld(), context.getBlockPos())) { + return state; } } return null; @@ -127,7 +127,7 @@ public class BlockAlarm extends BaseBlockEntityProvider { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope. + // We extended BaseTileBlock. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.FAIL; } diff --git a/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java b/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java index a6f9ed100..b6f20c173 100644 --- a/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/EnergyStorageBlock.java @@ -64,7 +64,7 @@ public abstract class EnergyStorageBlock extends BaseBlockEntityProvider { this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH)); this.name = name; this.gui = gui; - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } public void setFacing(Direction facing, World world, BlockPos pos) { @@ -100,7 +100,7 @@ public abstract class EnergyStorageBlock extends BaseBlockEntityProvider { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BlockTileBase. Thus we should always have blockEntity entity. I hope. + // We extended BlockTileBase. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.FAIL; } diff --git a/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java b/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java index 5321aab82..17ba8a255 100644 --- a/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/LSUStorageBlock.java @@ -49,7 +49,7 @@ public class LSUStorageBlock extends BaseBlockEntityProvider { public LSUStorageBlock() { super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f)); - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } // BaseTileBlock @@ -87,7 +87,7 @@ public class LSUStorageBlock extends BaseBlockEntityProvider { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BaseTileBlock. Thus we should always have blockEntity entity. I hope. + // We extended BaseTileBlock. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.FAIL; } diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 8d0ebd51d..fb8d4b1a1 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -58,7 +58,7 @@ public abstract class BlockTransformer extends BaseBlockEntityProvider { super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f)); this.setDefaultState(this.getStateManager().getDefaultState().with(FACING, Direction.NORTH)); this.name = name; - BlockWrenchEventHandler.wrenableBlocks.add(this); + BlockWrenchEventHandler.wrenchableBlocks.add(this); } public void setFacing(Direction facing, World world, BlockPos pos) { @@ -94,7 +94,7 @@ public abstract class BlockTransformer extends BaseBlockEntityProvider { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); BlockEntity blockEntity = worldIn.getBlockEntity(pos); - // We extended BlockTileBase. Thus we should always have blockEntity entity. I hope. + // We extended BlockTileBase. Thus, we should always have blockEntity entity. I hope. if (blockEntity == null) { return ActionResult.FAIL; } diff --git a/src/main/java/techreborn/client/GuiType.java b/src/main/java/techreborn/client/GuiType.java index bfb7a3d7f..4a9cbfef0 100644 --- a/src/main/java/techreborn/client/GuiType.java +++ b/src/main/java/techreborn/client/GuiType.java @@ -78,7 +78,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; -//The meme is here the double suppliers dont cause the client side gui classes to load on the server +// The meme is here the double suppliers don't cause the client side gui classes to load on the server public final class GuiType implements IMachineGuiHandler { private static final Map> TYPES = new HashMap<>(); @@ -121,7 +121,7 @@ public final class GuiType implements IMachineGuiHandler public static final GuiType SEMIFLUID_GENERATOR = register("semifluid_generator", () -> () -> GuiSemifluidGenerator::new); public static final GuiType THERMAL_GENERATOR = register("thermal_generator", () -> () -> GuiThermalGenerator::new); public static final GuiType VACUUM_FREEZER = register("vacuum_freezer", () -> () -> GuiVacuumFreezer::new); - public static final GuiType SOLID_CANNING_MACHINE = register("solid_canning_machine", () -> () -> GuiSolidCanningMachine::new); + public static final GuiType SOLID_CANNING_MACHINE = register("solid_canning_machine", () -> () -> GuiSolidCanningMachine::new); public static final GuiType WIRE_MILL = register("wire_mill", () -> () -> GuiWireMill::new); public static final GuiType GREENHOUSE_CONTROLLER = register("greenhouse_controller", () -> () -> GuiGreenhouseController::new); public static final GuiType FLUID_REPLICATOR = register("fluid_replicator", () -> () -> GuiFluidReplicator::new); diff --git a/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java b/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java index a61144ae7..e0d06ff7b 100644 --- a/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java +++ b/src/main/java/techreborn/client/gui/GuiSolidCanningMachine.java @@ -29,13 +29,13 @@ import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.screen.builder.BuiltScreenHandler; -import techreborn.blockentity.machine.tier1.SoildCanningMachineBlockEntity; +import techreborn.blockentity.machine.tier1.SolidCanningMachineBlockEntity; public class GuiSolidCanningMachine extends GuiBase { - SoildCanningMachineBlockEntity blockEntity; + SolidCanningMachineBlockEntity blockEntity; - public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SoildCanningMachineBlockEntity blockEntity) { + public GuiSolidCanningMachine(int syncID, final PlayerEntity player, final SolidCanningMachineBlockEntity blockEntity) { super(player, blockEntity, blockEntity.createScreenHandler(syncID, player)); this.blockEntity = blockEntity; diff --git a/src/main/java/techreborn/client/render/ModelHelper.java b/src/main/java/techreborn/client/render/ModelHelper.java index 93ca0f485..dffe265ea 100644 --- a/src/main/java/techreborn/client/render/ModelHelper.java +++ b/src/main/java/techreborn/client/render/ModelHelper.java @@ -61,8 +61,8 @@ public class ModelHelper { public static Reader getReaderForResource(Identifier location) throws IOException { Identifier file = new Identifier(location.getNamespace(), location.getPath() + ".json"); - Resource iresource = MinecraftClient.getInstance().getResourceManager().getResource(file); - return new BufferedReader(new InputStreamReader(iresource.getInputStream(), Charsets.UTF_8)); + Resource resource = MinecraftClient.getInstance().getResourceManager().getResource(file); + return new BufferedReader(new InputStreamReader(resource.getInputStream(), Charsets.UTF_8)); } } diff --git a/src/main/java/techreborn/compat/autoswitch/AutoSwitchApiImpl.java b/src/main/java/techreborn/compat/autoswitch/AutoSwitchApiImpl.java index f2a07acee..ce74febc1 100644 --- a/src/main/java/techreborn/compat/autoswitch/AutoSwitchApiImpl.java +++ b/src/main/java/techreborn/compat/autoswitch/AutoSwitchApiImpl.java @@ -53,7 +53,7 @@ public class AutoSwitchApiImpl implements AutoSwitchApi { @Override public void customDamageSystems(AutoSwitchMap, DurabilityGetter> damageMap) { - // Multiple by 100 to get percentage out of decimal form + // Multiply by 100 to get percentage out of decimal form damageMap.put(DrillItem.class, stack -> 100 * ItemUtils.getPowerForDurabilityBar(stack)); damageMap.put(ChainsawItem.class, stack -> 100 * ItemUtils.getPowerForDurabilityBar(stack)); damageMap.put(JackhammerItem.class, stack -> 100 * ItemUtils.getPowerForDurabilityBar(stack)); diff --git a/src/main/java/techreborn/config/TechRebornConfig.java b/src/main/java/techreborn/config/TechRebornConfig.java index efbec3b1e..0e38c71e1 100644 --- a/src/main/java/techreborn/config/TechRebornConfig.java +++ b/src/main/java/techreborn/config/TechRebornConfig.java @@ -29,7 +29,7 @@ import reborncore.common.config.Config; import java.util.Arrays; import java.util.List; -//All moved into one class as its a lot easier to find the annotations when you know where they all are +// All moved into one class as it's a lot easier to find the annotations when you know where they all are public class TechRebornConfig { // Generators @@ -268,11 +268,11 @@ public class TechRebornConfig { @Config(config = "items", category = "power", key = "lapotronicOrbMaxCharge", comment = "Energy Capacity for Lapotronic Orb") public static int lapotronicOrbMaxCharge = 100_000_000; - @Config(config = "items", category = "power", key = "cloakingDeviceCharge", comment = "Energy Capacity for Cloacking Device") + @Config(config = "items", category = "power", key = "cloakingDeviceCharge", comment = "Energy Capacity for Cloaking Device") public static int cloakingDeviceCharge = 40_000_000; - @Config(config = "items", category = "power", key = "clockingDeviceEnergyUsage", comment = "Cloacking device energy usage") - public static int cloackingDeviceCost = 10; + @Config(config = "items", category = "power", key = "clockingDeviceEnergyUsage", comment = "Cloaking device energy usage") + public static int cloakingDeviceCost = 10; @Config(config = "items", category = "power", key = "quantumSuitCapacity", comment = "Quantum Suit Energy Capacity") public static long quantumSuitCapacity = 40_000_000; diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index 647b06eb6..458200a0c 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -117,7 +117,7 @@ public class ModRegistry { RebornRegistry.registerBlockNoItem(TRContent.POTTED_RUBBER_SAPLING = InitUtils.setup(new FlowerPotBlock(TRContent.RUBBER_SAPLING, AbstractBlock.Settings.of(Material.DECORATION).breakInstantly().nonOpaque()), "potted_rubber_sapling")); RebornRegistry.registerBlock(TRContent.COPPER_WALL = InitUtils.setup(new WallBlock(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL)), "copper_wall"), itemGroup); - TechReborn.LOGGER.debug("TechReborns Blocks Loaded"); + TechReborn.LOGGER.debug("TechReborn's Blocks Loaded"); } private static void registerItems() { @@ -233,7 +233,7 @@ public class ModRegistry { RebornRegistry.registerItem(TRContent.CELL = InitUtils.setup(new DynamicCellItem(), "cell")); TRContent.CELL.registerFluidApi(); - TechReborn.LOGGER.debug("TechReborns Items Loaded"); + TechReborn.LOGGER.debug("TechReborn's Items Loaded"); } private static void registerFluids() { diff --git a/src/main/java/techreborn/events/UseBlockHandler.java b/src/main/java/techreborn/events/UseBlockHandler.java index bfde1db53..a60c56ada 100644 --- a/src/main/java/techreborn/events/UseBlockHandler.java +++ b/src/main/java/techreborn/events/UseBlockHandler.java @@ -72,8 +72,8 @@ public class UseBlockHandler implements UseBlockCallback{ world.setBlockState(pos, strippedBlock.getDefaultState().with(PillarBlock.AXIS, hitState.get(PillarBlock.AXIS)), 11); // Damage axe - stack.damage(1, playerEntity, playerx -> - playerx.sendToolBreakStatus(hand) + stack.damage(1, playerEntity, playerX -> + playerX.sendToolBreakStatus(hand) ); return ActionResult.SUCCESS; } diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index d38047dc3..1563bc43f 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -45,8 +45,8 @@ public class ModLoot { LootPoolEntry tinIngot = makeEntry(Ingots.TIN); LootPoolEntry leadIngot = makeEntry(Ingots.LEAD); LootPoolEntry silverIngot = makeEntry(Ingots.SILVER); - LootPoolEntry refinedronIngot = makeEntry(Ingots.REFINED_IRON); - LootPoolEntry advancedalloyIngot = makeEntry(Ingots.ADVANCED_ALLOY); + LootPoolEntry refinedIronIngot = makeEntry(Ingots.REFINED_IRON); + LootPoolEntry advancedAlloyIngot = makeEntry(Ingots.ADVANCED_ALLOY); LootPoolEntry basicFrame = makeEntry(TRContent.MachineBlocks.BASIC.frame.asItem()); LootPoolEntry basicCircuit = makeEntry(Parts.ELECTRONIC_CIRCUIT); LootPoolEntry rubberSapling = makeEntry(TRContent.RUBBER_SAPLING, 25); @@ -73,7 +73,7 @@ public class ModLoot { LootPool poolBasic = FabricLootPoolBuilder.builder().withEntry(copperIngot).withEntry(tinIngot) - .withEntry(leadIngot).withEntry(silverIngot).withEntry(refinedronIngot).withEntry(advancedalloyIngot) + .withEntry(leadIngot).withEntry(silverIngot).withEntry(refinedIronIngot).withEntry(advancedAlloyIngot) .withEntry(basicFrame).withEntry(basicCircuit).withEntry(rubberSapling).rolls(UniformLootNumberProvider.create(1.0f, 2.0f)) .build(); @@ -139,8 +139,8 @@ public class ModLoot { /** * Makes loot entry from item provided * - * @param item Item to include into LootEntry - * @return LootEntry for item provided + * @param item {@link ItemConvertible} Item to include into LootEntry + * @return {@link LootPoolEntry} Entry for item provided */ private static LootPoolEntry makeEntry(ItemConvertible item) { return makeEntry(item, 5); @@ -149,9 +149,9 @@ public class ModLoot { /** * Makes loot entry from item provided with weight provided * - * @param item Item to include into LootEntry - * @param weight Weight of that item - * @return LootEntry for item and weight provided + * @param item {@link ItemConvertible} Item to include into LootEntry + * @param weight {@code int} Weight of that item + * @return {@link LootPoolEntry} Entry for item and weight provided */ private static LootPoolEntry makeEntry(ItemConvertible item, int weight) { return ItemEntry.builder(item).weight(weight) diff --git a/src/main/java/techreborn/init/ModSounds.java b/src/main/java/techreborn/init/ModSounds.java index 0400f67e4..baea2cfde 100644 --- a/src/main/java/techreborn/init/ModSounds.java +++ b/src/main/java/techreborn/init/ModSounds.java @@ -28,7 +28,7 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.world.World; -import reborncore.common.recipes.ICrafterSoundHanlder; +import reborncore.common.recipes.ICrafterSoundHandler; import techreborn.config.TechRebornConfig; /** @@ -46,7 +46,7 @@ public class ModSounds { public static SoundEvent ALARM_2; public static SoundEvent ALARM_3; - public static class SoundHandler implements ICrafterSoundHanlder { + public static class SoundHandler implements ICrafterSoundHandler { @Override public void playSound(boolean firstRun, BlockEntity blockEntity) { diff --git a/src/main/java/techreborn/init/TRBlockEntities.java b/src/main/java/techreborn/init/TRBlockEntities.java index b98414bee..712b555ec 100644 --- a/src/main/java/techreborn/init/TRBlockEntities.java +++ b/src/main/java/techreborn/init/TRBlockEntities.java @@ -112,7 +112,7 @@ public class TRBlockEntities { public static final BlockEntityType FUSION_CONTROL_COMPUTER = register(FusionControlComputerBlockEntity::new, "fusion_control_computer", TRContent.Machine.FUSION_CONTROL_COMPUTER); public static final BlockEntityType LIGHTNING_ROD = register(LightningRodBlockEntity::new, "lightning_rod", TRContent.Machine.LIGHTNING_ROD); public static final BlockEntityType INDUSTRIAL_SAWMILL = register(IndustrialSawmillBlockEntity::new, "industrial_sawmill", TRContent.Machine.INDUSTRIAL_SAWMILL); - public static final BlockEntityType SOLID_FUEL_GENEREATOR = register(SolidFuelGeneratorBlockEntity::new, "solid_fuel_generator", TRContent.Machine.SOLID_FUEL_GENERATOR); + public static final BlockEntityType SOLID_FUEL_GENERATOR = register(SolidFuelGeneratorBlockEntity::new, "solid_fuel_generator", TRContent.Machine.SOLID_FUEL_GENERATOR); public static final BlockEntityType EXTRACTOR = register(ExtractorBlockEntity::new, "extractor", TRContent.Machine.EXTRACTOR); public static final BlockEntityType RESIN_BASIN = register(ResinBasinBlockEntity::new, "resin_basin", TRContent.Machine.RESIN_BASIN); public static final BlockEntityType COMPRESSOR = register(CompressorBlockEntity::new, "compressor", TRContent.Machine.COMPRESSOR); @@ -135,7 +135,7 @@ public class TRBlockEntities { public static final BlockEntityType LAMP = register(LampBlockEntity::new, "lamp", TRContent.Machine.LAMP_INCANDESCENT, TRContent.Machine.LAMP_LED); public static final BlockEntityType ALARM = register(AlarmBlockEntity::new, "alarm", TRContent.Machine.ALARM); public static final BlockEntityType FLUID_REPLICATOR = register(FluidReplicatorBlockEntity::new, "fluid_replicator", TRContent.Machine.FLUID_REPLICATOR); - public static final BlockEntityType SOLID_CANNING_MACHINE = register(SoildCanningMachineBlockEntity::new, "solid_canning_machine", TRContent.Machine.SOLID_CANNING_MACHINE); + public static final BlockEntityType SOLID_CANNING_MACHINE = register(SolidCanningMachineBlockEntity::new, "solid_canning_machine", TRContent.Machine.SOLID_CANNING_MACHINE); public static final BlockEntityType WIRE_MILL = register(WireMillBlockEntity::new, "wire_mill", TRContent.Machine.WIRE_MILL); public static final BlockEntityType GREENHOUSE_CONTROLLER = register(GreenhouseControllerBlockEntity::new, "greenhouse_controller", TRContent.Machine.GREENHOUSE_CONTROLLER); diff --git a/src/main/java/techreborn/init/TRCauldronBehavior.java b/src/main/java/techreborn/init/TRCauldronBehavior.java index a8c45a4a6..9d62c2089 100644 --- a/src/main/java/techreborn/init/TRCauldronBehavior.java +++ b/src/main/java/techreborn/init/TRCauldronBehavior.java @@ -53,7 +53,7 @@ public class TRCauldronBehavior { } return CauldronBehavior.emptyCauldron(state, world, pos, player, hand, stack, - DynamicCellItem.getCellWithFluid(Fluids.LAVA), (statex) -> true, SoundEvents.ITEM_BUCKET_FILL); + DynamicCellItem.getCellWithFluid(Fluids.LAVA), (stateX) -> true, SoundEvents.ITEM_BUCKET_FILL); }; CauldronBehavior FILL_CELL_WITH_WATER = (state, world, pos, player, hand, stack) -> { @@ -62,7 +62,7 @@ public class TRCauldronBehavior { } return CauldronBehavior.emptyCauldron(state, world, pos, player, hand, stack, - DynamicCellItem.getCellWithFluid(Fluids.WATER), (statex) -> true, SoundEvents.ITEM_BUCKET_FILL_LAVA); + DynamicCellItem.getCellWithFluid(Fluids.WATER), (stateX) -> true, SoundEvents.ITEM_BUCKET_FILL_LAVA); }; CauldronBehavior FILL_FROM_CELL = (state, world, pos, player, hand, stack) -> { diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 9b916d4ae..7ffae7982 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -618,7 +618,7 @@ public class TRContent { ROLLING_MACHINE(new GenericMachineBlock(GuiType.ROLLING_MACHINE, RollingMachineBlockEntity::new)), SCRAPBOXINATOR(new GenericMachineBlock(GuiType.SCRAPBOXINATOR, ScrapboxinatorBlockEntity::new)), VACUUM_FREEZER(new GenericMachineBlock(GuiType.VACUUM_FREEZER, VacuumFreezerBlockEntity::new)), - SOLID_CANNING_MACHINE(new GenericMachineBlock(GuiType.SOLID_CANNING_MACHINE, SoildCanningMachineBlockEntity::new)), + SOLID_CANNING_MACHINE(new GenericMachineBlock(GuiType.SOLID_CANNING_MACHINE, SolidCanningMachineBlockEntity::new)), WIRE_MILL(new GenericMachineBlock(GuiType.WIRE_MILL, WireMillBlockEntity::new)), GREENHOUSE_CONTROLLER(new GenericMachineBlock(GuiType.GREENHOUSE_CONTROLLER, GreenhouseControllerBlockEntity::new)), @@ -1157,8 +1157,8 @@ public class TRContent { powerAcceptor = (PowerAcceptorBlockEntity) blockEntity; } if (handler != null) { - handler.addSpeedMulti(TechRebornConfig.overclockerSpeed); - handler.addPowerMulti(TechRebornConfig.overclockerPower); + handler.addSpeedMultiplier(TechRebornConfig.overclockerSpeed); + handler.addPowerMultiplier(TechRebornConfig.overclockerPower); } if (powerAcceptor != null) { powerAcceptor.extraPowerInput += powerAcceptor.getMaxInput(null); diff --git a/src/main/java/techreborn/init/TRToolMaterials.java b/src/main/java/techreborn/init/TRToolMaterials.java index 614bf4198..45a89c1d7 100644 --- a/src/main/java/techreborn/init/TRToolMaterials.java +++ b/src/main/java/techreborn/init/TRToolMaterials.java @@ -25,7 +25,6 @@ package techreborn.init; import net.minecraft.item.ToolMaterial; -import net.minecraft.item.ToolMaterials; import net.minecraft.recipe.Ingredient; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/init/TRToolTier.java b/src/main/java/techreborn/init/TRToolTier.java index 985b5d474..fc8612035 100644 --- a/src/main/java/techreborn/init/TRToolTier.java +++ b/src/main/java/techreborn/init/TRToolTier.java @@ -30,7 +30,7 @@ import net.minecraft.util.Lazy; import java.util.function.Supplier; -//TODO: Use tags +// TODO: Use tags public enum TRToolTier implements ToolMaterial { BRONZE(2, 375, 7.0F, 2.25f, 6, () -> { return Ingredient.ofItems(TRContent.Ingots.BRONZE.asItem()); diff --git a/src/main/java/techreborn/items/DynamicCellItem.java b/src/main/java/techreborn/items/DynamicCellItem.java index b989f1626..2c65eea94 100644 --- a/src/main/java/techreborn/items/DynamicCellItem.java +++ b/src/main/java/techreborn/items/DynamicCellItem.java @@ -165,7 +165,7 @@ public class DynamicCellItem extends Item implements ItemFluidInfo { public Text getName(ItemStack itemStack) { Fluid fluid = getFluid(itemStack); if (fluid != Fluids.EMPTY) { - //TODO use translation keys for fluid and the cell https://fabric.asie.pl/wiki/tutorial:lang?s[]=translation might be useful + // TODO use translation keys for fluid and the cell https://fabric.asie.pl/wiki/tutorial:lang?s[]=translation might be useful return new LiteralText(WordUtils.capitalizeFully(FluidUtils.getFluidName(fluid).replaceAll("_", " ")) + " Cell"); } return super.getName(itemStack); diff --git a/src/main/java/techreborn/items/armor/CloakingDeviceItem.java b/src/main/java/techreborn/items/armor/CloakingDeviceItem.java index 401564dd9..8777d18c8 100644 --- a/src/main/java/techreborn/items/armor/CloakingDeviceItem.java +++ b/src/main/java/techreborn/items/armor/CloakingDeviceItem.java @@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; import reborncore.api.items.ArmorBlockEntityTicker; import reborncore.api.items.ArmorRemoveHandler; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.util.ItemUtils; import reborncore.common.powerSystem.RcEnergyTier; @@ -46,7 +45,7 @@ import techreborn.utils.InitUtils; public class CloakingDeviceItem extends TRArmourItem implements RcEnergyItem, ArmorBlockEntityTicker, ArmorRemoveHandler { public static int maxCharge = TechRebornConfig.cloakingDeviceCharge; - public static int cost = TechRebornConfig.cloackingDeviceCost; + public static int cost = TechRebornConfig.cloakingDeviceCost; public static boolean isActive; // 40M FE capacity with 10k FE\t charge rate diff --git a/src/main/java/techreborn/items/armor/TRArmourItem.java b/src/main/java/techreborn/items/armor/TRArmourItem.java index fb1255d34..ce2cb5456 100644 --- a/src/main/java/techreborn/items/armor/TRArmourItem.java +++ b/src/main/java/techreborn/items/armor/TRArmourItem.java @@ -37,7 +37,7 @@ import java.util.UUID; */ public class TRArmourItem extends ArmorItem { - //Thanks for being private + // Thanks for being private public static final UUID[] MODIFIERS = new UUID[]{ UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), UUID.fromString("D8499B04-0E66-4726-AB29-64469D734E0D"), diff --git a/src/main/java/techreborn/items/tool/ChainsawItem.java b/src/main/java/techreborn/items/tool/ChainsawItem.java index 6e001add2..d540652b9 100644 --- a/src/main/java/techreborn/items/tool/ChainsawItem.java +++ b/src/main/java/techreborn/items/tool/ChainsawItem.java @@ -80,13 +80,13 @@ public class ChainsawItem extends AxeItem implements RcEnergyItem { } @Override - public boolean postHit(ItemStack itemstack, LivingEntity entityliving, LivingEntity entityliving1) { + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } // ToolItem @Override - public boolean canRepair(ItemStack itemStack_1, ItemStack itemStack_2) { + public boolean canRepair(ItemStack stack, ItemStack ingredient) { return false; } diff --git a/src/main/java/techreborn/items/tool/DebugToolItem.java b/src/main/java/techreborn/items/tool/DebugToolItem.java index 1dd0a201f..395d96c13 100644 --- a/src/main/java/techreborn/items/tool/DebugToolItem.java +++ b/src/main/java/techreborn/items/tool/DebugToolItem.java @@ -94,16 +94,16 @@ public class DebugToolItem extends Item { } private String getPropertyString(Entry, Comparable> entryIn) { - Property iproperty = entryIn.getKey(); + Property property = entryIn.getKey(); Comparable comparable = entryIn.getValue(); - String s = Util.getValueAsString(iproperty, comparable); + String s = Util.getValueAsString(property, comparable); if (Boolean.TRUE.equals(comparable)) { s = Formatting.GREEN + s; } else if (Boolean.FALSE.equals(comparable)) { s = Formatting.RED + s; } - return iproperty.getName() + ": " + s; + return property.getName() + ": " + s; } private String getRegistryName(Block block) { diff --git a/src/main/java/techreborn/items/tool/DrillItem.java b/src/main/java/techreborn/items/tool/DrillItem.java index edcf13da8..bf63b327e 100644 --- a/src/main/java/techreborn/items/tool/DrillItem.java +++ b/src/main/java/techreborn/items/tool/DrillItem.java @@ -108,7 +108,7 @@ public class DrillItem extends PickaxeItem implements RcEnergyItem, DynamicAttri // ToolItem @Override - public boolean canRepair(ItemStack itemStack_1, ItemStack itemStack_2) { + public boolean canRepair(ItemStack stack, ItemStack ingredient) { return false; } diff --git a/src/main/java/techreborn/items/tool/JackhammerItem.java b/src/main/java/techreborn/items/tool/JackhammerItem.java index e345b6173..c61bbcfdc 100644 --- a/src/main/java/techreborn/items/tool/JackhammerItem.java +++ b/src/main/java/techreborn/items/tool/JackhammerItem.java @@ -76,7 +76,7 @@ public class JackhammerItem extends PickaxeItem implements RcEnergyItem, Dynamic } /* - Fabric API doesn't allow to have mining speed less then the one from vanilla ToolMaterials + Fabric API doesn't allow to have mining speed less than the one from vanilla ToolMaterials @Override public float getMiningSpeedMultiplier(Tag tag, BlockState state, ItemStack stack, LivingEntity user) { if (tag.equals(FabricToolTags.PICKAXES) && stack.getItem().isEffectiveOn(state)) { diff --git a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java index 29cfbaef9..adb176043 100644 --- a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java +++ b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java @@ -82,13 +82,13 @@ public class RockCutterItem extends PickaxeItem implements RcEnergyItem { } @Override - public boolean postHit(ItemStack itemstack, LivingEntity entityliving, LivingEntity entityliving1) { + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { return true; } // ToolItem @Override - public boolean canRepair(ItemStack stack, ItemStack stack2) { + public boolean canRepair(ItemStack stack, ItemStack ingredient) { return false; } diff --git a/src/main/java/techreborn/items/tool/industrial/OmniToolItem.java b/src/main/java/techreborn/items/tool/industrial/OmniToolItem.java index 59ce417ad..938e37280 100644 --- a/src/main/java/techreborn/items/tool/industrial/OmniToolItem.java +++ b/src/main/java/techreborn/items/tool/industrial/OmniToolItem.java @@ -95,9 +95,9 @@ public class OmniToolItem extends PickaxeItem implements RcEnergyItem, DynamicAt } @Override - public boolean postHit(ItemStack stack, LivingEntity entityliving, LivingEntity attacker) { + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { if (tryUseEnergy(stack, hitCost)) { - entityliving.damage(DamageSource.player((PlayerEntity) attacker), 8F); + target.damage(DamageSource.player((PlayerEntity) attacker), 8F); } return false; } diff --git a/src/main/java/techreborn/utils/ToolsUtil.java b/src/main/java/techreborn/utils/ToolsUtil.java index 1be137641..54f6d0e04 100644 --- a/src/main/java/techreborn/utils/ToolsUtil.java +++ b/src/main/java/techreborn/utils/ToolsUtil.java @@ -47,7 +47,6 @@ import java.util.Set; /** * @author drcrazy */ - public class ToolsUtil { public static void breakBlock(ItemStack tool, World world, BlockPos pos, LivingEntity entityLiving, int cost) { if (!(entityLiving instanceof PlayerEntity)) { @@ -69,26 +68,27 @@ public class ToolsUtil { } /** - * Fills in set of BlockPos which should be broken by AOE mining + * Fills in set of {@link BlockPos} which should be broken by AOE mining * - * @param worldIn World reference - * @param pos BlockPos Position of originally broken block - * @param entityLiving LivingEntity Player who broke block - * @param radius int Radius of additional blocks to include. E.g. for 3x3 mining radius will be 1 - * @return Set of BlockPos to process by tool block break logic + * @param worldIn {@link World} World reference + * @param pos {@link BlockPos} Position of originally broken block + * @param entityLiving {@link LivingEntity} Player who broke block + * @param radius {@code int} Radius of additional blocks to include. E.g. for 3x3 mining radius will be 1 + * @return {@link Set} Set of {@link BlockPos} to process by tool block break logic */ public static Set getAOEMiningBlocks(World worldIn, BlockPos pos, @Nullable LivingEntity entityLiving, int radius) { return getAOEMiningBlocks(worldIn, pos, entityLiving, radius, true); } /** - * Fills in set of BlockPos which should be broken by AOE mining + * Fills in set of {@link BlockPos} which should be broken by AOE mining * - * @param worldIn World reference - * @param pos BlockPos Position of originally broken block - * @param entityLiving LivingEntity Player who broke block - * @param radius int Radius of additional blocks to include. E.g. for 3x3 mining radius will be 1 - * @return Set of BlockPos to process by tool block break logic + * @param worldIn {@link World} World reference + * @param pos {@link BlockPos} Position of originally broken block + * @param entityLiving {@link LivingEntity} Player who broke block + * @param radius {@code int} Radius of additional blocks to include. E.g. for 3x3 mining radius will be 1 + * @param placeDummyBlocks {@code boolean} Whether to place dummy blocks + * @return {@link Set} Set of {@link BlockPos} to process by tool block break logic */ public static Set getAOEMiningBlocks(World worldIn, BlockPos pos, @Nullable LivingEntity entityLiving, int radius, boolean placeDummyBlocks) { if (!(entityLiving instanceof PlayerEntity playerIn)) { @@ -167,10 +167,10 @@ public class ToolsUtil { } /** - * Check if JackHammer shouldn't break block. JackHammers should be good on stone, dirt, sand. And shouldn't break ores. + * Check if JackHammer shouldn't break block. JackHammers should be good on stone, dirt, sand. And shouldn't break ores. * - * @param blockState BlockState to check - * @return boolean True if block shouldn't be breakable by JackHammer + * @param blockState {@link BlockState} State to check + * @return {@code boolean} True if block shouldn't be breakable by JackHammer */ public static boolean JackHammerSkippedBlocks(BlockState blockState){ if (blockState.getMaterial() == Material.AIR) { @@ -191,5 +191,3 @@ public class ToolsUtil { return blockState.getBlock() instanceof RedstoneOreBlock; } } - - diff --git a/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java b/src/main/java/techreborn/utils/damageSources/ElectricalShockSource.java similarity index 93% rename from src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java rename to src/main/java/techreborn/utils/damageSources/ElectricalShockSource.java index 9f5f8ce17..9025529b9 100644 --- a/src/main/java/techreborn/utils/damageSources/ElectrialShockSource.java +++ b/src/main/java/techreborn/utils/damageSources/ElectricalShockSource.java @@ -29,8 +29,8 @@ import net.minecraft.entity.damage.DamageSource; /** * Created by modmuss50 on 06/03/2016. */ -public class ElectrialShockSource extends DamageSource { - public ElectrialShockSource() { +public class ElectricalShockSource extends DamageSource { + public ElectricalShockSource() { super("shock"); } }