diff --git a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java index 12085887e..eeed2e8a9 100644 --- a/src/main/java/techreborn/items/armor/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/armor/ItemCloakingDevice.java @@ -67,7 +67,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo @Override @OnlyIn(Dist.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { - return "techreborn:" + "textures/models/cloaking.png"; + return "techreborn:" + "textures/models/armor/cloaking.png"; } @Override diff --git a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java index 88f8e4e9c..18fa68e25 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java @@ -37,8 +37,11 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ItemUtils; +import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; +import techreborn.init.TRContent; import javax.annotation.Nullable; @@ -49,15 +52,21 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo public int transferLimit = 100_000; public ItemLapotronicOrbpack() { - super(ArmorMaterial.DIAMOND, EntityEquipmentSlot.CHEST, new Item.Properties().maxStackSize(1)); + super(ArmorMaterial.DIAMOND, EntityEquipmentSlot.CHEST, new Item.Properties().group(TechReborn.ITEMGROUP).maxStackSize(1)); } // Item @Override public void fillItemGroup(ItemGroup group, NonNullList items) { - if (this.isInGroup(group)) { - items.add(new ItemStack(this)); + if (!isInGroup(group)) { + return; } + ItemStack uncharged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK); + ItemStack charged = new ItemStack(TRContent.LAPOTRONIC_ORBPACK); + ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged); + capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); + items.add(uncharged); + items.add(charged); } @Override @@ -94,7 +103,7 @@ public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo @Override @OnlyIn(Dist.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { - return "techreborn:" + "textures/models/lapotronpack.png"; + return "techreborn:" + "textures/models/armor/lapotronpack.png"; } // IEnergyItemInfo diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index 794eaff4d..ae26ac643 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -59,7 +59,7 @@ public class ItemIndustrialChainsaw extends ItemChainsaw { if (!isInGroup(par2ItemGroup)) { return; } - ItemStack stack = new ItemStack(TRContent.ADVANCED_CHAINSAW); + ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_CHAINSAW); ItemStack charged = stack.copy(); ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged); capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index 468ea3234..72be40350 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -162,7 +162,7 @@ public class ItemIndustrialDrill extends ItemDrill { if (!isInGroup(par2ItemGroup)) { return; } - ItemStack stack = new ItemStack(TRContent.ADVANCED_DRILL); + ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_DRILL); ItemStack charged = stack.copy(); ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged); capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java index 3bd9a1fcf..eec36c34c 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialJackhammer.java @@ -52,7 +52,7 @@ public class ItemIndustrialJackhammer extends ItemJackhammer { if (!isInGroup(par2ItemGroup)) { return; } - ItemStack stack = new ItemStack(TRContent.ADVANCED_JACKHAMMER); + ItemStack stack = new ItemStack(TRContent.INDUSTRIAL_JACKHAMMER); ItemStack charged = stack.copy(); ForgePowerItemManager capEnergy = new ForgePowerItemManager(charged); capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored()); diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json b/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json similarity index 64% rename from src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json rename to src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json index 0f316bf10..c769e416a 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/advanced_chainsaw.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/advanced_chainsaw" - }, - "overrides": [ - { - "predicate": { - "techreborn:animated": 1 - }, - "model": "techreborn:item/tool/override/advanced_chainsaw_animated" - } - ] +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/advanced_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/advanced_chainsaw_animated" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_drill.json b/src/main/resources/assets/techreborn/models/item/advanced_drill.json new file mode 100644 index 000000000..1d0a1a462 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/advanced_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/advanced_jackhammer.json b/src/main/resources/assets/techreborn/models/item/advanced_jackhammer.json new file mode 100644 index 000000000..5403faa61 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/advanced_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/advanced_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json b/src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json deleted file mode 100644 index e3ad36d3e..000000000 --- a/src/main/resources/assets/techreborn/models/item/armor/cloaking_device.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/armor/cloaking_device" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json b/src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json deleted file mode 100644 index 6593ccf00..000000000 --- a/src/main/resources/assets/techreborn/models/item/armor/lapotronic_orbpack.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/armor/lapotronic_orbpack" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/basic_chainsaw.json b/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json similarity index 64% rename from src/main/resources/assets/techreborn/models/item/tool/basic_chainsaw.json rename to src/main/resources/assets/techreborn/models/item/basic_chainsaw.json index 8344d63fb..3eab333ee 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/basic_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/basic_chainsaw.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/basic_chainsaw" - }, - "overrides": [ - { - "predicate": { - "techreborn:animated": 1 - }, - "model": "techreborn:item/tool/override/basic_chainsaw_animated" - } - ] +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/basic_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/basic_chainsaw_animated" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/basic_drill.json b/src/main/resources/assets/techreborn/models/item/basic_drill.json new file mode 100644 index 000000000..280323ee1 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/basic_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/basic_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/basic_jackhammer.json b/src/main/resources/assets/techreborn/models/item/basic_jackhammer.json new file mode 100644 index 000000000..61b9f301e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/basic_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/basic_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/cloaking_device.json b/src/main/resources/assets/techreborn/models/item/cloaking_device.json new file mode 100644 index 000000000..4ee05a4cc --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/cloaking_device.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/cloaking_device" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/electric_treetap.json b/src/main/resources/assets/techreborn/models/item/electric_treetap.json new file mode 100644 index 000000000..8ebbe8a0b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/electric_treetap.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/electric_treetap" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter.json b/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json similarity index 62% rename from src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter.json rename to src/main/resources/assets/techreborn/models/item/frequency_transmitter.json index 694e4a441..9ab537011 100644 --- a/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter.json +++ b/src/main/resources/assets/techreborn/models/item/frequency_transmitter.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/frequency_transmitter" - }, - "overrides": [ - { - "predicate": { - "techreborn:coords": 1 - }, - "model": "techreborn:item/misc/frequency_transmitter_coords" - } - ] +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/tool/frequency_transmitter" + }, + "overrides": [ + { + "predicate": { + "techreborn:coords": 1 + }, + "model": "techreborn:item/misc/frequency_transmitter_coords" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/industrial_chainsaw.json b/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json similarity index 64% rename from src/main/resources/assets/techreborn/models/item/tool/industrial_chainsaw.json rename to src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json index 44170c761..74f003cf8 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/industrial_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/industrial_chainsaw.json @@ -1,14 +1,14 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/industrial_chainsaw" - }, - "overrides": [ - { - "predicate": { - "techreborn:animated": 1 - }, - "model": "techreborn:item/tool/override/industrial_chainsaw_animated" - } - ] +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/industrial_chainsaw" + }, + "overrides": [ + { + "predicate": { + "techreborn:animated": 1 + }, + "model": "techreborn:item/tool/override/industrial_chainsaw_animated" + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/industrial_drill.json b/src/main/resources/assets/techreborn/models/item/industrial_drill.json new file mode 100644 index 000000000..7d592f23d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_drill.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/industrial_drill" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/industrial_jackhammer.json b/src/main/resources/assets/techreborn/models/item/industrial_jackhammer.json new file mode 100644 index 000000000..9b734712a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/industrial_jackhammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/industrial_jackhammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronic_orbpack.json b/src/main/resources/assets/techreborn/models/item/lapotronic_orbpack.json new file mode 100644 index 000000000..36d9fc8b2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/lapotronic_orbpack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/armor/lapotronic_orbpack" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/manual.json b/src/main/resources/assets/techreborn/models/item/manual.json new file mode 100644 index 000000000..ab6d071dd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/manual.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/misc/manual" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json b/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json index 8ba9d62c6..ea82cc102 100644 --- a/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json +++ b/src/main/resources/assets/techreborn/models/item/misc/frequency_transmitter_coords.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "minecraft:item/generated", "textures": { - "layer0": "techreborn:items/tool/frequency_transmitter_coords" + "layer0": "techreborn:item/tool/frequency_transmitter_coords" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/misc/manual.json b/src/main/resources/assets/techreborn/models/item/misc/manual.json deleted file mode 100644 index 4a19f4d2c..000000000 --- a/src/main/resources/assets/techreborn/models/item/misc/manual.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/misc/manual" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/nanosaber.json b/src/main/resources/assets/techreborn/models/item/nanosaber.json new file mode 100644 index 000000000..38dc07bca --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/nanosaber.json @@ -0,0 +1,20 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/nanosaber_off" + }, + "overrides": [ + { + "predicate": { + "techreborn:active": 0.5 + }, + "model": "techreborn:item/tool/override/nanosaber_active_low" + }, + { + "predicate": { + "techreborn:active": 1 + }, + "model": "techreborn:item/tool/override/nanosaber_active" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/rock_cutter.json b/src/main/resources/assets/techreborn/models/item/rock_cutter.json new file mode 100644 index 000000000..8b997b617 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/rock_cutter.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/rock_cutter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json deleted file mode 100644 index 51a63aaba..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/advanced_drill" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json deleted file mode 100644 index e747c9e1b..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/advanced_jackhammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/basic_drill.json b/src/main/resources/assets/techreborn/models/item/tool/basic_drill.json deleted file mode 100644 index da629fc35..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/basic_drill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/basic_drill" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/basic_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/basic_jackhammer.json deleted file mode 100644 index 3e2ca4c3f..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/basic_jackhammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/basic_jackhammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/electric_treetap.json b/src/main/resources/assets/techreborn/models/item/tool/electric_treetap.json deleted file mode 100644 index 13b143a53..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/electric_treetap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/electric_treetap" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/industrial_drill.json b/src/main/resources/assets/techreborn/models/item/tool/industrial_drill.json deleted file mode 100644 index 36c1999ee..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/industrial_drill.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/industrial_drill" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/industrial_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/industrial_jackhammer.json deleted file mode 100644 index d8b9cc94e..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/industrial_jackhammer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/industrial_jackhammer" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/nanosaber.json b/src/main/resources/assets/techreborn/models/item/tool/nanosaber.json deleted file mode 100644 index c5eb87609..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/nanosaber.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/nanosaber_off" - }, - "overrides": [ - { - "predicate": { - "techreborn:active": 0.5 - }, - "model": "techreborn:item/tool/nanosaber_active_low" - }, - { - "predicate": { - "techreborn:active": 1 - }, - "model": "techreborn:item/tool/nanosaber_active" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active.json b/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active.json deleted file mode 100644 index 4a4345c5a..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/nanosaber_on" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active_low.json b/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active_low.json deleted file mode 100644 index 4aa626ea1..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/nanosaber_active_low.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/nanosaber_low" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json index 6598224af..63903713e 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/advanced_chainsaw_animated.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/tool/tool", + "parent": "minecraft:item/handheld", "textures": { - "layer0": "techreborn:items/tool/advanced_chainsaw_animated" + "layer0": "techreborn:item/tool/advanced_chainsaw_animated" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json index 32d5cbf5b..d9de9e27f 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/basic_chainsaw_animated.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/tool/tool", + "parent": "minecraft:item/handheld", "textures": { - "layer0": "techreborn:items/tool/basic_chainsaw_animated" + "layer0": "techreborn:item/tool/basic_chainsaw_animated" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json index 6401ae259..05a8f9674 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/industrial_chainsaw_animated.json @@ -1,6 +1,6 @@ { - "parent": "techreborn:item/tool/tool", + "parent": "minecraft:item/handheld", "textures": { - "layer0": "techreborn:items/tool/industrial_chainsaw_animated" + "layer0": "techreborn:item/tool/industrial_chainsaw_animated" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active.json b/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active.json new file mode 100644 index 000000000..42e3b56bb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/nanosaber_on" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active_low.json b/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active_low.json new file mode 100644 index 000000000..e1ad7716c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/override/nanosaber_active_low.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "techreborn:item/tool/nanosaber_low" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/rock_cutter.json b/src/main/resources/assets/techreborn/models/item/tool/rock_cutter.json deleted file mode 100644 index 82251c9d2..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/rock_cutter.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/tool/tool", - "textures": { - "layer0": "techreborn:items/tool/rock_cutter" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/tool.json b/src/main/resources/assets/techreborn/models/item/tool/tool.json deleted file mode 100644 index d373e2671..000000000 --- a/src/main/resources/assets/techreborn/models/item/tool/tool.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "item/handheld" -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/armor/cloaking.png b/src/main/resources/assets/techreborn/textures/models/armor/cloaking.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/armor/cloaking.png rename to src/main/resources/assets/techreborn/textures/models/armor/cloaking.png diff --git a/src/main/resources/assets/techreborn/textures/item/armor/lapotronpack.png b/src/main/resources/assets/techreborn/textures/models/armor/lapotronpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/item/armor/lapotronpack.png rename to src/main/resources/assets/techreborn/textures/models/armor/lapotronpack.png