From 43913207bc8d9210f9397ee2f77fa88cfe5ed8ec Mon Sep 17 00:00:00 2001 From: 90 Date: Mon, 27 Nov 2023 10:54:28 +0000 Subject: [PATCH] Update Applied Botanics integration Closes #90 --- .../datagen/CommonModelProvider.java | 12 +++++++++-- .../integration/appbot/AppBotIntegration.java | 19 ++++++++++++------ .../cell/portable/portable_mana_cell_16m.png | Bin 0 -> 258 bytes .../cell/portable/portable_mana_cell_1m.png | Bin 0 -> 258 bytes .../cell/portable/portable_mana_cell_256m.png | Bin 0 -> 258 bytes .../cell/portable/portable_mana_cell_4m.png | Bin 0 -> 258 bytes .../cell/portable/portable_mana_cell_64m.png | Bin 0 -> 258 bytes .../megacells/textures/part/cell_dock.png | Bin 4685 -> 218 bytes .../textures/part/cell_dock_side.png | Bin 4601 -> 277 bytes fabric/build.gradle.kts | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- forge/build.gradle.kts | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- settings.gradle.kts | 2 +- 14 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_16m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_1m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_256m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_4m.png create mode 100644 common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_64m.png diff --git a/common/src/data/java/gripe/_90/megacells/datagen/CommonModelProvider.java b/common/src/data/java/gripe/_90/megacells/datagen/CommonModelProvider.java index cc3b35c6..04e60145 100644 --- a/common/src/data/java/gripe/_90/megacells/datagen/CommonModelProvider.java +++ b/common/src/data/java/gripe/_90/megacells/datagen/CommonModelProvider.java @@ -184,8 +184,7 @@ private void generateItemModels(BiConsumer cellModel(cell, output)); - - // TODO: portables + AppBotItems.getPortables().forEach(portable -> portableModel(portable, output)); driveCell("mega_mana_cell", output); } @@ -207,6 +206,15 @@ private void cellModel(ItemDefinition cell, BiConsumer portable, BiConsumer> output) { + ModelTemplates.TWO_LAYERED_ITEM.create( + ModelLocationUtils.getModelLocation(portable.asItem()), + TextureMapping.layered( + MEGACells.makeId("item/cell/portable/" + portable.id().getPath()), + AppEng.makeId("item/portable_cell_led")), + output); + } + private void portableModel( ItemDefinition portable, String screenType, diff --git a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java index b57c63ea..00c551e8 100644 --- a/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java +++ b/common/src/main/java/gripe/_90/megacells/integration/appbot/AppBotIntegration.java @@ -4,10 +4,13 @@ import java.util.List; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.item.Item; + import appeng.api.upgrades.Upgrades; import appeng.core.localization.GuiText; -import appbot.ABItems; +import appbot.AppliedBotanics; public final class AppBotIntegration { public static void initUpgrades() { @@ -15,12 +18,16 @@ public static void initUpgrades() { .forEach(c -> Upgrades.add(GREATER_ENERGY_CARD, c, 2, GuiText.PortableCells.getTranslationKey())); for (var portable : List.of( - ABItems.PORTABLE_MANA_CELL_1K, - ABItems.PORTABLE_MANA_CELL_4K, - ABItems.PORTABLE_MANA_CELL_16K, - ABItems.PORTABLE_MANA_CELL_64K, - ABItems.PORTABLE_MANA_CELL_256K)) { + cell("portable_mana_storage_cell_1k"), + cell("portable_mana_storage_cell_4k"), + cell("portable_mana_storage_cell_16k"), + cell("portable_mana_storage_cell_64k"), + cell("portable_mana_storage_cell_256k"))) { Upgrades.add(GREATER_ENERGY_CARD, portable, 2, GuiText.PortableCells.getTranslationKey()); } } + + private static Item cell(String id) { + return BuiltInRegistries.ITEM.get(AppliedBotanics.id(id)); + } } diff --git a/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_16m.png b/common/src/main/resources/assets/megacells/textures/item/cell/portable/portable_mana_cell_16m.png new file mode 100644 index 0000000000000000000000000000000000000000..f94d60247075f12035f3128db3f98ee774cee76a GIT binary patch literal 258 zcmV+d0sa1oP)9i1vA;>nv3;N$uo;3&BZdLE49R+t1Qr9a(KWL> zE20{JZV1c(5bg6L3R5GxW^_Z)T|iJHE<;Gth%I@OtdUdz05$Dr!o;#;dH?_b07*qo IM6N<$f<9+rUjP6A literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..975d189cd2a44c1dd5afbc455379cea2c7f63973 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Cp}#pLo7}wCmdjo$VvHk*nnA+ zVVUQ@2elSzrvyrRb6$oP^jsH+kvd=hpa0mo>-LY$SX2t0{SOoARp3?F^Wkv4ftk%u zk?o2Kec$}DHz*pMRftZMa+El7?4^)E^0p}=U5Y2n4)ZW1&fs=@-LY$SX2t0{SOoARp3?F^Wkv4ftk%u zk?o2Kec$}DHz*pMRftZMa+El7?4^)^a{P0xF2xgOhj|zhXK*{da+u-h_rd-~L)vq7 ziM9rlLorS3CNB4o?Rm)7U~z-z;8MY(3^U9(NH%#Zw=wSEIaxK4MT~jlMbpjJ+KZ$b z@;J^g2)zBQ%oVJ>E3L%&Laal8vYxZYr4HT7$!jKtFfiPR%xw*N^nxGgDF#nhKbLh* G2~7Y2LSeoD literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..499da8d5aa9eb9adead1721f15502f7c71b9ddbd GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Cp}#pLo7}wCmdjo$VvHk*nnA+ zVVUQ@2elSzrvyrRb6$oP^jsH+kvd=hpa0mo>-LY$SX2t0{SOoARp3?F^Wkv4ftk%u zk?o2Kec$}DHz*pMRftZMa+El7?4^*v<4?A1BF+ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..ab368659345537228b303db148530bfcd305ba35 GIT binary patch literal 258 zcmV+d0sa1oP)nv3;N$uo;3&BZdLE49R+t1Qr9a(KWL> zE20{JZV1c(5bg6L3R5GxW^_Z)T|iJHE<;Gth%I@OtdUdz03+XSL)*Dw+yDRo07*qo IM6N<$f{C+ZBLDyZ literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/megacells/textures/part/cell_dock.png b/common/src/main/resources/assets/megacells/textures/part/cell_dock.png index 6930947e5cceac885af2895418394405ef46eda6..262c2362556f73e6c4abb568e1d0cf8b52ffe431 100644 GIT binary patch delta 190 zcmV;v073uFB-#OxB!8hvL_t(I%iWUE4Fn+wMD4;D{m~Ar!LBXB1}uily99&h?(O%T z$wa_mP{g_aSfv!nISac2KgKAnHL10}ft^xXoJ~LpD&)PFIj4*suQ<3D}%lf!_NeKdje#j4L4N(c!F&RHh>gDxWv)K syKnr4?HjL#h@J2J93(0qgY?_$1)mlF$C&mtSpWb407*qoM6N<$f^P9xPXGV_ literal 4685 zcmeHKc~BH*7H`%lhk^)VSPR!qD;03l)5l!h9YzI)W6(hgCI*R>q^A$;WiDqL7&M4i z;pKjQ|~=x!L50TC0EX7i(!}BDM~g0 zmP=d$EO;dmg1l|^ti-S;cwGIx^@bOk<2Sdr)|5Y3Whe_cUu~&b-PwF9G`Od`CwTvu zjS+lHtdzlrM}7C3%GTMpVoc1^#5Es0`bKj(@6TB3f~{Z8dbDMCRjwI*f9KsIZbxX; zIqWd}bV8faX1xdBhi~JRfnVHtDI@Rh{ou|_^=ay(3GQ<Hn;*V-ZPtz-Dv>F3qBgww(V?ikLj34I$8OV1k5_G6S=P{h(AxW7ADP_-CdE6iLHfiU2ST*RF9wQSk`rp*!it_jMsQQ?n3AW?<%k3!g;zoGH`(@ zd+oV(e;ii_-gQv`6-jUV(Y1@f2>>8Y(22*yD%{}IkqA;EWSGRr=*L*+xI5r z*JN{_EWP{un7eHm+d4HT!%s#;q$jQZ?c~#Y8j?Pk|GSBi@ok$5?`&e8Oh3xI-)%f~ zVEGJ7`o^h`$1f``m?ZALS~Yvz_oWAJZ3=EUJXX_L`>#^lmCqs@dd4l3>}53p#+j!5 zhih6V;739iE*UGRSJ<`{OxY2 z%M~40!zFBc~xu1&8}o&k(9o~E#xf8v~WubIGRUh%?wHK zG629X$Smx&+Z-OoYe0Os40u+=7y|oL;z*RZe$4M$j~k;Uq?qD9}JXB@UVOq7KhA1;USE6g-?; za>O@JbAEnPxI)^;;+u$R8Q-Ip z7Id6dFQ9sorBRKVq)}Ea;3%iJlC&OIt2vS%1Z8q~WY)n63KRfWNdSjtHJr#30xA-u zh-x%C9;MV;D@sust3Z*gR;?2ULCkYYpetG1;HVTR9zbcddYw+x>rg#QYf+6}O`;S> zXi-utQaYC9C_?Xt;yEVO>9(_=oRXc*7ciG2-{(UioJq_w84yy14@k0XtSkZpFawf< zcNTjFmMoH8$dOrvPeMoQDZN@t(v*$@R17H17u+7uiwY`%tJE6bic%N`qywmBl}-f! zJ~_ySNp=gY>~ve4PMZNyf`S#x{$(>5D4vyBBP$C46eraTfiomw!Er`SGB}OmdIle) z@8l)1h6#p!W5KYTKLrn4B={>1u>4Eh zBG!>Ffc>MlVf*CL&ol$U5tLppiYNgJ3HnLPqO_HzP?4sUCLz@#F8EmJNB1~IxtMhe ziTQv>z!hjvA6IZ(Z>i#k>K88(lsW*)Py$B@+Je&zAWK6d*t1WM64ZJv%V|(OC9)tr zPKQziMWSks)^Jvy6s%U=&~X2^^agcAUwR3cvLW^rGXeXLa{Cnq?Vx}bzYOfmV57(S zclutwKq;Q((c5Ov(gh5UI2jhdBXo_>H7o{(r99GIBXkXmfnh0+bl3llu8@ImMZp37 z;1z=}!JEgI<3FeWR1>!=_r1}}Upf>0&I){7Kx^LEo1@Na zV$YC=E(X1D`QeUQ``>GCJ>a%Z*O;4b+<|8QBDdgXT_!X!<(s!+uhedt-h!@}x9F46 zFtn$-BO-2>qdh+>qtx>C(#NOYXzX11YGp}9*|G9vb-${Zcj37PYU8&hPtePq`x<}A zslr?_fr+<0E80ttUCq(=j{h}o{hrRY(${Y+j@jP+(;-9m=$qz)`+nV7hpcX((_&8M z7JOXYAyyslURSxcY_B!ApVL_t(I%dL`43WP8Wg}s5g646cFh)d7lp#=}&TIkwyWcUIJ zb#S2K6dq0D%gc`~ip+Byhpg)==3^7f&DVsgsuX2eN?q3%!K`D6hT`e5M1;VjWZJb3 zxEbZq2tSuN41$-&syT^-+1?kxcQym4~fd@Ln8J8D^*<3`1A)z00000NkvXXu0mjfgl~9f literal 4601 zcmeHLdsGuw8XttpOR`vBtVS7vr-)^enIw?MNdO^8B1S2oJjCi`<_4yahsgxOLn~Od zimea2QmC(0t3r>D)vi{tsEe9fUA3|mAE%(8)gBbvuC7(7?w#-uPJ7NC&)NRRB$Ju> z9>4p2zx#dn%*~4A8HoXYWBm{W3D9XZDexM|ojyb1Z}7igknnQ6I4y%sAq!Ef&0=Ko z0m>Fx0ScUq5kZ{SOvxt#8gZX4NkZcBSbmU;$*vv8cD2RUeQ{qG?YaDX(A~XvJk6eI zUUcT)vv%JN9I@^DGQ*bf*~z@~UKi%qH725>zqRsfFW-ylcr9$_B~_MiYVl0+lh-OA zHj6@6R=6~wElpotdO!TVbwja+rQfn&E+RYR@$JXaZ;I}1E`4ff2tU8&{rm~u{&Q-c#67?NgV#}y<{Oz~p5fRs1o2qP#K$M=;^TXBff;OAxK^!g zj15}Wx?^R^_;cJWz=PO`G30mV%?H6pT2u>dx&nqf|1$&yyp?K$7gSF zIIN?*P6P+0j|oc{6aG{E_KSkkOX^FU4@%~BHh8`_`-58JJbrTI*{>#!Ff{C&%sVPr zjK_UGW7@fYrCvS7SGk(irKQIzeu{W-B*wKSMf&F(BUZFemqoM%v|ZIF-8njwPma=s zM2Bs{@0Oojon19|QG0el#*OOXp;gsk9|l(3p0K{;<5|Q0;#?-L+coyKe^J$_^K&+Q zo3+Hzd1hWv#5-?h?rGvDyq=^D2^cOOyKC!Ef8ttX%5?g!>gLVh1zn8o%&ofewUmcr z*BXAzFTq`%yEAJx*(%F@x4bxYFy{2)vbkHn`~3a`>biL|@;v9pw2r48*!<4QhsN}Z z2_Ann-Do@V*_o2#w|RKi_M~OEw2NxuYQ2tb{zf)x@sC(whW*)Ph3f~;HQV0CS`qK% z$DP&to7FAqE7uRbo2UHsna7b)w#Ep<-nU@U6)>>4GW64xl*J?@X^Q~}ohB=+Is{S0 zIISd=2Uyeqau~B(@Sy&f0A*;kAU#r#>#gx1m(dp6Kx*-fG^#j{QqY2!Xg`%x2?0!i zB~hm--)vVp)dDxJ65exSkpOj@uz6}hhCUgMx7YwG6-tFTmf&Ox#DZu)RAr-$$`sAi z9tilP7UZ(5RVfk`78VK%B|?iWM?@$T3K1?AiNzSS!0bh4mULofdngCdjiCW{%Enk( z#$rY}OwwR+uxfz->e1f#OjfLkolPi!AUy&7u7^Dh z_NXWY*ewnl1riE?nGNj^K~sJHR);O$oeoWjKt3=*Q#%}$7%*g_PM_T8!BLRIn5=Fu zNcI3rmNC90Yd~zA#+^?8K%jdc?f~oF+}*~|O0QRHER=%_Pp44}xbc;=g<@!>`<5`` zgd~yx7%jnNm{egfVkB;$FoQ%!lLTSFX?bKnD4p5Pl4c5UP!L?mKpcZON-iN4QJ6$Z zL>i(ZWfTc8k^~Y=DpSBxl16crC6N(EN=%cIsDbEq zi;*oPZD2|c!Ux(H<^paWAY~YVWBn)-h1l`7CnIvw^>6CNr@WdJonL79F{|guT`6AM-cxJ-06YT zYzTrvZ&s&I@V?_WBG8veJy4{Bo9Pd9nki}Wvm4hDbw9_BTzbqmq%2lDtjV|R%E^UZ zURCo$_QdTUT6J?s1eiQ7efTFM%h-_7<)?O4r*}<^e(~6E;i3A%PIXSFVob}bt&>)z zeEsln%GVUU^*4)JVvTvbt1sNiSiclxHqI%9QnQ0Ra5cI4QOx3lrWNf$t&f*4tekk$cDU=ExqMgr zy!GJw^l`zfU31R!dER8=Tbfz3wBakZ<_1om_M|=c>7j-{#jbKu_G7Ky!#$ps!q8&% zP5a>ABS(1G57u^MAsKr*wtm#+RJF-@dpa8Ml1;KJmz$r?K>~H_K7O%U>r-~QMyj93 ztDUs6Y)eGaT2TFD$d|5DJC~n5_cNR;9>~xc^?GD7y!U}8cU(%X=$ae2wtVersion", - "appbot": "$appbotVersion" + "appbot": ">=$appbotVersion" } } diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index e96873c2..ef746752 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -80,7 +80,7 @@ dependencies { modCompileOnly(variantOf(libs.mekanism) { classifier("generators") }) modRuntimeOnly(variantOf(libs.mekanism) { classifier("all") }) - modCompileOnly(libs.appbot.forge) + modImplementation(libs.appbot.forge) modRuntimeOnly(libs.botania.forge) modRuntimeOnly(libs.patchouli.forge) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index f1002b57..27e024a6 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -38,7 +38,7 @@ description = "ME Greater Accumulation Cells - For when kilobytes just won't do. [[dependencies.megacells]] modId="appbot" mandatory=false - versionRange = "[$appbotVersion]" + versionRange = "[$appbotVersion,)" ordering = "AFTER" side = "BOTH" diff --git a/settings.gradle.kts b/settings.gradle.kts index 33cae985..4929093b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -43,7 +43,7 @@ dependencyResolutionManagement { library("curios", "top.theillusivec4.curios", "curios-forge").version("5.2.0+$minecraftVersion") // Applied Botanics - val appbotVersion = "1.4.2" + val appbotVersion = "1.5.0" version("appbot", appbotVersion) library("appbot-fabric", "maven.modrinth", "applied-botanics").version("$appbotVersion-fabric") library("appbot-forge", "maven.modrinth", "applied-botanics").version("$appbotVersion-forge")