maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-Structured assets for items a little bit

Browse source
This commit is contained in:
drcrazy 2018-09-17 14:32:55 +03:00
parent be23d2af6e
commit 89ca71386f
39 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/main/java/techreborn/client/RegisterItemJsons.java
View file

@ -52,9 +52,9 @@ public class RegisterItemJsons {
private static void registerItems() {
// Armor
register(TRItems.CLOAKING_DEVICE, "tool/cloaking_device");
register(TRItems.LAPOTRONIC_ORBPACK, "tool/lapotronic_orbpack");
register(TRItems.LITHIUM_ION_BATPACK, "tool/lithium_batpack");
register(TRItems.CLOAKING_DEVICE, "armor/cloaking_device");
register(TRItems.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack");
register(TRItems.LITHIUM_ION_BATPACK, "armor/lithium_batpack");
// Battery
register(TRItems.RED_CELL_BATTERY, "battery/re_battery");
@ -67,7 +67,7 @@ public class RegisterItemJsons {
register(TRItems.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw");
register(TRItems.INDUSTRIAL_DRILL, "tool/industrial_drill");
register(TRItems.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer");
register(TRItems.DEBUG_TOOL, "misc/debug");
register(TRItems.DEBUG_TOOL, "tool/debug");
register(TRItems.ADVANCED_CHAINSAW, "tool/advanced_chainsaw");
register(TRItems.ADVANCED_DRILL, "tool/advanced_drill");
register(TRItems.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer");
@ -89,43 +89,43 @@ public class RegisterItemJsons {
// Gem armor & tools
if (ConfigTechReborn.enableGemArmorAndTools) {
registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/tool/armour");
registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/tool/armour");
registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/tool/armour");
registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/tool/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/tool/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/tool/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/tool/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/tool/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/tool/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/tool/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/tool/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/tool/armour");
registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/tool/armour");
registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/tool/armour");
registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/tool/armour");
registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/tool/armour");
registerBlockstateMultiItem(TRItems.RUBY_HELMET, "ruby_helmet", "items/armour");
registerBlockstateMultiItem(TRItems.RUBY_CHESTPLATE, "ruby_chestplate", "items/armour");
registerBlockstateMultiItem(TRItems.RUBY_LEGGINGS, "ruby_leggings", "items/armour");
registerBlockstateMultiItem(TRItems.RUBY_BOOTS, "ruby_boots", "items/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_HELMET, "sapphire_helmet", "items/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_CHESTPLATE, "sapphire_chestplate", "items/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_LEGGINGS, "sapphire_leggings", "items/armour");
registerBlockstateMultiItem(TRItems.SAPPHIRE_BOOTS, "sapphire_boots", "items/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_HELMET, "peridot_helmet", "items/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_CHESTPLATE, "peridot_chestplate", "items/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_LEGGINGS, "peridot_leggings", "items/armour");
registerBlockstateMultiItem(TRItems.PERIDOT_BOOTS, "peridot_boots", "items/armour");
registerBlockstateMultiItem(TRItems.BRONZE_HELMET, "bronze_helmet", "items/armour");
registerBlockstateMultiItem(TRItems.BRONZE_CHESTPLATE, "bronze_chestplate", "items/armour");
registerBlockstateMultiItem(TRItems.BRONZE_LEGGINGS, "bronze_leggings", "items/armour");
registerBlockstateMultiItem(TRItems.BRONZE_BOOTS, "bronze_boots", "items/armour");
registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool/tool");
registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool/tool");
registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool/tool");
registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool/tool");
registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool/tool");
registerBlockstateMultiItem(TRItems.RUBY_PICKAXE, "ruby_pickaxe", "items/tool");
registerBlockstateMultiItem(TRItems.RUBY_SWORD, "ruby_sword", "items/tool");
registerBlockstateMultiItem(TRItems.RUBY_AXE, "ruby_axe", "items/tool");
registerBlockstateMultiItem(TRItems.RUBY_SPADE, "ruby_spade", "items/tool");
registerBlockstateMultiItem(TRItems.RUBY_HOE, "ruby_hoe", "items/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_PICKAXE, "sapphire_pickaxe", "items/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_SWORD, "sapphire_sword", "items/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_AXE, "sapphire_axe", "items/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_SPADE, "sapphire_spade", "items/tool");
registerBlockstateMultiItem(TRItems.SAPPHIRE_HOE, "sapphire_hoe", "items/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_PICKAXE, "peridot_pickaxe", "items/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_SWORD, "peridot_sword", "items/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_AXE, "peridot_axe", "items/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_SPADE, "peridot_spade", "items/tool");
registerBlockstateMultiItem(TRItems.PERIDOT_HOE, "peridot_hoe", "items/tool");
registerBlockstateMultiItem(TRItems.BRONZE_PICKAXE, "bronze_pickaxe", "items/tool");
registerBlockstateMultiItem(TRItems.BRONZE_SWORD, "bronze_sword", "items/tool");
registerBlockstateMultiItem(TRItems.BRONZE_AXE, "bronze_axe", "items/tool");
registerBlockstateMultiItem(TRItems.BRONZE_SPADE, "bronze_spade", "items/tool");
registerBlockstateMultiItem(TRItems.BRONZE_HOE, "bronze_hoe", "items/tool");
}
register(ModBlocks.RUBBER_SAPLING, "misc/rubber_sapling");

32
src/main/resources/assets/techreborn/blockstates/items/tool/armour.json → src/main/resources/assets/techreborn/blockstates/items/armour.json
View file

@ -8,82 +8,82 @@
"type": {
"ruby_helmet": {
"textures": {
"layer0": "techreborn:items/tool/ruby_helmet"
"layer0": "techreborn:items/armor/ruby_helmet"
}
},
"ruby_chestplate": {
"textures": {
"layer0": "techreborn:items/tool/ruby_chestplate"
"layer0": "techreborn:items/armor/ruby_chestplate"
}
},
"ruby_leggings": {
"textures": {
"layer0": "techreborn:items/tool/ruby_leggings"
"layer0": "techreborn:items/armor/ruby_leggings"
}
},
"ruby_boots": {
"textures": {
"layer0": "techreborn:items/tool/ruby_boots"
"layer0": "techreborn:items/armor/ruby_boots"
}
},
"sapphire_helmet": {
"textures": {
"layer0": "techreborn:items/tool/sapphire_helmet"
"layer0": "techreborn:items/armor/sapphire_helmet"
}
},
"sapphire_chestplate": {
"textures": {
"layer0": "techreborn:items/tool/sapphire_chestplate"
"layer0": "techreborn:items/armor/sapphire_chestplate"
}
},
"sapphire_leggings": {
"textures": {
"layer0": "techreborn:items/tool/sapphire_leggings"
"layer0": "techreborn:items/armor/sapphire_leggings"
}
},
"sapphire_boots": {
"textures": {
"layer0": "techreborn:items/tool/sapphire_boots"
"layer0": "techreborn:items/armor/sapphire_boots"
}
},
"peridot_helmet": {
"textures": {
"layer0": "techreborn:items/tool/peridot_helmet"
"layer0": "techreborn:items/armor/peridot_helmet"
}
},
"peridot_chestplate": {
"textures": {
"layer0": "techreborn:items/tool/peridot_chestplate"
"layer0": "techreborn:items/armor/peridot_chestplate"
}
},
"peridot_leggings": {
"textures": {
"layer0": "techreborn:items/tool/peridot_leggings"
"layer0": "techreborn:items/armor/peridot_leggings"
}
},
"peridot_boots": {
"textures": {
"layer0": "techreborn:items/tool/peridot_boots"
"layer0": "techreborn:items/armor/peridot_boots"
}
},
"bronze_helmet": {
"textures": {
"layer0": "techreborn:items/tool/bronze_helmet"
"layer0": "techreborn:items/armor/bronze_helmet"
}
},
"bronze_chestplate": {
"textures": {
"layer0": "techreborn:items/tool/bronze_chestplate"
"layer0": "techreborn:items/armor/bronze_chestplate"
}
},
"bronze_leggings": {
"textures": {
"layer0": "techreborn:items/tool/bronze_leggings"
"layer0": "techreborn:items/armor/bronze_leggings"
}
},
"bronze_boots": {
"textures": {
"layer0": "techreborn:items/tool/bronze_boots"
"layer0": "techreborn:items/armor/bronze_boots"
}
}
}

0
src/main/resources/assets/techreborn/blockstates/items/tool/tool.json → src/main/resources/assets/techreborn/blockstates/items/tool.json
View file

2
src/main/resources/assets/techreborn/models/item/tool/cloaking_device.json → src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json
View file

@ -1,6 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/cloaking_device"
"layer0": "techreborn:items/armor/cloaking_device"
}
}

2
src/main/resources/assets/techreborn/models/item/tool/lapotronic_orbpack.json → src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json
View file

@ -1,6 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lapotronic_orbpack"
"layer0": "techreborn:items/armor/lapotronic_orbpack"
}
}

2
src/main/resources/assets/techreborn/models/item/tool/lithium_batpack.json → src/main/resources/assets/techreborn/models/item/armor/lithium_batpack.json
View file

@ -1,6 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/tool/lithium_batpack"
"layer0": "techreborn:items/armor/lithium_batpack"
}
}

2
src/main/resources/assets/techreborn/models/item/misc/debug.json → src/main/resources/assets/techreborn/models/item/tool/debug.json
View file

@ -1,6 +1,6 @@
{
"parent": "techreborn:item/techrebornItem",
"textures": {
"layer0": "techreborn:items/misc/debug"
"layer0": "techreborn:items/tool/debug"
}
}

0
src/main/resources/assets/techreborn/textures/items/tool/bronze_boots.png → src/main/resources/assets/techreborn/textures/items/armor/bronze_boots.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

0
src/main/resources/assets/techreborn/textures/items/tool/bronze_chestplate.png → src/main/resources/assets/techreborn/textures/items/armor/bronze_chestplate.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

0
src/main/resources/assets/techreborn/textures/items/tool/bronze_helmet.png → src/main/resources/assets/techreborn/textures/items/armor/bronze_helmet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 501 B

0
src/main/resources/assets/techreborn/textures/items/tool/bronze_leggings.png → src/main/resources/assets/techreborn/textures/items/armor/bronze_leggings.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 635 B

0
src/main/resources/assets/techreborn/textures/models/cloaking.png → src/main/resources/assets/techreborn/textures/items/armor/cloaking.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 266 B

0
src/main/resources/assets/techreborn/textures/items/tool/cloaking_device.png → src/main/resources/assets/techreborn/textures/items/armor/cloaking_device.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 578 B

0
src/main/resources/assets/techreborn/textures/items/tool/lapotronic_orbpack.png → src/main/resources/assets/techreborn/textures/items/armor/lapotronic_orbpack.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 706 B

0
src/main/resources/assets/techreborn/textures/models/lapotronpack.png → src/main/resources/assets/techreborn/textures/items/armor/lapotronpack.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 624 B

After

Width:  |  Height:  |  Size: 624 B

0
src/main/resources/assets/techreborn/textures/items/tool/lithium_batpack.png → src/main/resources/assets/techreborn/textures/items/armor/lithium_batpack.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
src/main/resources/assets/techreborn/textures/models/lithiumbatpack.png → src/main/resources/assets/techreborn/textures/items/armor/lithiumbatpack.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 488 B

0
src/main/resources/assets/techreborn/textures/items/tool/peridot_boots.png → src/main/resources/assets/techreborn/textures/items/armor/peridot_boots.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 546 B

0
src/main/resources/assets/techreborn/textures/items/tool/peridot_chestplate.png → src/main/resources/assets/techreborn/textures/items/armor/peridot_chestplate.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 717 B

After

Width:  |  Height:  |  Size: 717 B

0
src/main/resources/assets/techreborn/textures/items/tool/peridot_helmet.png → src/main/resources/assets/techreborn/textures/items/armor/peridot_helmet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 491 B

0
src/main/resources/assets/techreborn/textures/items/tool/peridot_leggings.png → src/main/resources/assets/techreborn/textures/items/armor/peridot_leggings.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 579 B

After

Width:  |  Height:  |  Size: 579 B

0
src/main/resources/assets/techreborn/textures/items/tool/ruby_boots.png → src/main/resources/assets/techreborn/textures/items/armor/ruby_boots.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

0
src/main/resources/assets/techreborn/textures/items/tool/ruby_chestplate.png → src/main/resources/assets/techreborn/textures/items/armor/ruby_chestplate.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 721 B

After

Width:  |  Height:  |  Size: 721 B

0
src/main/resources/assets/techreborn/textures/items/tool/ruby_helmet.png → src/main/resources/assets/techreborn/textures/items/armor/ruby_helmet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 488 B

After

Width:  |  Height:  |  Size: 488 B

0
src/main/resources/assets/techreborn/textures/items/tool/ruby_leggings.png → src/main/resources/assets/techreborn/textures/items/armor/ruby_leggings.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 580 B

After

Width:  |  Height:  |  Size: 580 B

0
src/main/resources/assets/techreborn/textures/items/tool/sapphire_boots.png → src/main/resources/assets/techreborn/textures/items/armor/sapphire_boots.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 540 B

0
src/main/resources/assets/techreborn/textures/items/tool/sapphire_chestplate.png → src/main/resources/assets/techreborn/textures/items/armor/sapphire_chestplate.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 714 B

0
src/main/resources/assets/techreborn/textures/items/tool/sapphire_helmet.png → src/main/resources/assets/techreborn/textures/items/armor/sapphire_helmet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

0
src/main/resources/assets/techreborn/textures/items/tool/sapphire_leggings.png → src/main/resources/assets/techreborn/textures/items/armor/sapphire_leggings.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 576 B

0
src/main/resources/assets/techreborn/textures/items/misc/debug.png → src/main/resources/assets/techreborn/textures/items/tool/debug.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 603 B

After

Width:  |  Height:  |  Size: 603 B

0
src/main/resources/assets/techreborn/textures/items/misc/debug.png.mcmeta → src/main/resources/assets/techreborn/textures/items/tool/debug.png.mcmeta
View file

BIN
src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 884 B

BIN
src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 884 B

BIN
src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 878 B