mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix impostor recipes for disks 

Well, this is embarrassing. See #652
This commit is contained in:
Jonathan Coates 2021-01-09 18:30:07 +00:00
parent 247c05305d
commit c864576619
17 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generated/resources/data/computercraft/recipes/disk_1.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:1118481}" "nbt": "{Color:1118481}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_10.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:15905484}" "nbt": "{Color:15905484}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_11.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:8375321}" "nbt": "{Color:8375321}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_12.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:14605932}" "nbt": "{Color:14605932}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_13.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:10072818}" "nbt": "{Color:10072818}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_14.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:15040472}" "nbt": "{Color:15040472}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_15.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:15905331}" "nbt": "{Color:15905331}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_16.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:15790320}" "nbt": "{Color:15790320}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_2.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:13388876}" "nbt": "{Color:13388876}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_3.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:5744206}" "nbt": "{Color:5744206}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_4.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:8349260}" "nbt": "{Color:8349260}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_5.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:3368652}" "nbt": "{Color:3368652}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_6.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:11691749}" "nbt": "{Color:11691749}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_7.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:5020082}" "nbt": "{Color:5020082}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_8.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:10066329}" "nbt": "{Color:10066329}"
} }
} }

2
src/generated/resources/data/computercraft/recipes/disk_9.json generated
View File

@ -14,6 +14,6 @@
], ],
"result": { "result": {
"item": "computercraft:disk", "item": "computercraft:disk",
"nbt": "{color:5000268}" "nbt": "{Color:5000268}"
} }
} }

3
src/main/java/dan200/computercraft/data/Recipes.java
View File

@ -10,6 +10,7 @@
import dan200.computercraft.shared.PocketUpgrades; import dan200.computercraft.shared.PocketUpgrades;
import dan200.computercraft.shared.Registry; import dan200.computercraft.shared.Registry;
import dan200.computercraft.shared.TurtleUpgrades; import dan200.computercraft.shared.TurtleUpgrades;
import dan200.computercraft.shared.common.IColouredItem;
import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.computer.core.ComputerFamily;
import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory; import dan200.computercraft.shared.pocket.items.PocketComputerItemFactory;
import dan200.computercraft.shared.turtle.items.TurtleItemFactory; import dan200.computercraft.shared.turtle.items.TurtleItemFactory;
@ -64,7 +65,7 @@ private void diskColours( @Nonnull Consumer<IFinishedRecipe> add )
.addCriterion( "has_drive", inventoryChange( Registry.ModBlocks.DISK_DRIVE.get() ) ) .addCriterion( "has_drive", inventoryChange( Registry.ModBlocks.DISK_DRIVE.get() ) )
.build( RecipeWrapper.wrap( .build( RecipeWrapper.wrap(
ImpostorShapelessRecipe.SERIALIZER, add, 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) ) ); ), new ResourceLocation( ComputerCraft.MOD_ID, "disk_" + (colour.ordinal() + 1) ) );
} }
} }