From 9b9c1959f5f72e3b59d004c11fbff373b10120f4 Mon Sep 17 00:00:00 2001
From: Raoul Van den Berge <raoulvdberge@gmail.com>
Date: Sun, 31 Jul 2016 16:33:55 +0200
Subject: [PATCH] Add textures

---
 .../block/BlockNetworkReceiver.java           |  10 +++++++
 .../block/BlockNetworkTransmitter.java        |  10 +++++++
 .../refinedstorage/proxy/ClientProxy.java     |   3 +++
 .../blockstates/network_receiver.json         |  25 ++++++++++++++++++
 .../blockstates/network_transmitter.json      |  25 ++++++++++++++++++
 .../models/item/network_card.json             |   6 +++++
 .../blocks/network_receiver_connected.png     | Bin 0 -> 801 bytes
 .../blocks/network_receiver_disconnected.png  | Bin 0 -> 763 bytes
 .../blocks/network_transmitter_connected.png  | Bin 0 -> 800 bytes
 .../network_transmitter_disconnected.png      | Bin 0 -> 768 bytes
 .../textures/items/grid_filter.png            | Bin 232 -> 542 bytes
 .../textures/items/network_card.png           | Bin 0 -> 443 bytes
 12 files changed, 79 insertions(+)
 create mode 100755 src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
 create mode 100755 src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
 create mode 100755 src/main/resources/assets/refinedstorage/models/item/network_card.json
 create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png
 create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png
 create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png
 create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png
 create mode 100755 src/main/resources/assets/refinedstorage/textures/items/network_card.png

diff --git a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
index 3f37bab2c..eb09a8e23 100755
--- a/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
+++ b/src/main/java/refinedstorage/block/BlockNetworkReceiver.java
@@ -30,4 +30,14 @@ public class BlockNetworkReceiver extends BlockNode {
     public TileEntity createTileEntity(World world, IBlockState state) {
         return new TileNetworkReceiver();
     }
+
+    @Override
+    public EnumPlacementType getPlacementType() {
+        return null;
+    }
+
+    @Override
+    public boolean hasConnectivityState() {
+        return true;
+    }
 }
diff --git a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java b/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java
index 6dca66146..75b6512b3 100755
--- a/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java
+++ b/src/main/java/refinedstorage/block/BlockNetworkTransmitter.java
@@ -30,4 +30,14 @@ public class BlockNetworkTransmitter extends BlockNode {
     public TileEntity createTileEntity(World world, IBlockState state) {
         return new TileNetworkTransmitter();
     }
+
+    @Override
+    public EnumPlacementType getPlacementType() {
+        return null;
+    }
+
+    @Override
+    public boolean hasConnectivityState() {
+        return true;
+    }
 }
diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java
index 8307640aa..07a2aa23c 100755
--- a/src/main/java/refinedstorage/proxy/ClientProxy.java
+++ b/src/main/java/refinedstorage/proxy/ClientProxy.java
@@ -95,6 +95,7 @@ public class ClientProxy extends CommonProxy {
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_HOUSING, 0, new ModelResourceLocation("refinedstorage:storage_housing", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.GRID_FILTER, 0, new ModelResourceLocation("refinedstorage:grid_filter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.NETWORK_CARD, 0, new ModelResourceLocation("refinedstorage:network_card", "inventory"));
 
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, 0, new ModelResourceLocation("refinedstorage:upgrade", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory"));
@@ -129,6 +130,8 @@ public class ClientProxy extends CommonProxy {
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER), 0, new ModelResourceLocation("refinedstorage:processing_pattern_encoder", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:network_transmitter", "inventory"));
+        ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.NETWORK_RECEIVER), 0, new ModelResourceLocation("refinedstorage:network_receiver", "inventory"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k"));
         ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k"));
diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
new file mode 100755
index 000000000..774d8c95a
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/blockstates/network_receiver.json
@@ -0,0 +1,25 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "refinedstorage:blocks/network_receiver_disconnected"
+    }
+  },
+  "variants": {
+    "inventory": [
+      {
+        "transform": "forge:default-block"
+      }
+    ],
+    "connected": {
+      "true": {
+        "textures": {
+          "all": "refinedstorage:blocks/network_receiver_connected"
+        }
+      },
+      "false": {
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
new file mode 100755
index 000000000..86e56d08f
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/blockstates/network_transmitter.json
@@ -0,0 +1,25 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {
+      "all": "refinedstorage:blocks/network_transmitter_disconnected"
+    }
+  },
+  "variants": {
+    "inventory": [
+      {
+        "transform": "forge:default-block"
+      }
+    ],
+    "connected": {
+      "true": {
+        "textures": {
+          "all": "refinedstorage:blocks/network_transmitter_connected"
+        }
+      },
+      "false": {
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/models/item/network_card.json b/src/main/resources/assets/refinedstorage/models/item/network_card.json
new file mode 100755
index 000000000..cd2b01777
--- /dev/null
+++ b/src/main/resources/assets/refinedstorage/models/item/network_card.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/network_card"
+  }
+}
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_connected.png
new file mode 100755
index 0000000000000000000000000000000000000000..46c528615dc3befb4dad2b55968d25161b44543e
GIT binary patch
literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000iZ000iZ0XPLyBme*a8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMF)*zP3cvsW0-i}kK~y+TEt1bq6HySy=f8kTDVXTNvi(Ji2n{r(Zd=&4yW6_#
zuRgY|+b-SRlx~-X(f}3`g9qc^z=0SK#uyJAh%p|BA;b_5#u&rF11C<NJUgo<pEr4#
zH}m~YUIrMZoTb@Zj$dBp3k8AamDN>E5VRsIVdOZOSt&CNpIzp&SvHd?LO%a!v%9~&
zeK^>8wl{n}9KPswhwwWJH}_n3e=s=g_n&q;JFff0>FlOy22j{Edycb<;Dc#z+2#Ol
z?!vFIX>Qr}pw~Na++Ei_Xt%f0X$F>-a+cM%EPU(NY8&t^06!++`VRb@gsVxsSF3iT
z;pqBCt!6JS(m>OB*B!c>!<OMX&Yp?#Sc+WVhN}s5LubQq(A;hh78cTwN@WbAi!$(i
zLf4&^xv5nx_!>ZYO|#nVLA7qf<v1Z$y>2h29s(XkX-d*#IP=5#I9^&-Pt$BdOrz;m
zlqP)gBa)<xVl9!F1JC7i0KNp^G5{CjNTssgY&wlbM^SW?fD6B;^_RJ13g+jR;N0(J
z-;a4cXMR;N^hO)eNXyH3{BKKQLwsg#B`*{T61?-l$t{kpsA{uZuCT1E5tHXD@YV;f
zeGDUT#Y!wT3o|oGLe^zjhYx;9sN)ByssX2C*jy3_{^qJwhmT_%M`XDgk3WED^u8!o
zWx39A%D)IFKF<w%PO(l=RUIQy4O!L0;RHk?30#;`Nky_*9*#%gc+>+YL5@afy2$Y=
z$4M+JhC<VTW8rTQVyvw-HO(xQ)(WfyZ+!5|m&=r}x?CorP{l<QL@gSf^+w`31((#L
ztni#n<4PWlz{}BGu7uMff<Q1|EQ%p&8iK)SFc_hzSSS>ys3;mDXdMp65geEbV?IU&
fV?io1H5L8?JQ@6G7yTff00000NkvXXu0mjfOO0Fq

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_receiver_disconnected.png
new file mode 100755
index 0000000000000000000000000000000000000000..f56457e64746ba7293c033661139578fc1521e5d
GIT binary patch
literal 763
zcmV<X0tEeuP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000iZ000iZ0XPLyBme*a8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMF)*zP3cvsW0(eP8K~y+TJ(A076G0rue;^(_iT_5rc{QoEEo~?<uja8YxBJR;
zleoz?yGxqQHZ)z@niixU#J|CVhzAkz;K74<5D^g%o<ux&=*fe4^ys$<2%jB>+4(-0
z8LC$0Qh_g*#Y#o2*A-DTwzn-su^POFQ4sX%mRzlhrHWW8@x@|;YPCE2qtnB~^XTZo
z$@JlL`e-zo{-qng=~@_`M$!3Xa(_5H3d4KB@Hk(n5{zAU90bPzKV1L7ccWi)^$%Tl
z-2>l`#^bXfJPyON!QddDuhQmb+4ClzhkuiHd+#gJH=+x=@`DI`Cu+6)Za1*)y>{E*
z*eFn;Pz%FpxIgVXVGx|SZuFA~T+9SWL$c!p2=@ok`g)#nxuWBYU;|^@4*KrC)$%aM
zZp-opgQ(T<zYsCzbvph=?l$2wjGm_5eNXg}2$Q}ywk)49*Xe~#qxXRbXqv66?QC|1
zkn))b9^liAW^=dK3%cE*Vc7E(7{Ly#tmSBRb#w0hW~O;ZWEzg$9RQ2<{~KWgSc4$5
zw6axG>UHhqOe643)9lG|ljn7dxuV#7Mf8GjzlzXkrqj!`w6w<9uCCi}QB>*R08G<?
z@->m9Fr4PL)<LWwFkNqDGPfv|x~ZxyUGE5jF&|+Gpt%eb4AZnRGSksbJCVpzGMUAL
zkt7q8O5ziuInRku@-g9}8iHsFg2wY|JibV%h0|cn+1cq?mMcj+bzVd1XGG<qgx#{t
zRHcQ7sHj#dwR~Ag6bwAlOJqY7^g^)#<EIdmCA0;K!m!?GsBvzQVzE>#mgKl}Jf7jW
t6aoRF6NwB!VJ?C7G#5+9xa7h@;vY2*^-Z7K33&hj002ovPDHLkV1jUYWi<c*

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_connected.png
new file mode 100755
index 0000000000000000000000000000000000000000..1e590c582e4f59f7f1f05709090bd4e1d6a0d0f6
GIT binary patch
literal 800
zcmV+*1K<3KP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000iZ000iZ0XPLyBme*a8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMF)*zP3cvsW0-Z@jK~y+TEs{%56Hye$&$oa|DUis*GJR1Hfj~q0q7KZfola-&
z4Aa)>ly++Abf~lqU?DNMFn$JOh;d<zF~)^4#sx9N7~;YhV_di(ELgd6?U`WmyC?Ua
zdmjIs9H8lJI?1lC@|g_3zAo~-lF#d+s55K<Eyv09?JQ06=?tGvv#AsVYiqgf_Cc?A
z)Zcx$KX^14JZ`rK@HY&XHyr1n-#_YhAGBJ#j&t8`?ZuNcVBvbbW7~TOe$=dca4`v&
zlkg`97ZaA%>vRrnXU}mCo6VhgoQ9Q^Rm<vH)=s0*EtR(5yAOVj!TELgJr2Ld@m?%i
zm5OZ`TcuKCc{vHm<eK9QobAD;>Dcyut=2P5$BjOpFpRrat%sdW)5hkFW`AiZ4zXCO
zT5V$)_%UV}cCEgx7whoNhvjv>-fZ@ZWed(mRkdC&H<n`wz$42QIPoHQk)%5{tE20d
zs@AHeL*z=KV8AE$H=i%f%*=z^<%<u#`ryn5pGOfws;Hq-Y00tyr|5B`ub5wq!NS4{
zoO)gF`w=(i#H+}rQE4K&y6Jjc{--TsLUeXML+9X?2VQ#wj&Lj?#LQ+1%NBI4&hvy>
zm*9m5;TRH$%)#vJqNZ)SLO*z=Tp0(TC?>ocfw$L$oQl&Fr80aR;W$;6i_z#U2#0S<
zQc;%6xCK|1;Uw&aIf9_#lMn-~MyfI~g25RGg=X+A2n0!`csL${<6##Ri98ufBp8k-
z99LjjDG-<jl%*(!rd2mKOdPx*Y`_~2y!60x4?G>l=xkP##3C-DDCyzwoGXdv6kJl5
ztip40BFSK3cs86)3#b+mMGgH7BL%2w@cYAle~6+Yfk2d^!q^bO*1=#DLBUiI{SnF^
e@l&Cxso+100Q?S?nXdN$0000<MNUMnLSTYQ?rBf}

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/network_transmitter_disconnected.png
new file mode 100755
index 0000000000000000000000000000000000000000..77c4f8da55ff7cbed0f404b2853145478bab1350
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006O%
z3;baP00009a7bBm000iZ000iZ0XPLyBme*a8FWQhbW?9;ba!ELWdLwtX>N2bZe?^J
zG%heMF)*zP3cvsW0)0tDK~y+TJ(9g|(@+$}uY?$w5dTK%d^IVht=g!{SA$!BC5~f1
zyH0}RG<HbixS>hZmb4No1LALBK!^b$#K6FS7!X1TF)$&-z<?MS5F;a}sZ{Cbr}wV!
zJ?H4@5zm*4d2wSyE|ui1Emf9{YSmU%TM%nlB}wORmU&(-mgHhlEEELV+^p;kj>qHE
z$-(`j>4WL?;b1WRN7w$)l`uS>Oio9md;R`F7~T!~huJ(&5ca%b5F7&h==gVj(`E3N
zuKptO{qb;k5`>3gc+%_bXR|!5uW$JN$oKcV-BF{l`-SK$(NDVcod|p*s@MHiD{!3M
zMx(p7mZyAvGYqHU-gL(egW#ys8M|)y<7|c;=eFM&!`XEMn0I@V)zvIzGKF?~02v57
zPSEl8?7D|N<ZavQ^(OVE|Cz`%y=Jq!mdO!5U2nZ30@!HUt&TsmZQnFIZ8v0kt5$Q~
z&;C}cjdXg6;PQzG8sOs$#@fixYV~#9Ij?+}4S=PU3@tCOV~5h~+00uaLwB8457_3;
zg%BFR3I<XOOC`SYf(R%QlSIatTP`zEtl5?)%S_nPo)bMIk_47aF4Drnie>E}=o=!f
z(!>QAh6}e>n6H?)O;u~cR+3CzucuNsD3Q3XX?0z1;uV~)f~38iB~%m>N5&ki7HjLw
ziN(?skEd}~6b1?f`7zNs$bgWKh;lhWl9?pcL{W=I=LxY4!?CRP_O^?QSCnn^A@ozC
zC$sKy+0xWH9-^w*iNxYrBv~@>NY5x6vZUwo0))|BEGkF~RMkRV5VR;aPmxF>5{YwM
yG8#>BTmpsw*0ER$ATSq0J;_Cq5iUMA7yA!|MfCV$xL{}i0000<MNUMnLSTY^&tEP8

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png b/src/main/resources/assets/refinedstorage/textures/items/grid_filter.png
index f4cab8420e13ba4736b5801f01aa9c38b7e64684..9d2a62091650a443791747e3787098dae60319d3 100755
GIT binary patch
delta 442
zcmV;r0Y(1k0iFbq83+ad001BJ|6!3KS$_eJNkl<ZI8V(|$xgyh6s^-AY2vUTMuw`4
zWt3=wQE_bxYM`Ycu{2-_2u{D?Pp~5x;}ng*bA0z%gb>lCp5&%4cQ`$F5dIk;Oz65k
z8NH28rEk(R!$v-eQI4HG0v2#|9Mh_9B44Z^S2Aon<zMnq%%SVk-;xl!oYhdOSbvaJ
z4e{L#_&0-CPx>H6R-xnzC>a(f;Yvn966He;idsNoKZ){F9f7ojz+MRE{W-+wCrMtf
zfO74!0jSS|V-?|41m(v%jOPZd_bZq$Em%*NsN6NVl3dXM<=SNf^a<7yUifx`sJ&f4
z%ETaL<EXz}VLj#NDrg=*61XEG)_+nyR3BOh$`MFP42{<tc(()a{H8!YQZesbM77t#
zS+9-8<29`N3s?`AFndk7LLRn_F$7;jWP@68Euq$J!<q14b;}F0+k`tTBEw=TTj#e!
zq}3?d0{SGgjyWv*SKth~;bNxbHJtpkMt(@_Nctqy&Vg<8=EUqy^v;+=;wNAMVke2z
k=dh8F|9Ncj-#`#P0Q%t`#iOd**#H0l07*qoM6N<$f?s#f82|tP

delta 129
zcmV-{0Dk|T1n2>f83+OZ005AYXf}}{S#AJWNkl<ZI8U{VK@Pwm48!>Ur#o1>D74iW
zn(!$uGR-y_LA!BJBj5o<Sp<B}Bj5p~^D6*QQh)Qpen8Z9cc5U1p7LG?RNbTqd_6lf
jML@-%f=Rw`IxxEchX{G2+gvob00000NkvXXu0mjfknA$4

diff --git a/src/main/resources/assets/refinedstorage/textures/items/network_card.png b/src/main/resources/assets/refinedstorage/textures/items/network_card.png
new file mode 100755
index 0000000000000000000000000000000000000000..40d0716be77b99e49c17c4f44c367ac20805169c
GIT binary patch
literal 443
zcmV;s0Yv_ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9
za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00ApWL_t(IPu)?;PQp+Wed@2cab<#1tl+RQ
z(S;kO5Q}tBDzs?Tg^5#wg&G`?jUT2J^lQ-Lz0b13RM(v3BsX_BcM@ZWi{KGwVF#yo
zPw*eQl5De&V{zK=I6l9@W#<`gtBs8#2jc4uQ}}>d)})VPi6Zr@CTbxS`v(x{A?upR
zc@`$|E=6i2!jr`5qo_7QOi<y9XaCT(Br|(EQ0yX26yb!{iPJ~n1h-K4b=h&bZX@UH
zVyS9CbxII}2pOvg|Gt|nkTwg{sfUG%j>Sres7qU*4~1fh0>c$jMjom1Hs%bCm`B<w
zVBXYdikIXShDV&)TqB`AW?6)HAG|`*xBfmNztOvH%9l;AuSyZ|8Oh>*y^+BphdfE6
l1t$n4*=8Td;<WLB5Z~W)-*ZCmb5Q^Q002ovPDHLkV1hpNx99)>

literal 0
HcmV?d00001