Fix recipe book upgrade recipes

- Flip turtle/pocket and upgrade item.
 - Correctly set NBT on pocket upgrade recipe output.

src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/speaker.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_advanced.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/pocket_advanced/computercraft/wireless_modem_normal.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/speaker.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_advanced.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/pocket_normal/computercraft/wireless_modem_normal.json

@@ -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\"}"
   }
 }

src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/speaker.json

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

src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_advanced.json

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

src/generated/resources/data/computercraft/recipes/turtle_advanced/computercraft/wireless_modem_normal.json

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

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

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

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

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

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

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

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

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

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

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

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

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

src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/speaker.json

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

src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_advanced.json

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

src/generated/resources/data/computercraft/recipes/turtle_normal/computercraft/wireless_modem_normal.json

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/dan200/computercraft/data/Recipes.java

@@ -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', base.getItem() )
-                    .define( 'T', upgrade.getCraftingItem().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', base.getItem() )
-                    .define( 'P', upgrade.getCraftingItem().getItem() )
+                    .define( '#', upgrade.getCraftingItem().getItem() )
                     .unlockedBy( "has_items",
                         inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
                     .save(