up to 1.17.1

This commit is contained in:
Alexander Popov 2021-07-21 04:39:18 +03:00
parent f1aa69b2bd
commit 2591b2e029
Signed by: iiiypuk
GPG Key ID: 398FC73478D97286
9 changed files with 20 additions and 84 deletions

3
.gitignore vendored
View File

@ -1,7 +1,4 @@
venv
node_modules/ node_modules/
package-lock.json package-lock.json
tools/version.json
tools/libs.txt
for_build/ for_build/
Minecraft.jar Minecraft.jar

View File

@ -1,10 +1,7 @@
TODO ## 2021 jul 21
==== + update launcher to 1.17.1
* Сделать цветной выхлоп > java 16 to run need
* Реализовать параметр вывода в файл [b38e3ca]
* Реализовать копирование в буфер обмена, при выхлопе в терминал
* Исправить автоматический выхлоп для Windows, либо сделать оповещение об этом [1ecc7be]
2020/10/10 # 1 ------------------ ## 2020/10/10
+ add return notification for generate libraries list. + add return notification for generate libraries list.
+ add output parameter for make libs script. + add output parameter for make libs script.

View File

@ -1,2 +1,10 @@
## TODO
- [ ] Move docs to `gh-pages`
- [ ] Сделать цветной выхлоп `make_libs_list.py`
- [ ] Реализовать копирование в буфер обмена, при выхлопе в терминал
- [ ] Script for automatic make release **zip** - [ ] Script for automatic make release **zip**
- [ ] Make binary archives with this launcher for vanilla and forge version - [ ] Make binary archives with this launcher for vanilla and forge version
## Complete
- [x] Реализовать параметр вывода в файл [[b38e3ca](https://github.com/iiiypuk/minecraft-launcher/commit/b38e3ca913ece59809cd98c65bf29d7cdb08750e)]
- [x] Исправить автоматический выхлоп для Windows, либо сделать оповещение об этом [[1ecc7be](https://github.com/iiiypuk/minecraft-launcher/commit/1ecc7be9ce5e074b0fa920efa9480502dba34e3a)]

View File

@ -1,5 +1,4 @@
Minecraft Natives ## Minecraft Natives
=========================
Natives catalog in [Mega.nz](https://mega.nz/#F!hUNg0Y6I!93cYw1NZg4MUWUHaVrCO7w) Natives catalog in [Mega.nz](https://mega.nz/#F!hUNg0Y6I!93cYw1NZg4MUWUHaVrCO7w)

View File

@ -1 +1,2 @@
* `make_libs_list.py` - parse `version.json` file and return libs * `make_libs_list.py` - parse `version.json` file and return libs
Moved to [iiiypuk/minecraft-libs-parser](https://github.com/iiiypuk/minecraft-libs-parser).

View File

@ -1,68 +0,0 @@
#!/usr/bin/env python3
import sys
import json
import click
__author__ = "Alexander Popov"
__version__ = "1.0.2"
__license__ = "Unlicense"
@click.command()
@click.option("--platform", default=sys.platform, help="Output platform (win32, linux, darwin).")
@click.option("--output", default="tty", help="Output option (tty, txt).")
def make_output(platform, output):
""" Return libraries list """
libraries = parse_libs()
# OS libs separate
_ = {"win32": ";", "linux": ":", "darwin": ":"}
out_lib = str()
# Generate libraries list
for lib in libraries:
out_lib = out_lib + "$MC_DIR/libraries/{0}".format(lib) + _[platform]
out_lib = out_lib + "$MC_DIR/versions/$GAME_VERSION/$GAME_VERSION.jar"
# Replace for OS shell variable symbol
if platform == "win32":
out_lib = out_lib.replace("$MC_DIR", "%MC_DIR%")
out_lib = out_lib.replace("$GAME_VERSION", "%GAME_VERSION%")
if output == "tty":
click.echo(out_lib)
if platform == "win32":
print("\nWindows generate libraries list complete!")
elif platform == "linux" or platform == "darwin":
print("\nUnix generate libraries list complete!")
elif output == "txt":
with open("./libs.txt", "w", encoding="utf-8") as f:
f.write(out_lib)
if platform == "win32":
print("\nWindows generate libraries list complete!\n" "See libs.txt file.")
elif platform == "linux" or platform == "darwin":
print("\nUnix generate libraries list complete!\n" "See libs.txt file.")
def parse_libs():
""" Make libraries list from version.json file """
_ = []
with open("./version.json", "r", encoding="utf-8") as f:
file_data = json.loads(f.read())
for lib in file_data["libraries"]:
_.append(lib["downloads"]["artifact"]["path"])
return _
if __name__ == "__main__":
make_output()

View File

@ -14,10 +14,10 @@ GAME_DIR=$MC_DIR
# Assets location # Assets location
ASSETS_DIR=$MC_DIR/assets ASSETS_DIR=$MC_DIR/assets
ASSETS_INDEX=1.16 ASSETS_INDEX=1.17
# Version to use # Version to use
GAME_VERSION=1.16.5 GAME_VERSION=1.17.1
# Native libs location # Native libs location
NATIVES_DIR=$MC_DIR/bin/$GAME_VERSION NATIVES_DIR=$MC_DIR/bin/$GAME_VERSION

2
windows/README.md Normal file
View File

@ -0,0 +1,2 @@
## Java SE Download
Oracle JavaSE JDK 16 [download](https://www.oracle.com/java/technologies/javase-jdk16-downloads.html).

View File

@ -14,10 +14,10 @@ set GAME_DIR=%MC_DIR%
:: libraries and resource dir (requires no changes) :: libraries and resource dir (requires no changes)
set ASSETS_DIR=%MC_DIR%\assets set ASSETS_DIR=%MC_DIR%\assets
set ASSETS_INDEX=1.16 set ASSETS_INDEX=1.17
:: version minecraft (from versions/ dir) :: version minecraft (from versions/ dir)
set GAME_VERSION=1.16.5 set GAME_VERSION=1.17.1
:: get archive from natives/ dir :: get archive from natives/ dir
set NATIVES_DIR=%MC_DIR%\bin\%GAME_VERSION% set NATIVES_DIR=%MC_DIR%\bin\%GAME_VERSION%