diff --git a/.docsifytopdfrc.json b/.docsifytopdfrc.json new file mode 100644 index 000000000..862af52aa --- /dev/null +++ b/.docsifytopdfrc.json @@ -0,0 +1,5 @@ +{ + "contents": [ "docs/ru/config/_sidebar.md" ], + "pathToPublic": "docs.pdf", + "emulateMedia": "screen" +} diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml index 16cde41e6..575c32f9d 100644 --- a/.github/workflows/github-pages.yml +++ b/.github/workflows/github-pages.yml @@ -1,36 +1,31 @@ -name: Build docs & Deploy +name: Deploy + on: push: branches: - master + jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Node - uses: actions/setup-node@v2 + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 with: node-version: '14' - - name: Cache - uses: actions/cache@v1 + - uses: actions/cache@v1 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - name: Setup grunt - run: npm install -g grunt-cli - - name: Setup other dependencies - run: npm install --safe-dev - - name: Build docs - run: grunt docs_api - - name: Deploy - uses: JamesIves/github-pages-deploy-action@4.1.6 + - run: npm install -g grunt-cli + - run: npm install --safe-dev + - run: grunt docs_api + - uses: JamesIves/github-pages-deploy-action@4.1.6 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BASE_BRANCH: master BRANCH: gh-pages - FOLDER: out - single-commit: true \ No newline at end of file + FOLDER: docs + single-commit: true diff --git a/.gitignore b/.gitignore index 24f5fc641..3e0e43f8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /documentation/core-engine/headers/core-engine.d.ts /package-lock.json -/node_modules -/OLD -/out \ No newline at end of file +/node_modules/ +/docs/README.md +/docs/headers/ +/docs/api/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 25377a046..f8f9198f4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,8 @@ }, "spellright.language": [ "en", - "uk" + "uk", + "ru" ], "spellright.documentTypes": [ "markdown", @@ -14,4 +15,4 @@ "markdown.extension.tableFormatter.normalizeIndentation": true, "markdown.extension.list.indentationSize": "inherit", "markdown.extension.toc.orderedList": true -} \ No newline at end of file +} diff --git a/.vscode/spellright.dict b/.vscode/spellright.dict index 9a192c569..477ed6bed 100644 --- a/.vscode/spellright.dict +++ b/.vscode/spellright.dict @@ -5,3 +5,8 @@ minecraft Superflat Params perlin +шейдеры +шейдер +Майнкрафт +суперплоскость +калбек diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b6220fb64..31a52cfbd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Run typedoc", "type": "shell", - "command": "grunt docs_api", + "command": "npm run build", "group": { "kind": "build", "isDefault": true @@ -15,14 +15,11 @@ { "label": "Initialize Environment", "type": "shell", - "options": { - "cwd": "documentation" - }, - "command": "npm install --safe-dev", + "command": "npm install --save-dev", "group": { "kind": "build", "isDefault": true } } ] -} \ No newline at end of file +} diff --git a/README.md b/README.md index 4650d4360..bdef875e9 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,6 @@ npm install -g grunt-cli Documentation repository is located at [GitHub](https://github.com/mineprogramming/innercore-docs). -To build this repository locally, open this folder in Visual Studio Code and run (_Ctrl+Shift+B_) **Initialize Environment** task. This will install all required npm dependencies locally. To build typedoc documentation and headers, run **Run Typedoc** task. +To build this repository locally, open this folder in Visual Studio Code and run (_Ctrl+Shift+B_) **Initialize Environment** task. This will install all required npm dependencies locally. To build typedoc documentation and headers, run **Run Typedoc** task. Use npm package manager to perform another scripts, such as `npm run build-serve` or `npm run serve`. [Goto Docs](/) diff --git a/docs/config/_404.md b/docs/config/_404.md new file mode 100644 index 000000000..1f5580686 --- /dev/null +++ b/docs/config/_404.md @@ -0,0 +1,24 @@ +# Oops... Not found! + +## [Diving back into documentation...](https://docs.mineprogramming.org/#/) + + diff --git a/documentation/static/en/config/_navbar.md b/docs/config/_navbar.md similarity index 63% rename from documentation/static/en/config/_navbar.md rename to docs/config/_navbar.md index f4eb3e581..b14fc2510 100644 --- a/documentation/static/en/config/_navbar.md +++ b/docs/config/_navbar.md @@ -1,3 +1,3 @@ - Language - - [:uk: English](/en/) + - [:us: English](/) - [:ru: Русский](/ru/) diff --git a/docs/config/_sidebar.md b/docs/config/_sidebar.md new file mode 100644 index 000000000..29ba93ba7 --- /dev/null +++ b/docs/config/_sidebar.md @@ -0,0 +1,38 @@ +- [Horizon](/page/apps/horizon/index.md) + - [Packs](/page/apps/horizon/pack-system.md) + - [What is in pack](/page/apps/horizon/packs.md) + +- [Inner Core](/page/apps/innercore/index.md) + - [Core Engine API](/api/modules.html ':ignore :target=_self') + - [Changelog](/page/apps/innercore/changelog.md) + + Getting Started + - [Inner Core Mod Toolchain](/page/guides/getting-started/setup-toolchain.md) + - [Configure your toolchain](/page/guides/getting-started/toolchain-configuration.md) + - [Mod Configuration Files](/page/guides/getting-started/config.md) + + Minecraft + - [Attributes](/page/guides/minecraft/attributes.md) + - [Player Containers](/page/guides/minecraft/playercontainers.md) + + Mod API + - [Callbacks](/page/guides/mod-api/callbacks.md) + + Mod Resources + - [Materials](/page/guides/mod-resources/materials.md) + + Player + - [Abilities](/page/guides/player/abilities.md) + + World + - [Biomes](/page/guides/world/biomes.md) + - [Dimensions](/page/guides/world/dimensions.md) + +- [Contributing](/page/other/contributing.md) + - [Creating new pages](/page/other/create-page.md) + +- Libraries + - [BackpackAPI](/page/lib/BackpackAPI.md) + +- Mods + - [IndustrialCraft](/page/mod/IndustrialCraft2.md) diff --git a/documentation/static/images/dimensions-1.jpg b/docs/images/dimensions-1.jpg similarity index 100% rename from documentation/static/images/dimensions-1.jpg rename to docs/images/dimensions-1.jpg diff --git a/documentation/static/images/dimensions-2.jpg b/docs/images/dimensions-2.jpg similarity index 100% rename from documentation/static/images/dimensions-2.jpg rename to docs/images/dimensions-2.jpg diff --git a/documentation/static/images/dimensions-3.jpg b/docs/images/dimensions-3.jpg similarity index 100% rename from documentation/static/images/dimensions-3.jpg rename to docs/images/dimensions-3.jpg diff --git a/documentation/static/images/dimensions-4.jpg b/docs/images/dimensions-4.jpg similarity index 100% rename from documentation/static/images/dimensions-4.jpg rename to docs/images/dimensions-4.jpg diff --git a/documentation/static/images/dimensions-5.jpg b/docs/images/dimensions-5.jpg similarity index 100% rename from documentation/static/images/dimensions-5.jpg rename to docs/images/dimensions-5.jpg diff --git a/documentation/static/images/dimensions-6.jpg b/docs/images/dimensions-6.jpg similarity index 100% rename from documentation/static/images/dimensions-6.jpg rename to docs/images/dimensions-6.jpg diff --git a/documentation/static/images/dimensions-7.jpg b/docs/images/dimensions-7.jpg similarity index 100% rename from documentation/static/images/dimensions-7.jpg rename to docs/images/dimensions-7.jpg diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 000000000..506cb11f1 --- /dev/null +++ b/docs/index.html @@ -0,0 +1,142 @@ + +
+ +