From 4acb2dca5142f6f253bc5a02972992be63bf4b2e Mon Sep 17 00:00:00 2001 From: 90 Date: Thu, 20 Jul 2023 20:30:21 +0100 Subject: [PATCH] Update portable cell item models to support dyeing + some more datagen cleanup --- .../portable/portable_cell_fluid_screen.png | Bin 0 -> 718 bytes .../portable/portable_cell_item_screen.png | Bin 0 -> 684 bytes .../cell/portable/portable_cell_side_16m.png | Bin 0 -> 586 bytes .../cell/portable/portable_cell_side_1m.png | Bin 0 -> 600 bytes .../cell/portable/portable_cell_side_256m.png | Bin 0 -> 600 bytes .../cell/portable/portable_cell_side_4m.png | Bin 0 -> 587 bytes .../cell/portable/portable_cell_side_64m.png | Bin 0 -> 600 bytes .../cell/portable/portable_fluid_cell_16m.png | Bin 291 -> 0 bytes .../cell/portable/portable_fluid_cell_1m.png | Bin 291 -> 0 bytes .../portable/portable_fluid_cell_256m.png | Bin 291 -> 0 bytes .../cell/portable/portable_fluid_cell_4m.png | Bin 291 -> 0 bytes .../cell/portable/portable_fluid_cell_64m.png | Bin 291 -> 0 bytes .../cell/portable/portable_item_cell_16m.png | Bin 235 -> 0 bytes .../cell/portable/portable_item_cell_1m.png | Bin 235 -> 0 bytes .../cell/portable/portable_item_cell_256m.png | Bin 235 -> 0 bytes .../cell/portable/portable_item_cell_4m.png | Bin 235 -> 0 bytes .../cell/portable/portable_item_cell_64m.png | Bin 235 -> 0 bytes .../cell/portable/portable_mana_cell_16m.png | Bin 234 -> 0 bytes .../cell/portable/portable_mana_cell_1m.png | Bin 234 -> 0 bytes .../cell/portable/portable_mana_cell_256m.png | Bin 234 -> 0 bytes .../cell/portable/portable_mana_cell_4m.png | Bin 234 -> 0 bytes .../cell/portable/portable_mana_cell_64m.png | Bin 234 -> 0 bytes fabric/build.gradle.kts | 2 +- .../_90/megacells/datagen/ModelProvider.java | 112 +++++++++--------- 24 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_fluid_screen.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_item_screen.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_16m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_1m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_256m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_4m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_64m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_16m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_1m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_256m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_4m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_64m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_16m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_1m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_256m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_4m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_64m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_16m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_1m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_256m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_4m.png delete mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_64m.png diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_fluid_screen.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_fluid_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..d23aaca3c994f19d5bbd2ea43a7871391f8d13f2 GIT binary patch literal 718 zcmV;<0x|uGP)EX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;!_!|Bn>_000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0001`NklS;X0E=osNq+s^9smFU07*qoM6N<$f{M#9 Awg3PC literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_item_screen.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_item_screen.png new file mode 100644 index 0000000000000000000000000000000000000000..7bb8ab01952ebcc7070e38c30bbe4651b1d16534 GIT binary patch literal 684 zcmV;d0#p5oP)EX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;->mRl?~2000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0001kNkl>iceA_c?p(!I?#~?OoB)8T0sw5=hB+t9 zjHgLNgznDnW@b`VsjAG(mq~8x5)s494(FAsf|*_afvO%!_Mg1f!p9B#`9&UB8(kud SqbSV)0000EX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;HIA*0MDK000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000XNklEX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5-~En=DcnI000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000lNklhd literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_256m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_cell_side_256m.png new file mode 100644 index 0000000000000000000000000000000000000000..7df543ceb1e4d45d4a0db52da91ea2cef150cc5c GIT binary patch literal 600 zcmV-e0;m0nP)EX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;im)#E+Z+000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000lNklEX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;8b&9tN`j000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000YNklEX>4Tx04R}tkv&MmKpe$iQ>7vmK|6>zWT*~eK~%)CR-p(LLaorMgUO{ILX(Ch z#l=x@EjakGSaoo5*44pP5ClI!TwRhjEO`%ra&rDFxs0b&mjF?_xa5|JTnMuzPM~KB@8!K(hN~T6UMI2Q%o$`gO z$13M7&RV(3n)l={4CnRbC9cyPLJ|vDgai=^s@OmoHe$5uq*zGPe!|B;==vpcDdgG! zBgZ@{&>*{h@IUz7tyP$u@RGs_p!3CXK8AtNF3_ks&iAq7G){ovGjOH1{FOQ|^GSNG zrA3c`-fiIGx}_<5z~v4w@MOrQ>`FnJLZJY>pV2qvfc{&cd)4c$xsTHaAVXcHZh(VB zV5CUdYd-JpYVYmeGtK^f0PJUS*BWC4sQ>@~24YJ`L;wH)5diSA5;hnw9OHig000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000lNklHBe-w z&=!RjryKvBW@jw>TKjZfr{VW&Uzbi#Tl-aiQb)vH;`5^g#kXl~#*%>KtL_Uxhk4EM4= ki8bWTtJh3go^JP@b%zb7dsf`?KOoGLBhVB>`B zqswMXNv%^>-tzhG(Z4UJ@7<;YG?TF;$S;_|;n|HeAg968#W6%8-1k(VP_qJ$YoN$V zp)C#?2{-;b&CXc%wf5<}PQ&llzAl}frukHVQb)ucXY=u z7dk2q9hy;(&;2_W!JgiuXz(W8Ug)0Yf=NLf_u>;`5^g#kXl~#*%>KtL_Uxhk4EM4= ki8bWTtJh3go^JP@wKtGcaf0Hp*&yF~y85}Sb4q9e03`To4gdfE diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_256m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_256m.png deleted file mode 100644 index 3efb6c5310bcc158973d9966d43191cbb672b837..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V1Q4EE0AUo=4VinVbD@yFjQx- z)MKzWX7IFTi1K1c4Q41!U}(u<=qq8E)4;I0hvCjGLBhVB>`B zqs#Jjt~NVA+4A}B(Z4T^H(jm+n#ouaHBe-w z&=v=cgd6{zW@jw>TKjZfr{VW&Uzbi#(|oEwsUzZ!@$n2Tz2a?dA)$9BZsc7x^+|f- z3mp}Q4$Y{?=l-3GU{CK+G;m~UHx3vIVCg!01+8$WdHyG diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_4m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_4m.png deleted file mode 100644 index 2db6d4128071e4b8807aa8ecac034af47abb17aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V1Q4EE0AUo=4VinVbD@yFjQx- z)MKzWX7IFTi1K1c4Q41!U}(u<=qq8E)4;I0hvCjGLBhVB>`B zqsz8@zI*iV%ggr|KK*A{Gj;z|pqY#%L4Lsu4$p3+0XYqxE{-7*;l8H=g_;$3TmwZ` z3T<)FV7c?(X?Di4ueDF-bsB!Z_I2s>G|i{_lR6^q7+2?O=@oBt3kkh5abxMKsZY`q zC3I9AIy9pmpZj<&!aBW2(csN<3!!_O3nm3|+>1|$Nx12Fpt*tLF#8{~*t3WBGu+Gi kB-W5SuU<20dAi+q*5<98l6(7;SAcx$>FVdQ&MBb@0Eks=egFUf diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_64m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_fluid_cell_64m.png deleted file mode 100644 index db6b1db8252bfbd6dc78d0d3ddab1a72fc48c067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}V1Q4EE0AUo=4VinVbD@yFjQx- z)MKzWX7IFTi1K1c4Q41!U}(u<=qq8E)4;I0hvCj-6`UWUsBC=yK%MJWIFm!kL@P7cG0#*HasitzysZ zoT$j?MdPMzZP;UCjurqg^(ax5+qb`Q3{%o6*@`XOxc jc7~kKf4l{)Z9nhSU)|4X)i&8I8RT0}S3j3^P6_iUcC6jhYx@M{++#R(odik#*!evU>gTe~DWM4fVzp6Z diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_1m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_1m.png deleted file mode 100644 index b3e136535f1fb1c072788d3871ca53fd4edcd425..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE06{PR#sLvHa0;)K^Ykt zH8nL24GmLMQ=cDEIXO91RaLX4q!uq;yiQs9!-o%l|Nh;>_t_Sxhp{BcFPOpM*^M+H zC(YBvF+?If^i-f&g93+3pfb;8p6~l_$t*}dEB;bhn#$ZNkrum!8fR c`1Q1$e`6j?vaa+)Cy<*xUHx3vIVCg!0GM@7-2eap diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_256m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_256m.png deleted file mode 100644 index 07d6c116b66baa9547c99ef445151c9c74f231c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE06{PR#sLvHa0;)K^Ykt zH8nL24GmLMQ=cDEIXOA`I#;Wzs+ygjEMC0$!-o%l|Ndn#SbPqshp{BcFPOpM*^M+H zC(YBvF+?If^i-f&g93+3pfZoK@b~?HsR;SOHXGD c{CZl>zg3zgH7?-M4v?EYUHx3vIVCg!0Qk;N(f|Me diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_4m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_4m.png deleted file mode 100644 index d8fb46d7839511c38f08c39762a13d6c8f48e8db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE06{PR#sLvHa0;)K^Ykt zH8nL24GmLMQ=cDEIXO91RaJ`@FTQ+_;lqaypZ+ua{rh*d;MapdJ&Ywme!&b5&u*jv zIcc6Qjv*4^p{D}H8WcEO0+o4!mA~)5C9@#;toVDmpihEFVdQ&MBb@0N)o;ng9R* diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_64m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_item_cell_64m.png deleted file mode 100644 index ea42493b2cc500c3dee2f563e3e3dd69c40155cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE06{PR#sLvHa0;)K^Ykt z)uQ`qYHAu98m6YEcD?_7enjQuoz{jYpE_Uv?DHck>qXMS5C6~n-+KQ0|F>>)V}QCCOM?7@862M7 zNCR?GJzX3_B*H^a-4<(5;BX1lJ`vsY|NmA?r_|3!ZgvagxICGj?)6ew#n?XSW_78e zY~*T>!i8&Mc280I=X_j%kz?~Kv5fX9cE-mT3%gVg94%_{?3S!$QrP*F+furz-`w|F c%LV=Gcdv%9+zped>;yU5)78&qol`;+00>!B$N&HU diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_1m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_1m.png deleted file mode 100644 index 42fb7a0005f2b0fb87653ba6c28d925f56987e4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0AW86J)WGVN0)KcUI&n zQkOq?Uwfyu;mN1Y*FXFGh{}4AG+Rn);fMe0l$Fo?-+KQ0|ME45UIKM7mIV0)GdMiE zkp|?Xdb&7!i8&Mc280I=looNkz?~Ku@_BK?2L~w7Ivu~I9k-?*)6%3Sz+f>W=rX&eskYz cEf@5!->rSl5;-A4RSD#1Pgg&ebxsLQ0Q6#3TL1t6 diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_4m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_4m.png deleted file mode 100644 index 0ded3d4eb04e885beb4e1b1678ccbb3cbb64ba06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0AW86J)WGVN0)KcUI&n zQkOq?Uwfyu;mN1Y*FXFGh{}4AwD80KGyk`q|Nj5-J%&&J8N%u-J%PFyOM?7@862M7 zNCR?GJzX3_B*H^a1&TE&aJU3Ei}-H&w*QvQ!c9LP-F4^!tni`w`7)4C1Fb)l9jn*d3OfYMjG+@c3-C dY^N8~U*}~OvDlYZ%C~_W?dj_0vd$@?2>=SIRrUY? diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_64m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_64m.png deleted file mode 100644 index 817b7bce077fc8959116216d5a42961df313d9b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0AW86J)WGVN0)KcUI&n zQkOq?U$yAI_D*ZVlTYn>|2tp*?DHck>qXMS5C6~n-+KQ0|L14DJb=0wOM?7@862M7 zNCR?GJzX3_B*H^a1&TE&aJU3Eo1A6&zWV2anHI e%XWG({dHblA4|CUgL5GuM|-;ZxvX(MEGAItems.getItemPortables()); - portables.addAll(MEGAItems.getFluidPortables()); - if (Utils.PLATFORM.isModLoaded("appbot")) { cells.addAll(AppBotItems.getCells()); - portables.addAll(AppBotItems.getPortables()); - generator.generateFlatItem(AppBotItems.MEGA_MANA_CELL_HOUSING.asItem(), ModelTemplates.FLAT_ITEM); - createDriveCellModel("mega_mana_cell", generator.output); + + for (var portable : AppBotItems.getPortables()) { + // lot of assumptions being made here in advance + portableModel(portable, "mana", new ResourceLocation("appbot", "item/portable_cell_mana_housing"), + generator); + } + + driveCell("mega_mana_cell", generator); } for (var cell : cells) { - createCellItem( - Utils.makeId("item/cell/standard/" + cell.id().getPath()), - Utils.makeId("item/" + cell.id().getPath()), - AppEng.makeId("item/storage_cell_led"), generator.output); + cellModel(cell, generator); } - for (var cell : portables) { - createCellItem( - Utils.makeId("item/cell/portable/" + cell.id().getPath()), - Utils.makeId("item/" + cell.id().getPath()), - AppEng.makeId("item/portable_cell_led"), generator.output); + for (var portable : MEGAItems.getItemPortables()) { + portableModel(portable, "item", AppEng.makeId("item/portable_cell_item_housing"), generator); } - createDriveCellModel("mega_item_cell", generator.output); - createDriveCellModel("mega_fluid_cell", generator.output); - createDriveCellModel("bulk_item_cell", generator.output); - } + for (var portable : MEGAItems.getFluidPortables()) { + portableModel(portable, "fluid", AppEng.makeId("item/portable_cell_fluid_housing"), generator); + } - private void generatePartModels(ItemModelGenerators generator) { - createPatternProviderPart(generator); + driveCell("mega_item_cell", generator); + driveCell("mega_fluid_cell", generator); + driveCell("bulk_item_cell", generator); } - private TextureMapping cell(ResourceLocation cell, ResourceLocation led) { - return new TextureMapping().put(TextureSlot.LAYER0, cell).put(LAYER1, led); + private void generatePartModels(ItemModelGenerators generator) { + patternProviderPart(generator); } - private TextureMapping driveCell(ResourceLocation cell) { - return new TextureMapping().put(CELL_TEXTURE, cell); + private void cellModel(ItemDefinition cell, ItemModelGenerators generator) { + CELL.create(Utils.makeId("item/" + cell.id().getPath()), new TextureMapping() + .put(TextureSlot.LAYER0, Utils.makeId("item/cell/standard/" + cell.id().getPath())) + .put(TextureSlot.LAYER1, AppEng.makeId("item/storage_cell_led")), generator.output); } - private void createCellItem(ResourceLocation cellTexture, ResourceLocation cellModel, ResourceLocation led, - BiConsumer> output) { - CELL.create(cellModel, cell(cellTexture, led), output); + private void portableModel(ItemDefinition portable, String screenType, + ResourceLocation housingTexture, ItemModelGenerators generator) { + var path = portable.id().getPath(); + var tierSuffix = path.substring(path.lastIndexOf('_') + 1); + PORTABLE.create(Utils.makeId("item/" + portable.id().getPath()), new TextureMapping() + .put(TextureSlot.LAYER0, Utils.makeId("item/cell/portable/portable_cell_" + screenType + "_screen")) + .put(TextureSlot.LAYER1, AppEng.makeId("item/portable_cell_led")) + .put(TextureSlot.LAYER2, housingTexture) + .put(LAYER3, Utils.makeId("item/cell/portable/portable_cell_side_" + tierSuffix)), + generator.output); } - private void createDriveCellModel(String texture, - BiConsumer> output) { + private void driveCell(String texture, ItemModelGenerators generator) { var path = Utils.makeId("block/drive/cells/" + texture); - DRIVE_CELL.create(path, driveCell(path), output); + DRIVE_CELL.create(path, new TextureMapping().put(CELL_TEXTURE, path), generator.output); } - private MultiVariantGenerator craftingUnit(Block block, String texture, - BiConsumer> output) { + private void craftingUnit(Block block, String texture, BlockModelGenerators generator) { var formed = Utils.makeId("block/crafting/" + texture + "_formed"); var unformed = Utils.makeId("block/crafting/" + texture); - return MultiVariantGenerator.multiVariant(block) + + var craftingUnit = MultiVariantGenerator.multiVariant(block) .with(PropertyDispatch.property(AbstractCraftingUnitBlock.FORMED) .select(false, Variant.variant().with(VariantProperties.MODEL, - ModelTemplates.CUBE_ALL.create(unformed, TextureMapping.cube(unformed), output))) + ModelTemplates.CUBE_ALL.create(unformed, TextureMapping.cube(unformed), + generator.modelOutput))) .select(true, Variant.variant().with(VariantProperties.MODEL, formed))); - } - private void createCraftingUnit(Block block, String texture, BlockModelGenerators generator) { - var formed = Utils.makeId("block/crafting/" + texture + "_formed"); - var unformed = Utils.makeId("block/crafting/" + texture); - generator.blockStateOutput.accept(craftingUnit(block, texture, generator.modelOutput)); + generator.blockStateOutput.accept(craftingUnit); generator.modelOutput.accept(formed, () -> customModelLoader(formed)); generator.delegateItemModel(block, unformed); } - private void createCraftingMonitor(BlockModelGenerators generator) { + private void craftingMonitor(BlockModelGenerators generator) { var formed = Utils.makeId("block/crafting/monitor_formed"); var unformed = Utils.makeId("block/crafting/monitor"); var unit = Utils.makeId("block/crafting/unit"); @@ -208,7 +212,7 @@ private JsonObject customModelLoader(ResourceLocation loc) { return json; } - private void createPatternProviderBlock(BlockModelGenerators generator) { + private void patternProviderBlock(BlockModelGenerators generator) { var normal = ModelTemplates.CUBE_ALL.create(MEGABlocks.MEGA_PATTERN_PROVIDER.block(), TextureMapping.cube(MEGABlocks.MEGA_PATTERN_PROVIDER.block()), generator.modelOutput); @@ -258,7 +262,7 @@ private VariantProperties.Rotation rotationByAngle(int angle) { }; } - private void createPatternProviderPart(ItemModelGenerators generator) { + private void patternProviderPart(ItemModelGenerators generator) { var provider = Utils.makeId("part/mega_pattern_provider"); var monitorBack = Utils.makeId("part/mega_monitor_back"); var monitorSides = Utils.makeId("part/mega_monitor_sides"); @@ -272,7 +276,7 @@ private void createPatternProviderPart(ItemModelGenerators generator) { generator.output); } - private void createEnergyCell(BlockModelGenerators generator) { + private void energyCell(BlockModelGenerators generator) { var cell = MEGABlocks.MEGA_ENERGY_CELL; var fillStage = PropertyDispatch.property(EnergyCellBlock.ENERGY_STORAGE); List> itemModelOverrides = new ArrayList<>();