From d0f9895845f330b84c99203dd6fc34fbda0da9d5 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sun, 8 Oct 2023 16:58:53 +0200 Subject: [PATCH] util: cleanup --- util/.gitignore | 1 + util/ReadMe.md | 10 +++------- util/assets_properties_generator.py | 16 ---------------- util/bb_model_stripe.py | 22 ---------------------- 4 files changed, 4 insertions(+), 45 deletions(-) create mode 100644 util/.gitignore delete mode 100644 util/bb_model_stripe.py diff --git a/util/.gitignore b/util/.gitignore new file mode 100644 index 000000000..bff2d7629 --- /dev/null +++ b/util/.gitignore @@ -0,0 +1 @@ +*.iml diff --git a/util/ReadMe.md b/util/ReadMe.md index 92855f121..5878eae50 100644 --- a/util/ReadMe.md +++ b/util/ReadMe.md @@ -11,11 +11,7 @@ The script asks you for a version of minecraft, you enter it (can be a snapshot) 3. Adjust the `javaPath` in the file (edit with an editor). If Java 8 is your default JRE, just insert `java`. 4. Run the script with `python3 server_wrapper.py`. You can pass the parameter `download-all` and it will create an offline cache for all minecraft versions (latest - first) -## Mappings Generator +## Assets Properties Generator -This data generates the jar assets hash for every version - -#### Installation / Usage - -1. Download the script -2. Run the script with `python3 version_mappings_generator.py` and wait for the process to complete. Currently, some versions will fail, because it is difficult to generate the blocks.json. Feel free to make a Pull Request :): ['1.13-pre6', '1.13-pre5', '17w50a', '17w49b', '17w49a', '17w48a', '17w47b', '17w47a'] +A tool to create the `assets_properties.json` resource. +It automatically fetches the minecraft version index and the pixlyzer index. It then combines them, stores all hashes of files that minosoft needs to work. It might also start the minosoft assets properties generator to generate the jar assets hash. diff --git a/util/assets_properties_generator.py b/util/assets_properties_generator.py index 47901e67c..d1f906e2c 100644 --- a/util/assets_properties_generator.py +++ b/util/assets_properties_generator.py @@ -8,22 +8,6 @@ # You should have received a copy of the GNU General Public License along with this program. If not, see . # # This software is not affiliated with Mojang AB, the original developer of Minecraft. -# -# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with this program. If not, see . -# -# This software is not affiliated with Mojang AB, the original developer of Minecraft. -# -# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with this program. If not, see . -# -# This software is not affiliated with Mojang AB, the original developer of Minecraft. import subprocess import ujson diff --git a/util/bb_model_stripe.py b/util/bb_model_stripe.py deleted file mode 100644 index abcf92ff9..000000000 --- a/util/bb_model_stripe.py +++ /dev/null @@ -1,22 +0,0 @@ -# Minosoft -# Copyright (C) 2020-2022 Moritz Zwerger -# -# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with this program. If not, see . -# -# This software is not affiliated with Mojang AB, the original developer of Minecraft. -# -# This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with this program. If not, see . -# -# This software is not affiliated with Mojang AB, the original developer of Minecraft. - -def stripe_model(data): - for property in data: - if property is list: