Fixes to enchantments, loot tables, and materials, and typo fixes. (#372)
- Added the missing enchantment types to the enum for the `minecraft:enchantable` item component. - Fixed a typo where the `killed_by_player_or_pets` condition was called "Killed By Player Or Pets Or Pets" instead of "Killed By Player Or Pets". - Fixed the match tool loot table condition to use the correct schema for the `enchantments` property. - Fixed a typo where the title of the match tool loot table condition schema was "Killed By Player" instead of "Match Tool". - Added the missing `skinning_alphatest` value to the variant enum for materials (this variant type is used in the vanilla material files). - Fixed a typo where the title of the `skins.json` schema was "Skip Pack" instead of "Skin Pack".
This commit is contained in:
8Crafter
GitHub
@@ -1,37 +1,42 @@
|
|||||||
{
|
{
|
||||||
"$id": "blockception.minecraft.behavior.items.minecraft:enchantable",
|
"$id": "blockception.minecraft.behavior.items.minecraft:enchantable",
|
||||||
"title": "Enchantable",
|
"title": "Enchantable",
|
||||||
"description": "The enchantable component determines what enchantments can be applied to the item.",
|
"description": "The enchantable component determines what enchantments can be applied to the item.",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
"required": ["slot"],
|
"required": ["slot"],
|
||||||
"properties": {
|
"properties": {
|
||||||
"slot": {
|
"slot": {
|
||||||
"title": "Slot",
|
"title": "Slot",
|
||||||
"description": "If true you can always eat this item (even when not hungry), defaults to false.",
|
"description": "If true you can always eat this item (even when not hungry), defaults to false.",
|
||||||
"enum": [
|
"enum": [
|
||||||
"axe",
|
"all",
|
||||||
"bow",
|
"axe",
|
||||||
"armor_feet",
|
"bow",
|
||||||
"armor_torso",
|
"crossbow",
|
||||||
"armor_head",
|
"spear",
|
||||||
"armor_legs",
|
"armor_feet",
|
||||||
"hoe",
|
"armor_torso",
|
||||||
"pickaxe",
|
"armor_head",
|
||||||
"shovel",
|
"armor_legs",
|
||||||
"elytra",
|
"hoe",
|
||||||
"fishing_rod",
|
"pickaxe",
|
||||||
"flintsteel",
|
"shovel",
|
||||||
"sword",
|
"elytra",
|
||||||
"shears",
|
"fishing_rod",
|
||||||
"cosmetic_head"
|
"flintsteel",
|
||||||
]
|
"sword",
|
||||||
},
|
"shield",
|
||||||
"value": {
|
"shears",
|
||||||
"title": "Value",
|
"cosmetic_head",
|
||||||
"description": "The value of the enchantment.",
|
"carrotstick"
|
||||||
"type": "number",
|
]
|
||||||
"minimum": 0
|
},
|
||||||
}
|
"value": {
|
||||||
}
|
"title": "Value",
|
||||||
}
|
"description": "The value of the enchantment.",
|
||||||
|
"type": "number",
|
||||||
|
"minimum": 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
"description": "Returns the condition true if the actor of the loot table is killed by player or entities that has owner.",
|
"description": "Returns the condition true if the actor of the loot table is killed by player or entities that has owner.",
|
||||||
"title": "Killed By Player Or Pets Or Pets",
|
"title": "Killed By Player Or Pets",
|
||||||
"properties": {
|
"properties": {
|
||||||
"condition": { "type": "string", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" }
|
"condition": { "type": "string", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,68 +1,122 @@
|
|||||||
{
|
{
|
||||||
"$id": "blockception.minecraft.behavior.condition.match_tool",
|
"$id": "blockception.minecraft.behavior.condition.match_tool",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
"description": "Returns the condition true if the block of the loot table was broken with a specific item.",
|
"description": "Returns the condition true if the block of the loot table was broken with a specific item.",
|
||||||
"title": "Killed By Player",
|
"title": "Match Tool",
|
||||||
"required": ["condition"],
|
"required": ["condition"],
|
||||||
"properties": {
|
"properties": {
|
||||||
"condition": { "type": "string", "const": "match_tool", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" },
|
"condition": { "type": "string", "const": "match_tool", "title": "Condition", "description": "UNDOCUMENTED.", "$comment": "UNDOCUMENTED" },
|
||||||
"item": {
|
"item": {
|
||||||
"title": "Item",
|
"title": "Item",
|
||||||
"description": "The item to match",
|
"description": "The item to match",
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"count": {
|
"count": {
|
||||||
"title": "Count",
|
"title": "Count",
|
||||||
"description": "Minimum count to match of the given item",
|
"description": "Minimum count to match of the given item",
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"minimum": 0
|
"minimum": 0
|
||||||
},
|
},
|
||||||
"enchantments": {
|
"enchantments": {
|
||||||
"title": "Enchantments",
|
"title": "Enchantments",
|
||||||
"description": "List of enchantments to check for",
|
"description": "List of enchantments to check for",
|
||||||
"type": "array",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"patternProperties": {
|
"required": ["enchantment"],
|
||||||
"^[a-zA-Z]+$": {
|
"properties": {
|
||||||
"type": "object",
|
"enchantment": {
|
||||||
"properties": {
|
"title": "Enchantment",
|
||||||
"level": {
|
"description": "The enchantment ID to check for",
|
||||||
"type": "integer"
|
"type": "string",
|
||||||
}
|
"enum": [
|
||||||
},
|
"protection",
|
||||||
"required": ["level"]
|
"fire_protection",
|
||||||
}
|
"feather_falling",
|
||||||
},
|
"blast_protection",
|
||||||
"minProperties": 1,
|
"projectile_protection",
|
||||||
"maxProperties": 1
|
"thorns",
|
||||||
},
|
"respiration",
|
||||||
"minItems": 1
|
"depth_strider",
|
||||||
},
|
"aqua_affinity",
|
||||||
"minecraft:match_tool_filter_all": {
|
"sharpness",
|
||||||
"title": "Match Tool Filter All",
|
"smite",
|
||||||
"description": "List of tags the item must have",
|
"bane_of_arthropods",
|
||||||
"type": "array",
|
"knockback",
|
||||||
"items": {
|
"fire_aspect",
|
||||||
"type": "string"
|
"looting",
|
||||||
}
|
"efficiency",
|
||||||
},
|
"silk_touch",
|
||||||
"minecraft:match_tool_filter_none": {
|
"unbreaking",
|
||||||
"title": "Match Tool Filter None",
|
"fortune",
|
||||||
"description": "List of tags the item must NOT have",
|
"power",
|
||||||
"type": "array",
|
"punch",
|
||||||
"items": {
|
"flame",
|
||||||
"type": "string"
|
"infinity",
|
||||||
}
|
"luck_of_the_sea",
|
||||||
},
|
"lure",
|
||||||
"minecraft:match_tool_filter_any": {
|
"frost_walker",
|
||||||
"title": "Match Tool Filter Any",
|
"mending",
|
||||||
"description": "List of tags the item must have at least one of",
|
"binding",
|
||||||
"type": "array",
|
"vanishing",
|
||||||
"items": {
|
"impaling",
|
||||||
"type": "string"
|
"riptide",
|
||||||
}
|
"loyalty",
|
||||||
}
|
"channeling",
|
||||||
}
|
"multishot",
|
||||||
}
|
"piercing",
|
||||||
|
"quick_charge",
|
||||||
|
"soul_speed",
|
||||||
|
"swift_sneak",
|
||||||
|
"wind_burst",
|
||||||
|
"density",
|
||||||
|
"breach"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"levels": {
|
||||||
|
"title": "Levels",
|
||||||
|
"description": "The level of the enchantment",
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"range_min": {
|
||||||
|
"title": "Minimum",
|
||||||
|
"description": "The minimum level of the enchantment",
|
||||||
|
"type": "integer"
|
||||||
|
},
|
||||||
|
"range_max": {
|
||||||
|
"title": "Maximum",
|
||||||
|
"description": "The maximum level of the enchantment",
|
||||||
|
"type": "integer"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"minecraft:match_tool_filter_all": {
|
||||||
|
"title": "Match Tool Filter All",
|
||||||
|
"description": "List of tags the item must have",
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"minecraft:match_tool_filter_none": {
|
||||||
|
"title": "Match Tool Filter None",
|
||||||
|
"description": "List of tags the item must NOT have",
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"minecraft:match_tool_filter_any": {
|
||||||
|
"title": "Match Tool Filter Any",
|
||||||
|
"description": "List of tags the item must have at least one of",
|
||||||
|
"type": "array",
|
||||||
|
"items": {
|
||||||
|
"type": "string"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -235,7 +235,7 @@
|
|||||||
"title": "Variant",
|
"title": "Variant",
|
||||||
"description": "UNDOCUMENTED.",
|
"description": "UNDOCUMENTED.",
|
||||||
"$comment": "UNDOCUMENTED",
|
"$comment": "UNDOCUMENTED",
|
||||||
"propertyNames": { "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "underlava", "underwater"] },
|
"propertyNames": { "enum": ["fading", "fog", "fog.underwater", "lit", "skinning", "skinning_color", "skinning_alphatest", "underlava", "underwater"] },
|
||||||
"additionalProperties": {
|
"additionalProperties": {
|
||||||
"title": "Variant Item",
|
"title": "Variant Item",
|
||||||
"description": "UNDOCUMENTED.",
|
"description": "UNDOCUMENTED.",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"$schema": "http://json-schema.org/draft-07/schema",
|
"$schema": "http://json-schema.org/draft-07/schema",
|
||||||
"title": "Skip Pack",
|
"title": "Skin Pack",
|
||||||
"description": "Skin pack definition.",
|
"description": "Skin pack definition.",
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"additionalProperties": false,
|
"additionalProperties": false,
|
||||||
|
|||||||
Reference in New Issue
Block a user