From e946a7378f8e78090a091f159ceef8d5a7e5376f Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Thu, 12 Jul 2018 22:18:50 +0200
Subject: [PATCH] Fix disk leds looking messed up on Nvidia cards.

---
 .../models/block/disks/disk.json              | 24 +++++------
 .../models/block/disks/disk_disconnected.json | 24 +++++------
 .../models/block/disks/disk_full.json         | 24 +++++------
 .../block/disks/disk_near_capacity.json       | 24 +++++------
 .../block/disks/portable_grid_disk.json       | 24 +++++------
 .../portable_grid_disk_disconnected.json      | 42 +++++++++++++++++--
 .../block/disks/portable_grid_disk_full.json  | 24 +++++------
 .../portable_grid_disk_near_capacity.json     | 24 +++++------
 8 files changed, 123 insertions(+), 87 deletions(-)

diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json
index 652dd1c61..3ca48c581 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/disk.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk.json
@@ -92,8 +92,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         },
         "east": {
@@ -101,8 +101,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         },
         "south": {
@@ -110,8 +110,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         },
         "west": {
@@ -119,8 +119,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         },
         "up": {
@@ -128,8 +128,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         },
         "down": {
@@ -137,8 +137,8 @@
           "uv": [
             2.0,
             0.0,
-            2.0,
-            0.0
+            3.0,
+            1.0
           ]
         }
       }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json
index f670fed99..4d253e5ae 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_disconnected.json
@@ -92,8 +92,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         },
         "east": {
@@ -101,8 +101,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         },
         "south": {
@@ -110,8 +110,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         },
         "west": {
@@ -119,8 +119,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         },
         "up": {
@@ -128,8 +128,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         },
         "down": {
@@ -137,8 +137,8 @@
           "uv": [
             3.0,
             0.0,
-            3.0,
-            0.0
+            4.0,
+            1.0
           ]
         }
       }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json
index 44f456b25..73bd68f9f 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_full.json
@@ -92,8 +92,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         },
         "east": {
@@ -101,8 +101,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         },
         "south": {
@@ -110,8 +110,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         },
         "west": {
@@ -119,8 +119,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         },
         "up": {
@@ -128,8 +128,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         },
         "down": {
@@ -137,8 +137,8 @@
           "uv": [
             1.0,
             0.0,
-            1.0,
-            0.0
+            2.0,
+            1.0
           ]
         }
       }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json
index 1002b12b4..28ef7c1ac 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/disk_near_capacity.json
@@ -92,8 +92,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         },
         "east": {
@@ -101,8 +101,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         },
         "south": {
@@ -110,8 +110,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         },
         "west": {
@@ -119,8 +119,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         },
         "up": {
@@ -128,8 +128,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         },
         "down": {
@@ -137,8 +137,8 @@
           "uv": [
             0.0,
             0.0,
-            0.0,
-            0.0
+            1.0,
+            1.0
           ]
         }
       }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json
index 7174f1884..421bfa965 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk.json
@@ -94,8 +94,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         },
@@ -103,8 +103,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         },
@@ -112,8 +112,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         },
@@ -121,8 +121,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         },
@@ -130,8 +130,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         },
@@ -139,8 +139,8 @@
           "uv": [
             2,
             0,
-            2,
-            0
+            3,
+            1
           ],
           "texture": "#led"
         }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json
index 7d4f56672..a4705cae6 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_disconnected.json
@@ -94,8 +94,8 @@
           "uv": [
             3,
             0,
-            3,
-            0
+            4,
+            1
           ],
           "texture": "#led"
         },
@@ -103,8 +103,44 @@
           "uv": [
             3,
             0,
+            4,
+            1
+          ],
+          "texture": "#led"
+        },
+        "north": {
+          "uv": [
             3,
-            0
+            0,
+            4,
+            1
+          ],
+          "texture": "#led"
+        },
+        "south": {
+          "uv": [
+            3,
+            0,
+            4,
+            1
+          ],
+          "texture": "#led"
+        },
+        "up": {
+          "uv": [
+            3,
+            0,
+            4,
+            1
+          ],
+          "texture": "#led"
+        },
+        "down": {
+          "uv": [
+            3,
+            0,
+            4,
+            1
           ],
           "texture": "#led"
         }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json
index 06601183e..a7b0b1327 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_full.json
@@ -94,8 +94,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         },
@@ -103,8 +103,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         },
@@ -112,8 +112,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         },
@@ -121,8 +121,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         },
@@ -130,8 +130,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         },
@@ -139,8 +139,8 @@
           "uv": [
             1,
             0,
-            1,
-            0
+            2,
+            1
           ],
           "texture": "#led"
         }
diff --git a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json
index c44a0ee16..737cc3d3a 100644
--- a/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json
+++ b/src/main/resources/assets/refinedstorage/models/block/disks/portable_grid_disk_near_capacity.json
@@ -94,8 +94,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         },
@@ -103,8 +103,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         },
@@ -112,8 +112,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         },
@@ -121,8 +121,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         },
@@ -130,8 +130,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         },
@@ -139,8 +139,8 @@
           "uv": [
             0,
             0,
-            0,
-            0
+            1,
+            1
           ],
           "texture": "#led"
         }