Skip to content

Commit a6bc630

Browse files
Smartin-bSmartin-b
committed
- icons
1 parent 980285b commit a6bc630

File tree

82 files changed

+445
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+445
-75
lines changed

‎common/src/main/java/smartin/miapi/armory/GenerateArmorModularConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected void addShoesItem(Material material, Item item) {
160160
modularItem.put(item, (stack) -> {
161161
ItemStack modularItem = new ItemStack(RegistryInventory.modularItem);
162162
String swordData = "{\n" +
163-
" \"module\": \"boot\",\n" +
163+
" \"module\": \"boot_base\",\n" +
164164
" \"subModules\": {\n" +
165165
" \"0\": {\n" +
166166
" \"module\": \"boot_left\",\n" +

‎common/src/main/resources/assets/miapi/models/item/armor/gui/arm_left/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/arm_right/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/background/boots/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/background/boots/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/background/chest/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/background/chest/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/background/chest/base_alt/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/background/chest/alt/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/background/helmet/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/background/helmet/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/background/pants/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/background/pants/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/arm_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/arm_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/arm_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/arm_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/belt/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/belt/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/boot_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/boot_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/boot_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/boot_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/chest/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/chest/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/helmet/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/helmet/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/leg_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/leg_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/base/leg_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/base/leg_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/belt/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/boot_left/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/boot_right/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/chest/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/helmet/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/leg_left/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/leg_right/base/default.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/arm_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/arm_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/arm_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/arm_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/boot_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/boot_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/boot_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/boot_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/elytra_base/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/elytra_base/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/elytra_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/wing_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/elytra_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/wing_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/leg_left/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/leg_left/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/models/item/armor/gui/wingsuit/leg_right/base/default.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "miapi:item/armor/gui/wingsuit/leg_right/default"
5+
}
6+
}

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/background/boots/default.png

190 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/background/chest/alt/default.png

175 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/background/chest/default.png

192 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/background/helmet/default.png

194 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/background/pants/default.png

180 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/arm_left/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/arm_left/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/arm_right/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/arm_right/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/belt/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/belt/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/boot_left/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/boot_left/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/boot_right/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/boot_right/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/chest/default.png

233 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/helmet/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/helmet/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/leg_left/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/leg_left/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/leg_right/default.png renamed to ‎common/src/main/resources/assets/miapi/textures/item/armor/gui/base/leg_right/default.png

File renamed without changes.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/chest/default.png

-233 Bytes
Binary file not shown.

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/arm_left/default.png

259 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/arm_right/default.png

261 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/boot_left/default.png

305 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/boot_right/default.png

312 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/elytra_base/default.png

158 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/leg_left/default.png

298 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/leg_right/default.png

292 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/wing_left/default.png

240 Bytes

‎common/src/main/resources/assets/miapi/textures/item/armor/gui/wingsuit/wing_right/default.png

240 Bytes

‎common/src/main/resources/data/miapi/modular_converter/boots.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"minecraft:iron_boots": {
3-
"module": "boot",
3+
"module": "boot_base",
44
"subModules": {
55
"0": {
66
"module": "boot_left",
@@ -19,7 +19,7 @@
1919
}
2020
},
2121
"minecraft:golden_boots": {
22-
"module": "boot",
22+
"module": "boot_base",
2323
"subModules": {
2424
"0": {
2525
"module": "boot_left",
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"minecraft:diamond_boots": {
41-
"module": "boot",
41+
"module": "boot_base",
4242
"subModules": {
4343
"0": {
4444
"module": "boot_left",
@@ -76,7 +76,7 @@
7676
}
7777
},
7878
"minecraft:leather_boots": {
79-
"module": "boot",
79+
"module": "boot_base",
8080
"subModules": {
8181
"0": {
8282
"module": "boot_left",

‎common/src/main/resources/data/miapi/modules/armor/boots/boot_left.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
{
26-
"path": "miapi:models/item/armor/gui/boot_left/base/[material.texture].json",
26+
"path": "miapi:models/item/armor/gui/base/boot_left/base/[material.texture].json",
2727
"transform": {
2828
"rotation": {
2929
"x": 0.0,
@@ -44,6 +44,11 @@
4444
}
4545
}
4646
],
47+
"tag": [
48+
"background_icon",
49+
"armor",
50+
"boot"
51+
],
4752
"allowedInSlots": [
4853
"boot_left"
4954
],

‎common/src/main/resources/data/miapi/modules/armor/boots/boot_right.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
{
26-
"path": "miapi:models/item/armor/gui/boot_right/base/[material.texture].json",
26+
"path": "miapi:models/item/armor/gui/base/boot_right/base/[material.texture].json",
2727
"transform": {
2828
"rotation": {
2929
"x": 0.0,
@@ -44,6 +44,11 @@
4444
}
4545
}
4646
],
47+
"tag": [
48+
"background_icon",
49+
"armor",
50+
"boot"
51+
],
4752
"allowedInSlots": [
4853
"boot_right"
4954
],

‎common/src/main/resources/data/miapi/modules/armor/boots/boots.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "boot",
2+
"name": "boot_base",
33
"allowedInSlots": [
44
"melee",
55
"boots"

‎common/src/main/resources/data/miapi/modules/armor/boots/wing_boot_left.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
{
26-
"path": "miapi:models/item/armor/gui/boot_left/base/[material.texture].json",
26+
"path": "miapi:models/item/armor/gui/wingsuit/boot_left/base/[material.texture].json",
2727
"transform": {
2828
"rotation": {
2929
"x": 0.0,

‎common/src/main/resources/data/miapi/modules/armor/boots/wing_boot_right.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
{
26-
"path": "miapi:models/item/armor/gui/boot_right/base/[material.texture].json",
26+
"path": "miapi:models/item/armor/gui/wingsuit/boot_right/base/[material.texture].json",
2727
"transform": {
2828
"rotation": {
2929
"x": 0.0,

‎common/src/main/resources/data/miapi/modules/armor/chest/arm_left.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
}
2424
},
2525
{
26-
"path": "miapi:models/item/armor/gui/arm_left/base/[material.texture].json",
26+
"path": "miapi:models/item/armor/gui/wingsuit/arm_left/base/[material.texture].json",
2727
"transform": {
2828
"rotation": {
2929
"x": 0.0,
@@ -55,6 +55,11 @@
5555
"slot": "chest"
5656
}
5757
],
58+
"tag": [
59+
"background_icon_alt",
60+
"armor",
61+
"arm"
62+
],
5863
"durability": "[material.durability] / 8",
5964
"allowedMaterial": {
6065
"allowedMaterials": [

0 commit comments

Comments
 (0)