diff --git a/src/main/resources/assets/techreborn/models/item/battery/battery.json b/src/main/resources/assets/techreborn/models/item/battery/battery.json deleted file mode 100644 index da6f4b6dd..000000000 --- a/src/main/resources/assets/techreborn/models/item/battery/battery.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "techreborn:item/techrebornitem" -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json b/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json index f68de178c..09468a6c9 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json +++ b/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/battery/battery", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/battery/energy_crystal_empty" + "layer0": "techreborn:item/battery/energy_crystal_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json b/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json index 164d68d93..f2651325e 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/battery/battery", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/battery/lapotron_crystal_empty" + "layer0": "techreborn:item/battery/lapotron_crystal_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json b/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json index dcc0f2ae0..d9e052e24 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/battery/battery", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/battery/lapotronic_orb_empty" + "layer0": "techreborn:item/battery/lapotronic_orb_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json b/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json index b033f0ee3..4392b7507 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/battery/battery", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/battery/lithium_battery_empty" + "layer0": "techreborn:item/battery/lithium_battery_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json b/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json index 5411871f4..2af2e4953 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json +++ b/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/battery/battery", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/battery/re_battery_empty" + "layer0": "techreborn:item/battery/re_battery_empty" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/energy_crystal.json b/src/main/resources/assets/techreborn/models/item/energy_crystal.json similarity index 63% rename from src/main/resources/assets/techreborn/models/item/battery/energy_crystal.json rename to src/main/resources/assets/techreborn/models/item/energy_crystal.json index cf811c061..8377c4129 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/energy_crystal.json +++ b/src/main/resources/assets/techreborn/models/item/energy_crystal.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/battery/battery", - "textures": { - "layer0": "techreborn:items/battery/energy_crystal" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/battery/override/energy_crystal_empty" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/battery/energy_crystal" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/battery/override/energy_crystal_empty" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/lapotron_crystal.json b/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json similarity index 63% rename from src/main/resources/assets/techreborn/models/item/battery/lapotron_crystal.json rename to src/main/resources/assets/techreborn/models/item/lapotron_crystal.json index 3677b6c09..3d8bdbbce 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/lapotron_crystal.json +++ b/src/main/resources/assets/techreborn/models/item/lapotron_crystal.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/battery/battery", - "textures": { - "layer0": "techreborn:items/battery/lapotron_crystal" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/battery/override/lapotron_crystal_empty" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/battery/lapotron_crystal" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/battery/override/lapotron_crystal_empty" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/lapotronic_orb.json b/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json similarity index 63% rename from src/main/resources/assets/techreborn/models/item/battery/lapotronic_orb.json rename to src/main/resources/assets/techreborn/models/item/lapotronic_orb.json index eff5bbb5e..1f5d3a97a 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/lapotronic_orb.json +++ b/src/main/resources/assets/techreborn/models/item/lapotronic_orb.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/battery/battery", - "textures": { - "layer0": "techreborn:items/battery/lapotronic_orb" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/battery/override/lapotronic_orb_empty" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/battery/lapotronic_orb" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/battery/override/lapotronic_orb_empty" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/lithium_battery.json b/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json similarity index 63% rename from src/main/resources/assets/techreborn/models/item/battery/lithium_battery.json rename to src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json index cfe7fa4fb..47a5a2c7e 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/lithium_battery.json +++ b/src/main/resources/assets/techreborn/models/item/lithium_ion_battery.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/battery/battery", - "textures": { - "layer0": "techreborn:items/battery/lithium_battery" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/battery/override/lithium_battery_empty" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/battery/lithium_battery" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/battery/override/lithium_battery_empty" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/battery/re_battery.json b/src/main/resources/assets/techreborn/models/item/red_cell_battery.json similarity index 63% rename from src/main/resources/assets/techreborn/models/item/battery/re_battery.json rename to src/main/resources/assets/techreborn/models/item/red_cell_battery.json index 5c8b8d591..a4f5f6e63 100644 --- a/src/main/resources/assets/techreborn/models/item/battery/re_battery.json +++ b/src/main/resources/assets/techreborn/models/item/red_cell_battery.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/battery/battery", - "textures": { - "layer0": "techreborn:items/battery/re_battery" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/battery/override/re_battery_empty" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/battery/re_battery" + }, + "overrides": [ + { + "predicate": { + "techreborn:empty": 1 + }, + "model": "techreborn:item/battery/override/re_battery_empty" + } + ] } \ No newline at end of file