From a80615c10af51dee431fba4e1224852d9cec53ae Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sat, 13 Jan 2024 21:43:04 -0800
Subject: [PATCH 1/6] Fixed meshes not being able to be enchanted in an
 Enchanting Table

---
 changelog.md                                           |  4 ++++
 .../java/thedarkcolour/exdeorum/item/MeshItem.java     | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/changelog.md b/changelog.md
index d2345ab9..2bb809ba 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+## Ex Deorum 1.15
+- Added Mechanical Hammer, a machine that uses FE to hammer blocks automatically. Uses 20 FE a tick by default and takes 200 ticks (10 seconds) to hammer an item with a hammer that has no efficiency.
+- Fixed not being able to enchant sieve meshes in the Enchanting Table.
+
 ## Ex Deorum 1.14
 - Added Mechanical Sieve, a machine that uses FE to sift blocks automatically. Uses 40 FE a tick by default and takes 100 ticks to sift an item with no efficiency enchantment.
 - Added `by_hand_only` boolean field to Sieve recipes, which allows modpack makers to add sieve drops that don't drop from the Mechanical Sieve.
diff --git a/src/main/java/thedarkcolour/exdeorum/item/MeshItem.java b/src/main/java/thedarkcolour/exdeorum/item/MeshItem.java
index 0e528428..794bdfd3 100644
--- a/src/main/java/thedarkcolour/exdeorum/item/MeshItem.java
+++ b/src/main/java/thedarkcolour/exdeorum/item/MeshItem.java
@@ -32,4 +32,14 @@ public class MeshItem extends Item {
     public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
         return enchantment == Enchantments.BLOCK_EFFICIENCY || enchantment == Enchantments.BLOCK_FORTUNE;
     }
+
+    @Override
+    public boolean isEnchantable(ItemStack pStack) {
+        return true;
+    }
+
+    @Override
+    public int getEnchantmentValue() {
+        return 10;
+    }
 }

From 079cf10ee899a9a8420e86a3198283f22d6ba351 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 14 Jan 2024 13:22:35 -0800
Subject: [PATCH 2/6] Improved appearance of witch water

---
 changelog.md                                  |   5 ++++-
 .../exdeorum/client/ter/BarrelRenderer.java   |   8 ++++----
 .../textures/block/witch_water_flowing.png    | Bin 9034 -> 9035 bytes
 .../textures/block/witch_water_still.png      | Bin 5149 -> 5315 bytes
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2bb809ba..04b80d9d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,9 @@
-## Ex Deorum 1.15
+## Ex Deorum 1.16
 - Added Mechanical Hammer, a machine that uses FE to hammer blocks automatically. Uses 20 FE a tick by default and takes 200 ticks (10 seconds) to hammer an item with a hammer that has no efficiency.
+
+## Ex Deorum 1.15
 - Fixed not being able to enchant sieve meshes in the Enchanting Table.
+- Improved appearance of witch water to better match water so that the transformation animation looks smoother.
 
 ## Ex Deorum 1.14
 - Added Mechanical Sieve, a machine that uses FE to sift blocks automatically. Uses 40 FE a tick by default and takes 100 ticks to sift an item with no efficiency enchantment.
diff --git a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java
index a3113fe5..8313740e 100644
--- a/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java
+++ b/src/main/java/thedarkcolour/exdeorum/client/ter/BarrelRenderer.java
@@ -81,10 +81,10 @@ public class BarrelRenderer implements BlockEntityRenderer<BarrelBlockEntity> {
                 if (barrel.isBrewing()) {
                     float progress = barrel.progress;
 
-                    // Transition between water color and witch water color (1F0C4C)
-                    r = (int) Mth.lerp(progress, r, 31);
-                    g = (int) Mth.lerp(progress, g, 12);
-                    b = (int) Mth.lerp(progress, b, 76);
+                    // Transition between water color and witch water color (200B41)
+                    r = (int) Mth.lerp(progress, r, 32);
+                    g = (int) Mth.lerp(progress, g, 11);
+                    b = (int) Mth.lerp(progress, b, 65);
                 }
 
                 RenderUtil.renderFlatFluidSprite(buffers, stack, level, pos, y, 2.0f, light, r, g, b, fluid);
diff --git a/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png b/src/main/resources/assets/exdeorum/textures/block/witch_water_flowing.png
index 0f2c4f08f631f9f8e7b8a47c0ca4730a60196d80..61281c735fc210b907def084a8bd0b6de8cf4011 100644
GIT binary patch
delta 2583
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

delta 2586
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

diff --git a/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png b/src/main/resources/assets/exdeorum/textures/block/witch_water_still.png
index 1fc70ed8dae4ae5ede71a797ded5b26a845f5b06..f209b31922113057dd753bd7d00e345be1d406e0 100644
GIT binary patch
delta 5290
zcmWkyc|4R|8=f)rj3p06wD2$_3E8sD%VR8wQc;S^GNII)G=#hi&x|2!lBIZU6W$P^
zlt?o6B_VCHj(y2CW@3i$&3FDdzw_5Q*L8mPeO>o`XQ?(GPP9Q9P$=;Rw6y9;3JN9V
zWMgUO5ac?PHIy)6<ri68{NLv}FEMV*{m@CF)#H1XAGp<b7v0nGR%eQ~|2y=#ld~fF
z{YgNY?JK8mx-0zvRvW?Ll$4SR+U6ENe}RU#1|CADo58z|7Ce0NeU{@N{NZ(J5R8Nd
zhpqqJ8<IZNUBE`7&LWyhLP`fmjn@$#mp!}Lx}9EXn$=b7hqq{QoE|x5v#Gmnb6n*_
zY{SC4<x3s_>gv?@^_P~%6?)SpXY@AkR$Y6aJ0_;0S4WJId+SrYs4oKs+YV>CyU)7i
zd<ffeIjyYv1G{9prPE&Xr3Tz~*<@$54;XYKj&kwC#t0I!KKjYj_D%L&sBe<vfMrD2
zmpbxxD|Bl@JPoj$rk^mif@ax~uXR+`wRN-qyWnNta)lH?P5z|8G3P2LR^o|wMU4_h
z-@0vv3Lk7uFT~o4uY6(;6vb~lB^}ILG_Bh%`%(sNzpsM2rVH3(Uwz}Y{%o0^@*C7Y
zW8^RYfsM32al6tM{YXK0x=1kY{l8#J6pvus38+-bDW^*2Sr_b;#N%%nS))S>R}Ztp
z!B@({7PjSMr(udH3A?s-#_6**Zhe7AXn$G5rOS|HAP%G5g`DVB|4S1xJTbL2h7pee
zgzR2rgQVCnxqRb*!CceY?T1MRy7l!f&yy*L*?n(iENOqyI4+9IFiK7vI4;hnUTJ$l
zQH1DU+2|jQWR%X=d78ie1V&}uZejdJGcefDQ^T-XjZAPPFNXztH}2m^0_P9OCI^u?
zf5U~=M?FNfKGU?DVOcyQ1Z=U=@h5?<%|P2#nDSo;T&OYQ@=yszL2j@&+bkEE#z<A;
z!e0tOS~uIQ!h5<iPF^ix)i=*JV1oh%Z%+k2>M#o~03D>Nvzih?hSxOByP!fEDkK(`
zDpz5iEQuzYn+&^21*E)v!C)0UIeQ9bMtrW<RmMRS=Pdmra1&tJG?(}5X^s809yf5L
z%W!Y|lTi#KNJO}^;;9%9g~;N{_c@egGc`B+&6j-RK-6z&#q9frDwLTs)yOBkb`psL
z`!^bzZw?5E;5&V@R$~SyFw&MjhhDY=vkw2Hf#(SLznXy39VD^=G-KN;2a$)ksJsc9
zpeU)08%EVn;FEV>^KsCA&?`HSXV~?~+ZfH%#=c-#{uN__=y*mXJ?Lstge5#TB_NWW
z#6`h<%UwayAom?;FBz1E^0>z`>lPM;36i95)=}mKd6pOVe))^G?=Y(1q<b4MOHyVG
z@`;=XEj&EK51iMIWTu9Q|5rBk^C#&bgZA!YZdaI!yXINwV&2n6_us!ie|$X@!lSn?
zE@T?*r6MdBpjL5Hs^>Y%%5mUIp&GW<@3ck#rgq@_P@@s0MyYl{R<{ms{aEzr1HX1p
zbtt7GE?Ed-K8mh7ZGVQdsR+rU1xU}T4$ACZK@-nK;p8fgt#`zNmTKswm~R*LPSX7Q
zL>0U~WWG&KJ87sm=pP&1KQ&p?SHq?Jb5VY|9(j|3?;peb{}^zLi}JPYlumQB>h^>;
zw>FSX$?g!+EdjvCmt7(0c}9w^y;;LWak@SnfRssN_Gb#54R|Qdc=@s-Y;9KE)!qcW
z*Oec`ELm$q*(2d#T2s3Cas2Qk&AV8^|9v~4@WATKLWYx_B*%&)Y#^u7hTb@V+<Sx>
zu$9mxzWINIf5h6k<9G_iS`!$$QWa$>Itldum(2WA%%$-23ESw{30@hPq-o4xy;saS
z<n?(BeTJ}2r=J=>ck&NHs40+zb~9d9=ZU~vyQo8GNa9m57geMoE6(^olqtPl$LAvZ
z@|9<P1-(giK3%4ik9h34O=i%o)IJ{?)QFlOCW8_x(PHJ7@g9@X5Qo^XGNxM0=rG_>
zXpNgbQYG={FUqZ;cfP-a285NyFWU_2?wC`xYWWUBkSbBHGV)?1=il3uWc6zuE@Z}U
z6-c4v8C~qtdDrEeIBDu)EQqpCzbUUC#`}Htx65vigx&2(IEa$>Z8>4M+<EuLie9e|
znV4op)rA`#?3k!DjH&*H2V^HjZi+cen}l`YW}qpWyj7?SWcW}*($4_uEQ_cI{`*Fa
zX(SU@(YLD?RUwC6)D3r`wdv<56E&jr>zWLZ(vsTr_YigX=aX@opm688X9u>nD4`X7
zLuA4w2${lEp-49-FjR}&qNPX6%Es248nuzq5HTnYtirEKKvmMEM_@ydJXhnnXG)E>
z1)WDMBg8&NhhGi%-vI?VRvzFGal12kqdo`03^FkX8y}wPiw|~lVo}Fpu>?@%<i#nv
zNheUz=$61jUy+y<D@sngw4+kmQT}O`r3n%~Ouv`r7Y&w({W#hPG)Tw9-nLhn%jyQq
z;lgRmPFA!<4)`a&Z5mUGHSO{424t(sG++WSqzDn2A}7P)&*hO(JbI2UUy>E5&c{48
zo1<l}`QM>98jl*j`UosOSe9byKXQRl9Bn(n;_Bd8+y7n+@O0|>uZS@AemjZ4sG9B$
z_X)B0vEXItzAM+EG~a8WC@k@FPwn|hEl71R(izPLxXghujO!ZJ^v;eM@f^??qYIH$
zm7<&GF*vjS?)2pyPLHw=kVG#Co%!**KD@P$x4OshXjd9;-%35X(rZ`ygz)+xW{{Xc
zrc~`ryxp_*X&@G~v$QK;K%7th6{Ds&Z{yiAq-(CJKO&>&9w0QK-`+g6AwYjf#l<In
zdsEGqMe$3u{l6)!SDup^oUV8=uQ)Yt>T+ZPAM=w-d#*eG6uA2)GHicdVQ>Mqk8IW9
zdn)$86sAm;zg>M?q`M=8y!>ai7};7oyZh#H>*+HRgL+!m){iD5qbWI0p4h+_+GcQ>
zmJ{;@4@}{;@0GR<0O()cRj_h<rM{;5ux(Gy5|x)6bL+yL*u_lCBn7jW4<P9kK1LPi
z-KtM|<jRkKrpAL^@in<*Mjmv7Ou5&SBYZW&k|Ms)NT#50inHH7M1h1QEcp^V(|Xrc
ztFj$PIHYBbMjn6%BodNYDW_pn<<6{PXG&0rsJ}Q1{T5Fq3Znz9YmX+{n?>WBDMm}M
z`Ll<_sMph&wU&kF=fxt(%Tv6KcQWNiVCF4SeB!XRmi`Eay+kBYo}bi(-XDn^?um%?
z7R`JeVs_((`!WAVt{qe>HJY*IW9js@u+29W--Zm4aB0HSb6cadw7u$F)NFSIDL_yz
z>EYlfz~{wrV$fSHKaLt~x7ET!IkZ@av#8-?7G#A&_8y4Xc(z`KOpJDf(@bBUAXB~$
zwV7x@l-n@3l10slYX<%t7QZ??g~_(Q4r_tZXt!(eVyE-lDi2yc7ZKihx`eH+l?3pZ
z$oeg>C>~0yJFr;o_beHJP)Y=^dO%E;D!g#~wcsAe_C&n66(2^^#jq=|wH#qv6Gq{C
ze-4qg>N2|t(-M#Z32nZ**RigPiZPkMxapV}6Kd8)nrd|vt|_iib2?v#9EKUHJcbRM
zP^b(2S-uRXZQmcSV42-kJVd#VOfX;~)s@jmX4<&0sM)*m9tq_|(S_YYTCurNZ0|d;
z^KK~7W-Y^>lcbPay{jImJ@;@}GSKZYSmoPRIqrNO=z)BwtABoYd>jeK;Cn9(m@f_a
z-cfIUPVF}ju6RKtP0|cx;3|17|9y~xiB=|$Sx{u~;%zH{#k2#%$Wu0C*$MHcKCbfX
z6HF3Va*l;ws(;HRZpE~ug4xf!p0xma!4|s@zgl>FOVkK$bssCrY2d0r*xhsQ56Pen
zcnlKyZp4CY0$&@~zfViTgeTvMusP@Mv8e;-*C5Nx{KUyr-zFea=jV^w0&%*VB<Bi!
zVfyNQv0$$k@ks4GvtC=jO0$9RmP+ZANsJH9hc1Zc-|9vCGW&(E&iV^$pg&`DIV*9~
z%g5>lnejJW-1?rr6MY&}takyunuQ!U&kMV-zAW^JHAgEQFk*XjlNTgabj&;t_h~#w
zRjyk-Zs3j`$bVXH-nIRLRX@QDAZrbEMWh@X2~R*?T{isNs0zSa1o9Y%&P|8Nc|HN>
zI4(Mxz4piLUI@>c@ZssS=~u;pE29E*_CYRlU8-SN*FZ@RrdU%f|BbnZRtr~#?6O*b
z!C(7+7xxz6mI*6na+8u!nq?DQp5LJYDbMe}Byu-{+>;bsl*rDu74%*~D+*Lz&oJ6R
zun7h{g{*%9<Spg{c|_5fSHY<p_Hf&(1v&A?HUA|_U^if0Mw5b6!}%v{j|BZ~JFt3s
zd5=C1MeNl0^eNB)x-rN$oBQm_G7Aso|4`xE%5?BLprYQrLzMr{NNN{ZYrp%~vXgEw
zmpi+u4^70zhB5?x=laI1D8fivUgw|%nYp#MOh=#=N0C4u!BLF*BNoY<8vsK(9+wsK
zm1Q^d2{2!;%K(FUf5^m)f?i|aXgr}-8tR)0P5<K6^6A}uRBZ;C(GlV_L0H;%KFb6~
zrP4mD?OS4*O-@!UQ=g`*EA!#BVO(EY#DbLK!@}!fcN8Fs5QK27(rwGs{gT08LoZLC
zPeP7ldZI%<99d92KA-XBry<LI<o(=F%U#z?=bUQxYq*t)`z!m&Yc~XM{)j2&v?!&u
zjW(`gXN@P>Y&8A!<2x*LUntBxrB=Eq!--p1K{s@SRMEgGH<=mxdwDyAAB@s?8%;(2
z^?>s)<#Xl$^1lD^?t67-o8opbB8srlq+}4go9KB=Pl_{%8Ift4n--l?V!IEVyPk3(
z(xJs3|MIq{<}=qUOZuzO<my%+{%999n|k%%(CHhxm1CGh$$VXArhCM84p+g<4OaLy
zm!G}R0tl~r_FFujk=x7}rG0D+Y6T`{6(HwoM$%p6+Ito{N+5{f;D4$e*pe6T<)WM<
zE&I;G%lprkGikO=)uW*)ZQ<bhw}5EFY4^DoT*mXXPHkv;!@3^OqZ~n5ycXDt9+}YK
zQg%2xp6%<#S{|os|8PEhkeXeHwd)~)vs#l^VbU!NU@_n!XnDjVyr=KGB23uJNpR>a
zK`^H@#o1^ixanz!8pQ=>?uV-w8PSa%g3fnV(1$du8G}I@Ffl+(?7@-T+$*^_zTV~x
z%9^g#r98!Mgdxm}P7#sa#vjV}k=|&?X3>YZbT=0-eCIy_3>Byi<E?#GX@TdZ!Cne_
zTSi4?4<&5)$CcWKOwo8zMsI}n86x$6<ytU1N)wbXlId0MB6#aDEr{a(j9(5UjxNlH
z-C@;V7ql&Zkqx$8z>mFa2PiK)-wDeUV>zYtOfvD!E>W0~C;7DV<1qt?hNxTnHjZ-m
zK61iPuQOZpTu>h~rId@h)}L<dp9H?riQA5h7!8r;jAHV$LBAsr?oPpooLRxm&c0j`
zya4`GRM(Nt7hFR1O8vb!lP~vo7ok*PqQuNzXC9G5*4j3eB@A^%CrEt6I(;i<$2`Vl
zGF^O+D~-*$ubPGQ1rotp%^yG5_5amTlB2kENbvqYaUkO~+~!*>^!nBnA^{_G4JKHT
z>EkVcI5veRlO9yQi13Jke_SSSuz9F!VMlNIYtGy?Z~q(%R^b*O{gdl?tP62VUo8~%
zOP$vRWk_2;6V~aKbgFAe{ujL+accRwUA;HUFlxZzd9a;dq8WjZ-Q|`efU2mu`slGc
z?-Fvrsk#OC50%UfdROnLD&Ai5we+EvA526K&k6T$hmcW7-*-)jw9;1*s%$UGp)s`B
zieHs~Ns#yzqe@SX2=y_I6YW%5U7`yGkqj{cLt`{S*9zwqDgfk<OG8yU3<__{w&#%P
z1JGfIZLgJN)r)lS`^fy)S_M4;d|*kXmK?8<%t#xr)VB3#xlg9ds2}`|@;Cw$`o>ei
zsbV7H!vKD)sn|Vr<uaxP9j||kPmdFYI_o+YV{0vlo>)c|uJD_t&X0Rr@;@h@6)Me)
zGy~=?rTm_-4m<F!9{7m7*)3^R`w{RQxNzEUiSz`dj4O+IMqU<F^L^uB{Wz6|A;W?*
zM}1TX>FT%I{pni#7;3l?!JZPj>fH=9Aelh{Vaed%s{-+QGjexUs8^|ae#Xu3v3#&7
zF>N6Z-U43kacU`%+Hhl0<*ueV^IIG_t+F5!Jz*T1f{s5Tuund_<mhe33t!Qz1GUWG
zd!hwh%Hr-anDSa}kv(p5$_&AzLuVxM1Cy9lRcqPazxbV)$t!aWfd|#Wc8N%J3ELy5
z?oX?UqMAU;uDgfJOr!th5yL+FpX!qkKB{N|YvB?D9A(E#zSccV=}_|=_$Q|?_?c^p
z<PCawqUg_aV-ir`A&$C+M=>p*Dmn8tu&hEY?>3l#>$Dih{5{B~7V5Y*rT*lzSscSC
z^H8tr?p|2sGO(!InI#=nLWq*q31?rwJ~JySD$^TJT)7HMsE9aq4UeiohMGai(=Ljq
zhH*V<zsPn|rt$YKMEEY!{-l**IV$Q0!*g+_DDV4Zg0+>WL%5Mph9X39uoRrmxy?x}
z(s`ysD^l(gAnkXz7uvb*AyzdNi1vu1<=3l<Y|It%U93T8-@6o~yJFXP4H>1LSA3FJ
z4;=l%_*3I$_y}CtDJ?5^1#R_pE2|`gqLhn{y5prpc!l&)`Lm!5@yd&~OukVI;vb(s
z(f=m7PpMITe0E%J_LQsSL{Z)+Mb^{H*IajQw1#owzyqk^=h0Et=$X4*W_Sy5KTcLS
zi6p<t(`%`Fn~ikLib;B(u-R1eP}4CwC*{)|$@k;8k3EE^_5e1R1AD1wbaVgTJg5II
zk&<p(x)=wl0zWK^xBrVMol|lf$82wRk#9J8@Cb((GrijUxy7z19~Gitt@p64NvD}e
z-$AL15~XR3c9Lk3cgBR`Y8K?9Xdx)O;$aby<P{L8#8WtBH8dLjN4x&ZERW+jU;C~B
TDp&VL@t4i<GnS?1#PI(Cl11`w

delta 5122
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
P!98Y17KRo2_^AH_vJ{<J


From ffe9225a25e2979c24d47edeb92e118a9628c4b7 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 14 Jan 2024 13:32:27 -0800
Subject: [PATCH 3/6] Fix barrels not sending visual data to the client. Closes
 #35

---
 changelog.md                                  |   1 +
 .../blockentity/BarrelBlockEntity.java        |  23 ++++++++++++++++++
 .../exdeorum/textures/block/compost_dirt.png  | Bin 250 -> 248 bytes
 3 files changed, 24 insertions(+)

diff --git a/changelog.md b/changelog.md
index 04b80d9d..b1485e37 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,7 @@
 
 ## Ex Deorum 1.15
 - Fixed not being able to enchant sieve meshes in the Enchanting Table.
+- Fixed Barrels not rendering their contents properly
 - Improved appearance of witch water to better match water so that the transformation animation looks smoother.
 
 ## Ex Deorum 1.14
diff --git a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java
index d3f2b37f..a121bdba 100644
--- a/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java
+++ b/src/main/java/thedarkcolour/exdeorum/blockentity/BarrelBlockEntity.java
@@ -22,6 +22,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.tags.FluidTags;
@@ -129,6 +130,28 @@ public class BarrelBlockEntity extends EBlockEntity {
         this.b = nbt.getShort("b");
     }
 
+    @Override
+    public void writeVisualData(FriendlyByteBuf buffer) {
+        buffer.writeItem(this.item.getStackInSlot(0));
+        buffer.writeFluidStack(this.tank.getFluid());
+        buffer.writeShort(this.compost);
+        buffer.writeFloat(this.progress);
+        buffer.writeShort(this.r);
+        buffer.writeShort(this.g);
+        buffer.writeShort(this.b);
+    }
+
+    @Override
+    public void readVisualData(FriendlyByteBuf buffer) {
+        this.item.setStackInSlot(0, buffer.readItem());
+        this.tank.setFluid(buffer.readFluidStack());
+        this.compost = buffer.readShort();
+        this.progress = buffer.readFloat();
+        this.r = buffer.readShort();
+        this.g = buffer.readShort();
+        this.b = buffer.readShort();
+    }
+
     public boolean isBrewing() {
         return this.tank.getFluidAmount() == 1000 && this.progress != 0.0f && !isBurning();
     }
diff --git a/src/main/resources/assets/exdeorum/textures/block/compost_dirt.png b/src/main/resources/assets/exdeorum/textures/block/compost_dirt.png
index 94a8e294bc7ba3461a5341afc123e0628c59f98b..0a52a21dc30a7fc1ed65bbde1464e7f0cf8eb612 100644
GIT binary patch
delta 183
zcmV;o07(D(0r&xsNq<8_LtR~6b#--zhlgxzY+hboHQ7zT00009a7bBm000ib000ib
z0l1NC?EnA(Y)M2xR2b78%)t!;K@0@JVJCr;PxrUS5P)q&01yHBC&P+oOQpt5J{c?o
zE$z()k8U4NxJh10D8H0N<CNHR!E+~r5R1A*l*h73!&9MHyfA|?S>CpdeZ<%P7`^$&
l<Dot<k5Kk0EcWWu`~W!D4;dHqOT7R9002ovPDHLkV1lxtOXvUq

delta 185
zcmV;q07n1#0r~-uNq=>9bzNOuLqkJ{hlgxzY+hboDk;Sw00009a7bBm000ic000ic
z0Tn1pfB*mhZb?KzR2b6@jKK}VFbo4}Wr0XW|00F{6M2Jlg09g0hp2x?9C#R!uFeFT
zpNz3!Wil<p%Vs(=5a+G=W}}>|O9|7H1`>j6x*S0kL%loI5;6#;jqC7dtCQcj3l(nK
n4%E-<$o;yi_S!Jwae4g#_+<_-W-90v00000NkvXXu0mjf!Q4y`


From aac2073e38c01bb08650f2b01a760d8c83eadfa0 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 14 Jan 2024 13:51:10 -0800
Subject: [PATCH 4/6] Fix inventory sorter voiding items in the Mechanical
 Sieve GUI. Closes #36

---
 build.gradle                                               | 7 +++++++
 src/main/java/thedarkcolour/exdeorum/compat/ModIds.java    | 2 ++
 .../java/thedarkcolour/exdeorum/event/EventHandler.java    | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/build.gradle b/build.gradle
index b18dbc5b..7180fd91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -139,6 +139,12 @@ repositories {
             includeModule("maven.modrinth", "embeddium")
         }
     }
+    maven {
+        url "https://cursemaven.com"
+        content {
+            includeGroup "curse.maven"
+        }
+    }
 }
 
 dependencies {
@@ -169,6 +175,7 @@ dependencies {
 
     // testing
     //implementation fg.deobf("curse.maven:allthecompressed-514045:4938351")
+    //implementation fg.deobf("curse.maven:inventorysorter-240633:4655091")
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
diff --git a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
index 912f9135..7b040515 100644
--- a/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
+++ b/src/main/java/thedarkcolour/exdeorum/compat/ModIds.java
@@ -18,6 +18,7 @@
 
 package thedarkcolour.exdeorum.compat;
 
+@SuppressWarnings("SpellCheckingInspection")
 public class ModIds {
     public static final String MINECRAFT = "minecraft";
     public static final String THE_ONE_PROBE = "theoneprobe";
@@ -41,4 +42,5 @@ public class ModIds {
     public static final String PAMS_HARVESTCRAFT_CROPS = "pamhc2crops";
     public static final String NUCLEARCRAFT_NEOTERIC = "nuclearcraft";
     public static final String JEI = "jei";
+    public static final String INVENTORY_SORTER = "inventorysorter";
 }
diff --git a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java
index c730d672..b702e76b 100644
--- a/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java
+++ b/src/main/java/thedarkcolour/exdeorum/event/EventHandler.java
@@ -57,6 +57,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 import thedarkcolour.exdeorum.ExDeorum;
 import thedarkcolour.exdeorum.blockentity.LavaCrucibleBlockEntity;
+import thedarkcolour.exdeorum.blockentity.helper.ItemHelper;
 import thedarkcolour.exdeorum.client.CompostColors;
 import thedarkcolour.exdeorum.compat.ModIds;
 import thedarkcolour.exdeorum.compat.top.ExDeorumTopCompat;
@@ -230,6 +231,10 @@ public final class EventHandler {
         if (ModList.get().isLoaded(ModIds.THE_ONE_PROBE)) {
             InterModComms.sendTo(ModIds.THE_ONE_PROBE, "getTheOneProbe", ExDeorumTopCompat::new);
         }
+        // todo instead of doing this, figure out the real reason sorting voids items
+        if (ModList.get().isLoaded(ModIds.INVENTORY_SORTER)) {
+            InterModComms.sendTo(ModIds.INVENTORY_SORTER, "slotblacklist", ItemHelper.Slot.class::getName);
+        }
     }
 
     private static void addReloadListeners(AddReloadListenerEvent event) {

From 4a6660a6b7f8e455a7e2a935f38287ddb2054346 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 14 Jan 2024 13:52:58 -0800
Subject: [PATCH 5/6] Ex Deorum 1.15

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index b1485e37..f22746af 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,7 @@
 ## Ex Deorum 1.15
 - Fixed not being able to enchant sieve meshes in the Enchanting Table.
 - Fixed Barrels not rendering their contents properly
+- Fixed Inventory Sorter by voxcpw voiding items when middle clicking slots in the Mechanical Sieve GUI.
 - Improved appearance of witch water to better match water so that the transformation animation looks smoother.
 
 ## Ex Deorum 1.14

From dd68f5e337fb80247c14c6cd853df8c423286df6 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 14 Jan 2024 13:53:45 -0800
Subject: [PATCH 6/6] Update version number

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7180fd91..dd5b730e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'org.spongepowered.mixin' version '0.7.+'
 }
 
-version = '1.14'
+version = '1.15'
 group = 'thedarkcolour.exdeorum'
 base {
     archivesName = 'exdeorum'