From 68b1c579ba336241d595d034304dbea7a487194d Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 18 Jul 2021 12:32:57 +0200 Subject: [PATCH 1/2] grammar and format fixes --- README.md | 26 +++++++++++++------------- docs/install.md | 30 +++++++++++++++--------------- docs/schema/addonscript.md | 6 +++--- docs/schema/file.md | 27 ++++++++++++++------------- docs/schema/index.md | 8 ++++---- docs/schema/meta.md | 8 ++++---- docs/schema/relation.md | 6 +++--- docs/schema/repository.md | 2 +- docs/schema/root.md | 22 +++++++++++----------- docs/schema/version.md | 6 +++--- 10 files changed, 71 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 93b1d73..6cf4a31 100644 --- a/README.md +++ b/README.md @@ -5,30 +5,30 @@ This repository contains the AddonScript specification. ## What is AddonScript? AddonScript is a format to distribute Minecraft addons. An addon could be anything, which is installed -to the Minecraft game, like a mod, modpack, modloader, texturepack or even a world could be an addon. -AddonScript can be used for example to define, how addons should be installed or to specify dependencies -for addons. This way addon creators just have to publish the AddonScript file for their addon and let +into the Minecraft game, like a mod, modpack, modloader, texturepack or even a world. +AddonScript can be used for example to define how addons are installed, or to specify dependencies +for addons. This way, addon creators just have to publish the AddonScript file for their addon and let AddonScript compatible tools (for example launchers) install them. ## The values of AddonScript ### Open -AddonScript can be used by everyone. There is no company or economic interest behind AddonScript, -it is intended to be an open standard, which can be implemented by anyone who like to. Anyone can +AddonScript can be used by everyone. There is no company or economic interest behind AddonScript. +It is intended to be an open standard, which can be implemented by anyone who likes to. Anyone can contribute ideas to the AddonScript specification. ### Independent -AddonScript depends on nothing, except Minecraft itself (and Java). This means, that the specification -does not depend on existing APIs and formats like Curseforge and it also does not reference any specific -modloader like Forge or Fabric, instead they are itself addons, which can be defined using AddonScript. +AddonScript depends on nothing, except Minecraft itself (and Java). This means that the specification +does not depend on existing APIs and formats like Curseforge. It also does not reference any specific +modloader like Forge or Fabric, instead they are themselves addons, which can be defined using AddonScript. This means, that AddonScript is not bound to a specific set of modloaders, instead you can use any -modloader you want. +modloader. ### Universal -AddonScript is not bound to any specific use case like just for modpack or just for mods. Instead it -is considered to be a universal format, which could handle anything, that should be installed into -the Minecraft game. AddonScript could handle modloaders, mods, modpacks, texturepacks and even worlds -and maybe other things, we can't think of. +AddonScript is not bound to any specific use case like just for modpacks or just for mods. Instead it +is considered to be a universal format, which can handle anything, that is installed into +the Minecraft game. AddonScript can handle modloaders, mods, modpacks, texturepacks and even worlds +and maybe other things as well. diff --git a/docs/install.md b/docs/install.md index e749e6f..4d95296 100644 --- a/docs/install.md +++ b/docs/install.md @@ -3,39 +3,39 @@ ## Install steps ### move -```move [location]``` \ -move is simplest install step of all. It just moves the selected file to +`move [location]` +`move` is simplest install step of all. It just moves the selected file to the given location. ### extract -```extract [location]``` \ -extract can be used with zip files, to extract the contents of the zip file +`extract [location]` +`extract` can be used with zip files, to extract the contents of the zip file to the given location. ### rename -```rename [new name]``` \ -rename renames the selected file to the new given filename. +`rename [new name]` +`rename` renames the selected file to the new given filename. ### execute -```execute [location] [arguments]``` -execute can be used with an executable jar file. The jar file will be executed with the given arguments and +`execute [location] [arguments]` +`execute` can be used with an executable jar file. The jar file will be executed with the given arguments and the given location as working directory. A client should inform the user before just executing the file and -ask him for permission to do so and/or it should execute the jar in a closed environment, like a container, -to prevent viruses from being installed. +ask them for permission to do so and/or it should execute the jar in a closed environment like a container +to prevent malicous code from running. ### select -```select [filename]``` -select is used to select the file with the given file name for other installation steps. +`select [filename]` +`select` is used to select the file with the given file name for other installation steps. The file name can also be a relative path, if the file is not directly in the Minecraft directory. If no file name is given, the selection resets to the original file itself, also if it was already moved to another location. ## Locations -Locations are specified as a relative path from the Minecraft directory. For example `./mods` -would point to the mods directory of the Minecraft instance, to which the file should be installed. +Locations are specified as a relative path from the Minecraft directory to which the file should be installed. +For example `./mods` would point to the mods directory of the Minecraft instance. ## Directories If the selected file is a directory, then it is treated like a zip file, which means, that you can move and -rename it like normal files, but also use the `extract` install step, to move all contents of the directory +rename it like a normal file, but also use the `extract` install step to move all contents of the directory to the specified location. diff --git a/docs/schema/addonscript.md b/docs/schema/addonscript.md index 81b65f9..bf7d580 100644 --- a/docs/schema/addonscript.md +++ b/docs/schema/addonscript.md @@ -2,9 +2,9 @@ ``` json { - "version": 2 + "version": 2 } ``` -Currently the AddonScript object only contains the version of AddonScript, the file ist using. -In future versions there may be other information in this. +Currently the AddonScript object only contains the version of AddonScript the file uses. +In future versions, there may be other information added to this. diff --git a/docs/schema/file.md b/docs/schema/file.md index 36c3fea..c636028 100644 --- a/docs/schema/file.md +++ b/docs/schema/file.md @@ -2,13 +2,13 @@ ``` json { - "id": "modfile", - "url": "https://example.com/mymod.jar", - "flags": [], - "install": [ - "move mods" - ], - "sha1": "somesha1checksum" + "id": "modfile", + "url": "https://example.com/mymod.jar", + "flags": [], + "install": [ + "move mods" + ], + "sha1": "somesha1checksum" } ``` @@ -16,10 +16,11 @@ ### id -This is the ID of the file. It should only contain lowercase letters, numbers and dashes. +This is the ID of the file. It should only contain **lowercase letters, numbers and dashes**. + If multiple file objects in the same array have the same ID, they are treated as the same file, -which means, that the first one of them in the array will be used unless it can't be retrieved from the URL, -in which case the next one will be used as fallback. +which means that the first one of them in the array will be used unless it can't be retrieved from the URL, +in which case the next one will be used as a fallback. ### url @@ -27,15 +28,15 @@ This is URL, which points to the actual file. The URL can have one of the scheme ### install -This is an array of [install steps](../install.md). They describe, how the file should be installed to the game. -The order in the array correspond to the order, in which the install steps should be applied. +This is an array of [install steps](../install.md). They describe how the file should be installed to the game. +The order in the array corresponds to the order in which the install steps should be applied. ## Optional properties ### flags This is an array of [flags](../flags.md) for this file. If this property is not present in a file object, the file -will have the flags, which are set as default for files or, if no default was set, it will inherit the flags from the +will have the flags which are set as default for files, or if no default was set, it will inherit the flags from the associated version, which are applicable for files. ### sha1 diff --git a/docs/schema/index.md b/docs/schema/index.md index 5e40217..6864abf 100644 --- a/docs/schema/index.md +++ b/docs/schema/index.md @@ -15,11 +15,11 @@ ### versions -This is a map, with version numbers as keys and URLs to AddonScript files as values. The AddonScript file, to which the URL -points, must include the version number, which is the key in the map, and its addon ID must match the addon ID of the AddonScript -file, which includes the index object. +This is an object, with version numbers as keys and URLs to AddonScript files as values. The AddonScript file which the URL +points to must include the version number, which is the key in the map, and its addon ID must match the addon ID of the AddonScript +file which includes the index object. ### addons -This is a map, with addon IDs as keys and URLs to AddonScript files as values. The addon ID of the AddonScript file, to +This is an object, with addon IDs as keys and URLs to AddonScript files as values. The addon ID of the AddonScript file, to which the URL points, must match the key in the map. diff --git a/docs/schema/meta.md b/docs/schema/meta.md index 2bce91c..12ff292 100644 --- a/docs/schema/meta.md +++ b/docs/schema/meta.md @@ -1,7 +1,7 @@ # Meta Object Meta objects can be included in [addon](root.md) and [version](version.md) objects. -They should be used, to give information about the addon or the version, like a name, -a description or a changelog. The specification does not require a specific format -for meta objects, therefore you can add any property you want to it. It is however -recommended, to follow conventions for it. +They should be used to give information about the addon or the version, like a **name**, +a **description** or a **changelog**. The specification does not require a specific format +for meta objects, therefore you can add any property to it. +It is however recommended to follow conventions for it. diff --git a/docs/schema/relation.md b/docs/schema/relation.md index a23c190..7ccc883 100644 --- a/docs/schema/relation.md +++ b/docs/schema/relation.md @@ -12,7 +12,7 @@ ### id -This is the ID or namespaced ID of the addon, this relation refers to. +This is the ID or namespaced ID of the addon this relation refers to. ### version @@ -23,5 +23,5 @@ This is a [maven version range](https://maven.apache.org/enforcer/enforcer-rules ### flags This is an array of [flags](../flags.md) for this relation. If this property is not present in a relation object, the relation -will have the flags, which are set as default for relations or, if no default was set, it will inherit the flags from the -associated version, which are applicable for relations. +will have the flags which are set as default for relations or, if no default was set, it will inherit the flags +which are applicable for relations from the associated version. diff --git a/docs/schema/repository.md b/docs/schema/repository.md index 0325c5d..d07e0dd 100644 --- a/docs/schema/repository.md +++ b/docs/schema/repository.md @@ -16,7 +16,7 @@ This is the ID of the repository. It has to be unique to the AddonScript file. ### type -This is the type of the repository. Possible values are ```api``` or ```maven```. +This is the type of the repository. Possible values are `api` or `maven`. ### link diff --git a/docs/schema/root.md b/docs/schema/root.md index bd7788e..d992c37 100644 --- a/docs/schema/root.md +++ b/docs/schema/root.md @@ -2,13 +2,13 @@ ``` json { - "addonscript": {}, - "id": "myaddon", - "versions": [], - "repositories": [], - "index": {}, - "flags": {}, - "meta": {} + "addonscript": {}, + "id": "myaddon", + "versions": [], + "repositories": [], + "index": {}, + "flags": {}, + "meta": {} } ``` @@ -20,24 +20,24 @@ This is an [AddonScript object](addonscript.md) containing information about the ### id -This is the ID of your addon. It should only contain lowercase letters, numbers and dashes. +This is the ID of your addon. It should only contain **lowercase letters, numbers and dashes**. ## Optional properties ### versions This is an array of [version objects](version.md). It is possible to define multiple versions of the addon in one AddonScript file, -but in the most cases, there should be just one version per file. Although this property is optional, as you can define versions +but in the most cases there should be just one version per file. Athough this property is optional, as you can define versions in the [index](index.md), it can be used to define a list of versions, which can be found in the index. ### repositories -This is an array of [repository objects](repository.md). Each repository object defines one repository, from which files or +This is an array of [repository objects](repository.md). Each repository object defines one repository from which files or addons can be retrieved. ### index -This is an [index object](index.md), which includes links to other versions of this addon or to other related addons. +This is an [index object](index.md) which includes links to other versions of this addon, or to other related addons. ### flags diff --git a/docs/schema/version.md b/docs/schema/version.md index 918bb1d..8c83fd0 100644 --- a/docs/schema/version.md +++ b/docs/schema/version.md @@ -21,16 +21,16 @@ as they are used to comparing versions. ### files -This is an array of [file objects](file.md), including the files, belonging to this version. +This is an array of [file objects](file.md) including the files belonging to this version. ### relations -This is an array of [relation objects](relation.md), which represents related addons. +This is an array of [relation objects](relation.md) which represents related addons. ### flags This is an array of [flags](../flags.md) for this version. If this property is not present in a version object, the version -will have the flags, which are set as default for versions. +will have the flags which are set as default for versions. ### meta From f31cb52020fe607a75017fdbc15339ae9d594894 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Sun, 18 Jul 2021 12:35:35 +0200 Subject: [PATCH 2/2] fix markdown format --- docs/install.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/install.md b/docs/install.md index 4d95296..8488298 100644 --- a/docs/install.md +++ b/docs/install.md @@ -4,20 +4,24 @@ ### move `move [location]` + `move` is simplest install step of all. It just moves the selected file to the given location. ### extract `extract [location]` + `extract` can be used with zip files, to extract the contents of the zip file to the given location. ### rename `rename [new name]` + `rename` renames the selected file to the new given filename. ### execute `execute [location] [arguments]` + `execute` can be used with an executable jar file. The jar file will be executed with the given arguments and the given location as working directory. A client should inform the user before just executing the file and ask them for permission to do so and/or it should execute the jar in a closed environment like a container @@ -25,6 +29,7 @@ to prevent malicous code from running. ### select `select [filename]` + `select` is used to select the file with the given file name for other installation steps. The file name can also be a relative path, if the file is not directly in the Minecraft directory. If no file name is given, the selection resets to the original file itself, also if it was already moved to another location.