Fixed charging \ discharging items items. Closes #1547
This commit is contained in:
parent
ca9a2c9b38
commit
30302e241b
16 changed files with 37 additions and 61 deletions
|
@ -56,12 +56,11 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
|
|
@ -151,12 +151,11 @@ public class ItemAdvancedDrill extends ItemDrill {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -50,12 +50,11 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@ import javax.annotation.Nullable;
|
|||
@RebornRegistry(modID = ModInfo.MOD_ID)
|
||||
public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo {
|
||||
|
||||
@ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in EU)")
|
||||
@ConfigRegistry(config = "items", category = "cloacking_device", key = "ClockingDeviceEnergyUsage", comment = "Cloacking device energy usesage (Value in FE)")
|
||||
public static int usage = 10;
|
||||
|
||||
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
||||
|
|
|
@ -39,8 +39,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemDiamondChainsaw extends ItemChainsaw {
|
||||
|
||||
public ItemDiamondChainsaw() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondChainsaw", ConfigTechReborn.DiamondChainsawCharge,
|
||||
1.0F);
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondChainsaw", ConfigTechReborn.DiamondChainsawCharge, 1.0F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
@ -51,12 +50,11 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemDiamondDrill extends ItemDrill {
|
||||
|
||||
public ItemDiamondDrill() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge,
|
||||
0.5F, 15F);
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge, 0.5F, 15F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
@ -51,12 +50,11 @@ public class ItemDiamondDrill extends ItemDrill {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
|
|
@ -49,12 +49,11 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -59,7 +59,7 @@ import javax.annotation.Nullable;
|
|||
*/
|
||||
public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo {
|
||||
|
||||
public static final int maxCharge = 10000;
|
||||
public static final int maxCharge = 10_000;
|
||||
public static final int tier = 1;
|
||||
public int cost = 20;
|
||||
|
||||
|
|
|
@ -95,12 +95,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
}
|
||||
|
||||
@Override
|
||||
public int getHarvestLevel(ItemStack stack,
|
||||
String toolClass,
|
||||
@Nullable
|
||||
EntityPlayer player,
|
||||
@Nullable
|
||||
IBlockState blockState) {
|
||||
public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState) {
|
||||
if (!stack.isItemEnchanted()) {
|
||||
stack.addEnchantment(Enchantments.SILK_TOUCH, 1);
|
||||
}
|
||||
|
@ -135,9 +130,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
|
||||
@Override
|
||||
@Nullable
|
||||
public ICapabilityProvider initCapabilities(ItemStack stack,
|
||||
@Nullable
|
||||
NBTTagCompound nbt) {
|
||||
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
|
||||
return new PoweredItemContainerProvider(stack);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemSteelChainsaw extends ItemChainsaw {
|
||||
|
||||
public ItemSteelChainsaw() {
|
||||
super(ToolMaterial.IRON, "techreborn.ironChainsaw", ConfigTechReborn.IronChainsawCharge,
|
||||
0.5F);
|
||||
super(ToolMaterial.IRON, "techreborn.ironChainsaw", ConfigTechReborn.IronChainsawCharge, 0.5F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
||||
|
@ -52,12 +51,11 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemSteelDrill extends ItemDrill {
|
||||
|
||||
public ItemSteelDrill() {
|
||||
super(ToolMaterial.IRON, "techreborn.ironDrill", ConfigTechReborn.IronDrillCharge,
|
||||
0.5F, 10F);
|
||||
super(ToolMaterial.IRON, "techreborn.ironDrill", ConfigTechReborn.IronDrillCharge, 0.5F, 10F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
||||
|
@ -52,12 +51,11 @@ public class ItemSteelDrill extends ItemDrill {
|
|||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,18 +44,16 @@ public class ItemSteelJackhammer extends ItemJackhammer {
|
|||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems( CreativeTabs par2CreativeTabs, NonNullList<ItemStack> itemList) {
|
||||
if (!isInCreativeTab(par2CreativeTabs)) {
|
||||
return;
|
||||
}
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
ForgePowerItemManager capEnergy = (ForgePowerItemManager) charged.getCapability(CapabilityEnergy.ENERGY, null);
|
||||
capEnergy.setEnergyStored(capEnergy.getMaxEnergyStored());
|
||||
|
||||
itemList.add(uncharged);
|
||||
itemList.add(stack);
|
||||
itemList.add(charged);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue