1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-30 21:23:00 +00:00

Split CC:T into common and forge projects

After several weeks of carefully arranging ribbons, we pull the string
and end up with, ... a bit of a messy bow. There were still some things
I'd missed.

 - Split the mod into a common (vanilla-only) project and Forge-specific
   project. This gives us room to add Fabric support later on.

 - Split the project into main/client source sets. This is not currently
   statically checked: we'll do that soon.

 - Rename block/item/tile entities to use suffixes rather than prefixes.
This commit is contained in:
Jonathan Coates
2022-11-09 23:58:56 +00:00
parent bdf590fa30
commit f04acdc199
992 changed files with 2294 additions and 2125 deletions

View File

@@ -0,0 +1,400 @@
{
"itemNames": {
"computercraft:cable": "Networking Cable",
"computercraft:computer_advanced": "Advanced Computer",
"computercraft:computer_command": "Command Computer",
"computercraft:computer_normal": "Computer",
"computercraft:disk": "Floppy Disk",
"computercraft:disk_drive": "Disk Drive",
"computercraft:monitor_advanced": "Advanced Monitor",
"computercraft:monitor_normal": "Monitor",
"computercraft:pocket_computer_advanced": "Advanced Pocket Computer",
"computercraft:pocket_computer_normal": "Pocket Computer",
"computercraft:printed_book": "Printed Book",
"computercraft:printed_page": "Printed Page",
"computercraft:printed_pages": "Printed Pages",
"computercraft:printer": "Printer",
"computercraft:speaker": "Speaker",
"computercraft:treasure_disk": "Floppy Disk",
"computercraft:turtle_advanced": "Advanced Turtle",
"computercraft:turtle_normal": "Turtle",
"computercraft:wired_modem": "Wired Modem",
"computercraft:wired_modem_full": "Wired Modem",
"computercraft:wireless_modem_advanced": "Ender Modem",
"computercraft:wireless_modem_normal": "Wireless Modem",
"minecraft:black_dye": "Black Dye",
"minecraft:blue_dye": "Blue Dye",
"minecraft:brown_dye": "Brown Dye",
"minecraft:chest": "Chest",
"minecraft:command_block": "Command Block",
"minecraft:cyan_dye": "Cyan Dye",
"minecraft:ender_eye": "Eye of Ender",
"minecraft:ender_pearl": "Ender Pearl",
"minecraft:glass_pane": "Glass Pane",
"minecraft:gold_block": "Block of Gold",
"minecraft:gold_ingot": "Gold Ingot",
"minecraft:golden_apple": "Golden Apple",
"minecraft:gray_dye": "Gray Dye",
"minecraft:green_dye": "Green Dye",
"minecraft:iron_ingot": "Iron Ingot",
"minecraft:leather": "Leather",
"minecraft:light_blue_dye": "Light Blue Dye",
"minecraft:light_gray_dye": "Light Gray Dye",
"minecraft:lime_dye": "Lime Dye",
"minecraft:magenta_dye": "Magenta Dye",
"minecraft:note_block": "Note Block",
"minecraft:orange_dye": "Orange Dye",
"minecraft:pink_dye": "Pink Dye",
"minecraft:purple_dye": "Purple Dye",
"minecraft:red_dye": "Red Dye",
"minecraft:redstone": "Redstone Dust",
"minecraft:stone": "Stone",
"minecraft:string": "String",
"minecraft:white_dye": "White Dye",
"minecraft:yellow_dye": "Yellow Dye"
},
"recipes": {
"computercraft:cable": {
"inputs": [
null,
["minecraft:stone"],
null,
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"],
null,
["minecraft:stone"],
null
],
"output": "computercraft:cable",
"count": 6
},
"computercraft:computer_advanced": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:redstone"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:glass_pane"],
["minecraft:gold_ingot"]
],
"output": "computercraft:computer_advanced",
"count": 1
},
"computercraft:computer_advanced_upgrade": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["computercraft:computer_advanced"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
null,
["minecraft:gold_ingot"]
],
"output": "computercraft:computer_advanced",
"count": 1
},
"computercraft:computer_command": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:command_block"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:glass_pane"],
["minecraft:gold_ingot"]
],
"output": "computercraft:computer_command",
"count": 1
},
"computercraft:computer_normal": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:glass_pane"],
["minecraft:stone"]
],
"output": "computercraft:computer_normal",
"count": 1
},
"computercraft:disk_drive": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"]
],
"output": "computercraft:disk_drive",
"count": 1
},
"computercraft:monitor_advanced": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:glass_pane"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"]
],
"output": "computercraft:monitor_advanced",
"count": 4
},
"computercraft:monitor_normal": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:glass_pane"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"]
],
"output": "computercraft:monitor_normal",
"count": 1
},
"computercraft:pocket_computer_advanced": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:golden_apple"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:glass_pane"],
["minecraft:gold_ingot"]
],
"output": "computercraft:pocket_computer_advanced",
"count": 1
},
"computercraft:pocket_computer_advanced_upgrade": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["computercraft:pocket_computer_normal"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
null,
["minecraft:gold_ingot"]
],
"output": "computercraft:pocket_computer_advanced",
"count": 1
},
"computercraft:pocket_computer_normal": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:golden_apple"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:glass_pane"],
["minecraft:stone"]
],
"output": "computercraft:pocket_computer_normal",
"count": 1
},
"computercraft:printed_book": {
"inputs": [
["minecraft:leather"],
["computercraft:printed_page"],
["minecraft:string"],
null,
null,
null,
null,
null,
null
],
"output": "computercraft:printed_book",
"count": 1
},
"computercraft:printed_pages": {
"inputs": [
["computercraft:printed_page"],
["computercraft:printed_page"],
["minecraft:string"],
null,
null,
null,
null,
null,
null
],
"output": "computercraft:printed_pages",
"count": 1
},
"computercraft:printer": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"],
["minecraft:stone"],
[
"minecraft:black_dye",
"minecraft:blue_dye",
"minecraft:brown_dye",
"minecraft:cyan_dye",
"minecraft:gray_dye",
"minecraft:green_dye",
"minecraft:light_blue_dye",
"minecraft:light_gray_dye",
"minecraft:lime_dye",
"minecraft:magenta_dye",
"minecraft:orange_dye",
"minecraft:pink_dye",
"minecraft:purple_dye",
"minecraft:red_dye",
"minecraft:white_dye",
"minecraft:yellow_dye"
],
["minecraft:stone"]
],
"output": "computercraft:printer",
"count": 1
},
"computercraft:speaker": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:note_block"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"]
],
"output": "computercraft:speaker",
"count": 1
},
"computercraft:turtle_advanced": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["computercraft:computer_advanced"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:chest"],
["minecraft:gold_ingot"]
],
"output": "computercraft:turtle_advanced",
"count": 1
},
"computercraft:turtle_advanced_upgrade": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["computercraft:computer_advanced"],
["minecraft:gold_ingot"],
null,
["minecraft:gold_block"],
null
],
"output": "computercraft:turtle_advanced",
"count": 1
},
"computercraft:turtle_normal": {
"inputs": [
["minecraft:iron_ingot"],
["minecraft:iron_ingot"],
["minecraft:iron_ingot"],
["minecraft:iron_ingot"],
["computercraft:computer_normal"],
["minecraft:iron_ingot"],
["minecraft:iron_ingot"],
["minecraft:chest"],
["minecraft:iron_ingot"]
],
"output": "computercraft:turtle_normal",
"count": 1
},
"computercraft:wired_modem": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:redstone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"]
],
"output": "computercraft:wired_modem",
"count": 1
},
"computercraft:wired_modem_full_from": {
"inputs": [["computercraft:wired_modem"], null, null, null, null, null, null, null, null],
"output": "computercraft:wired_modem_full",
"count": 1
},
"computercraft:wired_modem_full_to": {
"inputs": [["computercraft:wired_modem_full"], null, null, null, null, null, null, null, null],
"output": "computercraft:wired_modem",
"count": 1
},
"computercraft:wireless_modem_advanced": {
"inputs": [
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:ender_eye"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"],
["minecraft:gold_ingot"]
],
"output": "computercraft:wireless_modem_advanced",
"count": 1
},
"computercraft:wireless_modem_normal": {
"inputs": [
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:ender_pearl"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"],
["minecraft:stone"]
],
"output": "computercraft:wireless_modem_normal",
"count": 1
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 977 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 620 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 236 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 235 B

View File

@@ -39,7 +39,7 @@ const glob = promisify(globModule);
} as any
});
const dataExport = JSON.parse(await fs.readFile("../../src/generated/export/index.json", "utf-8")) as DataExport;
const dataExport = JSON.parse(await fs.readFile("src/export/index.json", "utf-8")) as DataExport;
for (const file of await glob(base + "/**/*.html")) {
const contents = await fs.readFile(file, "utf-8");