From ac71bf8de807123ca9f9764402ab14c32733f30c Mon Sep 17 00:00:00 2001 From: MartinSVK12 <37455793+MartinSVK12@users.noreply.github.com> Date: Tue, 2 Apr 2024 20:03:02 +0200 Subject: [PATCH] Added visual indicator of item conduit mode. --- .../states/ItemConduitStateInterpreter.java | 1 + .../item_conduit_basic_restrict_split.png | Bin 0 -> 635 bytes .../block/item_conduit_basic_split.png | Bin 0 -> 519 bytes .../block/item_conduit_prototype_split.png | Bin 0 -> 581 bytes .../signalindustries/block/itempipe.png | Bin 515 -> 0 bytes .../signalindustries/block/itempipeopaque.png | Bin 632 -> 0 bytes .../blockstates/basic_item_conduit.json | 113 +++++++++++++++--- .../basic_item_conduit_restrict.json | 8 ++ .../blockstates/prototype_item_conduit.json | 113 +++++++++++++++--- .../conduit/item/basic/split/conduit_all.json | 6 + .../item/basic/split/conduit_base.json | 6 + .../item/basic/split/conduit_down.json | 6 + .../item/basic/split/conduit_east.json | 6 + .../item/basic/split/conduit_north.json | 6 + .../item/basic/split/conduit_south.json | 6 + .../conduit/item/basic/split/conduit_up.json | 6 + .../item/basic/split/conduit_west.json | 6 + .../item/prototype/split/conduit_all.json | 6 + .../item/prototype/split/conduit_base.json | 6 + .../item/prototype/split/conduit_down.json | 6 + .../item/prototype/split/conduit_east.json | 6 + .../item/prototype/split/conduit_north.json | 6 + .../item/prototype/split/conduit_south.json | 6 + .../item/prototype/split/conduit_up.json | 6 + .../item/prototype/split/conduit_west.json | 6 + 25 files changed, 303 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/assets/signalindustries/block/item_conduit_basic_restrict_split.png create mode 100644 src/main/resources/assets/signalindustries/block/item_conduit_basic_split.png create mode 100644 src/main/resources/assets/signalindustries/block/item_conduit_prototype_split.png delete mode 100644 src/main/resources/assets/signalindustries/block/itempipe.png delete mode 100644 src/main/resources/assets/signalindustries/block/itempipeopaque.png create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/basic/split/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/item/prototype/split/conduit_west.json diff --git a/src/main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java b/src/main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java index f35ef2d6..d31bc9ab 100644 --- a/src/main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java +++ b/src/main/java/sunsetsatellite/signalindustries/blocks/states/ItemConduitStateInterpreter.java @@ -48,6 +48,7 @@ public HashMap getStateMap(WorldSource worldSource, int i, int j states.put(direction.getName().toLowerCase(), String.valueOf(show)); if(tile != null){ states.put("restrict_"+direction.getName().toLowerCase(), String.valueOf(tile.restrictDirections.get(direction))); + states.put("mode",tile.mode.name()); } } return states; diff --git a/src/main/resources/assets/signalindustries/block/item_conduit_basic_restrict_split.png b/src/main/resources/assets/signalindustries/block/item_conduit_basic_restrict_split.png new file mode 100644 index 0000000000000000000000000000000000000000..8062b29c45eeaac3a53e3628e9bf4665acc771cc GIT binary patch literal 635 zcmV->0)+jEP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0uV_=K~y+TeN%02 z+CUT>8;tRqW26ebMsto(1%B`+Axcy#704g{BBgbjM5&a9^ekMWp!62lhGKjB<^`Gt zq>jAWuebAN=dB%Vq2KS>y}dV>OeV4Vp7wi%Q0RkcMeIM3Zl*?r$;$f0+V}~Fx2B8GLZ#3XIj*_(7Z6Pp1 z5UitK;PgKAtg;724omi+iv9XqR4SfkCrM!oWUCC**%Zrki8M`+ETqj7I1l3o%Zwxm zNg|o5a*fZImztgO*}5OPSS(UGyg*EXI7XbraGK4gr4$;~YPDd5Ao>!Cf{L!u#8RoG z<8JpOk~GHc&8^P4?sC9JspIh&<&vkFiO%UM&d$%ZB5a;l#`V{0-QP4dadUtq@~Pz2 zYNcx%P|;?OarB3YT}}v2nny?4>xKkgMUi?zsZ3Jj7RM*Y&tr-4JP*!~$46_#z?!MS z)B^F~xgw*{NHcBJ^#=nnP)ro#;+Xv$b1~AnxENSI5SnKKK9(x#Qbxbx>zy4@k{3C$ z-z)r_PNfnHsen`=ktWsH`4_(5-`o9qUEjgo-8Zd5r*k6jAjfPr!(rp_|NjDIlKnvW4nZOWu@KNi8ns+5b)AnUNm3pEi(Li0pJd}Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz0h~!hK~y+TeUe#j z!Y~kq#|S94a}TI^pb`~54ZTO9a1zRP6(}!21(jGrIR}6GAD=*5%?P)_Q4*4 zK!XnP>@=`;r)?-BiAWN`OgU`hsZ?S%Nz7`wGGQ2Ca0rS7lmexd^;!m4_VjD&O!~}X zu{7h!_^v-@KL5V_K<&}7CTunvC)gPxwtScWd@-NHp_$EQcT4owzSAP>b-PC306pP> z@Ho&rZKPN%-sJn)ZcPy25OHuy(Q^ko93*Qr-VI$4L3`$OS#nUoH9lk?Ad|s0rc!V` z9U=NXz}ojA3`5)iZb9S0Z8%+hv|1)#D8%=mQhAB})9J)Sha(LUs;||X7-xu7CaIr; ziE{awDJ)k9iM=C^fJOm@0!ir7XdPJVidzBohuM;l09A1dz#jlx#;?yPfo1>z002ov JPDHLkV1n_g)NB9% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/signalindustries/block/item_conduit_prototype_split.png b/src/main/resources/assets/signalindustries/block/item_conduit_prototype_split.png new file mode 100644 index 0000000000000000000000000000000000000000..e90a526196a88e2fa9630a08653013c0406338b9 GIT binary patch literal 581 zcmV-L0=oT)P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0oqAKK~y+TeUiOy z;y@IIk8R>$vw+BoB*fbwUSlbsprfFmPHZGtQ6>+<6A+1Pg?Nl?N68z|5Mk#JV~7pw z*%>pzaz@%u8hg%+edpeD2Vbez>!jIi5-yM2T;GsJqam!z{C#A%+u`(7voUnnx;wEy6=DRl^Ch|vr1H&^2Xc1Fbr(A z8&oP4$g+%VHjCM8hRf0=!oMLr&%=7X1_?v>fe+9lq*|>;*pF-@LsPsmt}vg^F&>W- zb@cmv;<_$UN(xKI#>M$Lw%aY=<+R&vVp^u)^e4Bscf{&giT#8JlgUKNWtoWwSb1!4 z2~|D8{qR1KnPB4U>kFTWsH)iBM1U@J{?Nt)kAEH|Hn@yT?EUH`N{}qeBCFLZGB9QNi1Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TY1Q2%gEG(oAyuzRP@ZD(W=x0Qa9%iY}UeCO9f znr5?MeBU?LJTvGIOuOB7{%7p_j1Uq$DXeutdJ?3R*1F&da1ISLn|Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TFVn0UJnPjzV5h_lXsX-r$~|np68)lF5}|-0?&V*F&qxx#Q58N4`U)!BZJLm zgCGcWrD=+&8X=0J?W$vaN2wH`SS+dsxyzAmQq1Nvtdf;@V_}!F78c&quP4Wh zB#B5OnJQAohs#Sfj|#Xy{CL1}nMm*wF$v-rv5n!?>vhK(S#Q7JhY^D2$0o8YgL6(4 zg%Y?_Gw<)e!zMA>t+py7xlgwl%!|QbfMOxg+6sk&-dSsvhzNorT30RY5bvmZZ{ljT z(p_RS+YbC@2`@>Y9ocm!mNNWOsiX%o4x|Kr)BT+So_BY7=5YJMx<0t z6{Z@B2QM9IG#W2K5=@LI6P?UNjEiIL3oJx|*Xwm12ZZLCki$|zP1;y4m9=J1 zbiKjv*-QPiolR-8Y$o4Dlp zYvnLCn^$TWTX={g0xJZu5RhnR7IzMfwTYhp#jyg`C)pUp#WvDN5>Ulk0Dl2mHzm61 SL@2}n0000