From 2308c507024d80c5f6b3eacccffa1be686e91cff Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Wed, 9 Oct 2019 18:31:51 +0200
Subject: [PATCH] Fixes.

---
 .../com/raoulvdberge/refinedstorage/ClientSetup.java |  5 +++++
 .../apiimpl/network/node/NetworkNode.java            | 12 +++++++-----
 .../raoulvdberge/refinedstorage/block/GridBlock.java |  1 -
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java
index 443d4a6d0..e12613808 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/ClientSetup.java
@@ -33,6 +33,11 @@ public class ClientSetup {
             new ResourceLocation(RS.ID, "block/controller/cutouts/on")
         ));
 
+        bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "grid"), (base, registry) -> new FullbrightBakedModel(
+            base,
+            new ResourceLocation(RS.ID, "block/grid/cutouts/front_connected")
+        ));
+
         bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "disk_drive"), (base, registry) -> new FullbrightBakedModel(
             new DiskDriveBakedModel(
                 base,
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
index e47ba4273..10ae3ecd8 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -92,11 +92,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
     }
 
     protected void onConnectedStateChange(INetwork network, boolean state) {
-        BlockState blockState = world.getBlockState(pos);
-
-        if (blockState.getBlock() instanceof NodeBlock && ((NodeBlock) blockState.getBlock()).hasConnectedState()) {
-            world.setBlockState(pos, world.getBlockState(pos).with(NodeBlock.CONNECTED, state));
-        }
+        // NO OP
     }
 
     @Override
@@ -148,6 +144,12 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
                 couldUpdate = canUpdate;
                 throttlingDisabled = false;
 
+                BlockState blockState = world.getBlockState(pos);
+
+                if (blockState.getBlock() instanceof NodeBlock && ((NodeBlock) blockState.getBlock()).hasConnectedState()) {
+                    world.setBlockState(pos, world.getBlockState(pos).with(NodeBlock.CONNECTED, canUpdate));
+                }
+
                 if (network != null) {
                     onConnectedStateChange(network, canUpdate);
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java
index 0ab203948..68676d069 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/GridBlock.java
@@ -78,7 +78,6 @@ public class GridBlock extends NodeBlock {
 
         modelRegistration.addBakedModelOverride(info.getId(), base -> new BakedModelFullbright(
             base,
-            RS.ID + ":blocks/grid/cutouts/front_connected",
             RS.ID + ":blocks/grid/cutouts/crafting_front_connected",
             RS.ID + ":blocks/grid/cutouts/pattern_front_connected",
             RS.ID + ":blocks/grid/cutouts/fluid_front_connected"