From 89ffb5d047639eb6a52f2ecc93746d900c8654c0 Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Fri, 9 Dec 2016 22:50:26 -0800 Subject: [PATCH] More jsons! --- .../java/techreborn/client/RegisterItemJsons.java | 10 +++++----- .../java/techreborn/items/tools/ItemChainsaw.java | 10 +++++++++- .../techreborn/items/tools/ItemNanosaber.java | 3 ++- .../techreborn/blockstates/item/ingots.json | 0 .../techreborn/models/item/battery/battery.json | 3 +++ .../models/item/battery/energy_crystal.json | 14 ++++++++++++++ .../models/item/battery/lapotron_crystal.json | 14 ++++++++++++++ .../models/item/battery/lapotronic_orb.json | 14 ++++++++++++++ .../models/item/battery/lithium_battery.json | 14 ++++++++++++++ .../battery/override/energy_crystal_empty.json | 6 ++++++ .../battery/override/lapotron_crystal_empty.json | 6 ++++++ .../battery/override/lapotronic_orb_empty.json | 6 ++++++ .../battery/override/lithium_battery_empty.json | 6 ++++++ .../item/battery/override/re_battery_empty.json | 6 ++++++ .../models/item/battery/re_battery.json | 14 ++++++++++++++ .../techreborn/models/item/energycrystal.json | 14 -------------- .../models/item/energycrystalempty.json | 6 ------ .../techreborn/models/item/lapotroncrystal.json | 14 -------------- .../models/item/lapotroncrystalempty.json | 6 ------ .../techreborn/models/item/lapotronicorb.json | 14 -------------- .../models/item/lapotronicorbempty.json | 6 ------ .../techreborn/models/item/lithiumbattery.json | 14 -------------- .../models/item/lithiumbatteryempty.json | 6 ------ .../assets/techreborn/models/item/nanosaber.json | 6 ++++++ ...ebatteryempty.json => nanosaberactivelow.json} | 2 +- .../assets/techreborn/models/item/rebattery.json | 14 -------------- .../models/item/tool/advanced_chainsaw.json | 2 +- .../models/item/tool/advanced_drill.json | 2 +- .../models/item/tool/advanced_jackhammer.json | 2 +- .../models/item/tool/diamond_chainsaw.json | 2 +- .../models/item/tool/diamond_drill.json | 2 +- .../models/item/tool/diamond_jackhammer.json | 2 +- .../tool/override/advanced_chainsaw_animated.json | 2 +- .../tool/override/diamond_chainsaw_animated.json | 2 +- .../tool/override/steel_chainsaw_animated.json | 2 +- .../models/item/tool/steel_chainsaw.json | 2 +- .../techreborn/models/item/tool/steel_drill.json | 2 +- .../models/item/tool/steel_jackhammer.json | 2 +- .../assets/techreborn/models/item/tool/tool.json | 3 +++ .../energy_crystal.png} | Bin .../energy_crystal_empty.png} | Bin .../lapotron_crystal.png} | Bin .../lapotron_crystal_empty.png} | Bin .../lapotronic_orb.png} | Bin .../lapotronic_orb_empty.png} | Bin .../lithium_battery.png} | Bin .../lithium_battery_empty.png} | Bin .../rebattery.png => battery/re_battery.png} | Bin .../re_battery_empty.png} | Bin .../textures/items/ingot/advancedalloyingot.png | Bin 0 -> 690 bytes .../textures/items/tool/nanosaber_low.png | Bin 0 -> 665 bytes .../textures/items/tool/nanosaber_low.png.mcmeta | 7 +++++++ 52 files changed, 148 insertions(+), 114 deletions(-) create mode 100644 src/main/resources/assets/techreborn/blockstates/item/ingots.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/battery.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/energy_crystal.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/lapotron_crystal.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/lapotronic_orb.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/lithium_battery.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json create mode 100644 src/main/resources/assets/techreborn/models/item/battery/re_battery.json delete mode 100644 src/main/resources/assets/techreborn/models/item/energycrystal.json delete mode 100644 src/main/resources/assets/techreborn/models/item/energycrystalempty.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lapotroncrystal.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lapotroncrystalempty.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lapotronicorb.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lithiumbattery.json delete mode 100644 src/main/resources/assets/techreborn/models/item/lithiumbatteryempty.json rename src/main/resources/assets/techreborn/models/item/{rebatteryempty.json => nanosaberactivelow.json} (56%) delete mode 100644 src/main/resources/assets/techreborn/models/item/rebattery.json create mode 100644 src/main/resources/assets/techreborn/models/item/tool/tool.json rename src/main/resources/assets/techreborn/textures/items/{tool/energycrystal.png => battery/energy_crystal.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/energycrystalempty.png => battery/energy_crystal_empty.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lapotroncrystal.png => battery/lapotron_crystal.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lapotroncrystalempty.png => battery/lapotron_crystal_empty.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lapotronenergyorb.png => battery/lapotronic_orb.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lapotronenergyorbempty.png => battery/lapotronic_orb_empty.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lithiumbattery.png => battery/lithium_battery.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/lithiumbatteryempty.png => battery/lithium_battery_empty.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/rebattery.png => battery/re_battery.png} (100%) rename src/main/resources/assets/techreborn/textures/items/{tool/rebatteryempty.png => battery/re_battery_empty.png} (100%) create mode 100644 src/main/resources/assets/techreborn/textures/items/ingot/advancedalloyingot.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png create mode 100644 src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png.mcmeta diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index f95ec7594..48310bf7c 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -14,11 +14,11 @@ public class RegisterItemJsons { } private static void registerItems() { - register(ModItems.reBattery, "rebattery"); - register(ModItems.lithiumBattery, "lithiumbattery"); - register(ModItems.energyCrystal, "energycrystal"); - register(ModItems.lapotronCrystal, "lapotroncrystal"); - register(ModItems.lapotronicOrb, "lapotronicorb"); + register(ModItems.reBattery, "battery/re_battery"); + register(ModItems.lithiumBattery, "battery/lithium_battery"); + register(ModItems.energyCrystal, "battery/energy_crystal"); + register(ModItems.lapotronCrystal, "battery/lapotron_crystal"); + register(ModItems.lapotronicOrb, "battery/lapotronic_orb"); register(ModItems.nanosaber, "nanosaber"); register(ModItems.frequencyTransmitter, "frequencytransmitter"); diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 573641f89..7bd1be4bc 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -3,6 +3,7 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemAxe; @@ -27,6 +28,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { public int cost = 250; public float unpoweredSpeed = 2.0F; public double transferLimit = 100; + public boolean isBreaking = false; public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, int tier, float unpoweredSpeed) { @@ -46,7 +48,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { World worldIn, @Nullable EntityLivingBase entityIn) { - if (stack != ItemStack.EMPTY && PoweredItem.canUseEnergy(cost, stack) && entityIn != null && entityIn.getHeldItemMainhand().isItemEqual(stack)) { + if (stack != ItemStack.EMPTY && PoweredItem.canUseEnergy(cost, stack) && entityIn != null && entityIn.getHeldItemMainhand().equals(stack)) { return 1.0F; } return 0.0F; @@ -94,6 +96,12 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { return false; } + @Override + public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, EntityPlayer player) { + + return super.onBlockStartBreak(itemstack, pos, player); + } + @Override public double getMaxTransfer(ItemStack stack) { return transferLimit; diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index bcd6530e1..84ac3c651 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -41,7 +41,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { setNoRepair(); setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); - setMaxDamage(1); setUnlocalizedName("techreborn.nanosaber"); this.addPropertyOverride(new ResourceLocation("techreborn:active"), new IItemPropertyGetter() { @SideOnly(Side.CLIENT) @@ -51,6 +50,8 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @Nullable EntityLivingBase entityIn) { if (stack != ItemStack.EMPTY && stack.hasTagCompound() && stack.getTagCompound().hasKey("isActive") && stack.getTagCompound().getBoolean("isActive")) { + if (PoweredItem.getMaxPower(stack) - PoweredItem.getEnergy(stack) >= 0.9 * PoweredItem.getMaxPower(stack)) + return 0.5F; return 1.0F; } return 0.0F; diff --git a/src/main/resources/assets/techreborn/blockstates/item/ingots.json b/src/main/resources/assets/techreborn/blockstates/item/ingots.json new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/assets/techreborn/models/item/battery/battery.json b/src/main/resources/assets/techreborn/models/item/battery/battery.json new file mode 100644 index 000000000..da6f4b6dd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/battery.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:item/techrebornitem" +} \ 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/battery/energy_crystal.json new file mode 100644 index 000000000..cf811c061 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/energy_crystal.json @@ -0,0 +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" + } + ] +} \ 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/battery/lapotron_crystal.json new file mode 100644 index 000000000..3677b6c09 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/lapotron_crystal.json @@ -0,0 +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" + } + ] +} \ 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/battery/lapotronic_orb.json new file mode 100644 index 000000000..eff5bbb5e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/lapotronic_orb.json @@ -0,0 +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" + } + ] +} \ 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/battery/lithium_battery.json new file mode 100644 index 000000000..cfe7fa4fb --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/lithium_battery.json @@ -0,0 +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" + } + ] +} \ 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 new file mode 100644 index 000000000..f68de178c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/override/energy_crystal_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/battery/battery", + "textures": { + "layer0": "techreborn:items/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 new file mode 100644 index 000000000..164d68d93 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lapotron_crystal_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/battery/battery", + "textures": { + "layer0": "techreborn:items/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 new file mode 100644 index 000000000..dcc0f2ae0 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lapotronic_orb_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/battery/battery", + "textures": { + "layer0": "techreborn:items/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 new file mode 100644 index 000000000..b033f0ee3 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/override/lithium_battery_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/battery/battery", + "textures": { + "layer0": "techreborn:items/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 new file mode 100644 index 000000000..5411871f4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/override/re_battery_empty.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/battery/battery", + "textures": { + "layer0": "techreborn:items/battery/re_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/battery/re_battery.json new file mode 100644 index 000000000..5c8b8d591 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/battery/re_battery.json @@ -0,0 +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" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/energycrystal.json b/src/main/resources/assets/techreborn/models/item/energycrystal.json deleted file mode 100644 index 7b91c2c8a..000000000 --- a/src/main/resources/assets/techreborn/models/item/energycrystal.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/energyCrystal" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/energyCrystalEmpty" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/energycrystalempty.json b/src/main/resources/assets/techreborn/models/item/energycrystalempty.json deleted file mode 100644 index 85c57407b..000000000 --- a/src/main/resources/assets/techreborn/models/item/energycrystalempty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/energyCrystalEmpty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotroncrystal.json b/src/main/resources/assets/techreborn/models/item/lapotroncrystal.json deleted file mode 100644 index a8c96e984..000000000 --- a/src/main/resources/assets/techreborn/models/item/lapotroncrystal.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lapotronCrystal" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/lapotronCrystalEmpty" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotroncrystalempty.json b/src/main/resources/assets/techreborn/models/item/lapotroncrystalempty.json deleted file mode 100644 index 55f874fee..000000000 --- a/src/main/resources/assets/techreborn/models/item/lapotroncrystalempty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lapotronCrystalEmpty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronicorb.json b/src/main/resources/assets/techreborn/models/item/lapotronicorb.json deleted file mode 100644 index bbf757291..000000000 --- a/src/main/resources/assets/techreborn/models/item/lapotronicorb.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lapotronEnergyOrb" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/lapotronicOrbEmpty" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json b/src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json deleted file mode 100644 index fc9a459b2..000000000 --- a/src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lapotronEnergyOrbEmpty" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lithiumbattery.json b/src/main/resources/assets/techreborn/models/item/lithiumbattery.json deleted file mode 100644 index e66a7f670..000000000 --- a/src/main/resources/assets/techreborn/models/item/lithiumbattery.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lithiumBattery" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/lithiumBatteryEmpty" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lithiumbatteryempty.json b/src/main/resources/assets/techreborn/models/item/lithiumbatteryempty.json deleted file mode 100644 index 7c3f2e29c..000000000 --- a/src/main/resources/assets/techreborn/models/item/lithiumbatteryempty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/lithiumBatteryEmpty" - } -} \ 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 index f4a193f91..5bdc633de 100644 --- a/src/main/resources/assets/techreborn/models/item/nanosaber.json +++ b/src/main/resources/assets/techreborn/models/item/nanosaber.json @@ -4,6 +4,12 @@ "layer0": "techreborn:items/tool/nanosaber_off" }, "overrides": [ + { + "predicate": { + "techreborn:active": 0.5 + }, + "model": "techreborn:item/nanosaberActiveLow" + }, { "predicate": { "techreborn:active": 1 diff --git a/src/main/resources/assets/techreborn/models/item/rebatteryempty.json b/src/main/resources/assets/techreborn/models/item/nanosaberactivelow.json similarity index 56% rename from src/main/resources/assets/techreborn/models/item/rebatteryempty.json rename to src/main/resources/assets/techreborn/models/item/nanosaberactivelow.json index 5b4175375..be2579a92 100644 --- a/src/main/resources/assets/techreborn/models/item/rebatteryempty.json +++ b/src/main/resources/assets/techreborn/models/item/nanosaberactivelow.json @@ -1,6 +1,6 @@ { "parent": "techreborn:item/techrebornItem", "textures": { - "layer0": "techreborn:items/tool/reBatteryEmpty" + "layer0": "techreborn:items/tool/nanosaber_low" } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/rebattery.json b/src/main/resources/assets/techreborn/models/item/rebattery.json deleted file mode 100644 index c95976c47..000000000 --- a/src/main/resources/assets/techreborn/models/item/rebattery.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "techreborn:item/techrebornItem", - "textures": { - "layer0": "techreborn:items/tool/reBattery" - }, - "overrides": [ - { - "predicate": { - "techreborn:empty": 1 - }, - "model": "techreborn:item/reBatteryEmpty" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json index 5323ff287..0f316bf10 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_chainsaw.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/advanced_chainsaw" }, 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 index 8a91f7db5..51a63aaba 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_drill.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/advanced_drill" } 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 index f8b7a7582..e747c9e1b 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json +++ b/src/main/resources/assets/techreborn/models/item/tool/advanced_jackhammer.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/advanced_jackhammer" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json index 44eb57883..cd0a4e523 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_chainsaw.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/diamond_chainsaw" }, diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json index abeeb62e7..d95e46b43 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_drill.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/diamond_drill" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json index cbf2a7d7c..f48c005a7 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json +++ b/src/main/resources/assets/techreborn/models/item/tool/diamond_jackhammer.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/diamond_jackhammer" } 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 09d33debb..6598224af 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,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/advanced_chainsaw_animated" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json index c06e0a187..09326dc4b 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/diamond_chainsaw_animated.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/diamond_chainsaw_animated" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json b/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json index 875f63f10..32c295415 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json +++ b/src/main/resources/assets/techreborn/models/item/tool/override/steel_chainsaw_animated.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/steel_chainsaw_animated" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json b/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json index 0b69812cb..b340563c4 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_chainsaw.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/steel_chainsaw" }, diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json b/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json index 8765919d0..66eeed425 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_drill.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/steel_drill" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json b/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json index 7f0b7d3d5..362244e68 100644 --- a/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json +++ b/src/main/resources/assets/techreborn/models/item/tool/steel_jackhammer.json @@ -1,5 +1,5 @@ { - "parent": "techreborn:item/techrebornItem", + "parent": "techreborn:item/tool/tool", "textures": { "layer0": "techreborn:items/tool/steel_jackhammer" } diff --git a/src/main/resources/assets/techreborn/models/item/tool/tool.json b/src/main/resources/assets/techreborn/models/item/tool/tool.json new file mode 100644 index 000000000..da6f4b6dd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/tool/tool.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:item/techrebornitem" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/items/tool/energycrystal.png b/src/main/resources/assets/techreborn/textures/items/battery/energy_crystal.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/energycrystal.png rename to src/main/resources/assets/techreborn/textures/items/battery/energy_crystal.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/energycrystalempty.png b/src/main/resources/assets/techreborn/textures/items/battery/energy_crystal_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/energycrystalempty.png rename to src/main/resources/assets/techreborn/textures/items/battery/energy_crystal_empty.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotroncrystal.png b/src/main/resources/assets/techreborn/textures/items/battery/lapotron_crystal.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotroncrystal.png rename to src/main/resources/assets/techreborn/textures/items/battery/lapotron_crystal.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotroncrystalempty.png b/src/main/resources/assets/techreborn/textures/items/battery/lapotron_crystal_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotroncrystalempty.png rename to src/main/resources/assets/techreborn/textures/items/battery/lapotron_crystal_empty.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronenergyorb.png b/src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotronenergyorb.png rename to src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronenergyorbempty.png b/src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lapotronenergyorbempty.png rename to src/main/resources/assets/techreborn/textures/items/battery/lapotronic_orb_empty.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lithiumbattery.png b/src/main/resources/assets/techreborn/textures/items/battery/lithium_battery.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lithiumbattery.png rename to src/main/resources/assets/techreborn/textures/items/battery/lithium_battery.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lithiumbatteryempty.png b/src/main/resources/assets/techreborn/textures/items/battery/lithium_battery_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/lithiumbatteryempty.png rename to src/main/resources/assets/techreborn/textures/items/battery/lithium_battery_empty.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/rebattery.png b/src/main/resources/assets/techreborn/textures/items/battery/re_battery.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/rebattery.png rename to src/main/resources/assets/techreborn/textures/items/battery/re_battery.png diff --git a/src/main/resources/assets/techreborn/textures/items/tool/rebatteryempty.png b/src/main/resources/assets/techreborn/textures/items/battery/re_battery_empty.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/items/tool/rebatteryempty.png rename to src/main/resources/assets/techreborn/textures/items/battery/re_battery_empty.png diff --git a/src/main/resources/assets/techreborn/textures/items/ingot/advancedalloyingot.png b/src/main/resources/assets/techreborn/textures/items/ingot/advancedalloyingot.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd11339863beaa100a54783cb2b5ead8909a209 GIT binary patch literal 690 zcmV;j0!{siP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5&!@T5&_cPe*6Fc00(qQO+^Rb1RN1C z2Wc6V(f|Me8FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)*zP3cvsW0uM<Za8O zrRc(ms5r}NF$LX1EHO9sLrnT3-aUI-7hObM*5~dVzAwJ#obM6-pLoj^^q)~uSpHoG z)gpQ5Q5BO6cC$VDfd11Zq!#@9a5(l9%6`qDridZ+0et5aXIiFZULRAPm*)XW)VaH6rO*7wKq-?bs{Q(?c@enS4re%*W2ybFzUTU;27+ zA20iHojiWmTSIPXoXyvxq~4CPv*0H)?UV6tI7lw^j9ehVoW7E_|#z`VQL~_G!WA@$*4;_EO(ai&-9%-NZfppW|46+jOIf*A$5gFKMy}FgoFz&b7fSw|{A`^iqKpe$|9k}D YJBa~Y52;JY_y7O^07*qoM6N<$f*AudSpWb4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png new file mode 100644 index 0000000000000000000000000000000000000000..0c36b553cd7dc31a40282615bc73e72f1859f922 GIT binary patch literal 665 zcmV;K0%rY*P)AQrq?zU=?Y>GS?W zxuk)QyLSKIzkmP##>U3~e?C4S-H^w{75@((KK#GBy88dO<3~v|;AQV5ux1dbsHph= zdKL-Zc(;BdT=Tkh>;9*wr~kj3oJ+g`kE`qcU%h%2Yye2}5q=G>&%|KWa~|3OaPwQJY^Q>RY- zKYsl9|Jk!=gPr~$rwq4ddrMQWq=%#3e;YHS|BDwd{{Q;*>;E%m%=mxw=uxl%x80&} z8=$4C1eVlLQTnf|ss6vNt`2N7$OT}{e#y8sBLhXFAz{`W*FD{d2z>oC{P|Aa!J698Lz^_aDFv^4H<;BDs@O5S{ zN_p^gW*70A-}km)lm~aC69^md^U(VLAdFrfJjlz#tr=DxfSio2Jb2w&i(4}><-y&^ zINSyhDi0o{WZ~9~46v04FDna((>$Wf0|o{F-h|iz*$Pt@00000NkvXXu0mjfoy9m% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png.mcmeta b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png.mcmeta new file mode 100644 index 000000000..51fae9a12 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/items/tool/nanosaber_low.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [] + } +}