Fixes

- Fixed item_stacks expecting an identifier for tag instead of NBT
- Fixed #50
- Fixed #49
- Fixed description links not getting replaced properly

package.json

@@ -34,73 +34,47 @@
 		"jsonValidation": [
 			{
 				"fileMatch": [
-					"**/data/*/origin_layers/**/*.json",
-					"**/data/*/origin_layers/**/*.yml"
+					"**/data/*/origin_layers/**/*.json"
 				],
-				"url": "./schemas/apoli/origin_layers.json"
+				"url": "./schemas/apoli/origin_layer.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/badges/**/*.json",
-					"**/data/*/badges/**/*.yml"
+					"**/data/*/badges/**/*.json"
 				],
 				"url": "./schemas/apoli/badge.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/origins/**/*.json",
-					"**/data/*/origins/**/*.yml"
+					"**/data/*/origins/**/*.json"
 				],
 				"url": "./schemas/apoli/origin.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/powers/**/*.json",
-					"**/data/*/powers/**/*.yml"
+					"**/data/*/powers/**/*.json"
 				],
 				"url": "./schemas/apoli/power.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/global_powers/**/*.json",
-					"**/data/*/global_powers/**/*.yml"
+					"**/data/*/global_powers/**/*.json"
 				],
 				"url": "./schemas/apoli/global_power_set.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/skill_trees/**/*.json",
-					"**/data/*/skill_trees/**/*.yml"
+					"**/data/*/skill_trees/**/*.json"
 				],
 				"url": "./schemas/apoli/skill_tree.json"
 			},
 			{
 				"fileMatch": [
-					"**/data/*/keybindings/**/*.json",
-					"**/data/*/keybindings/**/*.yml"
+					"**/data/*/keybindings/**/*.json"
 				],
 				"url": "./schemas/apoli/keybinding.json"
 			}
-		],
-		"configurationDefaults": {
-			"yaml.schemas": {
-				"https://raw.githubusercontent.com/SnaveSutit/origins-mod-json-schemas/main/schemas/skill_tree.json": [
-					"**/data/*/skill_trees/**/*.yml"
-				],
-				"https://raw.githubusercontent.com/SnaveSutit/origins-mod-json-schemas/main/schemas/power.json": [
-					"**/data/*/powers/**/*.yml"
-				],
-				"https://raw.githubusercontent.com/SnaveSutit/origins-mod-json-schemas/main/schemas/origin.json": [
-					"**/data/*/origin/**/*.yml"
-				],
-				"https://raw.githubusercontent.com/SnaveSutit/origins-mod-json-schemas/main/schemas/origin_layers.json": [
-					"**/data/*/origin_layers/**/*.yml"
-				],
-				"https://raw.githubusercontent.com/SnaveSutit/origins-mod-json-schemas/main/schemas/keybinding.json": [
-					"**/data/*/keybindings/**/*.yml"
-				]
-			}
-		}
+		]
 	},
 	"scripts": {
 		"vscode:prepublish": "yarn run package",

schemas/apoli/bientity_action_types/actor_action.json

@@ -10,8 +10,8 @@
 			"markdownDescription": "The entity action type to execute on the actor entity."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/actor_action)\n\nExecutes an [Entity Action Type](../entity_action_types.md) on the actor entity.\n\nType ID: `origins:actor_action`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/actor_action)\n\nExecutes an [Entity Action Type](../entity_action_types.md) on the actor entity.\n\nType ID: `origins:actor_action`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nExecutes an [Entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/actor_action) on the actor entity.\n\nType ID: `origins:actor_action`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nExecutes an [Entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/actor_action) on the actor entity.\n\nType ID: `origins:actor_action`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/add_to_set.json

@@ -16,8 +16,8 @@
 			"markdownDescription": "If specified, this will determine how long the target entity will be stored in the specified power in ticks."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_to_set)\n\nAdd the target entity to the power that uses the [Entity Set (Power Type)](../power_types/entity_set.md) of the actor entity.\n\nType ID: `origins:add_to_set`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_to_set)\n\nAdd the target entity to the power that uses the [Entity Set (Power Type)](../power_types/entity_set.md) of the actor entity.\n\nType ID: `origins:add_to_set`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nAdd the target entity to the power that uses the [Entity Set (Power Type)](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_to_set) of the actor entity.\n\nType ID: `origins:add_to_set`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nAdd the target entity to the power that uses the [Entity Set (Power Type)](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_to_set) of the actor entity.\n\nType ID: `origins:add_to_set`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/add_velocity.json

@@ -38,8 +38,8 @@
 			"markdownDescription": "If this is true, the action will act as a \"set\" velocity action, overriding the entity's current velocity instead of adding to it."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_velocity)\n\nAdds or sets the velocity of the target entity, based on the direction from the actor entity to the target entity.\n\nType ID: `origins:add_velocity`\n\n!!! note\n\n    If the action behaves unexpectedly, try setting either the `client` (should always work) or `server` (might not work) boolean fields to `false`. [Here are some examples.](https://github.com/apace100/apoli/blob/3115c41ea4390ad9ced3ae5be86151131accc36f/testdata/apoli/powers/add_velocity.json)\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_velocity)\n\nAdds or sets the velocity of the target entity, based on the direction from the actor entity to the target entity.\n\nType ID: `origins:add_velocity`\n\n!!! note\n\n    If the action behaves unexpectedly, try setting either the `client` (should always work) or `server` (might not work) boolean fields to `false`. [Here are some examples.](https://github.com/apace100/apoli/blob/3115c41ea4390ad9ced3ae5be86151131accc36f/testdata/apoli/powers/add_velocity.json)\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nAdds or sets the velocity of the target entity, based on the direction from the actor entity to the target entity.\n\nType ID: `origins:add_velocity`\n\n!!! note\n\n    If the action behaves unexpectedly, try setting either the `client` (should always work) or `server` (might not work) boolean fields to `false`. [Here are some examples.](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_velocity)\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nAdds or sets the velocity of the target entity, based on the direction from the actor entity to the target entity.\n\nType ID: `origins:add_velocity`\n\n!!! note\n\n    If the action behaves unexpectedly, try setting either the `client` (should always work) or `server` (might not work) boolean fields to `false`. [Here are some examples.](https://origins.readthedocs.io/en/latest/types/bientity_action_types/add_velocity)\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/damage.json

@@ -11,8 +11,8 @@
 		},
 		"source": {
 			"type": "null",
-			"description": "Use `damage_type` instead. [More information here](https://origins.readthedocs.io/en/latest/types/bientity_action_types/damage).",
-			"markdownDescription": "Use `damage_type` instead. [More information here](https://origins.readthedocs.io/en/latest/types/bientity_action_types/damage)."
+			"description": "Use `damage_type` instead. [More information here](https://gist.github.com/apace100/bfbf82a8f9d6bd2db13e4feaf653a6b0).",
+			"markdownDescription": "Use `damage_type` instead. [More information here](https://gist.github.com/apace100/bfbf82a8f9d6bd2db13e4feaf653a6b0)."
 		},
 		"damage_type": {
 			"$ref": "../types/damage_source.json",
@@ -33,8 +33,8 @@
 			"markdownDescription": "If specified, these modifiers will be applied to the damage taken by the '**target**' entity."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/damage)\n\nApplies damage to the target entity as if the actor entity has attacked it.\n\nType ID: `origins:damage`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/damage)\n\nApplies damage to the target entity as if the actor entity has attacked it.\n\nType ID: `origins:damage`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nApplies damage to the target entity as if the actor entity has attacked it.\n\nType ID: `origins:damage`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nApplies damage to the target entity as if the actor entity has attacked it.\n\nType ID: `origins:damage`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/invert.json

@@ -10,8 +10,8 @@
 			"markdownDescription": "The bi-entity action to execute which will have its 'target' and 'actor' contexts swapped."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/invert)\n\nSwaps the context of the target entity and the actor entity.\n\nType ID: `origins:invert`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/invert)\n\nSwaps the context of the target entity and the actor entity.\n\nType ID: `origins:invert`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nSwaps the context of the target entity and the actor entity.\n\nType ID: `origins:invert`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nSwaps the context of the target entity and the actor entity.\n\nType ID: `origins:invert`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/mount.json

@@ -2,8 +2,8 @@
 	"type": "object",
 	"properties": {
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/mount)\n\nMounts the actor entity onto the target entity.\n\nType ID: `origins:mount`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/mount)\n\nMounts the actor entity onto the target entity.\n\nType ID: `origins:mount`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nMounts the actor entity onto the target entity.\n\nType ID: `origins:mount`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nMounts the actor entity onto the target entity.\n\nType ID: `origins:mount`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/remove_from_set.json

@@ -10,8 +10,8 @@
 			"markdownDescription": "The ID of the power to remove the target entity from."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/remove_from_set)\n\nRemoves the target entity from the power that uses the [Entity Set (Power Type)](../power_types.md) of the actor entity.\n\nType ID: `origins:remove_from_set`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/remove_from_set)\n\nRemoves the target entity from the power that uses the [Entity Set (Power Type)](../power_types.md) of the actor entity.\n\nType ID: `origins:remove_from_set`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nRemoves the target entity from the power that uses the [Entity Set (Power Type)](https://origins.readthedocs.io/en/latest/types/bientity_action_types/remove_from_set) of the actor entity.\n\nType ID: `origins:remove_from_set`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](../bientity_action_types.md)\n\nRemoves the target entity from the power that uses the [Entity Set (Power Type)](https://origins.readthedocs.io/en/latest/types/bientity_action_types/remove_from_set) of the actor entity.\n\nType ID: `origins:remove_from_set`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_action_types/target_action.json

@@ -10,8 +10,8 @@
 			"markdownDescription": "The entity action type to execute on the target entity."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action)\n\nExecutes an [Entity Action Type](../entity_action_types.md) on the target entity.\n\nType ID: `origins:target_action`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action)\n\nExecutes an [Entity Action Type](../entity_action_types.md) on the target entity.\n\nType ID: `origins:target_action`\n\n\n"
+			"description": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action)\n\nExecutes an [Entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action) on the target entity.\n\nType ID: `origins:target_action`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action)\n\nExecutes an [Entity Action Type](https://origins.readthedocs.io/en/latest/types/bientity_action_types/target_action) on the target entity.\n\nType ID: `origins:target_action`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_condition.json

@@ -371,8 +371,8 @@
 						"markdownDescription": "The value to compare the randomly generated number to."
 					},
 					"type": {
-						"description": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/chance)\n\nGenerates a random number between 0.0 and 1.0 and checks if it's less than a specified value.\n\nType ID: `origins:chance`\n\n\n",
-						"markdownDescription": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/chance)\n\nGenerates a random number between 0.0 and 1.0 and checks if it's less than a specified value.\n\nType ID: `origins:chance`\n\n\n"
+						"description": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nGenerates a random number between 0.0 and 1.0 and checks if it's less than a specified value.\n\nType ID: `origins:chance`\n\n\n",
+						"markdownDescription": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nGenerates a random number between 0.0 and 1.0 and checks if it's less than a specified value.\n\nType ID: `origins:chance`\n\n\n"
 					}
 				}
 			}
@@ -403,8 +403,8 @@
 						"markdownDescription": "If true, the condition is always fulfilled. If false, the condition is never fulfilled."
 					},
 					"type": {
-						"description": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/constant)\n\nProvides a constant state where it's either true or false. Mainly added as a backup case in case a condition is required in some power/action/condition types.\n\nType ID: `origins:constant`\n\n\n",
-						"markdownDescription": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/constant)\n\nProvides a constant state where it's either true or false. Mainly added as a backup case in case a condition is required in some power/action/condition types.\n\nType ID: `origins:constant`\n\n\n"
+						"description": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nProvides a constant state where it's either true or false. Mainly added as a backup case in case a condition is required in some power/action/condition types.\n\nType ID: `origins:constant`\n\n\n",
+						"markdownDescription": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nProvides a constant state where it's either true or false. Mainly added as a backup case in case a condition is required in some power/action/condition types.\n\nType ID: `origins:constant`\n\n\n"
 					}
 				}
 			}
@@ -438,8 +438,8 @@
 						"markdownDescription": "Any of these condition types have to be fulfilled in order for this condition to be fulfilled."
 					},
 					"type": {
-						"description": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/or)\n\nChecks whether any (one or more) of the provided conditions are fulfilled.\n\nType ID: `origins:or`\n\n\n",
-						"markdownDescription": "\n\n[Meta Condition Type](https://origins.readthedocs.io/en/latest/types/meta_condition_types/or)\n\nChecks whether any (one or more) of the provided conditions are fulfilled.\n\nType ID: `origins:or`\n\n\n"
+						"description": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nChecks whether any (one or more) of the provided conditions are fulfilled.\n\nType ID: `origins:or`\n\n\n",
+						"markdownDescription": "\n\n[Meta Condition Type](../meta_condition_types.md)\n\nChecks whether any (one or more) of the provided conditions are fulfilled.\n\nType ID: `origins:or`\n\n\n"
 					}
 				}
 			}

schemas/apoli/bientity_condition_types/actor_condition.json

@@ -10,8 +10,8 @@
 			"markdownDescription": "The entity condition type to check for on the acting entity."
 		},
 		"type": {
-			"description": "\n\n[Bi-entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/actor_condition)\n\nChecks for an [Entity Condition Type](../entity_condition_types.md) on the actor entity.\n\nType ID: `origins:actor_condition`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/actor_condition)\n\nChecks for an [Entity Condition Type](../entity_condition_types.md) on the actor entity.\n\nType ID: `origins:actor_condition`\n\n\n"
+			"description": "\n\n[Bi-entity Condition Type](../bientity_condition_types.md)\n\nChecks for an [Entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/actor_condition) on the actor entity.\n\nType ID: `origins:actor_condition`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Condition Type](../bientity_condition_types.md)\n\nChecks for an [Entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/actor_condition) on the actor entity.\n\nType ID: `origins:actor_condition`\n\n\n"
 		}
 	}
 }

schemas/apoli/bientity_condition_types/attacker.json

@@ -2,8 +2,8 @@
 	"type": "object",
 	"properties": {
 		"type": {
-			"description": "\n\n[Bi-entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/attacker)\n\nChecks if the actor entity has attacked the target entity within the last 5 seconds, and still exists.\n\nType ID: `origins:attacker`\n\n\n",
-			"markdownDescription": "\n\n[Bi-entity Condition Type](https://origins.readthedocs.io/en/latest/types/bientity_condition_types/attacker)\n\nChecks if the actor entity has attacked the target entity within the last 5 seconds, and still exists.\n\nType ID: `origins:attacker`\n\n\n"
+			"description": "\n\n[Bi-entity Condition Type](../bientity_condition_types.md)\n\nChecks if the actor entity has attacked the target entity within the last 5 seconds, and still exists.\n\nType ID: `origins:attacker`\n\n\n",
+			"markdownDescription": "\n\n[Bi-entity Condition Type](../bientity_condition_types.md)\n\nChecks if the actor entity has attacked the target entity within the last 5 seconds, and still exists.\n\nType ID: `origins:attacker`\n\n\n"
 		}
 	}
 }