diff --git a/src/generated/resources/data/computercraft/recipes/disk_1.json b/src/generated/resources/data/computercraft/recipes/disk_1.json index 66ce73a90..f062cd66f 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_1.json +++ b/src/generated/resources/data/computercraft/recipes/disk_1.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:1118481}" + "nbt": "{Color:1118481}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_10.json b/src/generated/resources/data/computercraft/recipes/disk_10.json index 9c064f0fb..45771c169 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_10.json +++ b/src/generated/resources/data/computercraft/recipes/disk_10.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15905484}" + "nbt": "{Color:15905484}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_11.json b/src/generated/resources/data/computercraft/recipes/disk_11.json index bfd6b21dc..d86dbf599 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_11.json +++ b/src/generated/resources/data/computercraft/recipes/disk_11.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:8375321}" + "nbt": "{Color:8375321}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_12.json b/src/generated/resources/data/computercraft/recipes/disk_12.json index 7fa0ff4be..b1306ad27 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_12.json +++ b/src/generated/resources/data/computercraft/recipes/disk_12.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:14605932}" + "nbt": "{Color:14605932}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_13.json b/src/generated/resources/data/computercraft/recipes/disk_13.json index ab237e75c..3305efea1 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_13.json +++ b/src/generated/resources/data/computercraft/recipes/disk_13.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:10072818}" + "nbt": "{Color:10072818}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_14.json b/src/generated/resources/data/computercraft/recipes/disk_14.json index 458ad2a71..d5ed6873b 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_14.json +++ b/src/generated/resources/data/computercraft/recipes/disk_14.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15040472}" + "nbt": "{Color:15040472}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_15.json b/src/generated/resources/data/computercraft/recipes/disk_15.json index 35147838e..e296c592a 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_15.json +++ b/src/generated/resources/data/computercraft/recipes/disk_15.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15905331}" + "nbt": "{Color:15905331}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_16.json b/src/generated/resources/data/computercraft/recipes/disk_16.json index 1f86b573a..e62f6c34f 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_16.json +++ b/src/generated/resources/data/computercraft/recipes/disk_16.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:15790320}" + "nbt": "{Color:15790320}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_2.json b/src/generated/resources/data/computercraft/recipes/disk_2.json index 40f55f5a4..ee4f4ba1d 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_2.json +++ b/src/generated/resources/data/computercraft/recipes/disk_2.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:13388876}" + "nbt": "{Color:13388876}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_3.json b/src/generated/resources/data/computercraft/recipes/disk_3.json index 5ed4b4d72..c8a8fae24 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_3.json +++ b/src/generated/resources/data/computercraft/recipes/disk_3.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5744206}" + "nbt": "{Color:5744206}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_4.json b/src/generated/resources/data/computercraft/recipes/disk_4.json index ecc80c9e2..109934949 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_4.json +++ b/src/generated/resources/data/computercraft/recipes/disk_4.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:8349260}" + "nbt": "{Color:8349260}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_5.json b/src/generated/resources/data/computercraft/recipes/disk_5.json index 94beac68a..53b5186b4 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_5.json +++ b/src/generated/resources/data/computercraft/recipes/disk_5.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:3368652}" + "nbt": "{Color:3368652}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_6.json b/src/generated/resources/data/computercraft/recipes/disk_6.json index 0416fba6e..b45ca974c 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_6.json +++ b/src/generated/resources/data/computercraft/recipes/disk_6.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:11691749}" + "nbt": "{Color:11691749}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_7.json b/src/generated/resources/data/computercraft/recipes/disk_7.json index 99f64b544..1fb41dea8 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_7.json +++ b/src/generated/resources/data/computercraft/recipes/disk_7.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5020082}" + "nbt": "{Color:5020082}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_8.json b/src/generated/resources/data/computercraft/recipes/disk_8.json index be1b7fea9..8043bf87f 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_8.json +++ b/src/generated/resources/data/computercraft/recipes/disk_8.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:10066329}" + "nbt": "{Color:10066329}" } } \ No newline at end of file diff --git a/src/generated/resources/data/computercraft/recipes/disk_9.json b/src/generated/resources/data/computercraft/recipes/disk_9.json index 48620dbdd..c9593d5f2 100644 --- a/src/generated/resources/data/computercraft/recipes/disk_9.json +++ b/src/generated/resources/data/computercraft/recipes/disk_9.json @@ -14,6 +14,6 @@ ], "result": { "item": "computercraft:disk", - "nbt": "{color:5000268}" + "nbt": "{Color:5000268}" } } \ No newline at end of file diff --git a/src/main/java/dan200/computercraft/data/Recipes.java b/src/main/java/dan200/computercraft/data/Recipes.java index c9d538b17..6c1b62dae 100644 --- a/src/main/java/dan200/computercraft/data/Recipes.java +++ b/src/main/java/dan200/computercraft/data/Recipes.java @@ -10,6 +10,7 @@ import dan200.computercraft.shared.PocketUpgrades; import dan200.computercraft.shared.Registry; import dan200.computercraft.shared.TurtleUpgrades; +import dan200.computercraft.shared.common.IColouredItem; import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory; import dan200.computercraft.shared.turtle.items.TurtleItemFactory; @@ -64,7 +65,7 @@ private void diskColours( @Nonnull Consumer add ) .addCriterion( "has_drive", inventoryChange( Registry.ModBlocks.DISK_DRIVE.get() ) ) .build( RecipeWrapper.wrap( ImpostorShapelessRecipe.SERIALIZER, add, - x -> x.putInt( "color", colour.getHex() ) + x -> x.putInt( IColouredItem.NBT_COLOUR, colour.getHex() ) ), new ResourceLocation( ComputerCraft.MOD_ID, "disk_" + (colour.ordinal() + 1) ) ); } }