From cfe737a79f11bc265990fba8b9a11224dc4af1f4 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 30 Jul 2017 21:27:24 +0200 Subject: [PATCH] Added CTM integration for Constructor and Destructor --- .../refinedstorage/proxy/ProxyClient.java | 8 +- .../blockstates/constructor_glow.json | 104 ++++++++++++++++++ .../blockstates/destructor_glow.json | 104 ++++++++++++++++++ .../textures/blocks/constructor.png | Bin 16091 -> 0 bytes .../blocks/constructor_connected_glow.png | Bin 0 -> 4959 bytes .../constructor_connected_glow.png.mcmeta | 26 +++++ .../textures/blocks/destructor.png | Bin 15549 -> 0 bytes .../blocks/destructor_connected_glow.png | Bin 0 -> 6099 bytes .../destructor_connected_glow.png.mcmeta | 34 ++++++ 9 files changed, 274 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/refinedstorage/blockstates/constructor_glow.json create mode 100644 src/main/resources/assets/refinedstorage/blockstates/destructor_glow.json delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/constructor.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/destructor.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 2edb86cd8..9ca3b05fe 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -201,8 +201,6 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXTERNAL_STORAGE), 0, new ModelResourceLocation("refinedstorage:external_storage", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.SOLDERER), 0, new ModelResourceLocation("refinedstorage:solderer", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_interface", "inventory")); @@ -259,6 +257,12 @@ public class ProxyClient extends ProxyCommon { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "connected=false,direction=north")); ModelLoader.setCustomStateMapper(RSBlocks.CRAFTER, new StateMapperCTM("refinedstorage:crafter")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CONSTRUCTOR), 0, new ModelResourceLocation("refinedstorage:constructor", "inventory")); + ModelLoader.setCustomStateMapper(RSBlocks.CONSTRUCTOR, new StateMapperCTM("refinedstorage:constructor")); + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DESTRUCTOR), 0, new ModelResourceLocation("refinedstorage:destructor", "inventory")); + ModelLoader.setCustomStateMapper(RSBlocks.DESTRUCTOR, new StateMapperCTM("refinedstorage:destructor")); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> { ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack)); diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor_glow.json b/src/main/resources/assets/refinedstorage/blockstates/constructor_glow.json new file mode 100644 index 000000000..db6a65354 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor_glow.json @@ -0,0 +1,104 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/constructor_disconnected", + "line": "refinedstorage:blocks/generic_grey", + "glow": "refinedstorage:blocks/none" + }, + "model": "refinedstorage:cable_core", + "uvlock": true + }, + "variants": { + "inventory": [ + { + "model": "refinedstorage:constructor_destructor_item", + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/constructor_connected", + "glow": "refinedstorage:blocks/constructor_connected_glow" + } + }, + "false": { + } + }, + "direction": { + "north": { + "submodel": "refinedstorage:constructor_destructor_glow" + }, + "east": { + "submodel": "refinedstorage:constructor_destructor_glow", + "y": 90 + }, + "south": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 180 + }, + "west": { + "submodel": "refinedstorage:constructor_destructor_glow", + "y": 270 + }, + "up": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 270 + }, + "down": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 90 + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_extension" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_extension", + "y": 90 + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 180 + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_extension", + "y": 270 + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 270 + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 90 + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor_glow.json b/src/main/resources/assets/refinedstorage/blockstates/destructor_glow.json new file mode 100644 index 000000000..a4fc5f2f9 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor_glow.json @@ -0,0 +1,104 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "front": "refinedstorage:blocks/destructor_disconnected", + "line": "refinedstorage:blocks/generic_grey", + "glow": "refinedstorage:blocks/none" + }, + "model": "refinedstorage:cable_core", + "uvlock": true + }, + "variants": { + "inventory": [ + { + "model": "refinedstorage:constructor_destructor_item", + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/destructor_connected", + "glow": "refinedstorage:blocks/destructor_connected_glow" + } + }, + "false": { + } + }, + "direction": { + "north": { + "submodel": "refinedstorage:constructor_destructor_glow" + }, + "east": { + "submodel": "refinedstorage:constructor_destructor_glow", + "y": 90 + }, + "south": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 180 + }, + "west": { + "submodel": "refinedstorage:constructor_destructor_glow", + "y": 270 + }, + "up": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 270 + }, + "down": { + "submodel": "refinedstorage:constructor_destructor_glow", + "x": 90 + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_extension" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_extension", + "y": 90 + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 180 + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_extension", + "y": 270 + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 270 + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_extension", + "x": 90 + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png deleted file mode 100755 index d3ab43ebf8552b7de3b19ba3978c21a4a6a4cdcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16091 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 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0efda7191ae71e297db6b6d6982efba30cf4b0 GIT binary patch literal 4959 zcmV-l6QJygP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^MlX|MGF020qhL_t(&L+zUPSJcRs_f9|sf7``ga>s@zc z-IX8qFl&Z+zq`Ee^M2mF_unMFRg1j5``u$L|M{8Xf9=rPQ$0#K=Tz!>r;<-~Dfwg% zpLOeFzKcEFp$~s*(UOCYwdh|@`RSyAm|t47p*yI|KuFt02eflEsEToKq*d|0Iyj=j zP*7=(pi;d7#q|tp$qyC-iNCffCmhh`3l7<@x>S1At*U!IZNELJ@*9InZ*;2o`hYU{ zKK^ifPkcJiad$N<|V;Ncd!rnoB z)#}&oCZ7({^=}!(kyRepTHa)ZT|fD!$}a{!^bep6F8LNI+|jc265f{7;9nhC@oK@6o!aZrYXa6>sLjCNBLKrD#E}=zgP^skAJUxHjD!W^(hmS=L@TN#IO92Lp9@WhS!Ii2V@%= zkUcP}0{+JQ``NUCzyIrz7Jc(bF~1NnC%P5;OPk^jweh!AiO0GW&k$p28%}ofWIj99 zu4O-4Ch=|Bj32&9i@f~BgIRchOMgXB9U!znd*D_18}WcZ`noNk?}^0kJA(SMEvOn| zW8pk_0uOlF*HGyI9(oWXUqGjY^MG(R27c@a>)Up}zUd2TKag2C4}i&@wjmvC4`Lvo z{Y}HFVlLi{2Q1^>r|{rDJmBfJzj*K$5B|@2kYRY>g9n|1DssXDTK+fAL_}HsgnH(jqT^ zG9Fxm2MzcE(snx{v-}o3xYeiP#sO`qn~w+A;Xw;O@cFbO7*u+nPelWM<8AJTg)C*rCHcB0S*>Ab$;KAboedY+Lmaa$Y zg|@K1Lo0m4qGseAY?b&#j`dbPQJ zJ|5J=gG=z>rbj9GMcFNQK(`CvLh>@j%o@7Z{Ou+C(5ONoi97hzTYF{H}hNhrLp85>j4 zSXdbz@ID;WN_^#I9{dL$keN0&_Nn9{JRrrHOtgdSWO$HnctA8}-tJez*-j-nLR$R2 zl?QaKgeTh{dz1zbGQ3{x7)D(7cvaXxtQ^;{@+bo$Jh<*u29EVULyj8Q2m?)5?GR{} z(FgY}`v(M3WdGnXYNelH-hv0?Lt1vo5=@)ONIMyGK0GLL5KLzO!0abZ^59EaWd8u! zYk08##h~JkbWR&cK^xWl9*Xe5Mwe?5+pqD!>>p5w*x|wM7d}?RVju~W?+ibW@L+c* zK;g%)@!%mmfW}+lLFMm3tvF@z#C2ynRmvP>!Gpqn@5KIr*-xD0!G5!!X!Z|K>)H3+ z+WsP-fYr30hLMt+G$e*^YuKWwZu%+Kq3>8 zjT0r`b7~zt$PVHMeXNRyDve3q1F2I62bJaWDfLdj3P(qjc+$#)ADWdG_G|MEr*g;* z8N|PRk_Tn*pa4=8-uI}I@#kZpXkAK}4~79y=n z>j{<={2`T=e4|&%MCkgPPJMEvM{$?B6@vpU`Kd{ZzOy9Pm}9Lz>w5y)fW?Y5yR%4<0xJTHg#08XQXZhxOhW%PMTb zvgxV~SzF@{sFDOST!cY+7#pUD0JKYEP^=6s<89w5HA{~pkaYhBX@)?Du< zU;@e|3UfN(0Z)7FeBrWN`AqDl%SKPZgR72d1FM*jY(g~Yu2bvVsTTsCSN0F!fg2w5 zd6jazPle;7O1NU_LCmohrJ_1E-{}KuXhj^#_FzCMOlldvQNS`6QfyT|9E`A`2%yBB zw#>o%hg%ij;YVPG^eGdRA0AclOFZx>6Hm39 zSEe#~rfs_AQ1VT9aNDWX4e)>#L-&^+eyYVkS(q5}Tf356A;5_~fCoDb56}iiA5=XL zt9o=aq7Tx6ZYniJ909lVxMdO(nY7$-v>;Ej-+>3W@B{MWc9WIwA^-38sThaKAQBVm zy0pO+){-+8psdCdOL(&Fo=54=;DKl2d?5|jE$THA7Zr=pHv0!jXvuVcNFUT$c>w=R zS8ar9jVquEdhr?$pj3G;nTo0=&*+0o79MQA*QcF~H}57{$DA+B#sjmTczZzmUJT&M zmT*qNg{$$v?3-wzsq@B}cwo*KNPWAX!-H#99yG#(&~xn|A4bm`XX1f5UqH22zJLdf zmRMMS6CMzvnU{&Q$@9h;d0_Sv8~RmF=&!hL<-v_^4EU8x)S3OneN5VGJgBFNH~Wd_ zscsApu3LG)cyhvFCEcW6cm@yr)8`ABQ|AjVbVILKX=JLRu@S9mv_SR4-`bQ04^nP9 zm30FiP!rf#$`mHG43{pzfeIR2szj|6K<=#=h{d6z2Hrp2u6T;A40uq%1my)sB0R_+ z>qor}Fg(|UK4A7sM#tcUSIbUY9O<2(o@nurCM~IHbP((vH4l?O~pF4RqB z`RpuX>2-KOwK}n%2oK;y@y!8kx$IN|sy3nzUg80>Zt4ZwO}EmT=QwYCs<(EI|3Bp-W}s!^&j{Ijz2l^TrwPA9%G9y=?ZD*1V(-@W4pD zaIIJCn&&=mOug!ir1w<~RvxgXh6ky*ZPrzn(m|Wqv6$FTga>9n@sdjwI8#1Lz7+#6 z^ME)oJlJA*zy#$5;K5ix1*3hc0pX?N@E{zN&D0A<9~d6+o2Y?BN1L?xBmqTojU#Yk z(FJkDeQaH)60i0uo*^1pmqegVXofC;VwuFZX)}KKCN1*vkJHT&9wgLvYwb07fL=_c zB^y~oGF{6sKCYt_;`^9$?OJlOSxc-NQ85?b0U??R+Dpd=C-)QK0j-KKuSRqgj)atk zhDaL@D$eECl9zbEghlobi1!j)wd~p}=Z#FB&73dP!-EqYk>bQmdep#b1csd_+Z)LV z^V~m3I@_ZRUr6trwwC|b$j)@tM(UpTKGHdd@9$3kE^Ds0Y4~iN+6Z?r2 zXi)(Nzyw!}liusCJh)>I8duf(J2H9=vlL@r-LOGXX;{V$Z>Ya~+C3 zOKni!qxcJa&UYK&;725sM0l`*|A`uSn>OQzZ_*+!?-?E-w9Nj&x_U?Cur~E-pORUf zVpTMecRZ8DkD6YIA5sZee`^xFR0X^iT#76 zCoDXO>>rF!8{!<1^TtH~BCVBD>EVj^lF<&qna*^}K`R*f`^F|U-A`gukFgsahKQX0#^1RXT;MMyFQ|FBUcxxDa zV9m}SP}0YD`js&d(hhi+J9)lP5H{zHlRPlz3(USfG_ilMjM#}9ScKSKe2jYG3;{#n z#GdL<94+=F0{mRJ;`uz5X6SA94_006((*qS58ef7D^9d3;Z&#Ao$pmDYn?`XY^3`e zS*~?B+UnzAj_+fRwrR<)NFr;!ud>I_TTr(<>N0^oKFA%002ovPDHLkV1mq!pO^pu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta new file mode 100644 index 000000000..f82377449 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected_glow.png.mcmeta @@ -0,0 +1,26 @@ +{ + "ctm": { + "ctm_version": 1, + "layer": "CUTOUT", + "extra": { + "light": 15 + } + }, + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png deleted file mode 100755 index 266950cebbab1b121f7d8f5a77cc13755917cea8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15549 zcmeI3e^e7!7RRTac1vkhw(TCM)f%Ebs|#Uf@`GfiNo+zua1F9R6=gj#Bm;~jGchxm zfY!EXU4N}@mE%@>+S8)dJzMLp$X2b2b`f1yt98ZN#nUcotv^=ly7*&T5%*0JNO**I z?4JHPIR}#a?z`Xn=5z0RGylxeg8Yd?6GtRs7&bI7*HH+*ljOgIA>jY(Z&YQ1uSa~j z(?tv$)*}BsaM`|fABIscam6K4iE}dT61*9VTPSBUf?gk(jbY{qK_BC)W+hcQTgmYj z^|f7l)hfSX){A^KOezB{r+C{n56Re5mAPoe(ti-5-UJozQL5n)1 zOM~C?Fs@dGrbyKmwM|Z_DsdL5vIIY?GGt_GTqH@Vj8q0`FzK|0bd{DM4LCvJB%vWl znj~l~p^ALe)~~ktg^rv^I$&AURg&bRaXb(RWCU~>g1-_cDT=}gEw0sSzzmI8 z%S%j9!;53WBE32eR&@C}pTr5gO4en{g&N7CR?CU{K9TG4`uY;_VuT%_hzA)TPG%5z zydbx$FUD8n_k@<_cHyjt^|HJqf;cj6oUcld1hGmOBxRp_(8Qo7PG?{4xa;+LV^0SO2_=^R>V-0s%K`%m8R#vF1RO6;`yjuu}L)l6GV(icqXLb6x>`zZGR18F{!5wB&`E_QH_|Hum;#aZboA6OC@%0 zjE>tyR|tMDBUw2wQ_12!zS4|G2V-XTbrqc@cmzLK7Hid+@p!{=qa1>(Ms8~x?_xzz z3^Aripj4raYiBC^kM=q|oD~!$!_B#AElFuJ9h5#xPZ>xuTW@z{Qw}3ZnX(OrY=a#v zN#3d;Ai9c3Cq%}3g>(itL$W4TQ*L66nsTk)prHsop)u+iigc5i2JpFWF;ga`HyLb1 z@2YHMPL@rVMVWNj`m7vBW_+RWX#cB@MT%l3x1!TY=kcP%0Hk@25Fri_qKt00R$H#s zkb0&n>`{e!~Y@DG2sKGr}#N=6Jb0t zb9&42LsG<%8IUTMle?|9e>;S_t%#k|e>B={q2u1i_(fJe%q;5O)2#3Q5N@eRV}%Yy znsLcD3ad*#Ygo4#?>8Da92 z@%h{^A~Fc$C3^lOYkrpQNRUR zPlyd8#sNiz!*m)FkHZxC#BGq3Xg*4Fz^V7_dNp+*lm4#;m7AZSy;h2{f!6ZTo4enso+BMfxHSX2ngC#aH07?UIiBf1Z^s~(0m}Tf(rtIHWgfG zK9E`Rd7K-(58Y5%?I)-xF8^CQ^AGi19=r(5D>Jf z;6n3(yb3M|2--yAN{qf$$@1V;$^dw0^3^%VaqzyS%9UH_#IU+&G3@1q81~&g@O=rx zY6uLwT!vxvn;4cXteVx9gJDB<-NuSK7TSWgvHy3*{|-azINwt zE&u#Q@MfUp#^;v#cMH13>(_Ux5}rKPwS2uZWh&FL=(P2S=FO)GV;TR++YfCkGX1f& zq`v2?#_r@+qW!>u#c6vM{_@!?4eFwmn=9yV$IeaLy6%;!laAzk@nP^_ZOYWq%W&dA z`}f~}d^$MXSm(|x+_Ph3!eerPXY!33hgEOi z(v}YU^e6M5yWQqp%#2&N@x|KYE%Ua%xXRhS|M=>)YiGW;YVF!jSNzw0_)3oX_pNt7 zvwT%Pea%_Z(dwQ@PtEW({VwI?*W!eaN-y0=|E_$)h1s*WKfZp%+%(_3Z z2lzVM_9pWO`_J*_!oPQ&_-n)J<@p;%S=TlG{Muh$YVF+c?>n8R0{h;$`#ImS;GX-` zJ0oviU)^wX+2Ma}JO6IOZ}%6ZwZ3q$dcpGvzj~~-d)(cjPmI6VVE^#(=G*ISmcqm{ ze|qZTp9>}|JNV^io_*84Ozx^z6)Z~H{-5De;EcWgPU_?-os(Wod+1y5j;jmDw0cLk z-0IAkwWQR1tZ32e_Z~g=jJ4;?=$2vc?=C$pRll|T^3$_AuD9*R`G;p8dhY11NuMNd z7k7?qYf3-XHS!>{;*r$HTFX}a)LySDTR|R3Kis3XFHt2-co_TU<1f1AT}=1NFBs=# L=R3C8%j*9Jm;-5x diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..95ffa10e9b8a6b3bc45e39a7ec6e0b64fce1a6ee GIT binary patch literal 6099 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta new file mode 100644 index 000000000..7bd39fa33 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected_glow.png.mcmeta @@ -0,0 +1,34 @@ +{ + "ctm": { + "ctm_version": 1, + "layer": "CUTOUT", + "extra": { + "light": 15 + } + }, + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19 + ] + } +} \ No newline at end of file