Skip to content

Commit

Permalink
centralized files and made things more consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Plueres committed Oct 9, 2022
1 parent a424f5d commit f350d04
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 174 deletions.
25 changes: 25 additions & 0 deletions attachables/diamond_leggings.player.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"format_version": "1.10.0",
"minecraft:attachable": {
"description": {
"identifier": "minecraft:diamond_leggings.player",
"item": { "minecraft:diamond_leggings": "query.owner_identifier == 'minecraft:player'" },
"materials": {
"default": "armor",
"enchanted": "armor_enchanted"
},
"textures": {
"default": "textures/models/armor/diamond_2",
"elytra": "textures/models/armor/diamond_elytra",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.player.armor.leggings"
},
"scripts": {
"parent_setup": "variable.leg_layer_visible = 0.0;"
},
"render_controllers": [ "controller.render.diamond" ]
}
}
}
25 changes: 25 additions & 0 deletions attachables/golden_leggings.player.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"format_version": "1.10.0",
"minecraft:attachable": {
"description": {
"identifier": "minecraft:golden_leggings.player",
"item": { "minecraft:golden_leggings": "query.owner_identifier == 'minecraft:player'" },
"materials": {
"default": "armor",
"enchanted": "armor_enchanted"
},
"textures": {
"default": "textures/models/armor/gold_2",
"elytra": "textures/models/armor/gold_elytra",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.player.armor.leggings"
},
"scripts": {
"parent_setup": "variable.leg_layer_visible = 0.0;"
},
"render_controllers": [ "controller.render.gold" ]
}
}
}
25 changes: 25 additions & 0 deletions attachables/iron_leggings.player.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"format_version": "1.10.0",
"minecraft:attachable": {
"description": {
"identifier": "minecraft:iron_leggings.player",
"item": { "minecraft:iron_leggings": "query.owner_identifier == 'minecraft:player'" },
"materials": {
"default": "armor",
"enchanted": "armor_enchanted"
},
"textures": {
"default": "textures/models/armor/iron_2",
"elytra": "textures/models/armor/iron_elytra",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.player.armor.leggings"
},
"scripts": {
"parent_setup": "variable.leg_layer_visible = 0.0;"
},
"render_controllers": [ "controller.render.iron" ]
}
}
}
25 changes: 25 additions & 0 deletions attachables/netherite_leggings.player.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"format_version": "1.10.0",
"minecraft:attachable": {
"description": {
"identifier": "minecraft:netherite_leggings.player",
"item": { "minecraft:netherite_leggings": "query.owner_identifier == 'minecraft:player'" },
"materials": {
"default": "armor",
"enchanted": "armor_enchanted"
},
"textures": {
"default": "textures/models/armor/netherite_2",
"elytra": "textures/models/armor/netherite_elytra",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.player.armor.leggings"
},
"scripts": {
"parent_setup": "variable.leg_layer_visible = 0.0;"
},
"render_controllers": [ "controller.render.netherite" ]
}
}
}
34 changes: 0 additions & 34 deletions entity/elytra.entity.json

This file was deleted.

46 changes: 0 additions & 46 deletions models/entity/armor.geo.json

This file was deleted.

89 changes: 0 additions & 89 deletions models/entity/elytra.geo.json

This file was deleted.

34 changes: 29 additions & 5 deletions render_controllers/armor.render_controllers.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,51 @@
{
"format_version": "1.8.0",
"render_controllers": {
"controller.render.elytra": {
"controller.render.iron": {
"geometry": "Geometry.default",
"materials": [
{
"*": "variable.is_enchanted ? Material.enchanted : Material.default"
}
],
"textures": [
"Texture.default",
"q.is_item_name_any('slot.armor.chest', 0, 'minecraft:elytra') ? Texture.elytra : Texture.default",
"Texture.enchanted"
]
},
"controller.render.elytra_armor": {
"geometry": "geometry.armor",
"controller.render.gold": {
"geometry": "Geometry.default",
"materials": [
{
"*": "variable.is_enchanted ? Material.enchanted : Material.default"
}
],
"textures": [
"q.is_item_name_any('slot.armor.chest', 0, 'minecraft:elytra') ? Texture.elytra : Texture.default",
"Texture.enchanted"
]
},
"controller.render.diamond": {
"geometry": "Geometry.default",
"materials": [
{
"*": "variable.is_enchanted ? Material.enchanted : Material.default"
}
],
"textures": [
"q.is_item_name_any('slot.armor.chest', 0, 'minecraft:elytra') ? Texture.elytra : Texture.default",
"Texture.enchanted"
]
},
"controller.render.netherite": {
"geometry": "Geometry.default",
"materials": [
{
"*": "variable.is_enchanted ? Material.enchanted : Material.default"
}
],
"textures": [
"q.is_item_name_any('slot.armor.legs', 0, 'minecraft:iron_leggings') ? Texture.iron : (q.is_item_name_any('slot.armor.legs', 0, 'minecraft:golden_leggings') ? Texture.gold : (q.is_item_name_any('slot.armor.legs', 0, 'minecraft:diamond_leggings') ? Texture.diamond : (q.is_item_name_any('slot.armor.legs', 0, 'minecraft:netherite_leggings') ? Texture.netherite : Texture.none)))",
"q.is_item_name_any('slot.armor.chest', 0, 'minecraft:elytra') ? Texture.elytra : Texture.default",
"Texture.enchanted"
]
}
Expand Down

0 comments on commit f350d04

Please sign in to comment.