Improve energy bars on items

This commit is contained in:
ProfessorProspector 2016-12-08 18:39:49 -08:00
parent 467544ebfe
commit 226c0bc619
30 changed files with 431 additions and 152 deletions

View file

@ -18,6 +18,7 @@ public class RegisterItemJsons {
register(ModItems.lithiumBattery, "lithiumBattery"); register(ModItems.lithiumBattery, "lithiumBattery");
register(ModItems.energyCrystal, "energyCrystal"); register(ModItems.energyCrystal, "energyCrystal");
register(ModItems.lapotronCrystal, "lapotronCrystal"); register(ModItems.lapotronCrystal, "lapotronCrystal");
register(ModItems.lapotronicOrb, "lapotronicOrb");
register(ModItems.nanosaber, "nanosaber"); register(ModItems.nanosaber, "nanosaber");
} }

View file

@ -17,10 +17,7 @@ import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLapotronPack;
import techreborn.items.armor.ItemLithiumBatpack; import techreborn.items.armor.ItemLithiumBatpack;
import techreborn.items.armor.ItemTRArmour; import techreborn.items.armor.ItemTRArmour;
import techreborn.items.battery.ItemEnergyCrystal; import techreborn.items.battery.*;
import techreborn.items.battery.ItemLapotronCrystal;
import techreborn.items.battery.ItemLithiumBattery;
import techreborn.items.battery.ItemReBattery;
import techreborn.items.tools.*; import techreborn.items.tools.*;
public class ModItems { public class ModItems {

View file

@ -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;
}
}

View file

@ -15,9 +15,11 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
@ -34,6 +36,11 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo, ITex
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { 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" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, NonNullList itemList) { public void getSubItems(Item item,
ItemStack itemStack = new ItemStack(this, 1); CreativeTabs par2CreativeTabs, NonNullList itemList) {
itemList.add(itemStack); ItemStack uncharged = new ItemStack(ModItems.lapotronpack);
ItemStack charged = new ItemStack(ModItems.lapotronpack);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -9,18 +9,19 @@ import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List;
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem { public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, ITexturedItem {
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge; public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
@ -35,6 +36,11 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
for (int i = 0; i < player.inventory.getSizeInventory(); i++) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
@ -86,12 +92,13 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo, IT
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { public void getSubItems(Item item,
ItemStack itemStack = new ItemStack(this, 1); CreativeTabs par2CreativeTabs, NonNullList itemList) {
itemList.add(itemStack); ItemStack uncharged = new ItemStack(ModItems.lithiumBatpack);
ItemStack charged = new ItemStack(ModItems.lithiumBatpack);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -1,24 +1,22 @@
package techreborn.items.battery; package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.items.ItemTRNoDestroy; import techreborn.items.ItemTRNoDestroy;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List;
public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
String name = "null"; String name;
int maxEnergy = 0; int maxEnergy = 0;
int maxTransfer = 0; int maxTransfer = 0;
int tier = 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 @Override
public double getDurabilityForDisplay(ItemStack stack) { public double getDurabilityForDisplay(ItemStack stack) {
double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack));
@ -70,6 +57,11 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
return true; return true;
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public double getMaxPower(ItemStack stack) { public double getMaxPower(ItemStack stack) {
return maxEnergy; return maxEnergy;

View file

@ -1,8 +1,30 @@
package techreborn.items.battery; 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 class ItemEnergyCrystal extends ItemBattery {
public ItemEnergyCrystal() { public ItemEnergyCrystal() {
super("energyCrystal", 100000, 512, 1); 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);
}
} }

View file

@ -1,8 +1,30 @@
package techreborn.items.battery; 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 class ItemLapotronCrystal extends ItemBattery {
public ItemLapotronCrystal() { public ItemLapotronCrystal() {
super("lapotronCrystal", 1000000, 512, 2); 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);
}
} }

View file

@ -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);
}
}

View file

@ -1,9 +1,31 @@
package techreborn.items.battery; 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 class ItemLithiumBattery extends ItemBattery {
public ItemLithiumBattery() { public ItemLithiumBattery() {
super("lithiumBattery", 100000, 512, 1); 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);
}
} }

View file

@ -1,8 +1,30 @@
package techreborn.items.battery; 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 class ItemReBattery extends ItemBattery {
public ItemReBattery() { public ItemReBattery() {
super("rebattery", 10000, 64, 1); 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);
}
} }

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemAdvancedChainsaw extends ItemChainsaw { public class ItemAdvancedChainsaw extends ItemChainsaw {
@ -12,6 +20,19 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
this.cost = 250; 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 @Override
public boolean canHarvestBlock(IBlockState blockIn) { public boolean canHarvestBlock(IBlockState blockIn) {
return Items.DIAMOND_AXE.canHarvestBlock(blockIn); return Items.DIAMOND_AXE.canHarvestBlock(blockIn);

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemAdvancedDrill extends ItemDrill { public class ItemAdvancedDrill extends ItemDrill {
@ -12,6 +20,19 @@ public class ItemAdvancedDrill extends ItemDrill {
this.cost = 250; 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 @Override
public boolean canHarvestBlock(IBlockState blockIn) { public boolean canHarvestBlock(IBlockState blockIn) {
return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn); return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn);

View file

@ -1,6 +1,14 @@
package techreborn.items.tools; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemAdvancedJackhammer extends ItemJackhammer { public class ItemAdvancedJackhammer extends ItemJackhammer {
@ -11,6 +19,19 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
this.efficiencyOnProperMaterial = 60F; 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 @Override
public String getTextureName(int damage) { public String getTextureName(int damage) {
return "techreborn:items/tool/advancedJackhammer"; return "techreborn:items/tool/advancedJackhammer";

View file

@ -3,10 +3,8 @@ package techreborn.items.tools;
import me.modmuss50.jsonDestroyer.api.IHandHeld; import me.modmuss50.jsonDestroyer.api.IHandHeld;
import me.modmuss50.jsonDestroyer.api.ITexturedItem; import me.modmuss50.jsonDestroyer.api.ITexturedItem;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
@ -18,13 +16,12 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List;
public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem, IHandHeld {
public static int tier = 1; public static int tier = 1;
@ -47,6 +44,11 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI
this.unpoweredSpeed = unpoweredSpeed; this.unpoweredSpeed = unpoweredSpeed;
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
// @Override // @Override
// public boolean onBlockDestroyed(ItemStack stack, World worldIn, // public boolean onBlockDestroyed(ItemStack stack, World worldIn,
// IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { // IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) {
@ -118,17 +120,6 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI
return tier; 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 @Override
public double getDurabilityForDisplay(ItemStack stack) { public double getDurabilityForDisplay(ItemStack stack) {
double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack));

View file

@ -6,17 +6,18 @@ import net.minecraft.init.MobEffects;
import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.items.ItemTextureBase; import techreborn.items.ItemTextureBase;
import java.util.List;
public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo { public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemInfo {
public static int Teir = ConfigTechReborn.CloakingDeviceTier; public static int Teir = ConfigTechReborn.CloakingDeviceTier;
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge; public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
@ -30,6 +31,11 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) {
if (PoweredItem.canUseEnergy(ConfigTechReborn.CloakingDeviceEUTick, itemStack)) { if (PoweredItem.canUseEnergy(ConfigTechReborn.CloakingDeviceEUTick, itemStack)) {
@ -78,13 +84,15 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
return itemStack; return itemStack;
} }
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { public void getSubItems(Item item,
ItemStack itemStack = new ItemStack(this, 1); CreativeTabs par2CreativeTabs, NonNullList itemList) {
itemList.add(itemStack); ItemStack uncharged = new ItemStack(ModItems.cloakingDevice);
ItemStack charged = new ItemStack(ModItems.cloakingDevice);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemDiamondChainsaw extends ItemChainsaw { public class ItemDiamondChainsaw extends ItemChainsaw {
@ -12,6 +20,19 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
this.cost = 250; 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 @Override
public boolean canHarvestBlock(IBlockState blockIn) { public boolean canHarvestBlock(IBlockState blockIn) {
return Items.DIAMOND_AXE.canHarvestBlock(blockIn); return Items.DIAMOND_AXE.canHarvestBlock(blockIn);

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemDiamondDrill extends ItemDrill { public class ItemDiamondDrill extends ItemDrill {
@ -12,6 +20,19 @@ public class ItemDiamondDrill extends ItemDrill {
this.cost = 250; 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 @Override
public boolean canHarvestBlock(IBlockState state) { public boolean canHarvestBlock(IBlockState state) {
return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state); return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state);

View file

@ -1,6 +1,14 @@
package techreborn.items.tools; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemDiamondJackhammer extends ItemJackhammer { public class ItemDiamondJackhammer extends ItemJackhammer {
@ -11,6 +19,19 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
this.efficiencyOnProperMaterial = 16F; 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 @Override
public String getTextureName(int damage) { public String getTextureName(int damage) {
return "techreborn:items/tool/diamondJackhammer"; return "techreborn:items/tool/diamondJackhammer";

View file

@ -16,18 +16,19 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List;
import java.util.Random; import java.util.Random;
public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem, IHandHeld { public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem, IHandHeld {
@ -51,6 +52,11 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
this.unpoweredSpeed = unpoweredSpeed; this.unpoweredSpeed = unpoweredSpeed;
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos,
EntityLivingBase entityLiving) { EntityLivingBase entityLiving) {
@ -116,18 +122,6 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
return tier; 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 @Override
public double getDurabilityForDisplay(ItemStack stack) { public double getDurabilityForDisplay(ItemStack stack) {
double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack));

View file

@ -6,16 +6,17 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List;
/** /**
* Created by modmuss50 on 05/11/2016. * 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" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { public void getSubItems(Item item,
ItemStack itemStack = new ItemStack(this, 1); CreativeTabs par2CreativeTabs, NonNullList itemList) {
itemList.add(itemStack); ItemStack uncharged = new ItemStack(ModItems.electricTreetap);
ItemStack charged = new ItemStack(ModItems.electricTreetap);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -22,6 +22,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
@ -50,6 +51,11 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex
this.tier = tier; this.tier = tier;
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos,
EntityLivingBase entityLiving) { EntityLivingBase entityLiving) {

View file

@ -22,6 +22,7 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.ChatUtils; import reborncore.common.util.ChatUtils;
import techreborn.client.TechRebornCreativeTab; 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" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, public void getSubItems(Item item,
@ -98,10 +104,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
inactiveCharged.getTagCompound().setBoolean("isActive", false); inactiveCharged.getTagCompound().setBoolean("isActive", false);
PoweredItem.setEnergy(getMaxPower(inactiveCharged), inactiveCharged); 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); ItemStack activeCharged = new ItemStack(ModItems.nanosaber);
activeCharged.setTagCompound(new NBTTagCompound()); activeCharged.setTagCompound(new NBTTagCompound());
activeCharged.getTagCompound().setBoolean("isActive", true); activeCharged.getTagCompound().setBoolean("isActive", true);
@ -109,7 +111,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
itemList.add(inactiveUncharged); itemList.add(inactiveUncharged);
itemList.add(inactiveCharged); itemList.add(inactiveCharged);
itemList.add(activeUncharged);
itemList.add(activeCharged); itemList.add(activeCharged);
} }

View file

@ -10,10 +10,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource; import net.minecraft.util.*;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -21,10 +18,12 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.TorchHelper; import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import java.util.List; import java.util.List;
@ -46,6 +45,11 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos,
EntityLivingBase entityLiving) { EntityLivingBase entityLiving) {
@ -123,14 +127,16 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
return 2; return 2;
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { public void getSubItems(Item item,
ItemStack itemStack = new ItemStack(this, 1); CreativeTabs par2CreativeTabs, NonNullList itemList) {
itemList.add(itemStack); ItemStack uncharged = new ItemStack(ModItems.omniTool);
ItemStack charged = new ItemStack(ModItems.omniTool);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -13,19 +13,21 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemPickaxe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.RebornCore; import reborncore.RebornCore;
import reborncore.api.power.IEnergyItemInfo; import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.init.ModItems;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List;
import java.util.Random; import java.util.Random;
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem { public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem {
@ -43,6 +45,11 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
} }
@Override
public int getRGBDurabilityForDisplay(ItemStack stack) {
return PowerSystem.getDisplayPower().colour;
}
@Override @Override
public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos,
EntityLivingBase entityLiving) { EntityLivingBase entityLiving) {
@ -118,17 +125,17 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
return 2; return 2;
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubItems(Item item, public void getSubItems(Item item,
CreativeTabs par2CreativeTabs, List itemList) { CreativeTabs par2CreativeTabs, NonNullList itemList) {
ItemStack itemStack = new ItemStack(this, 1); ItemStack uncharged = new ItemStack(ModItems.rockCutter);
itemStack.addEnchantment(Enchantments.SILK_TOUCH, 1); ItemStack charged = new ItemStack(ModItems.rockCutter);
itemList.add(itemStack);
ItemStack charged = new ItemStack(this, 1);
charged.addEnchantment(Enchantments.SILK_TOUCH, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged); PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(uncharged);
itemList.add(charged); itemList.add(charged);
} }

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemSteelChainsaw extends ItemChainsaw { public class ItemSteelChainsaw extends ItemChainsaw {
@ -12,6 +20,19 @@ public class ItemSteelChainsaw extends ItemChainsaw {
this.cost = 50; 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 @Override
public boolean canHarvestBlock(IBlockState state) { public boolean canHarvestBlock(IBlockState state) {
return Items.IRON_AXE.canHarvestBlock(state); return Items.IRON_AXE.canHarvestBlock(state);

View file

@ -1,8 +1,16 @@
package techreborn.items.tools; package techreborn.items.tools;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemSteelDrill extends ItemDrill { public class ItemSteelDrill extends ItemDrill {
@ -12,6 +20,19 @@ public class ItemSteelDrill extends ItemDrill {
this.cost = 50; 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 @Override
public boolean canHarvestBlock(IBlockState state) { public boolean canHarvestBlock(IBlockState state) {
return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state); return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state);

View file

@ -1,6 +1,14 @@
package techreborn.items.tools; 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.config.ConfigTechReborn;
import techreborn.init.ModItems;
public class ItemSteelJackhammer extends ItemJackhammer { public class ItemSteelJackhammer extends ItemJackhammer {
@ -11,6 +19,19 @@ public class ItemSteelJackhammer extends ItemJackhammer {
this.efficiencyOnProperMaterial = 12F; 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 @Override
public String getTextureName(int damage) { public String getTextureName(int damage) {
return "techreborn:items/tool/steelJackhammer"; return "techreborn:items/tool/steelJackhammer";

View file

@ -8,7 +8,7 @@
"predicate": { "predicate": {
"techreborn:empty": 1 "techreborn:empty": 1
}, },
"model": "techreborn:item/lapotronOrbEmpty" "model": "techreborn:item/lapotronicOrbEmpty"
} }
] ]
} }