From 226c0bc619571175b4e310e2353aa323346d155a Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Thu, 8 Dec 2016 18:39:49 -0800 Subject: [PATCH] Improve energy bars on items --- .../techreborn/client/RegisterItemJsons.java | 1 + src/main/java/techreborn/init/ModItems.java | 5 +- .../techreborn/items/ItemLapotronicOrb.java | 56 ------------------- .../items/armor/ItemLapotronPack.java | 18 ++++-- .../items/armor/ItemLithiumBatpack.java | 21 ++++--- .../techreborn/items/battery/ItemBattery.java | 22 +++----- .../items/battery/ItemEnergyCrystal.java | 22 ++++++++ .../items/battery/ItemLapotronCrystal.java | 22 ++++++++ .../items/battery/ItemLapotronicOrb.java | 31 ++++++++++ .../items/battery/ItemLithiumBattery.java | 22 ++++++++ .../items/battery/ItemReBattery.java | 22 ++++++++ .../items/tools/ItemAdvancedChainsaw.java | 21 +++++++ .../items/tools/ItemAdvancedDrill.java | 21 +++++++ .../items/tools/ItemAdvancedJackhammer.java | 21 +++++++ .../techreborn/items/tools/ItemChainsaw.java | 21 ++----- .../items/tools/ItemCloakingDevice.java | 22 +++++--- .../items/tools/ItemDiamondChainsaw.java | 21 +++++++ .../items/tools/ItemDiamondDrill.java | 21 +++++++ .../items/tools/ItemDiamondJackhammer.java | 21 +++++++ .../techreborn/items/tools/ItemDrill.java | 20 +++---- .../items/tools/ItemElectricTreetap.java | 23 +++++--- .../items/tools/ItemJackhammer.java | 6 ++ .../techreborn/items/tools/ItemNanosaber.java | 11 ++-- .../techreborn/items/tools/ItemOmniTool.java | 24 +++++--- .../items/tools/ItemRockCutter.java | 23 +++++--- .../items/tools/ItemSteelChainsaw.java | 21 +++++++ .../items/tools/ItemSteelDrill.java | 21 +++++++ .../items/tools/ItemSteelJackhammer.java | 21 +++++++ .../{lapotronorb.json => lapotronicorb.json} | 2 +- ...norbempty.json => lapotronicorbempty.json} | 0 30 files changed, 431 insertions(+), 152 deletions(-) delete mode 100644 src/main/java/techreborn/items/ItemLapotronicOrb.java create mode 100644 src/main/java/techreborn/items/battery/ItemLapotronicOrb.java rename src/main/resources/assets/techreborn/models/item/{lapotronorb.json => lapotronicorb.json} (80%) rename src/main/resources/assets/techreborn/models/item/{lapotronorbempty.json => lapotronicorbempty.json} (100%) diff --git a/src/main/java/techreborn/client/RegisterItemJsons.java b/src/main/java/techreborn/client/RegisterItemJsons.java index 40cddb3aa..ce807dda3 100644 --- a/src/main/java/techreborn/client/RegisterItemJsons.java +++ b/src/main/java/techreborn/client/RegisterItemJsons.java @@ -18,6 +18,7 @@ public class RegisterItemJsons { register(ModItems.lithiumBattery, "lithiumBattery"); register(ModItems.energyCrystal, "energyCrystal"); register(ModItems.lapotronCrystal, "lapotronCrystal"); + register(ModItems.lapotronicOrb, "lapotronicOrb"); register(ModItems.nanosaber, "nanosaber"); } diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index 11c4896d5..fc69b1e1d 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -17,10 +17,7 @@ import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.armor.ItemTRArmour; -import techreborn.items.battery.ItemEnergyCrystal; -import techreborn.items.battery.ItemLapotronCrystal; -import techreborn.items.battery.ItemLithiumBattery; -import techreborn.items.battery.ItemReBattery; +import techreborn.items.battery.*; import techreborn.items.tools.*; public class ModItems { diff --git a/src/main/java/techreborn/items/ItemLapotronicOrb.java b/src/main/java/techreborn/items/ItemLapotronicOrb.java deleted file mode 100644 index 5efae5983..000000000 --- a/src/main/java/techreborn/items/ItemLapotronicOrb.java +++ /dev/null @@ -1,56 +0,0 @@ -package techreborn.items; - -import net.minecraft.item.ItemStack; -import reborncore.api.power.IEnergyItemInfo; -import techreborn.client.TechRebornCreativeTab; -import techreborn.config.ConfigTechReborn; - -public class ItemLapotronicOrb extends ItemTextureBase implements IEnergyItemInfo { - - public static final int maxCharge = ConfigTechReborn.LapotronicOrbMaxCharge; - public static final int tier = ConfigTechReborn.LithiumBatpackTier; - public double transferLimit = 10000; - - public ItemLapotronicOrb() { - super(); - setMaxStackSize(1); - setMaxDamage(13); - setUnlocalizedName("techreborn.lapotronicorb"); - setCreativeTab(TechRebornCreativeTab.instance); - } - - @Override - public double getMaxPower(ItemStack stack) { - return maxCharge; - } - - @Override - public boolean canAcceptEnergy(ItemStack stack) { - return true; - } - - @Override - public boolean canProvideEnergy(ItemStack stack) { - return true; - } - - @Override - public double getMaxTransfer(ItemStack stack) { - return transferLimit; - } - - @Override - public int getStackTier(ItemStack stack) { - return tier; - } - - @Override - public String getTextureName(int damage) { - return "techreborn:items/tool/lapotronenergyorb"; - } - - @Override - public int getMaxMeta() { - return 1; - } -} diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index c5ff01cd4..fd94f29e0 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -15,9 +15,11 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; import techreborn.lib.ModInfo; public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { @@ -34,6 +36,11 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex RebornCore.jsonDestroyer.registerObject(this); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { @@ -67,12 +74,13 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, NonNullList itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.lapotronpack); + ItemStack charged = new ItemStack(ModItems.lapotronpack); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index 57a8b38ee..3ab2d2468 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -9,18 +9,19 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.util.List; - public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; @@ -35,6 +36,11 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT RebornCore.jsonDestroyer.registerObject(this); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -86,12 +92,13 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.lithiumBatpack); + ItemStack charged = new ItemStack(ModItems.lithiumBatpack); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/battery/ItemBattery.java b/src/main/java/techreborn/items/battery/ItemBattery.java index ec7eebe9f..b5f17cb5a 100644 --- a/src/main/java/techreborn/items/battery/ItemBattery.java +++ b/src/main/java/techreborn/items/battery/ItemBattery.java @@ -1,24 +1,22 @@ package techreborn.items.battery; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.IItemPropertyGetter; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.items.ItemTRNoDestroy; import javax.annotation.Nullable; -import java.util.List; public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { - String name = "null"; + String name; int maxEnergy = 0; int maxTransfer = 0; int tier = 0; @@ -47,17 +45,6 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { }); } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); - PoweredItem.setEnergy(getMaxPower(charged), charged); - itemList.add(charged); - } - @Override public double getDurabilityForDisplay(ItemStack stack) { double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); @@ -70,6 +57,11 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { return true; } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public double getMaxPower(ItemStack stack) { return maxEnergy; diff --git a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java index 41cecce8b..52b77044f 100644 --- a/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemEnergyCrystal.java @@ -1,8 +1,30 @@ package techreborn.items.battery; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; +import techreborn.init.ModItems; + public class ItemEnergyCrystal extends ItemBattery { public ItemEnergyCrystal() { super("energyCrystal", 100000, 512, 1); } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.energyCrystal); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } } diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index f7f3541f2..cf2b25e3c 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -1,8 +1,30 @@ package techreborn.items.battery; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; +import techreborn.init.ModItems; + public class ItemLapotronCrystal extends ItemBattery { public ItemLapotronCrystal() { super("lapotronCrystal", 1000000, 512, 2); } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.lapotronCrystal); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } } diff --git a/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java new file mode 100644 index 000000000..970e58c41 --- /dev/null +++ b/src/main/java/techreborn/items/battery/ItemLapotronicOrb.java @@ -0,0 +1,31 @@ +package techreborn.items.battery; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; +import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; + +public class ItemLapotronicOrb extends ItemBattery { + + public ItemLapotronicOrb() { + super("lapotronicorb", ConfigTechReborn.LapotronicOrbMaxCharge, 10000, ConfigTechReborn.LapotronicOrbTier); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.lapotronicOrb); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } +} diff --git a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java index 0fdb883fd..0f7edd365 100644 --- a/src/main/java/techreborn/items/battery/ItemLithiumBattery.java +++ b/src/main/java/techreborn/items/battery/ItemLithiumBattery.java @@ -1,9 +1,31 @@ package techreborn.items.battery; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; +import techreborn.init.ModItems; + public class ItemLithiumBattery extends ItemBattery { public ItemLithiumBattery() { super("lithiumBattery", 100000, 512, 1); } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.lithiumBattery); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } } diff --git a/src/main/java/techreborn/items/battery/ItemReBattery.java b/src/main/java/techreborn/items/battery/ItemReBattery.java index 0030458e2..1037b12e5 100644 --- a/src/main/java/techreborn/items/battery/ItemReBattery.java +++ b/src/main/java/techreborn/items/battery/ItemReBattery.java @@ -1,8 +1,30 @@ package techreborn.items.battery; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; +import techreborn.init.ModItems; + public class ItemReBattery extends ItemBattery { public ItemReBattery() { super("rebattery", 10000, 64, 1); } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.reBattery); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java index a1eb0037b..57c77dce7 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedChainsaw.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemAdvancedChainsaw extends ItemChainsaw { @@ -12,6 +20,19 @@ public class ItemAdvancedChainsaw extends ItemChainsaw { this.cost = 250; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.advancedChainsaw); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public boolean canHarvestBlock(IBlockState blockIn) { return Items.DIAMOND_AXE.canHarvestBlock(blockIn); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java index 77b75e818..79dc60a06 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedDrill.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemAdvancedDrill extends ItemDrill { @@ -12,6 +20,19 @@ public class ItemAdvancedDrill extends ItemDrill { this.cost = 250; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.advancedDrill); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public boolean canHarvestBlock(IBlockState blockIn) { return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn); diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 027f80476..4bf47058e 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -1,6 +1,14 @@ package techreborn.items.tools; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemAdvancedJackhammer extends ItemJackhammer { @@ -11,6 +19,19 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { this.efficiencyOnProperMaterial = 60F; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.advancedJackhammer); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public String getTextureName(int damage) { return "techreborn:items/tool/advancedJackhammer"; diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 78b75f2b4..2fa133fd3 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -3,10 +3,8 @@ package techreborn.items.tools; import me.modmuss50.jsonDestroyer.api.IHandHeld; import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; @@ -18,13 +16,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import java.util.List; - public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { public static int tier = 1; @@ -47,6 +44,11 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI this.unpoweredSpeed = unpoweredSpeed; } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + // @Override // public boolean onBlockDestroyed(ItemStack stack, World worldIn, // IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -118,17 +120,6 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI return tier; } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); - PoweredItem.setEnergy(getMaxPower(charged), charged); - itemList.add(charged); - } - @Override public double getDurabilityForDisplay(ItemStack stack) { double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 42ac95cf8..edb6ab6f8 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -6,17 +6,18 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; import techreborn.items.ItemTextureBase; -import java.util.List; - public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo { public static int Teir = ConfigTechReborn.CloakingDeviceTier; public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; @@ -30,6 +31,11 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn setCreativeTab(TechRebornCreativeTab.instance); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { if (PoweredItem.canUseEnergy(ConfigTechReborn.CloakingDeviceEUTick, itemStack)) { @@ -78,13 +84,15 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn return itemStack; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.cloakingDevice); + ItemStack charged = new ItemStack(ModItems.cloakingDevice); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java index 0881b9f28..ef3681cdd 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondChainsaw.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemDiamondChainsaw extends ItemChainsaw { @@ -12,6 +20,19 @@ public class ItemDiamondChainsaw extends ItemChainsaw { this.cost = 250; } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.diamondChainsaw); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } @Override public boolean canHarvestBlock(IBlockState blockIn) { return Items.DIAMOND_AXE.canHarvestBlock(blockIn); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java index 411b1f99b..7aa587708 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondDrill.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemDiamondDrill extends ItemDrill { @@ -12,6 +20,19 @@ public class ItemDiamondDrill extends ItemDrill { this.cost = 250; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.diamondDrill); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public boolean canHarvestBlock(IBlockState state) { return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 9f99dfce4..73a9f3474 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -1,6 +1,14 @@ package techreborn.items.tools; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemDiamondJackhammer extends ItemJackhammer { @@ -11,6 +19,19 @@ public class ItemDiamondJackhammer extends ItemJackhammer { this.efficiencyOnProperMaterial = 16F; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.diamondJackhammer); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public String getTextureName(int damage) { return "techreborn:items/tool/diamondJackhammer"; diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index e12d269f1..b34b1e7ae 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -16,18 +16,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.lib.ModInfo; -import java.util.List; import java.util.Random; public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { @@ -51,6 +52,11 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured this.unpoweredSpeed = unpoweredSpeed; } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -116,18 +122,6 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured return tier; } - @SuppressWarnings({ "rawtypes", "unchecked" }) - @SideOnly(Side.CLIENT) - public void getSubItems(Item item, - CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); - PoweredItem.setEnergy(getMaxPower(charged), charged); - itemList.add(charged); - } - @Override public double getDurabilityForDisplay(ItemStack stack) { double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 212dd224b..0e687182c 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -6,16 +6,17 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; +import techreborn.init.ModItems; import techreborn.lib.ModInfo; -import java.util.List; - /** * Created by modmuss50 on 05/11/2016. */ @@ -65,14 +66,22 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo, ITextu } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + + + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.electricTreetap); + ItemStack charged = new ItemStack(ModItems.electricTreetap); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 60cb9e014..15ac00622 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -22,6 +22,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; @@ -50,6 +51,11 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex this.tier = tier; } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 02bb60adf..bcd6530e1 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -22,6 +22,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.ChatUtils; import techreborn.client.TechRebornCreativeTab; @@ -85,6 +86,11 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item, @@ -98,10 +104,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { inactiveCharged.getTagCompound().setBoolean("isActive", false); PoweredItem.setEnergy(getMaxPower(inactiveCharged), inactiveCharged); - ItemStack activeUncharged = new ItemStack(ModItems.nanosaber); - activeUncharged.setTagCompound(new NBTTagCompound()); - activeUncharged.getTagCompound().setBoolean("isActive", true); - ItemStack activeCharged = new ItemStack(ModItems.nanosaber); activeCharged.setTagCompound(new NBTTagCompound()); activeCharged.getTagCompound().setBoolean("isActive", true); @@ -109,7 +111,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { itemList.add(inactiveUncharged); itemList.add(inactiveCharged); - itemList.add(activeUncharged); itemList.add(activeCharged); } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 1a1ebe786..457e978a3 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -10,10 +10,7 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -21,10 +18,12 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; import techreborn.lib.ModInfo; import java.util.List; @@ -46,6 +45,11 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu RebornCore.jsonDestroyer.registerObject(this); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -123,14 +127,16 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu return 2; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.omniTool); + ItemStack charged = new ItemStack(ModItems.omniTool); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 3fe11dd4b..11743f745 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -13,19 +13,21 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.RebornCore; import reborncore.api.power.IEnergyItemInfo; +import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItem; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; import techreborn.lib.ModInfo; import javax.annotation.Nullable; -import java.util.List; import java.util.Random; public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { @@ -43,6 +45,11 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex RebornCore.jsonDestroyer.registerObject(this); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return PowerSystem.getDisplayPower().colour; + } + @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -118,17 +125,17 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex return 2; } + + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item, - CreativeTabs par2CreativeTabs, List itemList) { - ItemStack itemStack = new ItemStack(this, 1); - itemStack.addEnchantment(Enchantments.SILK_TOUCH, 1); - itemList.add(itemStack); - - ItemStack charged = new ItemStack(this, 1); - charged.addEnchantment(Enchantments.SILK_TOUCH, 1); + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack uncharged = new ItemStack(ModItems.rockCutter); + ItemStack charged = new ItemStack(ModItems.rockCutter); PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); itemList.add(charged); } diff --git a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index d3265a662..80f5f9c70 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemSteelChainsaw extends ItemChainsaw { @@ -12,6 +20,19 @@ public class ItemSteelChainsaw extends ItemChainsaw { this.cost = 50; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.ironChainsaw); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public boolean canHarvestBlock(IBlockState state) { return Items.IRON_AXE.canHarvestBlock(state); diff --git a/src/main/java/techreborn/items/tools/ItemSteelDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java index 1dc367689..8daaffbf4 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -1,8 +1,16 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemSteelDrill extends ItemDrill { @@ -12,6 +20,19 @@ public class ItemSteelDrill extends ItemDrill { this.cost = 50; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.ironDrill); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public boolean canHarvestBlock(IBlockState state) { return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state); diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 57def30b3..18b3637ac 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -1,6 +1,14 @@ package techreborn.items.tools; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.powerSystem.PoweredItem; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModItems; public class ItemSteelJackhammer extends ItemJackhammer { @@ -11,6 +19,19 @@ public class ItemSteelJackhammer extends ItemJackhammer { this.efficiencyOnProperMaterial = 12F; } + @SuppressWarnings({ "rawtypes", "unchecked" }) + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, + CreativeTabs par2CreativeTabs, NonNullList itemList) { + ItemStack stack = new ItemStack(ModItems.steelJackhammer); + ItemStack uncharged = stack.copy(); + ItemStack charged = stack.copy(); + PoweredItem.setEnergy(getMaxPower(charged), charged); + + itemList.add(uncharged); + itemList.add(charged); + } + @Override public String getTextureName(int damage) { return "techreborn:items/tool/steelJackhammer"; diff --git a/src/main/resources/assets/techreborn/models/item/lapotronorb.json b/src/main/resources/assets/techreborn/models/item/lapotronicorb.json similarity index 80% rename from src/main/resources/assets/techreborn/models/item/lapotronorb.json rename to src/main/resources/assets/techreborn/models/item/lapotronicorb.json index ad5dbef15..bbf757291 100644 --- a/src/main/resources/assets/techreborn/models/item/lapotronorb.json +++ b/src/main/resources/assets/techreborn/models/item/lapotronicorb.json @@ -8,7 +8,7 @@ "predicate": { "techreborn:empty": 1 }, - "model": "techreborn:item/lapotronOrbEmpty" + "model": "techreborn:item/lapotronicOrbEmpty" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/lapotronorbempty.json b/src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json similarity index 100% rename from src/main/resources/assets/techreborn/models/item/lapotronorbempty.json rename to src/main/resources/assets/techreborn/models/item/lapotronicorbempty.json