AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-09 07:20:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix various typos

Browse Source 
Co-authored-by: DeinBerater <niklas.hernitscheck@gmail.com>
This commit is contained in:
Bixilon 2020-11-27 15:23:44 +01:00
parent 2da9c29a39
commit 35b1dd4626
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReadMe.md
View File

@ -59,7 +59,7 @@ Sadly, we cannot support all versions. We will add support for all major version
### Partly supported versions
- Protocol lacking; See [snapSupportToDo.txt](/doc/snapSupportToDo.txt)
- Entities everything below `19w36a` (shortly after 1.14.4) (except `1.14.4` and `1.8.9`). Why? There is simply no time to generate an `entities.json`. The [Generator](/util) only works after that version.
And 1.8.9 is only supported, because it this version is widely spread, and I wrote (~ 1000 lines) by hand.
And 1.8.9 is only supported, because this version is widely spread, and I wrote (~ 1000 lines) by hand.
## Modding
Minosoft is modding friendly. I am working hard on a reasonable API. See !17 for more details. See [Modding.md](doc/Modding.md) for more details. The code is pretty dynamic (all blocks, items, entities, etc are stored in json files). It is pretty easy to load custom entities, etc.

2
doc/Assets.md
View File

@ -19,7 +19,7 @@ Assets are [Game Files](https://wiki.vg/Game_files). For example:
"minecraft/lang/de_de.json": "a8f1b2babf63e3fa21d24728271eaef0d8d33041"
}
```
Next, in the `version.json` ([Example 1.16.4-pre1](https://launchermeta.mojang.com/v1/packages/edcca0531de05c4b15007ca689b575a33b9d96a2/1.16.4-pre1.json)) there is sub json object called `assetIndex`.
Next, in the `version.json` ([Example 1.16.4-pre1](https://launchermeta.mojang.com/v1/packages/edcca0531de05c4b15007ca689b575a33b9d96a2/1.16.4-pre1.json)) there is a sub json object called `assetIndex`.
The asset index will be downloaded and stored. The hash of the file is hardcoded into minosoft to ensure that the assets are compatible. Next we loop over all elements and check if the file exists.
If not, we will download it and store it gzip compressed.

24
doc/Config.md
View File

@ -55,18 +55,18 @@ There is a config file located in:
```
## General
- `version`: The current version of the config. Used for migration between versions. A new version will be tagged, once a new release of minosoft is there, and the format of the config changed.
- `log-level`: Self explaining, valid log levels are defined in [LogLevels.java](/src/main/java/de/bixilon/minosoft/logging/LogLevels.java).
- `language`: Self explaining. All values are valid, if the specific language cannot be loaded (or specific strings are not available), `en_US` will be used (as fallback).
- `version` The current version of the config. Used for migration between versions. A new version will be tagged, once a new release of minosoft is there, and the format of the config changed.
- `log-level` Self explaining, valid log levels are defined in [LogLevels.java](/src/main/java/de/bixilon/minosoft/logging/LogLevels.java).
- `language` Self explaining. All values are valid, if the specific language cannot be loaded (or specific strings are not available), `en_US` will be used (as fallback).
## Network
- `fake-network-brand`: Minosoft send its brand to the server. If true, minosoft will say, that we use standard `vanilla`.
- `show-lan-servers`: If true, minosoft will listen for lan servers (singleplayer and share to LAN) and show them in the server list.
- `fake-network-brand` Minosoft send its brand to the server. If true, minosoft will say, that we use standard `vanilla`.
- `show-lan-servers` If true, minosoft will listen for lan servers (singleplayer and share to LAN) and show them in the server list.
## Accounts
- `selected`: userId of the current selected account, can be empty
- `client-token`: A random uuid (generated at first startup), used as unique identifier for all authentication communication with mojang.
- `entries`: A account array:
- `selected` userId of the current selected account, can be empty
- `client-token` A random uuid (generated at first startup), used as unique identifier for all authentication communication with mojang.
- `entries` An account array:
### Account
```json
@ -82,7 +82,7 @@ There is a config file located in:
```
## Servers
- `entries`: A server array:
- `entries` A server array:
### Server
```json
@ -97,9 +97,9 @@ There is a config file located in:
}
```
## Download
- `url`:
- `mappings`: URL for resources. For example mappings. The data is in a folder starting with the first digs of the hash, followed by the hash
- `url`
- `mappings` URL for resources. For example mappings. The data is in a folder starting with the first digs of the hash, followed by the hash
The URL must contain .tar.gz files named after minecraft versions (e.g. `0a/0aeb75059ef955d4cf2b9823d15775d0eacb13d5.tar.gz`).
## Debug
- `verify-assets`: If true, minosoft will check the sha1 of every asset. Must be false, if you want to modify assets. (Should be true, can be false, if you want to improve the start time)
- `verify-assets` If true, minosoft will check the sha1 of every asset. Must be false, if you want to modify assets. (Should be true, can be false, if you want to improve the start time)

6
util/version_mappings_generator.py
View File

@ -60,7 +60,7 @@ def downloadAndReplace(url, filename, destination):
file.write(json)
def getMinsoftEntityFieldNames(obfuscationMapLines, clazz, obfuscatedFields):
def getMinosoftEntityFieldNames(obfuscationMapLines, clazz, obfuscatedFields):
classLineStart = -1
for i in range(0, len(obfuscationMapLines)):
if obfuscationMapLines[i].endswith(" -> %s:" % clazz):
@ -198,7 +198,7 @@ for version in VERSION_MANIFEST["versions"]:
entity = {}
# generate (deobfuscated) className
entityOriginalClassName, unused = getMinsoftEntityFieldNames(obfuscationMapLines, burgerEntityData["class"], [])
entityOriginalClassName, unused = getMinosoftEntityFieldNames(obfuscationMapLines, burgerEntityData["class"], [])
# check if entity was already parsed
if entityOriginalClassName in entities:
@ -236,7 +236,7 @@ for version in VERSION_MANIFEST["versions"]:
for entry in metadataEntry["data"]:
metadataObfuscatedFields.append(entry["field"])
metadataEntryOriginalClassName, metadataOriginalFields = getMinsoftEntityFieldNames(obfuscationMapLines, metadataEntry["class"], metadataObfuscatedFields)
metadataEntryOriginalClassName, metadataOriginalFields = getMinosoftEntityFieldNames(obfuscationMapLines, metadataEntry["class"], metadataObfuscatedFields)
metaDataEntityData = {}