From f7ee14e993ea1bf6d10388634b302fda29c1804c Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 1 Dec 2025 08:28:18 -0500 Subject: [PATCH 01/15] Add textures --- .../advanced_block_update_detector_active.png | Bin 0 -> 647 bytes .../advanced_block_update_detector_inactive.png | Bin 0 -> 630 bytes .../textures/blocks/block_update_detector.png | Bin 417 -> 0 bytes .../blocks/block_update_detector_active.png | Bin 0 -> 580 bytes .../blocks/block_update_detector_inactive.png | Bin 0 -> 577 bytes .../textures/blocks/magic_wood.png | Bin 139 -> 617 bytes .../textures/items/block_analyzer.png | Bin 163 -> 229 bytes .../textures/items/golden_bag.png | Bin 454 -> 262 bytes .../textures/items/inverted_ingot.png | Bin 311 -> 462 bytes .../textures/items/inverted_ingot_stable.png | Bin 351 -> 497 bytes .../textures/items/inverted_nugget.png | Bin 197 -> 192 bytes .../textures/items/xray_glasses.png | Bin 201 -> 265 bytes .../textures/items/xray_glasses_model.png | Bin 322 -> 296 bytes 13 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_active.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_inactive.png delete mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/block_update_detector.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/block_update_detector_active.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/block_update_detector_inactive.png diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_active.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_active.png new file mode 100644 index 0000000000000000000000000000000000000000..9b95666d5250ef6359a2ea7dfd568f5b44b61e00 GIT binary patch literal 647 zcmV;20(kw2P)Px%K}keGR5*=&lQC->K@f$%7>QfStH5HPIZPUJMH&-_fYlopZd|w&q;{%nj2cyu zl}d%x$%Ugopw1>;3M10S5D>Tu9PWhR4$iXH-dkKG#py0qlc@%FX5X86Z(bc99{vGP zN|7W9FY}F!4d(MXLI?oTG{qQ$QmV*H07pkhNGZ`;Bc@wfsCj#?zY3cKaWLBuRLFe#X<9>qY}> zEj#@_JN-Vlx3}Eg-SPhXocdsZ<2VI?>$(_YG6v;xnQtd21#%u?7!rmd0N!FuAq3+f z;OXfJr4%Kl)Y6u%wOltEgki|%(TJ&(eBIr}_kG?h1kmq*L6`!Win1C6Arpv z;yA`yTcG>CkMH{hi`i^Onx?!xJ0prB(ln)%BnjnmnW>cQ4~L9{fN>BYgrK&dTSyD+ z^!s>P^RQrB7-`b!z@i{$0T9PAaU2(Kp4NpMjWMhUAqrDWIvqT%sSgHAlCH0>FE!`p zt5ho45_4~Bt@(X%0l+)gC5j^I^*T`$@zCpKv|rQ$l+rZi>go!m6ha8@@9#0jz~Zd) hvjvLt&QIDH!(ZR_B|r)A7k2;v002ovPDHLkV1oSdB*6dx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_inactive.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/advanced_block_update_detector_inactive.png new file mode 100644 index 0000000000000000000000000000000000000000..c13d8944fe4e8cc084fb021d171f60b209da37a8 GIT binary patch literal 630 zcmV-+0*U>JP)Px%FiAu~R5*=&lRs+|Q5400vwwVVH#@~6JL%V{5`vxE34VYSDPtE9MQ~RHSGIGB z*et9zi6GcmNeUtP2m!mKH`Q24nt3o;W|KFMWm${ac{&!p>J|6gd(OG%dOJHiO8})5 zNs{pQe`8~VG)<9G0+3}H#u$`R?q37g-QA_tYB8J5Xti4W?-eySH#eM|oa7A(Fu=w0 zS9#_B9ss`YBZMFw9|CZ9^0qXnqLgyrpMy7u#gg`*hwu9Uq-l!Q8h_ZwRy{6nh57}Sy^VLqQD7EA2oM_6k~ z4?hE-S2Fl=3_yF(Lk#=a$q_*i{4ud!uXE?+Q*4^%dRK-;Q3OB;h{X~BDJAVekK5Z@ zlv31`QYDwIwXnZO6h&;EonxyW(S!ShVMwrAr?r-5vq_R9RFWiNZEdaOxNBDR+~gt$ z)9Dl;1aTba9so3(%@WZ2`i(6!=f}ftF5&wH;_MtbdhJ3L1OZB^e2rIESES=ZwAQ(V z)$}k73B%B_m`$#Oy3 z93QxXf(3xq8m)B+T%^$$Lq$sILa{kMKrEIn2Zb-~cDn>F!q;dtaubVe&t^03efr=` zisP7Ww@VzybUwc4-&%lLmSvoto}!dOO3C&0HO3fNopo`xfIIKvq>VBB27nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;aB>!N_{ z%yt&AcovWi0trA2(hsB2EM;J3V3@$pzyefZU}S8-xBy}*NC)czh)Gj`Y!F}qn!^NE z8DwbzWI=Tq8W@0NS2rjM2hX$605StST^vI!{F6-#41SzPx${z*hZR5*=&lf91GKoo_)Adn5r6eD@i7LgEg#RDw;YFi3Qr1YtHfUTlc9wYk# zbkL?)q104cQCTzyA=#3Fv9T=|Nnt#@L{VkrvMi$k&}y|Pio#B=BM1V5 zAOPU*`pmK{0k~W)D5YpBrEXX*ih|ealpqNBwpwuzf*<$y_`c8QtDHqq(CKuDd$!cMMza5|kV4?sm?r_;f49Q(e<`J69F!uN*<0KTr*+^tspdVaR1(psaG zs$|^n_tpb77Y8BmeIMWVEsE3WM4spDc00l_B+v6og;uL&VS1j&+iZsGy2vZspHENK zzbnFzVU47<#`8RkF&0H_o+yftQd*Y|heMJisbq9r*Vl3^mhr!H0h)Q9vs^AwO5wUL$K#PK%iy}!_1Xe1r;P)Px$`$bN~Q5suv?$&qfm4!m#^CUrtZM<5~%zN|Z&FJLh4&1S=Ty(WYp zY|65f*hyX2bX|urhUIcemSwolUwXvzv%cEb?*N$hZ~FhvVXb`>F^VEW2!iZ(EQ+E4 zAP3^#4*+ys2f%i_MQhDOYyC{+5CWW^Q4|HoSJ#BS5yi_F z_V@Sysd(5M3G(2B)oLX=0DTKdk`TwS^f&tUgJa+E>(#t(;pc+*>KgUwgP6)%i`Kdy zX?2X9toIKBk#cH*pZCh?{Zz;=?wr%?qEjs6T zdc;W9T8uF`=Y+*zo~o+IvP@ihbaX`1G;|m)9+B&7$Y%hnm#&l@OINQ z;xKD1Wmz(x&qeXSV*w^@+j4n%iPjpW6!-V{c<*7i*2CHYvfjf=d++%J2S5_u*l$@c P00000NkvXXu0mjfsdgA< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/magic_wood.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/magic_wood.png index a738b454f14f7d6c732198ce7021584c358c710d..cb821af3695215bf2c65d914bd7fb35086ed80da 100644 GIT binary patch delta 592 zcmV-W0<^k_d|IDoNuw8OJV*@uOAm#@Az?bMC$8 zj`i`~(QQ62`7!DMa5d;No95h&^{&(8z1E-XjxO exSo7)o&N(tAPbggwfxWk0000)q(2S)5>9Qe>0000+l=L_t(IjbmV-5HO+(80nk-$EV@k#nUKyP&hEnYncCH)g1Dd z8N(1JbVax{SF@L~GL_t(IjbmUKlwegq!~a$N4F7TQkpUw%&0Y==_O=5M8krwf zh^mJLo2gIVsWV6m-Gpm|i7_zTBhv0)z9$%%XtXiw-CYpavpm) zFyS)j)Fo6J7eFxp7Jx8KW_qZGcsW4SAnU;h#E;)(7|isZz*hM%Ltt_Y3{OzhV|d}q z4{oSJOoPAt;KmTgnhx~!)ERgy)37&w3&Rt70XRt82O%L|C5p=^+AG#Ht|;!HrcAtMvmbx}Ze zW;+X5JPXJMfdn81>4(v1mNGCiFic=)U;(NyFfuk^TmUf@q=R(<#H1-eHV7~Q&0zwo z46?KUvY@&Q4GciCKIad3sPUpR z!RgJbzyqu5+W!B~PdL7V=NQ+vb1oTotR}Pc@>s+)o-R`>VXS%ZpI7Nh@@Coj+8nbz z7y@z_!Wzy>2N?2jZ&d5~Z!WPTEI<86myX!0lM07c9Q+^_nKOfd;cr4>rB{BfC&)3L Lu6{1-oD!Mg zn{v+4Ime%M|8G!r&htF0G_AE%x;zCHMKM{g*Uv@dGXMnuoqtYepQh<`Wg@@pwB2q! z05}{DXG*EtIF9#9DFOgV9{@(9(Y4lEWVu{&x7(p8ib*ZVLmbCnPmls|AW37)>w4NC z2;jF`Elj7=$#^_|Wvxv~iiqq1+ygip3SzeJ8lIH+E0l1B# z=mNk80MCxcV;jKBM}uaw>50hWL{8tJh-|_z>;kwWxoI>S((m^#t9M#!@wL|Coa1aZ z%evhz03eE@Bfq;SlA9z+ZtBo4i&UA+=kx58pq(U1_8}*zUO!ya_u(n%->Pp1Rj|63 ST=Gr;0000CuF=A0K}6#{9c|f4)YW!J|t@4jgD$Bq*sMeQ3v<^Kbv#%Fg9s-56QG zy2C^-Vk1|peAv8m2M!%La3DZn_ECexk0xy`9R_=5nap`=_@q8Ep$EuoW7Q5jm{~I` z?@jFqpuz(S(wR&do;}$RP!E!Mc$I~Dzx`i_9S^=dJq>oyt*ERD(|`ZIG%M~hl|Q#W z!8Eny_@QrSXG?&thTaF U4rpRvVBlo%boFyt=akR{0P&f9Hvj+t diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot_stable.png b/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot_stable.png index 42f8946806a03a192555f0e747fec1fe5fb28130..de5a7be3ec46b633624a481c4c252e76c3990ac6 100644 GIT binary patch delta 458 zcmV;*0X6>L0`UWoF@LK`L_t(IjlGhwiW*TAhQH&;CfbNw%odyA2qRNXXOU)bS|7vG zY74Vgma%b>kffN}SFo{k<}Ct(PN5Ko;Ic~y#6(YuID?ptX+lnQ@8y2q;c$NVUlqr( z#&N8t@A5Y&Jts*5fN7domX&e837&!ghQnbOpwsCLjwNyq3V(v2H=oa+iO5&L0Jyrk z+8#?Jj$=LTv|g`s0K47p(lCsB$8olXVJLvA<^fu**1$AP^0V2D&1ORo1igdf0{G!L z&UeEwJ{>x%s;ck%Z_`GL#R7nQsZ^rh@Aum6_M0#aJE|%ovIQQ2%SNMdmqOF&^d0a` zL_VwPb+uZ($$tY>DwXF^6y5s1KMcdL+g1_z2#`PC z#$+<-Hk-|16h*hHDyn)7d;#ujwc1Ny1zha+dlPt-35vyHPDHYm9>!1+S=zS!0(el> zWuZ`zdcA&={xeOJYzw2&s9P?Vab0(?TCHB|FN>k7>O*SpWb407*qoM6N<$g37Vv AKL7v# delta 311 zcmey!e4lB8VZEfMi(`mIZ*sx{@gILaU;cmI-u|ze&SUq^{1MVScKY1$j>`-= zvm}5(?(SYj!C*JjmWdP8H2E^y`1jvGaCG0_zb6%zuQ~YOcleyf>2v!he*Api|Nq9! zq=W>Aiyb@@coSp3J^%K9UY}oE(+!;+Ofgd8Ya&_?@oW3Hw>Z{2=7=3`IeJ+_Na@gr ztV;#cj!$T3PjYgRINT(<`hkg^ulYB-lmsBSVB9FhP+SzT!X6~^A*-qJ{`@+Hn1WxQ zQrSQtSJ!lpRDJ!gg93MF@jp-hADrHB{Lr_vvq8?5SQodqFHv}xn#6K^XbKZ_NG}Iqz*JpQ~H>>NQ;5t-<#P-cC9;GiHX4->3g$Q-{+4WU%|(ew=c6!(hwl6$}=l z<_zED1sO>80s{jBgN3L$g8-`tUe^)j1+u}iKezwm3cOK(02Kh3swlGjl&RzZ0000< KMNUMnLSTYBM@ek} diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/xray_glasses.png b/src/main/resources/assets/utilitiesinexcess/textures/items/xray_glasses.png index 2bca425795b0d0b35f08fb9f4cdcb23c362fa376..2d113091f1f78576a05b3cca179f849f95ebc47f 100644 GIT binary patch delta 221 zcmV<303!d%0f_>TG=IQJL_t(IjqQ;^3W7ishQDzkiYqgM#1IBLf#6{}Ktu&N;z0)jApaW2}78* z&bQ`v6JbObgRYJS?*xI5>w4NeGKoK_WD@JP9tJ)DVm^&@^;WD|1rceU0Z|V}q`tw^#WBR9H#tFq^$MexQPBUJH!K1+OzOE(pY%j>YRZy-_LX1z66a14 zVg`cdZFl_HK;Wyezhugh76}meaMF0w#=<}6MMF{xp8Vl17u=)-Qd0BD$Kc@K`!gSM zt+Puy{y|NzQccoOvF+sh{A7(L%ZU?gjy76wtq@~ii1P8$win7QWdH(CS3j3^P6Az^jz8JB<6E;%e=Um2xv)$)>gaw433{00#=5t2V8u-aEB?u~zr4+;jgUU+r=T z75n-oZ(j31Keok*lTxhaJ*laiU9@|?%1^!hbMBUu+A;6H{_E3rGqcw!l~tAhrp%R* zd;05<*5!{Xo<-SqEO2+g7!CGcxVT?r?K=PG!AFpor>mdKI;Vst0H?)ko&W#< delta 279 zcmZ3%bckt!N&Qbx7srr_Id88W^kQ<9VSg~6HH>SLsO+?*%?h$rU2zM)f4ExJx^AyS zIDev?lXFuSU!uCJ@Zk`yN52yirr&?}=G+^e|Go@xpx_ymYPc@!`}3&PI>%N&`!n~{ zGTAMslI~R3oGQKOH7RD!UUkoN`SL;Y(Nrh($ From 8cb207e99ca9e8a760143b670e5bba3a78589e42 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 1 Dec 2025 08:28:30 -0500 Subject: [PATCH 02/15] Use metadata for bud --- .../common/blocks/BlockUpdateDetector.java | 18 +++++++++++++++++- .../TileEntityBlockUpdateDetector.java | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java index 91eb9bfa..316e94b1 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java @@ -3,8 +3,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -12,10 +14,24 @@ public class BlockUpdateDetector extends BlockContainer { + private IIcon iconInactive; + private IIcon iconActive; + public BlockUpdateDetector() { super(Material.rock); setBlockName("block_update_detector"); - setBlockTextureName("utilitiesinexcess:block_update_detector"); + } + + @Override + public void registerBlockIcons(IIconRegister reg) { + iconInactive = reg.registerIcon("utilitiesinexcess:block_update_detector_inactive"); + iconActive = reg.registerIcon("utilitiesinexcess:block_update_detector_active"); + } + + @Override + public IIcon getIcon(int side, int meta) { + boolean active = (meta) == 1; + return active ? iconActive : iconInactive; } @Override diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/tileentities/TileEntityBlockUpdateDetector.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/tileentities/TileEntityBlockUpdateDetector.java index 03ecb843..29ac554f 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/tileentities/TileEntityBlockUpdateDetector.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/tileentities/TileEntityBlockUpdateDetector.java @@ -17,6 +17,7 @@ public void updateEntity() { pulseTimer--; if (pulseTimer <= 0) { isProvidingPower = false; + updateBlockState(); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); } } @@ -26,11 +27,22 @@ public void onNeighborUpdate() { if (!isProvidingPower) { isProvidingPower = true; pulseTimer++; + updateBlockState(); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); worldObj.scheduleBlockUpdate(xCoord, yCoord, zCoord, getBlockType(), 1); } } + private void updateBlockState() { + int meta = worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + int newMeta = isProvidingPower ? 1 : 0; + + if (meta != newMeta) { + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 3); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } + public int getOutputPower() { return isProvidingPower ? 15 : 0; } From 906eb02d3f4c3083390b87fe8af944a08e0725c7 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 1 Dec 2025 08:28:42 -0500 Subject: [PATCH 03/15] Fix inverted ingot renderer to work with transparent texture --- .../common/renderers/InvertedIngotRenderer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/InvertedIngotRenderer.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/InvertedIngotRenderer.java index 65d8023e..5960de72 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/InvertedIngotRenderer.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/renderers/InvertedIngotRenderer.java @@ -126,6 +126,8 @@ public static void renderItemIcon(IIcon icon, double xStart, double yStart, doub if (icon == null) { return; } + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + GL11.glEnable(GL11.GL_BLEND); final Tessellator tess = Tessellator.instance; tess.startDrawingQuads(); tess.setNormal(nx, ny, nz); From 91e437bd3b3960e2b272ec5ddd829a7149d10418 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 1 Dec 2025 08:28:53 -0500 Subject: [PATCH 04/15] Remove obsolete tooltip from golden bag --- .../utilitiesinexcess/common/items/ItemGoldenBag.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemGoldenBag.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemGoldenBag.java index 8642c60e..9b456ec8 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemGoldenBag.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemGoldenBag.java @@ -1,7 +1,5 @@ package com.fouristhenumber.utilitiesinexcess.common.items; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,9 +22,6 @@ import com.cleanroommc.modularui.widgets.slot.ItemSlot; import com.cleanroommc.modularui.widgets.slot.ModularSlot; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class ItemGoldenBag extends Item implements IGuiHolder { private final int inventorySize = 54; @@ -49,12 +44,6 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla return super.onItemRightClick(stack, world, player); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - tooltip.add(StatCollector.translateToLocal("item.golden_bag.desc")); - } - @Override public ModularPanel buildUI(PlayerInventoryGuiData data, PanelSyncManager syncManager, UISettings settings) { final int panelHeight = 220; From f3bf78be3b622f535ea83f8fc9040f21777a7f56 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 1 Dec 2025 08:32:56 -0500 Subject: [PATCH 05/15] Move glasses down a bit --- .../textures/items/xray_glasses.png | Bin 265 -> 266 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/xray_glasses.png b/src/main/resources/assets/utilitiesinexcess/textures/items/xray_glasses.png index 2d113091f1f78576a05b3cca179f849f95ebc47f..c88d65359cfa8bf73577ed360c2bcb2c12faa632 100644 GIT binary patch delta 222 zcmV<403rX00*V5VG=ITKL_t(Ijn$D&3c@fHguiqVTDpoA!BQy{JVBv{@c<$oNW=qp zn1Uw|grX~<286ETLMoy3&y_gvAYtB2=DonLA?%A%%G77A^(fA1HfXIKI#3I3v(^`e zVD~!Tikl|FiY^9KEe7udzK4{qu`7wfPpTveO_Nu?2Y{GQ16NZ%D^`9$oTUI1`H5py z63r$6-0qJ~UP$Sh-Fn0Ie4)rs0K{3!Vwtc#>;dTGJHKo!L=uIjFXGS$ol6>8qRsy~ YUjIpLPA*$C6aWAK07*qoM6N<$f{BD-e*gdg delta 221 zcmV<303!d20*L~UG=IQJL_t(IjqQ;^3W7ishQDzkiYqgM#1IBLf#6{}Ktu&N;z0)jApaW2}78* z&bQ`v6JbObgRYJS?*xI5>w4NeGKoK_WD@JP9tJ)DVm^&@^;WD|1rceU0Z Date: Mon, 8 Dec 2025 11:22:06 -0500 Subject: [PATCH 06/15] Floating block --- .../textures/blocks/floating_block.png | Bin 257 -> 809 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/floating_block.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/floating_block.png index 209caf8976997e3d648f22a2f28ce9ffd68a4d73..7dac47af6c31cd753a4f464dc669856e1c2a8e12 100644 GIT binary patch delta 773 zcmV+g1N!`d0;vX&FnWiiiY-2-XAz(;s9sO=wAmPLh|5Gs(Pn z-eC{-0YG6banZ4`*0`hxNbsegosF=!K@b%0WaqLUER zhGXK<5fpuXyVGWAahr{`9fT^10_RhnJ^miM-DSqc>b&)K$h+q?;Mng#KnZf~Sh*k5 zxHm}ipHUj?zXFF8h2_kv?{lxw;2?+9e>Z9EoFEF%^XAlD(3U`JSpIvTzy56T`=TZ3 zK1S;T5H6g%!hij>WdNKjFvf8Ek0#HZY+#EjlOvV@fu*I#++Hlx$@b9N0|w{d%dgge znCUC47!zS_N`2@BZvD7L-&HvEL6ra{Y&^*5WF4&aKn55V=BK!LX@w{n;HMv6?sFTOrW5N;rNv_|87#w(-m zFgur!wk-hP--u~*Ov$iar`Cp>>(fWR*ud{ih&75FjE? zjoaM{`+tWm6bc=d2_OVODUJ7*huaymbKtxo>82tnE>&yus#f2k4Pyhm5~?hS4}ia)(9ST6ht2uJ5W$rl$2CNX=ssGiMx!EhFL5o zKx{yXT&2hqP(+CwVjKB7`|kfcf9q#W+igWDsbozG=E+c$5)ms_y+-xg%U!Mt0FmnK zqLMWtM7qwQ6hOEEfEfqOI7Cx;8~7YUDS`=H=U9sDc7JR!hf*_x{CJ^y9dz_@;wU)7 zQS�*n554w?WDbT698G$cH3t$QnA|Qy^X6~l8fib@OoNyXWBf+ TROFZ)00000NkvXXu0mjf(fMLF From 26742620c70b481f59dcaf714b01414338aff794 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 29 Dec 2025 21:48:42 -0500 Subject: [PATCH 07/15] Update inverted ingots --- .../textures/items/inverted_ingot.png | Bin 462 -> 526 bytes .../textures/items/inverted_ingot_stable.png | Bin 497 -> 635 bytes .../textures/items/inverted_nugget.png | Bin 192 -> 231 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot.png b/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot.png index d4cb88c990e12af6fad941d35ef08b43ca986973..7fa9e9e7945760142f328b728a2b3ac8439630b2 100644 GIT binary patch delta 487 zcmVNYP zpsJt>z|8Dy7=1gmW@)4D55ITVX>7XaXN0OEBIF7MtnCYk^x?~sQ{l;NM{{{>GM%Q` z*mSqcm9YJ(<$o0IdkcujDd_9xFK%FCL`YvuV(}h5y4?Hl-d(?OGd$Scb6fx`{gA{$KARCIvKR(IfDyxkTQkN!ESJo}+F-hGZf(2ak>UR5kR+^ delta 423 zcmV;Y0a*Ty1kMAHF@K0jL_t(Ijn$I9j@m#Jh0pa^NuWX60*YmYEZOo4pivr&X?YAv zsx7Q_MH!l1Sy7V0HLpNJLBY74CrCv_3Z#hDuA)dG3nxYJ%K6*0$*o3b<~#R{?gjpv za?a5?$DeioZ%}p4^E|6Gt+iCTJOvd+FxmWOsCVycszb(txZXai0lE}12`KD1~(P3TCLsy_#z@7NuCEmaOnd;uh)A~mgSW( zCb!n6#+bJiWPh!FNAg}o?mW*U$#xiq6p{D!DF^^87K>~+9Oh+NUXc`%=KwwdxQ(Ld z0>B3V&yL4q8^Fs)gJ!eoiOAzbPT!!2Y{D??0=Of&X*3$r@AogOcUo)lwbtUC<7_s| zy4@}SAc~?Rzq=@snd-HXRGG}@^X!zMog_*2Cm^U^KU~!J;VJ0fs&5BXu)3FA R@=gE%002ovPDHLkV1kq9#?t@* diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot_stable.png b/src/main/resources/assets/utilitiesinexcess/textures/items/inverted_ingot_stable.png index de5a7be3ec46b633624a481c4c252e76c3990ac6..36aa17f65b1be888cbdfad968dbf98fd0bdb7db6 100644 GIT binary patch delta 598 zcmV-c0;&D+1N#J!FnELZTbKiYP>* z5(Hvos~Z>i6LdX`yZ0ZM_!lS(5CdolXWasZ` z7+B%(UJw+fEh~(O6~T+~F{PPtYjD_eUH8dwch}P+!PM&7Xb1@Q_V)wd_cP(Jgkgi# zg`E1ny9<&M%na6ycs!1qLqm^UH~QdCx?@sg-@bq32f;I~H423SUQJCZ-}eCk1cH6DkR(fx1d@pav}Q;t zk7Pvv(ij6fVnMS;*~9?I08Cs;JA`c8Lb9>hvn&gO1mbQ*zjT~vU)z=L`IX#)s;aIk zeNHj~izLd%`lbsW1Yiuqww+PivA#&iiffl!XXHS-JvXtq*w@+9GoRmhrvN|_A=TXM z0e}z!u}@gV2s4|a;PZpsozMSR<(DgKxAy{nx_pkhv3>|s08llM{$1VEbE3+#tLwcG kMr)$jKu5>SSzX_g#0EWY17ogMW42~so4u1-Qpf{h-pNYs#&Fg_hRtE#H+`)|`mi^T$fe5q8T-|zR@?e?263_GeSBC-V@fy+jtahF2V>GU1& zO+-Gc>UFhRy?@CAR4SF{Q54o1F;szmB}-rX^jmStIzoxg2<&*ZmW89K7sunul}HlLAf>c@Fxg^%J+x&^hB(E?EEo002ovPDHLkV1ff> B+L_t(IjbmUK1&p{PR_#6TpMimafsK`wA;8WWr#cpFf@}95 z`p?e65xi`{Tn0%=NrnxFj{e7G2oo-oVVW5j7#OacJ=3-I_{sl78^FQA4rdGU3z}cO zcKy`v-+!=Lgwt Date: Mon, 29 Dec 2025 22:01:47 -0500 Subject: [PATCH 08/15] Smart pump --- .../common/blocks/BlockSmartPump.java | 26 ++++++++++++++++++ .../textures/blocks/smart_pump.png | Bin 214 -> 656 bytes .../textures/blocks/smart_pump_top.png | Bin 0 -> 664 bytes 3 files changed, 26 insertions(+) create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/smart_pump_top.png diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockSmartPump.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockSmartPump.java index 263a0528..6a82656c 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockSmartPump.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockSmartPump.java @@ -2,11 +2,17 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntitySmartPump; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class BlockSmartPump extends BlockContainer { public BlockSmartPump() { @@ -15,6 +21,26 @@ public BlockSmartPump() { setBlockTextureName("utilitiesinexcess:smart_pump"); } + IIcon sides; + IIcon top; + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister reg) { + sides = reg.registerIcon("utilitiesinexcess:smart_pump"); + top = reg.registerIcon("utilitiesinexcess:smart_pump_top"); + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIcon(int s, int meta) { + if (s == ForgeDirection.UP.ordinal() || s == ForgeDirection.DOWN.ordinal()) { + return top; + } else { + return sides; + } + } + @Override public TileEntity createNewTileEntity(World worldIn, int meta) { return new TileEntitySmartPump(); diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/smart_pump.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/smart_pump.png index 6f502b5a8d7aa51162fe811dc16aca5872977e1b..622e90aceb8c101309e477944685be77be835fba 100644 GIT binary patch delta 619 zcmV-x0+jvM0gwfdFn%-6hO~=Gds($%OXn0k3o+J)5Y$8zKMGug6_%ZuH}huZS*$K0*cfi}iksYb z?z#7hOkcm@6d?gb(PesOkQY=SUmc`-z4`i&t7_8cL<}1Pz5Au z%A>K{bhJ2Bynl#^(Q$Mbkj*+MuYxdXWk#6Sa zma+d5Y~*^`{``)hwo4K#GH!w1>Kd=S9-QVJDy)JK?0;`>acEg=EN&imu(kdg6&@ml zgfvC@2Q(E7VIoM=6r%!+Wn)eAUL*(yWc-jJ19e_Fii!d4JHbSwWg)m zh4S_Q0c5epzf{6hf+K?Rmk%UKf^eEpI;J^SfLIg9F)eK!05s*=>lc)9PCBS`It)F& zgI_8#`C^7jr^EQO2k8C_3_Te;%3nOk_|xg*dvKa_{teMqCtS8Z5!3(x002ovPDHLk FV1oLN7JmQ$ delta 174 zcmV;f08#&t1=azOFn<7$NklJZa zy0F>Kz`(%3bnET|jO2-K2sX_yeT>WI%|giw$lwWc3Hq)$ diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/smart_pump_top.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/smart_pump_top.png new file mode 100644 index 0000000000000000000000000000000000000000..d4d47451ffa28eb4fc405b49298d8ea94fa49688 GIT binary patch literal 664 zcmV;J0%!e+P)Px%Qb|NXR5*>L)5}ZLQ53-O@BQ81yqqCx6ed9-d*FoHR)Zb}l?@neOetvVrggOq zTDNTDf1tS)A%Z5_3L5r;8Y?So49Dm1-rxPbZi@j$T7_qG7Kd{uHZNh0JXQT!CFFNC=U#?y8MAaZxV(9q1K!|U*Wy?1>4Zg z0iu|rSPzg=va|UcCknw@dN19g_HG^kz4Hg*IQUAD$>q5D=q^)}bNd^-eD(t0Yd{nN z5ChV6vA!m8Q^<4%qcyF?4z$`pcbBjY-87h^ks4ky2ue!LdGSYlGI(2{!BB>FU2op-`Z=(#h2198$KoKOVn#4I6Y|v?dG`HVJ9T zw<3ffGz#gu#Kc6#VB;8XYn}O(AE2XsgRe_(@XZcFIM^g+dt(*Xb+OixBnj5nSm`3A zL~XC_88`rAqeIQc&|s4ogun`io!xbWfG7yCjzjKP5#L)UjAEu|s`~?`XQ~+GA%p3 Date: Mon, 29 Dec 2025 22:32:36 -0500 Subject: [PATCH 09/15] Conveyors --- .../common/blocks/BlockConveyor.java | 9 ++++++--- .../textures/blocks/conveyor_belt_blank.png | Bin 237 -> 148 bytes .../textures/blocks/conveyor_belt_down.png | Bin 265 -> 206 bytes .../textures/blocks/conveyor_belt_left.png | Bin 279 -> 242 bytes .../textures/blocks/conveyor_belt_right.png | Bin 278 -> 249 bytes .../textures/blocks/conveyor_belt_up.png | Bin 266 -> 229 bytes 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java index 90c0a4ce..3fc6a8a3 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java @@ -51,11 +51,14 @@ public void registerBlockIcons(IIconRegister reg) { @SideOnly(Side.CLIENT) @Override public IIcon getIcon(int s, int meta) { - if (s == getFacing(meta).getOpposite() + ForgeDirection facing = getFacing(meta); + if (s == facing.ordinal()) return belt_down; + if (s == facing.getOpposite() .ordinal()) return belt_up; - if (s != ForgeDirection.UP.ordinal()) return blank; + if (s != ForgeDirection.UP.ordinal() && s != ForgeDirection.DOWN.ordinal()) return blank; - return switch (getFacing(meta)) { + if (s == ForgeDirection.DOWN.ordinal()) facing = facing.getOpposite(); + return switch (facing) { case NORTH -> belt_up; case SOUTH -> belt_down; case WEST -> belt_left; diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank.png index c72b150d7c1e38cadbecc95bd88620daad4b7238..88fb12c86494262554109c678de7597005344895 100644 GIT binary patch delta 130 zcmaFMIE8V7WHlQD1B3kM|A|0~u{g-xiDBJ2nU_G0pQnpsh(&L5NLav+^A3y&i(HJE zfq;7#gE~8V9Pj=5KL_42InCO*GVzeA;~GVg_Jb=Jn@=%(5ozOBSe*(K>q%qFscaOP ep0J}qhJhjIrf_bdb2Tf_WCl-HKbLh*2~7Y3W-HzR literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1IggaDrqS0F7V zq3Nn&lV)kyA7(v2NcQG}w0DPR{r+S&^JzfVJ_GY9dES}&LEb7xHkS7GB?bvi(RmM( zXaA2s`{eZPKi95Zo3d(KOI>?rR#s$KP?=NL8Y82d;mOylclA&A>dH58zfj)@v_qjJ z$S;`TKYlQ2*4i?lT7FL##}J9B$pWs-Jj&4w44PX-8BgY{PXJ0Wc)I$ztaD0e0suV4 BV_g6M diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_down.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_down.png index 277814f6af7c3a459dcffd73c8bf8e2f32c0fcc4..86e88c7da8f30f9f4e545243e47292368172a354 100644 GIT binary patch delta 189 zcmV;u07CzX0?q-D8Gi-<000wx_m%(v00DDSM?wIu&K&6g004+dL_t(oh3(X_4nQyv z2H>CA*n|mbc>h-tDUZO+L~>UoO)T2~->%nQ(r>tAFlGmUrfcDo#m)eL>^#VeTwK`J zP1L%7<{DtfNi@3Nh+6lZ0cBmiKG1#V3p)D2Q)oZ~gkg~0jyClO5orJ#$N@V4G5BsD rM2tuS8XydV@Ag5&h%}%9!Z0`h(NN;$1x8Go00000NkvXXu0mjfX5>&n literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QjEnx?oJHr&dIz4auNc3LR^8g zl!T_MhE1BKVSkwQ{2lp7r~a+03T_S^Eskr{sBO>IZqN7};3b+m{$5G)3n< zOrHHe{_K;}xBpzbc5TY4Z7p@}nORwpVL@e1U2BYtZiXjcuin)^-K#6#!2LpfBhU_o zk|4iehX44%q*-grfNHfpT^vI!dXoi2lUbP0l+XkK)fR7Q diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_left.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_left.png index 5d8a6afc5abc029ef2af37fa1980663ddc9a0b99..bfbb58f3154bf1c8b0a46002428a9c98da0eb8ec 100644 GIT binary patch delta 225 zcmV<703QFB0`dWn8Gi-<000wx_m%(v00DDSM?wIu&K&6g0068>L_t(oh3%KI3WG2d zMUN$eC2pcq8-g7w{{Q!gI4W*+ZkPUm+(I6W+1`-DJHx&3ibsrZgm+Os1Grnbvn?y3 zi|nr*;Lt2@U;v=_|7L^qfVyp%#|d9~0FKTE6jVTwJdNoA?pj)w*=IrV-v%(H;t|1UQaLKpbTTTxJ6 b`abvoXOr@-_@#nG00000NkvXXu0mjfV%B4z literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QjEnx?oJHr&dIz4auNc3LR^8g zl!T_MhE1BKVSkwQ{2lp7r~a+03T_S^Eskr{sBO>IZqN7};3b+m{$5G)3n< zOrHHe{_K;}xBpzbc5TY4Z7p@}nORwpVL@e1U2BYtZiXjcuin)^-K#6#!2LpfBhU_o zk|4iehX44%q*-grfNCv0T^vI!dXoiQnR${j8X6}~ohT^DpUTK{KCxncLB)cZCoQJ1 tt`L;VNZZ7h%J`~8cmJImS1z3;) zmJDE7eX!;Mgl%1${)0*TThIa4xnR--SdanMxq#*L!I}pU`paOR5wlcK06^Il@>Jjt iPiKE2RrZp0000lp7r~a+03T_S^Eskr{sBO>IZqN7};3b+m{$5G)3n< zOrHHe{_K;}xBpzbc5TY4Z7p@}nORwpVL@e1U2BYtZiXjcuin)^-K#6#!2LpfBhU_o zk|4iehX44%q*-grfNCu~T^vI!dXoiQnR${j8X6}~oGK{EpUTK{KCxo{j1LZ`r5fA; s$~F-fePmBDg?P$mEaOXMYzopr0MGq&yZ`_I diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_up.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_up.png index 3e524e978ff39a95648fa6b51f7128c0ddc16013..f49810cacb324332c03293e354adfb267bf5e323 100644 GIT binary patch delta 212 zcmeBTddfIKvYw5BfkC+T`!pcMSRCZ;#IWw1%u66=zNd?0NJMLLNLav+^9K$bP*7Gs z-N18iUsdlRaWP@nhxV0UW;B8T>vT3tRaTLIi>vu1HZbmBd?B^3?q}Ea1GBH^Es$zh z$0++?Qu;wHFBgdf2?Hs%#fc5RhXr_=6Cbda7ziyE^p)*tJD4G1FhQ8@j?JBl*aq)9 zfyzV^Dfhz+v)e8jC@Aw>$aN?;I{1&tN}~7JMS}zhUS_s7MNu{eTRSh-485-#fo^5+ MboFyt=akR{0CDlp7r~a+03T_S^Eskr{sBO>IZqN7};3b+m{$5G)3n< zOrHHe{_K;}xBpzbc5TY4Z7p@}nORwpVL@e1U2BYtZiXjcuin)^-K#6#!2LpfBhU_o zk|4iehX44%q*-grfNFI-T^vI!dXoi2lU)3C5mdKI;Vst0Cz-j6#xJL From 5920445c98d0cf2fd9878dc117da6925db19bf32 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Mon, 29 Dec 2025 22:36:48 -0500 Subject: [PATCH 10/15] Update trash can model --- .../blocks/models/trash_can_energy.png | Bin 1331 -> 1389 bytes .../blocks/models/trash_can_fluid.png | Bin 1286 -> 1362 bytes .../textures/blocks/models/trash_can_item.png | Bin 1228 -> 1342 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/models/trash_can_energy.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/models/trash_can_energy.png index da2524b7601ec3892b9ee23cb8d501aeeab8d269..2a30c09b7e91ed399df94f9bfe6356ceff8dd9b7 100644 GIT binary patch delta 1358 zcmV-U1+n_G3hfGzFnsx5YlZOjGkAjN?lg0T}2b}WB2u67IgoqK08l4V)isF(+grP0_k?>q0; zGozDFAAb7|042K!Ld_{dhq=E30IWA#(dI1|006gA757os)PJ8qZDIX*I{^Ik&)+B7 z$t8rPHjwb6@l+ZZ06I+<*eQ!Ef%;8mJ^+YsetmxGyb+%NKYtc>odqng)gL~4z_TZ` zUb2fQ*@4jO%@*s;7T$7!PSa%;QfQAq$uzkbrL)l@Kxjfn8YkeX{1>CZa8(UH(M#) z&i$2W&jJN#gwPG92BBkCp67WoZ$9RFv(>g|k_Gsn>OkE5398>8JE`8~#X;9;!@@4I zlTY7XcYo1;7>E_8-0v-eXHb+yS)k$6_xftXsY?aX{o@m`s||R1B%Gf*fKp7Q4QuYN zP;<)gmJ767fq6Za(BW>9h2R7WEclJaQ<3Lyue(xE zBt?zJQ+UgTs1RwAaVj+uB&;8=5W~1Y+7Miz(|>fOdVmK#GWp^2K=egOuq1ztB1IhU z%>@cP&{2)=Ef=B+q-X8c8E&t;p~8m=62=0-;s+I6{lO4!rTV6wuCsu!fc0i8R$cXX zLR7J$V}R=YWadl$ypId?5LnZT|B5^N3f?lVSn*-WD;BKEdNb9!05m4a86EdqitxS5 z3xDw(yU0($k4oM<`|91efUtl##SoO}3`HSiIdgx7yI-yV#w4MX(uCY_fkQxk3Z^(( z@zHpSno|}ZFy5dd4_v?k6GCV9x**1_g{ML6f~C53Mr}N}LE!==yU1#O{`-u%K$u^t zc~}Sj?EdjdT19U9yboA*K%Tfj6iRkcq<_CS;FI3BlamWBK;UMtgK7025MmiJ(Z5gB73rXgn1~4=;p>L+Av|1sC9hg$+nNL1zKyrw;BPpMQkV zs-I70J|;6?RDoQfx#0pFLv}b47v#gbnjuW7dEf$tC==UP3moIic{vx5EI=KA--pp( z_5M&_&IK2U^8GkS>dSfH0#X`Ol|Vs{`>IY^NzeH5a4ul!4m@;6UNt9JC4O4`|Fgq+ zJq677<^rJ`B8Xsz9HhXczWnZ7Ab$-DNb1YE-~wq_KvG_x2QF~51tj%lJ}yyhI+!7F zUP1U&3EpY?C-W59e{nwlCydmrqIEpGCTA=Lvk2vF|^|F-3x4`N2hu^E48ztM7 z`t%dkJ57YzMv{pI{78knal%d{JJOJ}?QVgwB5?>Akl{ZVX%18B4uxKK2 zHBIjoVmINm-`o4ykamRPAZwE}FfcGMFfcGMFfcGMFfcGMFfcGMFvt!+0C)S8+Bs0p Qga7~l07*qoM6N<$g1H%qU;qFB delta 1300 zcmV+v1?&3l3bP83Fn0D7=A1k)T};cr9&Vq1Y;k#IJg5Fw{el` z;F|jf`DNE#nKIQCzTz5lfeWMv*dYkX1|eCSNNQB&3hA9ZJ3F(I*Q;oYc|dq(JUcV* z_xsN7!K)W9zXCultU?f}I&7H6GXTJRvD9OuFP{Mbokmmlvwzw$Um#>IW z+_2YH38}yR_z7pnN2rBW{CV{cemg%0fW-LKyAL=!K1yj%5eQiIf4{s){Ifq8YZZL{ z><2ym`s!LUfPW8_Mf`pIfUas`IEnR|yf>p3R&gIc;0#Cl*~{=0qc1tB%s>TebruOu z;~DycG5UjXVq$+V);<7a0-Z(^!%4hR@*oC@^dnWref)r0SVg4j=&F`xinQ4u3FC@H z#dLT!AK>y2E@!z3Oh{L?bXyoCjIqrr8Wrw{gll0{|9=GBW{36^yPU=|O(<)ZiEXqi zFDhHi!F;jQ(l-y9M=gbEvZnm)sut#pWg^^8R=C>+9Op&7d9V3m zX&v816i8@**fdKVWD+(!^-yQWM~`Y3jX)a1NsNo^xq!v-NfhX+)<#?Hsup@}rJ45j z<0oLPeSbEsGINolk|{=D+H@_frc_`0rWVMvLO>Q1*prJ1a8hI@I&3DpAY7m`K|!SI zh!hfe04G6mAbCa(xlN`fgt+E$hUlsViiS3UUR&Y%{f#yC+CQ71qr3)g+z?F^M%RK3;S0wSY9{i+`o|_M6IK8(2e3Et39l5-04r47EUz zRJWB>=8JLSa9Ocfq{yC}y|?MWWQ=Qp%kXq>wSd+Db8%M^WL|1;`|{`0#DO`iPU9J_ z-hD`|x9?gY;Ev5s1sont=O&VmR9#08Gn|@{1ZAoPgrF=HbD4q5F-5AL${@uYWS=tB z0)GK}_xWO(ioXIgNr7Pwl1bX{7H8JAI*sPuYk@=*V7Q#%Hef%%s%=YmOH&I79^+|O zOll^){fb#Dq9aw;%!^by=PyMqV9Wh&V0GtbY-;&!J-cHoT`eHsC}3ksr_ppKFT+WU zlX#Z$_R;$6Yzn2U1q7Vxx*Vc_nbd15+<)GUfV&Z3QCl_>CUD=iK!u55LR}l1mn9$@ z=AVH3!USflT$7(1c5r=ji%z4N8t1F@qLI=77dE{)5*s!%MceBzb4}a$cY7~js-P+1 zEY4@yG7REHvOK2@?**K-fGIil`ZlTNwdH-+0u?!&?SM9pyT&2AzUJJM`MBu0gY!@PUf-Ud87AQgk z^4fAKYJnm&fNi-JR>@}hlbWW!_hAq@O?gF|nuA6|7aS8mmuw{`mW^ zLOzu_`1P0buRLI52r@Lld}bSLT7P4keT({5D7g6P8`r1tEOnWYeo5L%%(;GllgpM* z4wLKj2V-4k^PWXX+J%6Lj#M3HU;F{c#)UB=sXVs4A~g9K&aPs876LiQww#vF>aad= z(Vwk-Z)|-dB-ph|dU$wvczAetczAetczAetczAetczEm%{{xjFU9QKbPz{Ix0000< KMNUMnLSTa9C~koO diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/models/trash_can_fluid.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/models/trash_can_fluid.png index c2ea066baf01536cce289c89eeb46f341ed6527e..75734bc2d2440219606048c2c1bd984176da2ce7 100644 GIT binary patch delta 1344 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 Date: Fri, 2 Jan 2026 21:16:23 -0500 Subject: [PATCH 11/15] Support side arrows --- .../common/blocks/BlockConveyor.java | 12 +++++++++--- .../textures/blocks/conveyor_belt_blank.png | Bin 148 -> 0 bytes .../textures/blocks/conveyor_belt_blank_left.png | Bin 0 -> 192 bytes .../textures/blocks/conveyor_belt_blank_right.png | Bin 0 -> 188 bytes 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_left.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_right.png diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java index 3fc6a8a3..c24043b4 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConveyor.java @@ -20,7 +20,7 @@ public class BlockConveyor extends BlockContainer { @SideOnly(Side.CLIENT) - private IIcon belt_up, belt_down, belt_left, belt_right, blank; + private IIcon belt_up, belt_down, belt_left, belt_right, blank_right, blank_left; public BlockConveyor() { super(Material.piston); @@ -45,7 +45,8 @@ public void registerBlockIcons(IIconRegister reg) { belt_down = reg.registerIcon("utilitiesinexcess:conveyor_belt_down"); belt_left = reg.registerIcon("utilitiesinexcess:conveyor_belt_left"); belt_right = reg.registerIcon("utilitiesinexcess:conveyor_belt_right"); - blank = reg.registerIcon("utilitiesinexcess:conveyor_belt_blank"); + blank_right = reg.registerIcon("utilitiesinexcess:conveyor_belt_blank_right"); + blank_left = reg.registerIcon("utilitiesinexcess:conveyor_belt_blank_left"); } @SideOnly(Side.CLIENT) @@ -55,7 +56,12 @@ public IIcon getIcon(int s, int meta) { if (s == facing.ordinal()) return belt_down; if (s == facing.getOpposite() .ordinal()) return belt_up; - if (s != ForgeDirection.UP.ordinal() && s != ForgeDirection.DOWN.ordinal()) return blank; + + if (s != ForgeDirection.UP.ordinal() && s != ForgeDirection.DOWN.ordinal()) { + if (s == facing.getRotation(ForgeDirection.DOWN) + .ordinal()) return blank_left; + else return blank_right; + } if (s == ForgeDirection.DOWN.ordinal()) facing = facing.getOpposite(); return switch (facing) { diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank.png deleted file mode 100644 index 88fb12c86494262554109c678de7597005344895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|{5)M8Lo9le zL&5@noOfVMSma{N3<9P4a|2goM$!XTcm5GN`9oHy|v>#l-*nEoNi%1*4 r!s=9@SWg;TPGzIW^n@J^G7JnsH-&QxovT@aCNp@t`njxgN@xNASjQ|p diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_left.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_left.png new file mode 100644 index 0000000000000000000000000000000000000000..1ac77f5bb82f7d775576ae96097b7707710e2fad GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|sytmBLo9le zL&5@noOfVMSma{N3<9P4a|2goM$!XTcm5GN`9oHyE9DeZW>uVS3wnPTa zS&|o+1tX2^noCSg3wJk!G(2L8_4VCx_QbXa%o2JEVak5Y9;PgL3{_l**(Y2zdN@hJ l&6s)H9)~V(gBS-s28K19N`;5pUVvQ2;OXk;vd$@?2>?I|J+}Y= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_right.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_right.png new file mode 100644 index 0000000000000000000000000000000000000000..1a696707ce265f1be166717a0bcbe4b1a292dda7 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|$~;{hLo9le zL&5@noOfVMSma{N3<9P4a|2goM$!XTcm5GN`9oHzjv>$x>`ufJM$s!#$ zcoG$tFw9omHEY(Boea_rg^Zg{-pDz&tW8BcVRJ(UbHPr&JccT+!|W5T8a Date: Wed, 7 Jan 2026 07:57:35 -0500 Subject: [PATCH 12/15] Conveyor side textures update --- .../blocks/conveyor_belt_blank_left.png | Bin 192 -> 224 bytes .../blocks/conveyor_belt_blank_right.png | Bin 188 -> 220 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_left.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_left.png index 1ac77f5bb82f7d775576ae96097b7707710e2fad..5dad615ee40925d7f4b4e46511f2e6790a2a289f 100644 GIT binary patch delta 183 zcmV;o07(D90pJ0UF@Ks#L_t(Ijir+73V_-S(&`J#f>s*!dH!#&BdIw7DDtFdaBH0OFfvH+%_^2^>KNaS^1`PK^nkiry z?sqB24!#8Gz!=T0%a(m{6Vup19#x2`fFY)`7#b(}1WE*-H82ABdqR;OoEZTN@Iz6z lVYqn$b~1w*HH8%s7!TIcSSyGG?I!>L002ovPDHLkV1gM?P4WN$ delta 151 zcmV;I0BHZ<0l)!}F@JhVL_t(Ijbl_+Q25V40brs;GXnzy0}HwUCkF>!4c~wK!0iG; znz5;2!X-hhAy~uU^7ZRP8-`&3DViD30})v>K7({MHF3LuRDj|FT}@56&B(Uk0~jtK zRwGUWNHqj*0D20;2awe=;gTRmGXu7~K#EH+TtE&00IUfjaS+3X=mr1)002ovPDHLk FV1gp>H(US! diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_right.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/conveyor_belt_blank_right.png index 1a696707ce265f1be166717a0bcbe4b1a292dda7..84846f7a4a7ed15c842b58f5326e43719778775e 100644 GIT binary patch delta 179 zcmV;k08Ib90o(zQF@KgxL_t(Ijir*^4!{r$g-uNG6q3FF>y3|+RxNl7A~z*Mg=awJUK#u_&Ulwf3Xn*s)4 zZ`PVm@TJHE&RsFrHPl|pJD;G8D&@T{48w7fPrw2Wt_JvfLM&kqE{uW=_@SuVFnoIg hPBMZ8HH9Z8uugWGSSy_!aU%c#002ovPDHLkV1gaBP09cO delta 147 zcmV;E0Brx<0lWc_F@JVRL_t(Ijbl_+Q25V40brs;GXnzy0}HwUCkF>!4c~wK!0iG; znz5;2!X-hhAw-A4Cx|*8gxd0nLaRIW)*lfn8h9nnYvw&y= zaJdd{0D20;2awe=;gTRmGXu7~K#EH+TtE&00GHw-ag1$9SquOG002ovPDHLkV1gM1 BIbQ$( From d5c02cc6111694a08e024478354dc606911b1224 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Wed, 7 Jan 2026 08:06:26 -0500 Subject: [PATCH 13/15] Update glutton's axe texture and rename to gourmand's axe --- .../utilitiesinexcess/ModItems.java | 6 ++-- .../utilitiesinexcess/UtilitiesInExcess.java | 2 +- .../utilitiesinexcess/client/IMCForNEI.java | 2 +- ...GluttonsAxe.java => ItemGourmandsAxe.java} | 33 +++++++++--------- .../common/recipe/RecipeLoader.java | 4 +-- ...AxeConfig.java => GourmandsAxeConfig.java} | 4 +-- .../items/unstabletools/UnstableTools.java | 2 +- .../utils/ForgeEventHandler.java | 6 ++-- .../assets/utilitiesinexcess/lang/en_US.lang | 4 +-- .../textures/items/gluttons_axe.png | Bin 281 -> 0 bytes .../textures/items/gourmands_axe.png | Bin 0 -> 324 bytes 11 files changed, 32 insertions(+), 31 deletions(-) rename src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/{ItemGluttonsAxe.java => ItemGourmandsAxe.java} (77%) rename src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/{GluttonsAxeConfig.java => GourmandsAxeConfig.java} (95%) delete mode 100644 src/main/resources/assets/utilitiesinexcess/textures/items/gluttons_axe.png create mode 100644 src/main/resources/assets/utilitiesinexcess/textures/items/gourmands_axe.png diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java index 0c115772..adebec3f 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/ModItems.java @@ -23,7 +23,7 @@ import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemAntiParticulateShovel; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemDestructionPickaxe; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemEthericSword; -import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemGluttonsAxe; +import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemGourmandsAxe; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemPrecisionShears; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemReversingHoe; import com.fouristhenumber.utilitiesinexcess.config.blocks.EnderLotusConfig; @@ -34,7 +34,7 @@ import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.AntiParticulateShovelConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.DestructionPickaxeConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.EthericSwordConfig; -import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GluttonsAxeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GourmandsAxeConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.PrecisionShearsConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.ReversingHoeConfig; @@ -45,7 +45,7 @@ public enum ModItems { // spotless:off // make sure to leave a trailing comma - GLUTTONS_AXE(GluttonsAxeConfig.enable, new ItemGluttonsAxe(), "gluttons_axe"), + GOURMANDS_AXE(GourmandsAxeConfig.enable, new ItemGourmandsAxe(), "gourmands_axe"), DESTRUCTION_PICKAXE(DestructionPickaxeConfig.enable, new ItemDestructionPickaxe(), "destruction_pickaxe"), ANTI_PARTICULATE_SHOVEL(AntiParticulateShovelConfig.enable, new ItemAntiParticulateShovel(), "anti_particulate_shovel"), PRECISION_SHEARS(PrecisionShearsConfig.enable, new ItemPrecisionShears(), "precision_shears"), diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java index a4c9ea2f..6d47e1c1 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java @@ -212,7 +212,7 @@ public Item getTabIconItem() { .getItem(); } - public static final ItemStack ICON_ITEM = new ItemStack(ModItems.GLUTTONS_AXE.get()); + public static final ItemStack ICON_ITEM = new ItemStack(ModItems.GOURMANDS_AXE.get()); @Override public ItemStack getIconItemStack() { diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java index 40d8437a..1466643d 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java @@ -31,7 +31,7 @@ public static void IMCSender() { sendInfoPage("utilitiesinexcess:inverted_ingot", "nei.infopage.uie.ticon_inverted"); } - sendInfoPage("", "nei.infopage.uie.gluttons_axe.1"); + sendInfoPage("", "nei.infopage.uie.gourmands_axe.1"); sendInfoPage("", "nei.infopage.uie.destruction_pickaxe.1"); sendInfoPage("", "nei.infopage.uie.anti_particulate_shovel.1"); sendInfoPage("", "nei.infopage.uie.precision_shears.1"); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGluttonsAxe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java similarity index 77% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGluttonsAxe.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java index 4398aba9..958dfbb6 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGluttonsAxe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemGourmandsAxe.java @@ -16,24 +16,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GluttonsAxeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GourmandsAxeConfig; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorEntityZombie; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorItemTool; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; -public class ItemGluttonsAxe extends ItemAxe { +public class ItemGourmandsAxe extends ItemAxe implements ITranslucentItem { - public ItemGluttonsAxe() { + public ItemGourmandsAxe() { super(ToolMaterial.EMERALD); - setTextureName("utilitiesinexcess:gluttons_axe"); - setUnlocalizedName("gluttons_axe"); - if (GluttonsAxeConfig.unbreakable) setMaxDamage(0); - ((AccessorItemTool) this).setDamageVsEntity(GluttonsAxeConfig.damageAgainstUndead); + setTextureName("utilitiesinexcess:gourmands_axe"); + setUnlocalizedName("gourmands_axe"); + if (GourmandsAxeConfig.unbreakable) setMaxDamage(0); + ((AccessorItemTool) this).setDamageVsEntity(GourmandsAxeConfig.damageAgainstUndead); } private static final Random particleRandom = new Random();; public static void spawnParticles(Entity e) { - if (!GluttonsAxeConfig.spawnParticles) return; + if (!GourmandsAxeConfig.spawnParticles) return; int ci = Potion.potionTypes[Potion.heal.getId()].getLiquidColor(); double d0 = (double) (ci >> 16 & 255) / 255.0D; double d1 = (double) (ci >> 8 & 255) / 255.0D; @@ -58,7 +59,7 @@ public void onUpdate(ItemStack s, World w, Entity e, int slot, boolean selected) if (e instanceof EntityPlayer p && selected) { if (w.getTotalWorldTime() % (2 * 20) == 0) { FoodStats fs = p.getFoodStats(); - fs.addStats(GluttonsAxeConfig.foodGain, GluttonsAxeConfig.saturationGain); + fs.addStats(GourmandsAxeConfig.foodGain, GourmandsAxeConfig.saturationGain); } } } @@ -80,10 +81,10 @@ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer attacker, Entity } if (!target.isEntityUndead()) { - float amountToHeal = Math.min(GluttonsAxeConfig.maxHeal, target.getMaxHealth() - target.getHealth()); - if (amountToHeal == 0) if (GluttonsAxeConfig.useHungerAlways) attacker.addExhaustion(3 * 4); + float amountToHeal = Math.min(GourmandsAxeConfig.maxHeal, target.getMaxHealth() - target.getHealth()); + if (amountToHeal == 0) if (GourmandsAxeConfig.useHungerAlways) attacker.addExhaustion(3 * 4); else { - if (GluttonsAxeConfig.drainHp) if (attacker.getHealth() >= amountToHeal + 1) + if (GourmandsAxeConfig.drainHp) if (attacker.getHealth() >= amountToHeal + 1) attacker.setHealth(attacker.getHealth() - amountToHeal); else return true; target.setHealth(target.getHealth() + (amountToHeal + 1)); @@ -99,26 +100,26 @@ public boolean onLeftClickEntity(ItemStack stack, EntityPlayer attacker, Entity @Override public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean p_77624_4_) { - if (GluttonsAxeConfig.unbreakable) + if (GourmandsAxeConfig.unbreakable) tooltip.add(EnumChatFormatting.RED + StatCollector.translateToLocalFormatted("item.unbreakable.desc")); } // Unbreakable @Override public boolean isDamageable() { - if (GluttonsAxeConfig.unbreakable) return false; + if (GourmandsAxeConfig.unbreakable) return false; return super.isDamageable(); } @Override public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) { - if (GluttonsAxeConfig.unbreakable) return false; + if (GourmandsAxeConfig.unbreakable) return false; return super.getIsRepairable(stack, repairMaterial); } @Override public boolean showDurabilityBar(ItemStack stack) { - if (GluttonsAxeConfig.unbreakable) return false; + if (GourmandsAxeConfig.unbreakable) return false; return super.showDurabilityBar(stack); } // diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java index b6d6c2ba..db12b1ac 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/recipe/RecipeLoader.java @@ -1029,9 +1029,9 @@ private static void loadInversionRecipes() { // Inverted Ingot (stable) addShapedRecipe(ModItems.INVERTED_INGOT.newItemStack(1, 1), "nnn", "nnn", "nnn", 'n', ModItems.INVERTED_NUGGET); - // Glutton's Axe + // Gourmand's Axe addShapedRecipe( - ModItems.GLUTTONS_AXE, + ModItems.GOURMANDS_AXE, "ii", "is", " s", diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GluttonsAxeConfig.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GourmandsAxeConfig.java similarity index 95% rename from src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GluttonsAxeConfig.java rename to src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GourmandsAxeConfig.java index e46b15a0..adca422a 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GluttonsAxeConfig.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/GourmandsAxeConfig.java @@ -3,8 +3,8 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.gtnewhorizon.gtnhlib.config.Config; -@Config(modid = UtilitiesInExcess.MODID, category = "items.unstable_tools.gluttons_axe") -public class GluttonsAxeConfig { +@Config(modid = UtilitiesInExcess.MODID, category = "items.unstable_tools.gourmands_axe") +public class GourmandsAxeConfig { @Config.DefaultBoolean(true) @Config.RequiresMcRestart diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/UnstableTools.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/UnstableTools.java index cf046428..1c28da6e 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/UnstableTools.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/config/items/unstabletools/UnstableTools.java @@ -13,7 +13,7 @@ public class UnstableTools { // Not sure abt nested categories, lets disccuss that later public static void registerConfig() throws ConfigException { ConfigurationManager.registerConfig(UnstableTools.class); - ConfigurationManager.registerConfig(GluttonsAxeConfig.class); + ConfigurationManager.registerConfig(GourmandsAxeConfig.class); ConfigurationManager.registerConfig(EthericSwordConfig.class); ConfigurationManager.registerConfig(AntiParticulateShovelConfig.class); ConfigurationManager.registerConfig(DestructionPickaxeConfig.class); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ForgeEventHandler.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ForgeEventHandler.java index 0cbe9cc8..95119802 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ForgeEventHandler.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/utils/ForgeEventHandler.java @@ -31,13 +31,13 @@ import com.fouristhenumber.utilitiesinexcess.common.items.ItemXRayGlasses; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemAntiParticulateShovel; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemDestructionPickaxe; -import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemGluttonsAxe; +import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemGourmandsAxe; import com.fouristhenumber.utilitiesinexcess.common.items.tools.ItemPrecisionShears; import com.fouristhenumber.utilitiesinexcess.common.renderers.XRayRenderer; import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityPacifistsBench; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.AntiParticulateShovelConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.DestructionPickaxeConfig; -import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GluttonsAxeConfig; +import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.GourmandsAxeConfig; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorEntityLivingBase; import com.gtnewhorizon.gtnhlib.client.event.LivingEquipmentChangeEvent; @@ -139,7 +139,7 @@ public void onBlockBroken(BlockEvent.HarvestDropsEvent event) { Item heldItemType = heldItem.getItem(); if ((heldItemType instanceof ItemDestructionPickaxe && DestructionPickaxeConfig.voidMinedBlock) || (heldItemType instanceof ItemAntiParticulateShovel && AntiParticulateShovelConfig.voidMinedBlocks) - || (heldItemType instanceof ItemGluttonsAxe && GluttonsAxeConfig.voidMinedBlock)) { + || (heldItemType instanceof ItemGourmandsAxe && GourmandsAxeConfig.voidMinedBlock)) { event.drops.clear(); } if (heldItemType instanceof ItemPrecisionShears) { diff --git a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang index f4ebab9a..b8921395 100644 --- a/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang +++ b/src/main/resources/assets/utilitiesinexcess/lang/en_US.lang @@ -169,9 +169,9 @@ tooltip.architects_wand.1=Can place up to %s blocks at once nei.infopage.uie.architects_wand.1=This wand is designed to aid the bearer in construction by placing many blocks at the same time. While looking at a block, you will see a wireframe indicating how a set of blocks will be extended by the wand. -item.gluttons_axe.name=Glutton's Axe +item.gourmands_axe.name=Gourmand's Axe -nei.infopage.uie.gluttons_axe.1=This axe contains potent restorative magic that will restore the bearer's hunger while it is held. Attacking with the axe will heal whatever is hit at the cost of hunger - but this healing is deadly to the undead. +nei.infopage.uie.gourmands_axe.1=This axe contains potent restorative magic that will restore the bearer's hunger while it is held. Attacking with the axe will heal whatever is hit at the cost of hunger - but this healing is deadly to the undead. item.destruction_pickaxe.name=Destruction Pickaxe diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/gluttons_axe.png b/src/main/resources/assets/utilitiesinexcess/textures/items/gluttons_axe.png deleted file mode 100644 index e924ac16ad1f0b6312ff6989d57ebda7b7b5fca9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|E_=E-hFJ6_ zCoEu(`1btU|J3@t|Hsvid-Oar=YMBx00bQx8b&S~S1fvwsO0v!Np!V@U;MtFP+mWA zh3vLQ|4X4fob@*(vVu|{{Q9t~p|P>iF*Ge{O5%~1-=Fm0QpAA>BHNlIYBB~WO}$l zp56bwzxekHOQ`&t;ucLK6TsadOoF diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/gourmands_axe.png b/src/main/resources/assets/utilitiesinexcess/textures/items/gourmands_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2b14f4ea2e7c42ec97d105f1d486216f86d92a GIT binary patch literal 324 zcmV-K0lWT*P)Px#{z*hZR5*=eV4w$>y=~k6+1s}5$0o-}jON=*{mghEAb)DhEhi8nc((;?32K(aE$H2hAz#t$X^(_t WOIyX;TpmmS0000 Date: Sun, 8 Feb 2026 18:54:12 -0500 Subject: [PATCH 14/15] Update trading post, unstable tools, and glove --- .../common/items/ItemArchitectsWand.java | 3 +- .../tools/ItemAntiParticulateShovel.java | 3 +- .../items/tools/ItemDestructionPickaxe.java | 3 +- .../common/items/tools/ItemEthericSword.java | 3 +- .../items/tools/ItemPrecisionShears.java | 3 +- .../common/items/tools/ItemReversingHoe.java | 3 +- .../common/multipart/FramePart.java | 78 ++++++++++++++++++ .../common/multipart/MultipartHandler.java | 20 +++++ .../textures/blocks/trading_post_bottom.png | Bin 627 -> 571 bytes .../textures/blocks/trading_post_side.png | Bin 724 -> 690 bytes .../textures/blocks/trading_post_top.png | Bin 702 -> 756 bytes .../items/anti_particulate_shovel.png | Bin 159 -> 419 bytes .../textures/items/architects_wand.png | Bin 272 -> 503 bytes .../textures/items/destruction_pickaxe.png | Bin 196 -> 475 bytes .../textures/items/etheric_sword.png | Bin 201 -> 534 bytes .../textures/items/glove.png | Bin 222 -> 271 bytes .../textures/items/glove_bottom.png | Bin 120 -> 140 bytes .../textures/items/glove_top.png | Bin 198 -> 245 bytes .../textures/items/gourmands_axe.png | Bin 324 -> 434 bytes .../textures/items/precision_shears.png | Bin 200 -> 505 bytes .../items/precision_shears_cooldown.png | Bin 176 -> 554 bytes .../textures/items/reversing_hoe.png | Bin 157 -> 444 bytes .../textures/items/super_architects_wand.png | Bin 266 -> 520 bytes 23 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java create mode 100644 src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java index 69c14c23..7f887562 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemArchitectsWand.java @@ -18,12 +18,13 @@ import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess; import com.fouristhenumber.utilitiesinexcess.common.renderers.WireframeRenderer; import com.fouristhenumber.utilitiesinexcess.utils.ArchitectsWandUtils; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; import com.gtnewhorizon.gtnhlib.blockpos.BlockPos; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemArchitectsWand extends Item { +public class ItemArchitectsWand extends Item implements ITranslucentItem { public int buildLimit; diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemAntiParticulateShovel.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemAntiParticulateShovel.java index 1a0db32d..daebb88e 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemAntiParticulateShovel.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemAntiParticulateShovel.java @@ -13,8 +13,9 @@ import net.minecraft.world.World; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.AntiParticulateShovelConfig; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; -public class ItemAntiParticulateShovel extends ItemSpade { +public class ItemAntiParticulateShovel extends ItemSpade implements ITranslucentItem { public ItemAntiParticulateShovel() { super(ToolMaterial.EMERALD); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java index 53c56d61..2724b069 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemDestructionPickaxe.java @@ -12,10 +12,11 @@ import net.minecraft.util.StatCollector; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.DestructionPickaxeConfig; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; import akka.japi.Pair; -public class ItemDestructionPickaxe extends ItemPickaxe { +public class ItemDestructionPickaxe extends ItemPickaxe implements ITranslucentItem { public ItemDestructionPickaxe() { super(ToolMaterial.EMERALD); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java index b19c833c..ecd6409d 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemEthericSword.java @@ -14,8 +14,9 @@ import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.EthericSwordConfig; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorEntityLivingBase; import com.fouristhenumber.utilitiesinexcess.mixins.early.minecraft.accessors.AccessorItemSword; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; -public class ItemEthericSword extends ItemSword { +public class ItemEthericSword extends ItemSword implements ITranslucentItem { public ItemEthericSword() { super(ToolMaterial.EMERALD); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java index 80013203..3c3bc255 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemPrecisionShears.java @@ -16,8 +16,9 @@ import net.minecraftforge.common.ForgeHooks; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.PrecisionShearsConfig; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; -public class ItemPrecisionShears extends ItemShears { +public class ItemPrecisionShears extends ItemShears implements ITranslucentItem { public static final String COOLDOWN_NBT_TAG = "uie:cooldown"; private IIcon cooldownIcon; diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java index 0756783b..9cdf4164 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/tools/ItemReversingHoe.java @@ -14,9 +14,10 @@ import com.fouristhenumber.utilitiesinexcess.ModBlocks; import com.fouristhenumber.utilitiesinexcess.config.blocks.CursedEarthConfig; import com.fouristhenumber.utilitiesinexcess.config.items.unstabletools.ReversingHoeConfig; +import com.gtnewhorizon.gtnhlib.api.ITranslucentItem; // TODO: Add new features to the reversing hoe -public class ItemReversingHoe extends ItemHoe { +public class ItemReversingHoe extends ItemHoe implements ITranslucentItem { public ItemReversingHoe() { super(ToolMaterial.EMERALD); diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java new file mode 100644 index 00000000..7a573756 --- /dev/null +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java @@ -0,0 +1,78 @@ +package com.fouristhenumber.utilitiesinexcess.common.multipart; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.nbt.NBTTagCompound; + +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.vec.Cuboid6; +import codechicken.microblock.MicroMaterialRegistry; +import codechicken.multipart.JCuboidPart; +import codechicken.multipart.JNormalOcclusion; +import codechicken.multipart.NormalOcclusionTest; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TSlottedPart; + +public class FramePart extends JCuboidPart implements JNormalOcclusion, TSlottedPart { + + public MicroMaterialRegistry.IMicroMaterial material; + int materialID; + + @Override + public String getType() { + return "utilitiesinexcess:frame"; + } + + @Override + public int getSlotMask() { + return 1 << 6; + } + + public void save(NBTTagCompound tag) { + super.save(tag); + tag.setString("mat", MicroMaterialRegistry.materialName(materialID)); + } + + public void load(NBTTagCompound tag) { + super.load(tag); + this.materialID = MicroMaterialRegistry.materialID(tag.getString("mat")); + } + + public void writeDesc(MCDataOutput data) { + data.writeInt(this.materialID); + } + + public void readDesc(MCDataInput data) { + this.materialID = data.readInt(); + } + + @Override + public boolean occlusionTest(TMultiPart part) { + return NormalOcclusionTest.apply(this, part); + } + + @Override + public Cuboid6 getBounds() { + return null; + } + + @Override + public Iterable getCollisionBoxes() { + double w = 0.25; + List boxes = new ArrayList<>(); + + boxes.add(new Cuboid6(0, 0, 0, 1, 1, w)); + boxes.add(new Cuboid6(0, 0, 1 - w, 1, 1, 1)); + boxes.add(new Cuboid6(0, 0, w, w, 1, 1 - w)); + boxes.add(new Cuboid6(1 - w, 0, w, 1, 1, 1 - w)); + + return boxes; + } + + public Iterable getOcclusionBoxes() { + return Arrays.asList(this.getBounds()); + } +} diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java new file mode 100644 index 00000000..507dd986 --- /dev/null +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java @@ -0,0 +1,20 @@ +package com.fouristhenumber.utilitiesinexcess.common.multipart; + +import codechicken.multipart.MultiPartRegistry; +import codechicken.multipart.MultiPartRegistry.IPartFactory; +import codechicken.multipart.TMultiPart; + +public class MultipartHandler implements IPartFactory { + + @Override + public TMultiPart createPart(String name, boolean client) { + if (name.equals("utilitiesinexcess:frame")) { + return new FramePart(); + } + return null; + } + + public static void init() { + MultiPartRegistry.registerParts(new MultipartHandler(), new String[] { "utilitiesinexcess:frame" }); + } +} diff --git a/src/main/resources/assets/utilitiesinexcess/textures/blocks/trading_post_bottom.png b/src/main/resources/assets/utilitiesinexcess/textures/blocks/trading_post_bottom.png index db2e6e2e130f0c43ace69afb3f47ad19b605a817..75c96d8155534ab77f18594a568ce391df6a9384 100644 GIT binary patch delta 546 zcmV+-0^R-d1iJ)~B!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv05AYB05Dq6*2Mq- z010qNS#tmY3ljhU3ljkVnw%H_000McNliru=?nrEC>ve%eShQt00DnVL_t(I%YBp0 zO2a@9$Nz;;^0B#P5riBpwGb>+f*+7uz)QXQ6h4Aa;3N1X>akFySdc`Twk7oh%lNhkf#Fx zfT%0j##snaSAXCvgzLJvx|za}Nl{nm_ab$Wvk(9jBh@&V40O0wpM4s-ceRq>bI1-GWBqF%3 ztJYFZo`%2JI4tlGM;vj)je|NHSzwqYh_yTmJhYN-XMb~^?flYcGx?W+q%7@z@`8RZ zQY?r_<@656^JybNLXtMj5)cuH$j~fh==+^|xmJ+$3N|dxLgZ;^KvfWLA6}JSU8^}4 z36jNrES@Ao3riR|*}{b!VmQYd};Aj!3CS=3b{O_S%?lV@KbxfG=^syFu0 k%z^!V?HjMG500Jt2AW;CQ@$qeVE_OC07*qoM6N<$f(w1*i~s-t delta 602 zcmV-g0;T=C1oH%tB!3BTNLh0L01FZT01FZU(%pXi0006dNklrr&s_U8*0`Bgne1AP9-}m^!A;-b8Nh!ra zAMzgrx4houtSn0|n9_Q^CWXpcf2AZzs3;0@U01$A(C11uh2iju=81!ds~QAh7zzpn z*f8Jk(|kUo;V`6LuP0Suv)O?1JeSI-itoe2z1*Qqg-bZsbtb`p*YEc!id=C*H6(-| zzA&_@bx-^h2!F!?3=ZS5M~A~39gn^wzFaO{qRC{!L=UBn)|7!6&|pAPwS~S~twa^m zqD!02hJ7N5i=ruWghUS6lZh_~u$IfEIB2aU@N_!y%H<4+)AYtK=s$xKSCfJF)*WRqpH+icS`kJdht zK4{X`;-eZL(1W&~ibbJC5Kp2PJ%|XNy(#n{C?cN3n}Xm)4_XgGQA)A3hgw8!iA~zw zv`N$5&2ILY`o#h1F#FBS_kGMaGyi(12?~vCjQ9_5)V~&N7Jq;ZMgS;k1wv9rZ2Eh0fRqJVOS@~6(9vaIki-U(? z%@wzSULnXEhJSH*ASU>j(PZk;@OV8(t3tyB$*j!4irx{4Vs|V*bt*rShKFN7K<-P?yXu4_{nU4+_zYCx*Qp)4U?| zx95bT;TEWAHVm8Nx?X&au8SqbH65U%8{8@b>zVK2Q-4eXjIL+|VbgV^p5WuSsga>u z_9x){YX0nC2c4y-P7Hln$xdYY7W2gq1M5K8>X$}Bv7%lty}Ner0Wj4a4YRx?S44Ry zFRMF-_9DJKdE*Yyvg>7`J6hwfBa5%@zh85uRQlNC&o2|Trnb&d*|MUshUwZoq)k>K zQe-RSBY%aTF~2SUSeRRyrFN;+PGBbVPidq{1TsafelZ*PAnh8l$e0{X{uSN}_sed+q8@k-kj_4$$WphlC4pb^Nl zb*Y*O%}?(kib&Wf)6@>LC)J(gIF=;hnQ=-I4IT{>{0mUYoGkwWd|Yf8GM%ZE00000 LNkvXXu0mjfi?~j} delta 711 zcmV;&0yzD$1=IzQ8Gi-<001BJ|6u?C010qNS#tmY3labT3lag+-G2N400M?dL_t(I zPfb(5Puoxs{+yq7LINR*2^gpg60KCRupwpX(502=$kee*CZz7&JFz427xb@aJJF>} zLnVp=l~MwsD6tbeCUNZE-4hlkJv~3ayYIgH?w(e7XT~`r4}Z3}qRGxys+MJ+3k=!2 z-c51`FT&KB$XS~!y^n3XgwF0~1(J(_VhZU@CJC5@q56Il*yuHJdio2gFjUA(U*9Uk z39%r@8D-$W$H5PXuZABIa7{P%;zFT-R4Rr0`+I1bhH&pIvhz9RL~Iz4ZSBh&%w{vh zF|i~YjYbfj3x5mq$Y!%}-687rC78Fn_=Zmj2-o}kbRSVBf^FLfiCGYgaeh7m!7Jec%DaR9Z?j?eWJng za-A*=G#U*YA0Ol3-~fk*hvLL*Yimn_rc>2>7CQ(6oSpqvB6^-r8K$_nXiKJ6>nAca z2b`T1cU^}7VsyJ*Y-~IwtsDZIDh1@r}wBv=7+Qb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv05AYB05Dq6*2R$_ z7k>Z;bV*G`2k8s~7AgV@sJEs700KBkL_t(I%Vm?jZWBQiM$es@UH^Lth7jTWD1c%i z`IYD>BcxP31frm#q~c-dU0@^Hbh920>t?&2U;vsfMSn!05{<<_3P&I5bi3dJPOYH=?O>Hyj7bwj z6zM^WWmRs4#mIIe6gKm;O$&g;fKj@hysS!^R~mO+k~)JRc=1%x6J4MaTX^s3)1Wvk zNzsTEOx%$Tw)=a_%O4qMrzdn;4f3MIXh8=kgXin_-^>n|^agzv6o8-}3R9vuJAXZ4 z_^i*LKQ}z>HCfCm_V+T@i^#|KZ_!!<&>Qq?iFaW!f=1D4HJD6uj*t3WToxQ3^_fg_ z#-jn&`7I~itXC7<$r3F%=NXR%oAAYD!Eo4NGR?VNJCsseO%y<^Vr@A@l0?@82loVd zzGgfc01!gh+R|1#L9zA~C$FAxaesAB@a8CEGR@iPHgT1^UuzXncNbRgIZ#>8uk-6o zcsv>~ndZFMYw>S(^XNL&!!tEO^ZDD9=erF$&4l5w!|Z0ocr+k{z^5-iF~$I}$cvgf z`>-EVn_x4~-g$#ns#w_-T5FV2cwd{3F`|@0i>5eSlg>3Z^O$%W3C`0Vv}KsTj_AI@ z(5)GbpdY+fj8NnSZPUUoOC&^0WgW%|_Nqj+HL6)hBvqTxU4^BuCofB)4bYVOH?9(k uNfK}#Th_?kw6|q@BRc~L5t@Q6*Zc?HjSX)Ve^a#p0000Ix> zAqoM#{zlYB>n M07*qoM6N<$g3p9A6951J diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/anti_particulate_shovel.png b/src/main/resources/assets/utilitiesinexcess/textures/items/anti_particulate_shovel.png index 55651ffee807420b7bb401c99e01ca01c527688e..cf966d366704f1757d2ed165d5ca93b2e750d82e 100644 GIT binary patch delta 393 zcmV;40e1eM0iy$uB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv07n390B?^_ajO6T z010qNS#tmY3ljhU3ljkVnw%H_000McNliru>H!H3A_{hzc7I9$008GnL_t(I%VS^| zXuwE{;@R7_?T4{by}TS57#J9sNYQ-z>BBF#pFaFDd(qM_FvD0#(fstqONQH5Z!Ixymv^z)qN=URAT1%zpeilTLv$Dj2uS?rVB=zVxbvhBx@Lkv zNKod#o|^N2aeqOT|LCzm*x7{WyuQ!y;lm3?k`j`* zpvr$fK2e7EpPwyF^Ompn| zUa)2mn`i^jHG^o93;+R@`S&Q(ymSBW{~9qzDANq$ldQRA_7k{fk^s8RBmuH*25F$! kX0kQI0LT!E3?K&p02-K?Dwdm{rvLx|07*qoM6N<$f*8Iv)&Kwi diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/architects_wand.png b/src/main/resources/assets/utilitiesinexcess/textures/items/architects_wand.png index 57a08208342a5159d7d9c2625776b0cfe4684897..930d018750b71d20914ceaf9143e5d4f062c54e5 100644 GIT binary patch delta 472 zcmV;}0Vn>D0`~)uDSrXk$t-^W000DMK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!5 z0Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000JJOGiWin*g=|w!B0+WdHyG32;bR za{vGf6951U69E94oEQKA00(qQO+^Rl0Sgp41@x;NO#*{>k$bV(gyT2=X*{z<1(sx!V$Ol7+2LallI663V62@Wxuo?tpmDD;+!eHjo zTnhhfCTvMAx0lIRA&q_IHT-&ACsV)!g) z_9=;wFxG8sTi|c2{hbr#`9#&{A?1AG+`#if)!FK*pi#Z6bY{f(`*N$bfwzx7Mz7M) zF5r0~EYnubii`KJ7mUXPEqK~S+i+DB>@5vX3;Y-p^q(GKnf6lfzr-)E6NT-2f1^qO O0000|A(=oSX5E;5Hw)f zpWFZ6Jh%_%izp~EM6swcN=QgBy?F8B9}6j(PhY;waCOBhhGl004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0CE7E0I)!I>`edw z010qNS#tmY3ljhU3ljkVnw%H_000McNliru>H!N9J2HB$^?y?U00AFKL_t(I%VS^| zXuya|V)nLe`_aWxy}TTWGGO+$ZToLOefZ_+i0U|?WS)mCM2FgD{Uj)-?) zXXR#i{q_MPNiLYZXz3RQ1_p-r$M5;Pe1C`G)2G*rB>7c{U*>;wbHiq{i0IA8hBFbP znU7EOzl^v#!+);+g+2@n3=9X(p85hagrET;0t){n1eF+`y}HNn`rUoT)VOFKShx^0 zfR9h~zqFVt!;AO#7~XuikJZmO4dCS!`L8Hp!0_nhHH-jL)mDYGS+Hpq;FJ07E+_rHE`1A0*go00000NkvXXu0mjf!6v|G delta 168 zcmV;Z09XIp1H=K4B!7!ZL_t(|USnVwv|!nv+yBuqx*D7Sqf0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0Gj}|0JgkDIb{F< z010qNS#tmY3ljhU3ljkVnw%H_000McNliru>H!NC3KD|R#DA;+00CM_L_t(I%bk$T zPQpMGM!z=vhtz^4Gj$RgfwIsgi7&veiI35z@-+-AO)P+sJF2;1wVErpX8pcga zAPNX~HJfwqnWJEjx#;!!$@4?q2lluxZf^Sm0Ms4fYmfVa2O?sWXge)P;D`re!YFCm z%!*yd=_bNbg8R~i(vWxRhqBctZ9bh)w)UTKhyu2XqbZFS>m{D6F>w9;g&0jacP?cf-r z@DWY31Fd90*QwmJV9~&+S~8!@lAdIO1pk0x2bMy@HrV{-}wP%#ieTj1n+SG0000X5MmDBzHgD|of(V9U3q}iw?1#SpQnqdH>*>_?dH2AVZMDgdhNE-nswxe~p+UU=1)A5Htj)5M(n8H#SsVCJOX7-P2dOgpHOwJ^q*LI^2@a0qzstq3*4n0M#-YeNJPsg=o3X^IG_ z;gyBR%*i1TsE=diA8Ca!I7+oo?I0XQXk zXXcl^>&vz)80`qm+(pjv=ykRr6*1(e$*Oz|^?#uUALK>mVYmdy;Q#;t07*qoM6N<$ Ef@I)x?f?J) delta 205 zcmV;;05boN0^R|T8Gi%-006c6H|hWY00DDSM?wIu&K&6g005XtL_t(2k)@Ea3c@fH zMNis5cL%@D#W`D`Uy-?U7ym6F1&2&RZ(PHg5C@Xo)c;9E^FF#MEMn(Hy_o+6x$E_^8B;zSj{=|@w!5h00000NkvXX Hu0mjfDR)$k diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/glove_bottom.png b/src/main/resources/assets/utilitiesinexcess/textures/items/glove_bottom.png index 2b5a16dcb0b63475029022a96537a4cf2764556b..6fdd585d95ce715dee4570e051258ef321d2d0e0 100644 GIT binary patch delta 121 zcmb>EVVodY%*MdLApiM)B9LM%4sv&5Sa(k5C6MFh>Eak-(fhW4p&)|+2lLKZv(BAT zk~G|B?Go7irtxX4%Riybi5?6cVUa;0D%$Mj`uaB+)-CxYw7F!duA-z$^`sCx)sy=C YdYsmkKgG_L0!?J_boFyt=akR{0MW!L@Bjb+ delta 101 zcmeBSte7Af&%(gKu=SVuD6GxWoa9wOw6$%zU3EXtP4|ce(4FK?gZzz176ugP(QwFTH zTeD3sB1-vY=IZ2J-e73Xh0L5{j48%=H1OV+O>hcBYyBI82wfsFDw9hzMFem%tAa>G z$ru9w07|K2dR7RbYfw>S=G0X*X6Ib{617_D8C(GmPe0Pa+-<#VGB7W-w}Ct6zi9>s eC;4kUR{8=+o1Pk}XLCvb0000nRF*8o|0J>k`3lJ%LB0$ORcZ_j4J`}|zkosw zFBlj~4Hy_+B``2p&0t^!dc)ESC@92 zfq->Bltfm7X4Rcc`7Nlch|WO4-Xr=g=YRd z8_-KHSdl zFX_4MX2j*$HtEI&1_lKMAO1go@ZkS>hkOQxbnob+?R%8jfj(pKboFyt=akR{0HG+3 AhyVZp delta 249 zcmVEAb)DhEhi8nc((;?32K(aE z$H2hAU%((BAoX8g&GkPYpXh&rim}tAhqBWz$f`EX;e?AUjhEG2}Fnsv% zlwc~wu-RDCn>=STFfcH1aPa@<;NT}uGbI23XG>ef+gu(@00000NkvXXu0mjfTrF}g diff --git a/src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears.png b/src/main/resources/assets/utilitiesinexcess/textures/items/precision_shears.png index b60a37c4fd80bcd0bff55e79cc1d166f9272e261..bc829a44fc33a65db3af3c3dac4dfbb65bf12dbb 100644 GIT binary patch delta 479 zcmV<50U-X!0r>-vB!2;OQb$4o*~u(_00004XF*Lt006O%3;baP0000WV@Og>004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0CoVI0GAN_|KH!NC1r8BNgnujm00BKoL_t(I%hiy( zPQqXqhTnpTqLLmg{#Y;?(;A2g4koy=xWNs;%)kveo49cU4qirCbTwWBk(%hB94v>b z9HfAslTC?5bTYo{|2|K?{{{X!+`NJ!$H?#V!yXOM=-hI@5-?Gvr9c2ImAKU6njHx< z6!V3QyW{%~4u46TV5vmO4IiJM>2n24R4KSBVEIrfX>kp1__5wVgvDv5fQc$ed<4(^ zCcI#yY+&*}cKQom7YxQ0Mibi;zPq?i&m577D)B)HFM|&1rojP#8*W}z(yx6JX6v5w z6ex0xBz^-Ats7WYl>>lqNTat=4_oVdsJ4tL_>16k;aFn6kP!rhRu*~4d=x{w53Bd& zT;-YE>51+Z?L-e~fA@$4L7~vvHqGLk5sk7j_0aCt(C*fpuly*c3G-%KzB) zz5gfO*+sk|xHJ=G2tLgqK3?yDH1FL18>|SMW{{yo8vqkS*4#4t32p004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0CoVI0GAN_|KH!NC1T5V%^nZx}00C}EL_t(I%hi#~ zPQpMGhW~0*VddKR3`EC7O}L6& zR4#J!xFH0CpgZHgoc!N6bIt&N9pR^f8jg|Q=SR2KL8*2((Vv?IGg+s=d;l!D?=#{C zG=)VS)5?x_e1EgxNN5u*xgQw9i;ih!ZO_$z6fjw*)fEX#N2+MVje({xIHuLIJy*yT zOOG0h(^LVIbqa|ZURuvE;zmPL*n(qPWP2`h#S-xhpC5emXYZihucJ5ULQ@zyrq#AR zcPUpawRwgI?=P<#Q-6WUI*F?xytZp7mbm}`!)9)Bu-NoiPKaX|0004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv0CE7E0I)!I>`edw z010qNS#tmY3ljhU3ljkVnw%H_000McNliru>H!NA00H<75r0Ym0096=L_t(I%VS`m z5HRACoV{(^ei%E|%gd1@17>gAw*U6ihaaE5c*)Gb!0^|>*o+^WAxyXoNcHk^RF#(J zcQ7{NynXfd*8^uyeVn~*+kRm|x&NZV3jc}n0a>5Rmv!v}PFK<(2rar{?@$ zLR95H$#KlbC;DGa-u%CSfE4MP1q7u2>#Mo`=i?J4&t`2UJMuNF%3BhxnGx05694%) zgc&~l_`vYt!&9Q-nF-luWl3X(58vMqtr-PyaPa@<;2Yro&p>Yg0NI~o4C*no$p8QV M07*qoM6N<$f?2D#F8}}l delta 128 zcmV-`0Du3y1DyeoBza^>L_t(|USnXOC0O?7_J0^gmm>&3nkL=Z^*?rfFBp?;2nZXs zq`(bPnSbwp%j_ql83r>1gm>=${a+*I2x$g@0LW&LD?o;j>>Zf1K{k`6nIdPyY(|$O i2u5ut1CVVqr2qii9gvKgaACIq00000*C~VDSrXk$t-^W000DMK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!5 z0Qvv`0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000JJOGiWi{{a60|De66lK=n!32;bR za{vGf6951U69E94oEQKA00(qQO+^Rl0TL53H}}@aw*UYEOn*s4K~y-)ty3{b!$1^$ zDYZhSrJ$e?F%fcz2*t(KB_MJ-2Ao9#L8O9%?ru6s*X-hIhXaQ|2PdIe3QiYFGXxbX zm0F@A5|>1hp-qau@$SF(-+%WH_#=d*0+X>D02u(=I;Ec`V^(nWrBk|@Nzo+BUFQP; zGa0kE>v-ICJbwTa2$VIwEO0N}3UxlhmF4;*BLfQV9F zr&Jy3AZj;C7UyOG0E(huq<~JTN<;}nlyXsWFwXl)wQ411ur|NHRh~KAIM~}MhU7-A zrV>#qCT7rV$$qJ{i^r>Ld@myxo@<&0!!Xuu+aBJz*hIy0R%U0l{tvefEVee zYoR?vaqktnb6+pv+Ntyi@dVRN9V$X&XrZ$TBwyy`2l#iHEsKaq<}oubOtb}CYhkTL z(=@tSnx>IA0TD@6Rfyvl0MNEAm>JVFX_Ai#nAy~I4dA4MH~zYwWlMI@XSiC~00000NkvXXu0mjfxOZcC From 13dc999163485f59316a0265a89462d6f6eb98f9 Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 15 Feb 2026 04:49:50 -0500 Subject: [PATCH 15/15] Resolve comments --- .../common/blocks/BlockUpdateDetector.java | 3 +- .../common/multipart/FramePart.java | 78 ------------------- .../common/multipart/MultipartHandler.java | 20 ----- 3 files changed, 1 insertion(+), 100 deletions(-) delete mode 100644 src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java delete mode 100644 src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java index 316e94b1..8c26ba5a 100644 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java +++ b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockUpdateDetector.java @@ -30,8 +30,7 @@ public void registerBlockIcons(IIconRegister reg) { @Override public IIcon getIcon(int side, int meta) { - boolean active = (meta) == 1; - return active ? iconActive : iconInactive; + return (meta) == 1 ? iconActive : iconInactive; } @Override diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java deleted file mode 100644 index 7a573756..00000000 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/FramePart.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.fouristhenumber.utilitiesinexcess.common.multipart; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; - -import codechicken.lib.data.MCDataInput; -import codechicken.lib.data.MCDataOutput; -import codechicken.lib.vec.Cuboid6; -import codechicken.microblock.MicroMaterialRegistry; -import codechicken.multipart.JCuboidPart; -import codechicken.multipart.JNormalOcclusion; -import codechicken.multipart.NormalOcclusionTest; -import codechicken.multipart.TMultiPart; -import codechicken.multipart.TSlottedPart; - -public class FramePart extends JCuboidPart implements JNormalOcclusion, TSlottedPart { - - public MicroMaterialRegistry.IMicroMaterial material; - int materialID; - - @Override - public String getType() { - return "utilitiesinexcess:frame"; - } - - @Override - public int getSlotMask() { - return 1 << 6; - } - - public void save(NBTTagCompound tag) { - super.save(tag); - tag.setString("mat", MicroMaterialRegistry.materialName(materialID)); - } - - public void load(NBTTagCompound tag) { - super.load(tag); - this.materialID = MicroMaterialRegistry.materialID(tag.getString("mat")); - } - - public void writeDesc(MCDataOutput data) { - data.writeInt(this.materialID); - } - - public void readDesc(MCDataInput data) { - this.materialID = data.readInt(); - } - - @Override - public boolean occlusionTest(TMultiPart part) { - return NormalOcclusionTest.apply(this, part); - } - - @Override - public Cuboid6 getBounds() { - return null; - } - - @Override - public Iterable getCollisionBoxes() { - double w = 0.25; - List boxes = new ArrayList<>(); - - boxes.add(new Cuboid6(0, 0, 0, 1, 1, w)); - boxes.add(new Cuboid6(0, 0, 1 - w, 1, 1, 1)); - boxes.add(new Cuboid6(0, 0, w, w, 1, 1 - w)); - boxes.add(new Cuboid6(1 - w, 0, w, 1, 1, 1 - w)); - - return boxes; - } - - public Iterable getOcclusionBoxes() { - return Arrays.asList(this.getBounds()); - } -} diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java deleted file mode 100644 index 507dd986..00000000 --- a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/multipart/MultipartHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.fouristhenumber.utilitiesinexcess.common.multipart; - -import codechicken.multipart.MultiPartRegistry; -import codechicken.multipart.MultiPartRegistry.IPartFactory; -import codechicken.multipart.TMultiPart; - -public class MultipartHandler implements IPartFactory { - - @Override - public TMultiPart createPart(String name, boolean client) { - if (name.equals("utilitiesinexcess:frame")) { - return new FramePart(); - } - return null; - } - - public static void init() { - MultiPartRegistry.registerParts(new MultipartHandler(), new String[] { "utilitiesinexcess:frame" }); - } -}