From bcc0effd00ca2e6c11c0cd33ad2f9d6dbc75dbb2 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Sat, 9 Jan 2021 18:30:07 +0000 Subject: [PATCH] Fix impostor recipes for disks Well, this is embarrassing. See #652 --- patchwork.md | 9 ++++++++- .../resources/data/computercraft/recipes/disk_1.json | 2 +- .../resources/data/computercraft/recipes/disk_10.json | 2 +- .../resources/data/computercraft/recipes/disk_11.json | 2 +- .../resources/data/computercraft/recipes/disk_12.json | 2 +- .../resources/data/computercraft/recipes/disk_13.json | 2 +- .../resources/data/computercraft/recipes/disk_14.json | 2 +- .../resources/data/computercraft/recipes/disk_15.json | 2 +- .../resources/data/computercraft/recipes/disk_16.json | 2 +- .../resources/data/computercraft/recipes/disk_2.json | 2 +- .../resources/data/computercraft/recipes/disk_3.json | 2 +- .../resources/data/computercraft/recipes/disk_4.json | 2 +- .../resources/data/computercraft/recipes/disk_5.json | 2 +- .../resources/data/computercraft/recipes/disk_6.json | 2 +- .../resources/data/computercraft/recipes/disk_7.json | 2 +- .../resources/data/computercraft/recipes/disk_8.json | 2 +- .../resources/data/computercraft/recipes/disk_9.json | 2 +- 17 files changed, 24 insertions(+), 17 deletions(-) diff --git a/patchwork.md b/patchwork.md index 67dcabdd4..ccda58db5 100644 --- a/patchwork.md +++ b/patchwork.md @@ -583,4 +583,11 @@ Just lua changes. 247c05305d106af430fcdaee41371a152bf7c38c Fix problem with RepeatArgumentType -``` \ No newline at end of file +``` + +``` +c864576619751077a0d8ac1a18123e14b095ec03 + +Fix impostor recipes for disks +``` +[TODO] [JUMT-03] REI still shows white disks, probably because it doesn' show nbt items. \ No newline at end of file diff --git a/src/main/resources/data/computercraft/recipes/disk_1.json b/src/main/resources/data/computercraft/recipes/disk_1.json index b365f90db..f58c4524d 100644 --- a/src/main/resources/data/computercraft/recipes/disk_1.json +++ b/src/main/resources/data/computercraft/recipes/disk_1.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:1118481}" + "nbt": "{Color:1118481}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_10.json b/src/main/resources/data/computercraft/recipes/disk_10.json index 7fdec5607..be3c706d6 100644 --- a/src/main/resources/data/computercraft/recipes/disk_10.json +++ b/src/main/resources/data/computercraft/recipes/disk_10.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15905484}" + "nbt": "{Color:15905484}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_11.json b/src/main/resources/data/computercraft/recipes/disk_11.json index 5e20d91f3..b16467e7a 100644 --- a/src/main/resources/data/computercraft/recipes/disk_11.json +++ b/src/main/resources/data/computercraft/recipes/disk_11.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:8375321}" + "nbt": "{Color:8375321}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_12.json b/src/main/resources/data/computercraft/recipes/disk_12.json index 42f2962e6..c0ff791a8 100644 --- a/src/main/resources/data/computercraft/recipes/disk_12.json +++ b/src/main/resources/data/computercraft/recipes/disk_12.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:14605932}" + "nbt": "{Color:14605932}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_13.json b/src/main/resources/data/computercraft/recipes/disk_13.json index 02ce61e52..8cf914c0c 100644 --- a/src/main/resources/data/computercraft/recipes/disk_13.json +++ b/src/main/resources/data/computercraft/recipes/disk_13.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:10072818}" + "nbt": "{Color:10072818}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_14.json b/src/main/resources/data/computercraft/recipes/disk_14.json index f741e4faa..a63ed9a0c 100644 --- a/src/main/resources/data/computercraft/recipes/disk_14.json +++ b/src/main/resources/data/computercraft/recipes/disk_14.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15040472}" + "nbt": "{Color:15040472}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_15.json b/src/main/resources/data/computercraft/recipes/disk_15.json index 07f131bb7..96e20a117 100644 --- a/src/main/resources/data/computercraft/recipes/disk_15.json +++ b/src/main/resources/data/computercraft/recipes/disk_15.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15905331}" + "nbt": "{Color:15905331}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_16.json b/src/main/resources/data/computercraft/recipes/disk_16.json index cc80c50b6..b3e31354f 100644 --- a/src/main/resources/data/computercraft/recipes/disk_16.json +++ b/src/main/resources/data/computercraft/recipes/disk_16.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15790320}" + "nbt": "{Color:15790320}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_2.json b/src/main/resources/data/computercraft/recipes/disk_2.json index f073b67b9..b211373ca 100644 --- a/src/main/resources/data/computercraft/recipes/disk_2.json +++ b/src/main/resources/data/computercraft/recipes/disk_2.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:13388876}" + "nbt": "{Color:13388876}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_3.json b/src/main/resources/data/computercraft/recipes/disk_3.json index 902f563ac..311e7fc28 100644 --- a/src/main/resources/data/computercraft/recipes/disk_3.json +++ b/src/main/resources/data/computercraft/recipes/disk_3.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5744206}" + "nbt": "{Color:5744206}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_4.json b/src/main/resources/data/computercraft/recipes/disk_4.json index 21e0e4f63..dad728d09 100644 --- a/src/main/resources/data/computercraft/recipes/disk_4.json +++ b/src/main/resources/data/computercraft/recipes/disk_4.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:8349260}" + "nbt": "{Color:8349260}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_5.json b/src/main/resources/data/computercraft/recipes/disk_5.json index efcddcdd3..52eca6cf8 100644 --- a/src/main/resources/data/computercraft/recipes/disk_5.json +++ b/src/main/resources/data/computercraft/recipes/disk_5.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:3368652}" + "nbt": "{Color:3368652}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_6.json b/src/main/resources/data/computercraft/recipes/disk_6.json index e099b73e1..f21b7d509 100644 --- a/src/main/resources/data/computercraft/recipes/disk_6.json +++ b/src/main/resources/data/computercraft/recipes/disk_6.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:11691749}" + "nbt": "{Color:11691749}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_7.json b/src/main/resources/data/computercraft/recipes/disk_7.json index 2232c6305..6c5d9335f 100644 --- a/src/main/resources/data/computercraft/recipes/disk_7.json +++ b/src/main/resources/data/computercraft/recipes/disk_7.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5020082}" + "nbt": "{Color:5020082}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_8.json b/src/main/resources/data/computercraft/recipes/disk_8.json index 1319f7fbf..5670d5fdb 100644 --- a/src/main/resources/data/computercraft/recipes/disk_8.json +++ b/src/main/resources/data/computercraft/recipes/disk_8.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:10066329}" + "nbt": "{Color:10066329}" } } diff --git a/src/main/resources/data/computercraft/recipes/disk_9.json b/src/main/resources/data/computercraft/recipes/disk_9.json index 3552f4418..b1b28a606 100644 --- a/src/main/resources/data/computercraft/recipes/disk_9.json +++ b/src/main/resources/data/computercraft/recipes/disk_9.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5000268}" + "nbt": "{Color:5000268}" } }