From a16908d3e0e2cb2af7f5b01fb236f23314084e4e Mon Sep 17 00:00:00 2001 From: Reclipse <17797013+ReclipseTheOne@users.noreply.github.com> Date: Sat, 21 Dec 2024 18:08:21 +0200 Subject: [PATCH 1/2] It was a pixel off --- .../assets/nautec/textures/gui/mutator.png | Bin 1455 -> 1463 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/nautec/textures/gui/mutator.png b/src/main/resources/assets/nautec/textures/gui/mutator.png index bda6c97fba640601cc6c2c5f5beae6f2a0637f76..b85e4aabbb56d32dbe34d02af0fca6d34d93b1d7 100644 GIT binary patch delta 1101 zcmV-T1hV_D3%3i9F@JGML_t(|obBCfZrV&32GEzPYeH(-23-hJ_K}54Ki zU+Rxrz?X5Jb0m~1CQ}QTXFOy4dR6Cj7q-DzR&(z_l5;P1*LC_o(_5`pRYG7g-%tGR zZ|8q|dz*G|i1+K)uiEeTT?v6nd^@*6=ZCNFYybdXp8$YhA6C}@toqTCOP@#U0|WV1 ze_rUW>$*BVU`~g_p+0^d`;RhM4dz=_>GU*Xx7*c^A3rWW=WsYw34uYZs&~%c>OZY} zetxd1s{MXnWjgSXe-;6Ce#qi1lOY5te>+tbcyPPj?%_7J+ih(&n*sKQYrJ1MCJBJ5 zKOcxkJUu-%d%5!K>uXijO&|ErJa&*f}sC6 zZokFx13lHxk2agl$wzTmNS4eeds|H323M zfLjjj`-^~=wAlHp>aM?;s`DTBe-Hk-GtgMy+}iDSwcT#-n%5uy#y86z)1Qu9a(urY zG3NW_&OpPN^a$WM@4qz!mb?)7nGQFlmiC4DISVj?Ru|oLe)?uv1iUuKUuws1na%E%Hsk0e$9bKxn}vM*!RHww|7zrueUBb?%hg$L&jy4f1|5(P=;! zlGA|0F$I%x1RsCRdNttExrruACjcJQa_KC%MgR=pmg1$Se8qYQEQ0WX@0P z1i(lf`m+QAU<5{fmO=mw%*fA@2!H_@`B@qPFc2d@OC%Zq24Li8sRY0S+(eV5695m` zY&ME{uxP#s2$LTKAt>zPwE#oi{r2VMMLXKLyB&8=9?#W_frhyI?aRxHcC>SMJ1)2y zk13NO1S~vE06?&d^#F#t`>l4gLz`Ar)pcE0RrSBZ3n~I>r-gR<6@i|gpR1~Bzu#B= z`3!R>6@j$Vd^;)vjmH|3Ap|UwKm-IG6@j$Vd^?OsMIh}o-;Rnv<53YvJI%MFBG7oO z0h15`7?VH*4U<3w3N%v@NIT89!+0)M1cDZ+2s9j100<@kAeaDvU>6qwRRz{g3+?o) z0y7*{fwj|oI~J$MV+xZV1TRHQRbcHj-wxwZ6_~|Q6?izN01!+7KrjKoq8tzZ8OHaj zTCG;A?r=DGaUsm{2w?T|=g(Pp1U|z8;4u0xU^mNNz~|}wlR*Vm8vpNjWH=Z#bFY2`Yncu^h7WdwOG^bwh{eG|gGrh%PQ6&T>^<(h= z_s0MF`a1pA5bgKx-?iOt_ay`-^Kj~y8b4$>82~^A0RX`cb58(f{piU@pGWfp4L#I< z6Mu&r+|zEitK-k(@K!pjrXDnUda>DT>gUg&A3kQc+f@mHW){Z>{muT-D-;t5t)o;WOT^ETacN)!z@qEgl~q zyFFd`<>jTS>Y@+)R~~y$-}(LGUxolTI5g8+B{3i&8x5NFHIDDX| z`gv@%TAjQNx9yV0PPy$ufMc_s1YE6F@8jF4eqQ3Z@m>0yvA2D=edYwHnm7P1*|i@| z0)C{&#$Q!eJ!h)Me}C9Ms5-hb&{*Hx+H5wpUazkj*B_qan`O5d4o5z6c)xBj=KJN! zKy6L72XGkoUm5~)o(TL(gPT%M+d>~41!%0-NjHt3QzoAT{A`Rr*M{FSjh}Pwb}qno zZ0P5Dd$aEJ$~OTU`O4XV(2LRc0M_euJw85;{b%m(+#$E)`w-_K<^AHX(GLScOAZ6J zWeAhe0~nLf0|$S*+u49~=OUVX2Lj**JujUFmkF1VCeYe&$2~G^FQeZUjIhdVc0e05qWIXRa6oz>W0$%$WeVl8b2a9SDFc ztyU|Gc`$pEZUZGI?70A~u73Oc{H%^TSJ!d%n+p=MId#0s54v<=;`UHs;aizZB^Cc z=06h7ia_dgUB`+*<1z=6(E}Kh&jS}7%!)wjbX|vWSrJH`uIpG4Xk1nVQm5-WRs@o} zu=`ItKNgEc?RGmaE(Ch0s>QEgzwW&qa4{2r?Hs>|`@3xge2vBrlTigulVAl37{E96 Y2cXQzCs&JB_5c6?07*qoM6N<$g7;b*;s5{u From bec3045958a0fbba01838f6f918050542cb3aa43 Mon Sep 17 00:00:00 2001 From: Reclipse <17797013+ReclipseTheOne@users.noreply.github.com> Date: Sat, 21 Dec 2024 18:08:41 +0200 Subject: [PATCH 2/2] Mutator Menu --- .../blockentities/MutatorBlockEntity.java | 22 ++++++++++++------- .../nautec/content/menus/MutatorMenu.java | 6 ++--- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/portingdeadmods/nautec/content/blockentities/MutatorBlockEntity.java b/src/main/java/com/portingdeadmods/nautec/content/blockentities/MutatorBlockEntity.java index a692acf..faa7439 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/blockentities/MutatorBlockEntity.java +++ b/src/main/java/com/portingdeadmods/nautec/content/blockentities/MutatorBlockEntity.java @@ -38,7 +38,13 @@ public class MutatorBlockEntity extends LaserBlockEntity implements MenuProvider public MutatorBlockEntity(BlockPos blockPos, BlockState blockState) { super(NTBlockEntityTypes.MUTATOR.get(), blockPos, blockState); - addItemHandler(3, 1, (slot, stack) -> (slot == 0 && stack.getItem() instanceof PetriDishItem) || slot == 1 || slot == 2); + addItemHandler(3, (slot) -> { + if (slot == 0 || slot == 1) { + return 1; + } else { + return 64; + } + }, (slot, stack) -> (slot == 0 && stack.getItem() instanceof PetriDishItem) || slot == 1 || slot == 2); } @Override @@ -62,13 +68,13 @@ public void commonTick() { ItemStack result = extracted.copy(); -// Bacteria bacteria = BacteriaHelper.getBacteria(getLevel().getServer().registryAccess(), extracted.get(NTDataComponents.BACTERIA).bacteria()); -// bacteria.stats().rollStats(); -// -// result.set(NTDataComponents.BACTERIA, new ComponentBacteriaStorage( -// NTBacterias.EMPTY, -// 1 -// )); + Bacteria bacteria = BacteriaHelper.getBacteria(getLevel().getServer().registryAccess(), extracted.get(NTDataComponents.BACTERIA).bacteria()); + bacteria.stats().rollStats(); + + result.set(NTDataComponents.BACTERIA, new ComponentBacteriaStorage( + NTBacterias.EMPTY, + 1 + )); getItemHandler().insertItem(1, result, false); } else { diff --git a/src/main/java/com/portingdeadmods/nautec/content/menus/MutatorMenu.java b/src/main/java/com/portingdeadmods/nautec/content/menus/MutatorMenu.java index 7965d5b..413846e 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/menus/MutatorMenu.java +++ b/src/main/java/com/portingdeadmods/nautec/content/menus/MutatorMenu.java @@ -18,13 +18,13 @@ public MutatorMenu(int containerId, Inventory inv, FriendlyByteBuf extraData) { public MutatorMenu(int containerId, @NotNull Inventory inv, @NotNull MutatorBlockEntity blockEntity) { super(NTMenuTypes.MUTATOR.get(), containerId, inv, blockEntity); // Input - addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 0, 25, 25)); + addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 0, 26, 25)); // Output - addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 1, 133, 25)); + addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 1, 134, 25)); // Catalyst - addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 2, 79, 54)); + addSlot(new SlotItemHandler(blockEntity.getItemHandler(), 2, 80, 54)); addPlayerInventory(inv, 84); addPlayerHotbar(inv, 142);