diff --git a/.editorconfig b/.editorconfig index cbffbb8d5..715cd7022 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ charset = utf-8 end_of_line = lf indent_size = 4 indent_style = space -insert_final_newline = false +insert_final_newline = true max_line_length = 0 tab_width = 4 ij_continuation_indent_size = 8 @@ -373,4 +373,4 @@ ij_xml_space_after_tag_name = false ij_xml_space_around_equals_in_attribute = false ij_xml_space_inside_empty_tag = true ij_xml_text_wrap = normal -ij_xml_use_custom_settings = false \ No newline at end of file +ij_xml_use_custom_settings = false diff --git a/.idea/copyright/GPL.xml b/.idea/copyright/GPL.xml index 51908d1b4..eef6ab612 100644 --- a/.idea/copyright/GPL.xml +++ b/.idea/copyright/GPL.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5e90e84ff..8fd72681d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + @@ -23,4 +22,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/cells/account.fxml b/src/main/resources/layout/cells/account.fxml index 076faf51d..7503f31f1 100644 --- a/src/main/resources/layout/cells/account.fxml +++ b/src/main/resources/layout/cells/account.fxml @@ -4,7 +4,7 @@ \ No newline at end of file + diff --git a/src/main/resources/layout/cells/session.fxml b/src/main/resources/layout/cells/session.fxml index 12974d145..5e3313150 100644 --- a/src/main/resources/layout/cells/session.fxml +++ b/src/main/resources/layout/cells/session.fxml @@ -4,7 +4,18 @@ - + \ No newline at end of file + diff --git a/src/main/resources/layout/main.fxml b/src/main/resources/layout/main.fxml index 1043b70e6..ab22e7f70 100644 --- a/src/main/resources/layout/main.fxml +++ b/src/main/resources/layout/main.fxml @@ -2,7 +2,18 @@ - + @@ -30,4 +41,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/sessions.fxml b/src/main/resources/layout/sessions.fxml index 16311a67b..ccf9d745a 100644 --- a/src/main/resources/layout/sessions.fxml +++ b/src/main/resources/layout/sessions.fxml @@ -4,7 +4,18 @@ - + @@ -16,4 +27,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/layout/settings.fxml b/src/main/resources/layout/settings.fxml index 58f9d584c..cfa05698e 100644 --- a/src/main/resources/layout/settings.fxml +++ b/src/main/resources/layout/settings.fxml @@ -2,7 +2,18 @@ - + diff --git a/util/blockModelCombinder.py b/util/blockModelCombinder.py index 6b5851b8b..eae8b98c2 100644 --- a/util/blockModelCombinder.py +++ b/util/blockModelCombinder.py @@ -1,4 +1,4 @@ -# Codename Minosoft +# Minosoft # Copyright (C) 2020 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. @@ -16,6 +16,14 @@ # 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 \ json diff --git a/util/mappingsDownloader.py b/util/mappingsDownloader.py index 6ae5a1909..e6f6b6b61 100644 --- a/util/mappingsDownloader.py +++ b/util/mappingsDownloader.py @@ -1,4 +1,4 @@ -# Codename Minosoft +# Minosoft # Copyright (C) 2020 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. @@ -8,24 +8,43 @@ # 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 os -import requests -import shutil -import tarfile -import ujson +import \ + os +import \ + requests +import \ + shutil +import \ + tarfile +import \ + traceback +import \ + ujson -import traceback - -print("Minecraft mappings downloader (and generator)") +print( + "Minecraft mappings downloader (and generator)") PRE_FLATTENING_UPDATE_VERSION = "17w46a" DATA_FOLDER = "./mcdata/" -FILES_PER_VERSION = ["blocks.json", "registries.json"] +FILES_PER_VERSION = [ + "blocks.json", + "registries.json"] DOWNLOAD_BASE_URL = "https://apimon.de/mcdata/" -manifest = requests.get('https://launchermeta.mojang.com/mc/game/version_manifest.json').json() +manifest = requests.get( + 'https://launchermeta.mojang.com/mc/game/version_manifest.json').json() failed = [] -defaultMappings = ujson.load(open("mappingsDefaults.json")) +defaultMappings = ujson.load( + open( + "mappingsDefaults.json")) if not os.path.isdir(DATA_FOLDER): os.mkdir(DATA_FOLDER) diff --git a/util/serverWrapper.py b/util/serverWrapper.py index 16062652c..1f2642edc 100644 --- a/util/serverWrapper.py +++ b/util/serverWrapper.py @@ -1,5 +1,5 @@ """ -* Codename Minosoft +* Minosoft * Copyright (C) 2020 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. @@ -10,6 +10,17 @@ * * This software is not affiliated with Mojang AB, the original developer of Minecraft. """ +# Minosoft +# Copyright (C) 2020 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. + import os import requests import shutil