From b91809bfc73553157bdf26f8174eabc2dc44f41c Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Wed, 1 Jun 2022 01:02:23 +0100
Subject: [PATCH] Move some eldritch horrors to another directory

Also fix make-doc.sh uploading the wrong file.
---
 .gitattributes                                      |   2 +-
 .github/workflows/make-doc.sh                       |   2 +-
 CONTRIBUTING.md                                     |   2 +-
 build.gradle                                        |   2 +-
 src/{web => generated}/export/index.json            |   0
 .../export/items/computercraft/cable.png            | Bin
 .../items/computercraft/computer_advanced.png       | Bin
 .../export/items/computercraft/computer_command.png | Bin
 .../export/items/computercraft/computer_normal.png  | Bin
 .../export/items/computercraft/disk.png             | Bin
 .../export/items/computercraft/disk_drive.png       | Bin
 .../export/items/computercraft/monitor_advanced.png | Bin
 .../export/items/computercraft/monitor_normal.png   | Bin
 .../computercraft/pocket_computer_advanced.png      | Bin
 .../items/computercraft/pocket_computer_normal.png  | Bin
 .../export/items/computercraft/printed_book.png     | Bin
 .../export/items/computercraft/printed_page.png     | Bin
 .../export/items/computercraft/printed_pages.png    | Bin
 .../export/items/computercraft/printer.png          | Bin
 .../export/items/computercraft/speaker.png          | Bin
 .../export/items/computercraft/treasure_disk.png    | Bin
 .../export/items/computercraft/turtle_advanced.png  | Bin
 .../export/items/computercraft/turtle_normal.png    | Bin
 .../export/items/computercraft/wired_modem.png      | Bin
 .../export/items/computercraft/wired_modem_full.png | Bin
 .../items/computercraft/wireless_modem_advanced.png | Bin
 .../items/computercraft/wireless_modem_normal.png   | Bin
 .../export/items/minecraft/black_dye.png            | Bin
 .../export/items/minecraft/blue_dye.png             | Bin
 .../export/items/minecraft/brown_dye.png            | Bin
 .../export/items/minecraft/chest.png                | Bin
 .../export/items/minecraft/command_block.png        | Bin
 .../export/items/minecraft/cyan_dye.png             | Bin
 .../export/items/minecraft/ender_eye.png            | Bin
 .../export/items/minecraft/ender_pearl.png          | Bin
 .../export/items/minecraft/glass_pane.png           | Bin
 .../export/items/minecraft/gold_block.png           | Bin
 .../export/items/minecraft/gold_ingot.png           | Bin
 .../export/items/minecraft/golden_apple.png         | Bin
 .../export/items/minecraft/gray_dye.png             | Bin
 .../export/items/minecraft/green_dye.png            | Bin
 .../export/items/minecraft/iron_ingot.png           | Bin
 .../export/items/minecraft/leather.png              | Bin
 .../export/items/minecraft/light_blue_dye.png       | Bin
 .../export/items/minecraft/light_gray_dye.png       | Bin
 .../export/items/minecraft/lime_dye.png             | Bin
 .../export/items/minecraft/magenta_dye.png          | Bin
 .../export/items/minecraft/note_block.png           | Bin
 .../export/items/minecraft/orange_dye.png           | Bin
 .../export/items/minecraft/pink_dye.png             | Bin
 .../export/items/minecraft/purple_dye.png           | Bin
 .../export/items/minecraft/red_dye.png              | Bin
 .../export/items/minecraft/redstone.png             | Bin
 .../export/items/minecraft/stone.png                | Bin
 .../export/items/minecraft/string.png               | Bin
 .../export/items/minecraft/white_dye.png            | Bin
 .../export/items/minecraft/yellow_dye.png           | Bin
 src/web/transform.tsx                               |   2 +-
 58 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{web => generated}/export/index.json (100%)
 rename src/{web => generated}/export/items/computercraft/cable.png (100%)
 rename src/{web => generated}/export/items/computercraft/computer_advanced.png (100%)
 rename src/{web => generated}/export/items/computercraft/computer_command.png (100%)
 rename src/{web => generated}/export/items/computercraft/computer_normal.png (100%)
 rename src/{web => generated}/export/items/computercraft/disk.png (100%)
 rename src/{web => generated}/export/items/computercraft/disk_drive.png (100%)
 rename src/{web => generated}/export/items/computercraft/monitor_advanced.png (100%)
 rename src/{web => generated}/export/items/computercraft/monitor_normal.png (100%)
 rename src/{web => generated}/export/items/computercraft/pocket_computer_advanced.png (100%)
 rename src/{web => generated}/export/items/computercraft/pocket_computer_normal.png (100%)
 rename src/{web => generated}/export/items/computercraft/printed_book.png (100%)
 rename src/{web => generated}/export/items/computercraft/printed_page.png (100%)
 rename src/{web => generated}/export/items/computercraft/printed_pages.png (100%)
 rename src/{web => generated}/export/items/computercraft/printer.png (100%)
 rename src/{web => generated}/export/items/computercraft/speaker.png (100%)
 rename src/{web => generated}/export/items/computercraft/treasure_disk.png (100%)
 rename src/{web => generated}/export/items/computercraft/turtle_advanced.png (100%)
 rename src/{web => generated}/export/items/computercraft/turtle_normal.png (100%)
 rename src/{web => generated}/export/items/computercraft/wired_modem.png (100%)
 rename src/{web => generated}/export/items/computercraft/wired_modem_full.png (100%)
 rename src/{web => generated}/export/items/computercraft/wireless_modem_advanced.png (100%)
 rename src/{web => generated}/export/items/computercraft/wireless_modem_normal.png (100%)
 rename src/{web => generated}/export/items/minecraft/black_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/blue_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/brown_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/chest.png (100%)
 rename src/{web => generated}/export/items/minecraft/command_block.png (100%)
 rename src/{web => generated}/export/items/minecraft/cyan_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/ender_eye.png (100%)
 rename src/{web => generated}/export/items/minecraft/ender_pearl.png (100%)
 rename src/{web => generated}/export/items/minecraft/glass_pane.png (100%)
 rename src/{web => generated}/export/items/minecraft/gold_block.png (100%)
 rename src/{web => generated}/export/items/minecraft/gold_ingot.png (100%)
 rename src/{web => generated}/export/items/minecraft/golden_apple.png (100%)
 rename src/{web => generated}/export/items/minecraft/gray_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/green_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/iron_ingot.png (100%)
 rename src/{web => generated}/export/items/minecraft/leather.png (100%)
 rename src/{web => generated}/export/items/minecraft/light_blue_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/light_gray_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/lime_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/magenta_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/note_block.png (100%)
 rename src/{web => generated}/export/items/minecraft/orange_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/pink_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/purple_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/red_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/redstone.png (100%)
 rename src/{web => generated}/export/items/minecraft/stone.png (100%)
 rename src/{web => generated}/export/items/minecraft/string.png (100%)
 rename src/{web => generated}/export/items/minecraft/white_dye.png (100%)
 rename src/{web => generated}/export/items/minecraft/yellow_dye.png (100%)

diff --git a/.gitattributes b/.gitattributes
index 9a0642d09..6501a79bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
 # Ignore changes in generated files
-src/generated/resources/data/** linguist-generated
+src/generated/** linguist-generated
 src/testMod/server-files/structures linguist-generated
 
 * text=auto
diff --git a/.github/workflows/make-doc.sh b/.github/workflows/make-doc.sh
index f22851bee..e7aca0e61 100755
--- a/.github/workflows/make-doc.sh
+++ b/.github/workflows/make-doc.sh
@@ -12,7 +12,7 @@ chmod 600 "$HOME/.ssh/key"
 
 # And upload
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/build/docs/lua/" \
+      "$GITHUB_WORKSPACE/build/docs/site/" \
       "$SSH_USER@$SSH_HOST:/$DEST"
 rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
       "$GITHUB_WORKSPACE/build/docs/javadoc/" \
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9afbdb4c..bae4f7b4f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,7 +65,7 @@ Gradle should be your entrypoint to building most documentation. There's two tas
 
  - `./gradlew luaJavadoc` - Generate documentation stubs for Java methods.
  - `./gradlew docWebsite` - Generate the whole website (including Javascript pages). The resulting HTML is stored at
-   `./build/docs/lua/`.
+   `./build/docs/site/`.
 
 #### Writing documentation
 illuaminate's documentation system is not currently documented (somewhat ironic), but is _largely_ the same as
diff --git a/build.gradle b/build.gradle
index 16a6d3dd1..59da21991 100644
--- a/build.gradle
+++ b/build.gradle
@@ -335,7 +335,7 @@ task docWebsite(type: Copy, dependsOn: [jsxDocs]) {
     from("$buildDir/docs/lua") {
         exclude '**/*.html'
     }
-    from("src/web/export/items") {
+    from("src/generated/export/items") {
         into("images/items")
     }
 
diff --git a/src/web/export/index.json b/src/generated/export/index.json
similarity index 100%
rename from src/web/export/index.json
rename to src/generated/export/index.json
diff --git a/src/web/export/items/computercraft/cable.png b/src/generated/export/items/computercraft/cable.png
similarity index 100%
rename from src/web/export/items/computercraft/cable.png
rename to src/generated/export/items/computercraft/cable.png
diff --git a/src/web/export/items/computercraft/computer_advanced.png b/src/generated/export/items/computercraft/computer_advanced.png
similarity index 100%
rename from src/web/export/items/computercraft/computer_advanced.png
rename to src/generated/export/items/computercraft/computer_advanced.png
diff --git a/src/web/export/items/computercraft/computer_command.png b/src/generated/export/items/computercraft/computer_command.png
similarity index 100%
rename from src/web/export/items/computercraft/computer_command.png
rename to src/generated/export/items/computercraft/computer_command.png
diff --git a/src/web/export/items/computercraft/computer_normal.png b/src/generated/export/items/computercraft/computer_normal.png
similarity index 100%
rename from src/web/export/items/computercraft/computer_normal.png
rename to src/generated/export/items/computercraft/computer_normal.png
diff --git a/src/web/export/items/computercraft/disk.png b/src/generated/export/items/computercraft/disk.png
similarity index 100%
rename from src/web/export/items/computercraft/disk.png
rename to src/generated/export/items/computercraft/disk.png
diff --git a/src/web/export/items/computercraft/disk_drive.png b/src/generated/export/items/computercraft/disk_drive.png
similarity index 100%
rename from src/web/export/items/computercraft/disk_drive.png
rename to src/generated/export/items/computercraft/disk_drive.png
diff --git a/src/web/export/items/computercraft/monitor_advanced.png b/src/generated/export/items/computercraft/monitor_advanced.png
similarity index 100%
rename from src/web/export/items/computercraft/monitor_advanced.png
rename to src/generated/export/items/computercraft/monitor_advanced.png
diff --git a/src/web/export/items/computercraft/monitor_normal.png b/src/generated/export/items/computercraft/monitor_normal.png
similarity index 100%
rename from src/web/export/items/computercraft/monitor_normal.png
rename to src/generated/export/items/computercraft/monitor_normal.png
diff --git a/src/web/export/items/computercraft/pocket_computer_advanced.png b/src/generated/export/items/computercraft/pocket_computer_advanced.png
similarity index 100%
rename from src/web/export/items/computercraft/pocket_computer_advanced.png
rename to src/generated/export/items/computercraft/pocket_computer_advanced.png
diff --git a/src/web/export/items/computercraft/pocket_computer_normal.png b/src/generated/export/items/computercraft/pocket_computer_normal.png
similarity index 100%
rename from src/web/export/items/computercraft/pocket_computer_normal.png
rename to src/generated/export/items/computercraft/pocket_computer_normal.png
diff --git a/src/web/export/items/computercraft/printed_book.png b/src/generated/export/items/computercraft/printed_book.png
similarity index 100%
rename from src/web/export/items/computercraft/printed_book.png
rename to src/generated/export/items/computercraft/printed_book.png
diff --git a/src/web/export/items/computercraft/printed_page.png b/src/generated/export/items/computercraft/printed_page.png
similarity index 100%
rename from src/web/export/items/computercraft/printed_page.png
rename to src/generated/export/items/computercraft/printed_page.png
diff --git a/src/web/export/items/computercraft/printed_pages.png b/src/generated/export/items/computercraft/printed_pages.png
similarity index 100%
rename from src/web/export/items/computercraft/printed_pages.png
rename to src/generated/export/items/computercraft/printed_pages.png
diff --git a/src/web/export/items/computercraft/printer.png b/src/generated/export/items/computercraft/printer.png
similarity index 100%
rename from src/web/export/items/computercraft/printer.png
rename to src/generated/export/items/computercraft/printer.png
diff --git a/src/web/export/items/computercraft/speaker.png b/src/generated/export/items/computercraft/speaker.png
similarity index 100%
rename from src/web/export/items/computercraft/speaker.png
rename to src/generated/export/items/computercraft/speaker.png
diff --git a/src/web/export/items/computercraft/treasure_disk.png b/src/generated/export/items/computercraft/treasure_disk.png
similarity index 100%
rename from src/web/export/items/computercraft/treasure_disk.png
rename to src/generated/export/items/computercraft/treasure_disk.png
diff --git a/src/web/export/items/computercraft/turtle_advanced.png b/src/generated/export/items/computercraft/turtle_advanced.png
similarity index 100%
rename from src/web/export/items/computercraft/turtle_advanced.png
rename to src/generated/export/items/computercraft/turtle_advanced.png
diff --git a/src/web/export/items/computercraft/turtle_normal.png b/src/generated/export/items/computercraft/turtle_normal.png
similarity index 100%
rename from src/web/export/items/computercraft/turtle_normal.png
rename to src/generated/export/items/computercraft/turtle_normal.png
diff --git a/src/web/export/items/computercraft/wired_modem.png b/src/generated/export/items/computercraft/wired_modem.png
similarity index 100%
rename from src/web/export/items/computercraft/wired_modem.png
rename to src/generated/export/items/computercraft/wired_modem.png
diff --git a/src/web/export/items/computercraft/wired_modem_full.png b/src/generated/export/items/computercraft/wired_modem_full.png
similarity index 100%
rename from src/web/export/items/computercraft/wired_modem_full.png
rename to src/generated/export/items/computercraft/wired_modem_full.png
diff --git a/src/web/export/items/computercraft/wireless_modem_advanced.png b/src/generated/export/items/computercraft/wireless_modem_advanced.png
similarity index 100%
rename from src/web/export/items/computercraft/wireless_modem_advanced.png
rename to src/generated/export/items/computercraft/wireless_modem_advanced.png
diff --git a/src/web/export/items/computercraft/wireless_modem_normal.png b/src/generated/export/items/computercraft/wireless_modem_normal.png
similarity index 100%
rename from src/web/export/items/computercraft/wireless_modem_normal.png
rename to src/generated/export/items/computercraft/wireless_modem_normal.png
diff --git a/src/web/export/items/minecraft/black_dye.png b/src/generated/export/items/minecraft/black_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/black_dye.png
rename to src/generated/export/items/minecraft/black_dye.png
diff --git a/src/web/export/items/minecraft/blue_dye.png b/src/generated/export/items/minecraft/blue_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/blue_dye.png
rename to src/generated/export/items/minecraft/blue_dye.png
diff --git a/src/web/export/items/minecraft/brown_dye.png b/src/generated/export/items/minecraft/brown_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/brown_dye.png
rename to src/generated/export/items/minecraft/brown_dye.png
diff --git a/src/web/export/items/minecraft/chest.png b/src/generated/export/items/minecraft/chest.png
similarity index 100%
rename from src/web/export/items/minecraft/chest.png
rename to src/generated/export/items/minecraft/chest.png
diff --git a/src/web/export/items/minecraft/command_block.png b/src/generated/export/items/minecraft/command_block.png
similarity index 100%
rename from src/web/export/items/minecraft/command_block.png
rename to src/generated/export/items/minecraft/command_block.png
diff --git a/src/web/export/items/minecraft/cyan_dye.png b/src/generated/export/items/minecraft/cyan_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/cyan_dye.png
rename to src/generated/export/items/minecraft/cyan_dye.png
diff --git a/src/web/export/items/minecraft/ender_eye.png b/src/generated/export/items/minecraft/ender_eye.png
similarity index 100%
rename from src/web/export/items/minecraft/ender_eye.png
rename to src/generated/export/items/minecraft/ender_eye.png
diff --git a/src/web/export/items/minecraft/ender_pearl.png b/src/generated/export/items/minecraft/ender_pearl.png
similarity index 100%
rename from src/web/export/items/minecraft/ender_pearl.png
rename to src/generated/export/items/minecraft/ender_pearl.png
diff --git a/src/web/export/items/minecraft/glass_pane.png b/src/generated/export/items/minecraft/glass_pane.png
similarity index 100%
rename from src/web/export/items/minecraft/glass_pane.png
rename to src/generated/export/items/minecraft/glass_pane.png
diff --git a/src/web/export/items/minecraft/gold_block.png b/src/generated/export/items/minecraft/gold_block.png
similarity index 100%
rename from src/web/export/items/minecraft/gold_block.png
rename to src/generated/export/items/minecraft/gold_block.png
diff --git a/src/web/export/items/minecraft/gold_ingot.png b/src/generated/export/items/minecraft/gold_ingot.png
similarity index 100%
rename from src/web/export/items/minecraft/gold_ingot.png
rename to src/generated/export/items/minecraft/gold_ingot.png
diff --git a/src/web/export/items/minecraft/golden_apple.png b/src/generated/export/items/minecraft/golden_apple.png
similarity index 100%
rename from src/web/export/items/minecraft/golden_apple.png
rename to src/generated/export/items/minecraft/golden_apple.png
diff --git a/src/web/export/items/minecraft/gray_dye.png b/src/generated/export/items/minecraft/gray_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/gray_dye.png
rename to src/generated/export/items/minecraft/gray_dye.png
diff --git a/src/web/export/items/minecraft/green_dye.png b/src/generated/export/items/minecraft/green_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/green_dye.png
rename to src/generated/export/items/minecraft/green_dye.png
diff --git a/src/web/export/items/minecraft/iron_ingot.png b/src/generated/export/items/minecraft/iron_ingot.png
similarity index 100%
rename from src/web/export/items/minecraft/iron_ingot.png
rename to src/generated/export/items/minecraft/iron_ingot.png
diff --git a/src/web/export/items/minecraft/leather.png b/src/generated/export/items/minecraft/leather.png
similarity index 100%
rename from src/web/export/items/minecraft/leather.png
rename to src/generated/export/items/minecraft/leather.png
diff --git a/src/web/export/items/minecraft/light_blue_dye.png b/src/generated/export/items/minecraft/light_blue_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/light_blue_dye.png
rename to src/generated/export/items/minecraft/light_blue_dye.png
diff --git a/src/web/export/items/minecraft/light_gray_dye.png b/src/generated/export/items/minecraft/light_gray_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/light_gray_dye.png
rename to src/generated/export/items/minecraft/light_gray_dye.png
diff --git a/src/web/export/items/minecraft/lime_dye.png b/src/generated/export/items/minecraft/lime_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/lime_dye.png
rename to src/generated/export/items/minecraft/lime_dye.png
diff --git a/src/web/export/items/minecraft/magenta_dye.png b/src/generated/export/items/minecraft/magenta_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/magenta_dye.png
rename to src/generated/export/items/minecraft/magenta_dye.png
diff --git a/src/web/export/items/minecraft/note_block.png b/src/generated/export/items/minecraft/note_block.png
similarity index 100%
rename from src/web/export/items/minecraft/note_block.png
rename to src/generated/export/items/minecraft/note_block.png
diff --git a/src/web/export/items/minecraft/orange_dye.png b/src/generated/export/items/minecraft/orange_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/orange_dye.png
rename to src/generated/export/items/minecraft/orange_dye.png
diff --git a/src/web/export/items/minecraft/pink_dye.png b/src/generated/export/items/minecraft/pink_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/pink_dye.png
rename to src/generated/export/items/minecraft/pink_dye.png
diff --git a/src/web/export/items/minecraft/purple_dye.png b/src/generated/export/items/minecraft/purple_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/purple_dye.png
rename to src/generated/export/items/minecraft/purple_dye.png
diff --git a/src/web/export/items/minecraft/red_dye.png b/src/generated/export/items/minecraft/red_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/red_dye.png
rename to src/generated/export/items/minecraft/red_dye.png
diff --git a/src/web/export/items/minecraft/redstone.png b/src/generated/export/items/minecraft/redstone.png
similarity index 100%
rename from src/web/export/items/minecraft/redstone.png
rename to src/generated/export/items/minecraft/redstone.png
diff --git a/src/web/export/items/minecraft/stone.png b/src/generated/export/items/minecraft/stone.png
similarity index 100%
rename from src/web/export/items/minecraft/stone.png
rename to src/generated/export/items/minecraft/stone.png
diff --git a/src/web/export/items/minecraft/string.png b/src/generated/export/items/minecraft/string.png
similarity index 100%
rename from src/web/export/items/minecraft/string.png
rename to src/generated/export/items/minecraft/string.png
diff --git a/src/web/export/items/minecraft/white_dye.png b/src/generated/export/items/minecraft/white_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/white_dye.png
rename to src/generated/export/items/minecraft/white_dye.png
diff --git a/src/web/export/items/minecraft/yellow_dye.png b/src/generated/export/items/minecraft/yellow_dye.png
similarity index 100%
rename from src/web/export/items/minecraft/yellow_dye.png
rename to src/generated/export/items/minecraft/yellow_dye.png
diff --git a/src/web/transform.tsx b/src/web/transform.tsx
index 24eb1a5f2..521ee56b8 100644
--- a/src/web/transform.tsx
+++ b/src/web/transform.tsx
@@ -39,7 +39,7 @@ const glob = promisify(globModule);
             } as any
         });
 
-    const dataExport = JSON.parse(await fs.readFile("src/web/export/index.json", "utf-8")) as DataExport;
+    const dataExport = JSON.parse(await fs.readFile("src/generated/export/index.json", "utf-8")) as DataExport;
 
     for (const file of await glob(base + "/**/*.html")) {
         const contents = await fs.readFile(file, "utf-8");