mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-10-01 08:20:47 +00:00
Code Issues Releases Wiki Activity

Fix recipe book upgrade recipes

Browse Source 
- Flip turtle/pocket and upgrade item.
 - Correctly set NBT on pocket upgrade recipe output.
This commit is contained in:
Jonathan Coates 2021-10-11 12:17:45 +01:00
parent 6dd33f7099
commit 482ae0d22e
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
25 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"#": {
"item": "computercraft:speaker"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
"item": "computercraft:pocket_computer_advanced",
"nbt": "{Upgrade:\"computercraft:speaker\"}"
}
}

7
src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"#": {
"item": "computercraft:wireless_modem_advanced"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
"item": "computercraft:pocket_computer_advanced",
"nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
}
}

7
src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_advanced"
},
"P": {
"#": {
"item": "computercraft:wireless_modem_normal"
}
},
"result": {
"item": "computercraft:pocket_computer_advanced"
"item": "computercraft:pocket_computer_advanced",
"nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
}
}

7
src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"#": {
"item": "computercraft:speaker"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
"item": "computercraft:pocket_computer_normal",
"nbt": "{Upgrade:\"computercraft:speaker\"}"
}
}

7
src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"#": {
"item": "computercraft:wireless_modem_advanced"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
"item": "computercraft:pocket_computer_normal",
"nbt": "{Upgrade:\"computercraft:wireless_modem_advanced\"}"
}
}

7
src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json generated
View File

@ -6,14 +6,15 @@
"P"
],
"key": {
"#": {
"P": {
"item": "computercraft:pocket_computer_normal"
},
"P": {
"#": {
"item": "computercraft:wireless_modem_normal"
}
},
"result": {
"item": "computercraft:pocket_computer_normal"
"item": "computercraft:pocket_computer_normal",
"nbt": "{Upgrade:\"computercraft:wireless_modem_normal\"}"
}
}

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "computercraft:speaker"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "computercraft:wireless_modem_advanced"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "computercraft:wireless_modem_normal"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/crafting_table.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:crafting_table"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_axe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:diamond_axe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_hoe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:diamond_hoe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_pickaxe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:diamond_pickaxe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_shovel.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:diamond_shovel"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_advanced/minecraft/diamond_sword.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_advanced"
},
"T": {
"#": {
"item": "minecraft:diamond_sword"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "computercraft:speaker"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "computercraft:wireless_modem_advanced"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "computercraft:wireless_modem_normal"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/crafting_table.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:crafting_table"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_axe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:diamond_axe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_hoe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:diamond_hoe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_pickaxe.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:diamond_pickaxe"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_shovel.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:diamond_shovel"
}
},

4
src/generated/resources/data/computercraft/recipes/turtle_normal/minecraft/diamond_sword.json generated
View File

@ -5,10 +5,10 @@
"#T"
],
"key": {
"#": {
"T": {
"item": "computercraft:turtle_normal"
},
"T": {
"#": {
"item": "minecraft:diamond_sword"
}
},

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

@ -104,8 +104,8 @@ public class Recipes extends RecipeProvider
.shaped( result.getItem() )
.group( String.format( "%s:turtle_%s", ComputerCraft.MOD_ID, nameId ) )
.pattern( "#T" )
.define( '#', base.getItem() )
.define( 'T', upgrade.getCraftingItem().getItem() )
.define( 'T', base.getItem() )
.define( '#', upgrade.getCraftingItem().getItem() )
.unlockedBy( "has_items",
inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
.save(
@ -133,14 +133,14 @@ public class Recipes extends RecipeProvider
String nameId = family.name().toLowerCase( Locale.ROOT );
PocketUpgrades.getVanillaUpgrades().forEach( upgrade -> {
ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, null );
ItemStack result = PocketComputerItemFactory.create( -1, null, -1, family, upgrade );
ShapedRecipeBuilder
.shaped( result.getItem() )
.group( String.format( "%s:pocket_%s", ComputerCraft.MOD_ID, nameId ) )
.pattern( "#" )
.pattern( "P" )
.define( '#', base.getItem() )
.define( 'P', upgrade.getCraftingItem().getItem() )
.define( 'P', base.getItem() )
.define( '#', upgrade.getCraftingItem().getItem() )
.unlockedBy( "has_items",
inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
.save(