Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."

This reverts commit be4f10b975.

# Conflicts:
#	src/main/java/techreborn/init/ModBlocks.java
This commit is contained in:
modmuss50 2016-08-10 00:29:47 +01:00
parent 91945c8dc9
commit 22fd152ec9
63 changed files with 2123 additions and 2154 deletions

View file

@ -2,99 +2,105 @@ package techreborn.items.battery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextFormatting;
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.util.PowerLocalization;
import reborncore.common.powerSystem.PoweredItem;
import techreborn.items.ItemTRNoDestroy;
import techreborn.power.EnergyItem;
import javax.annotation.Nullable;
import java.util.List;
public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo
{
int maxEnergy = 0;
int maxTransfer = 0;
int tier = 0;
String name = "null";
int maxEnergy = 0;
int maxTransfer = 0;
int tier = 0;
public ItemBattery(String name, int maxEnergy, int maxTransfer, int tier)
{
super();
setMaxStackSize(1);
setMaxDamage(1);
setUnlocalizedName("techreborn."+name);
this.name=name;
this.maxEnergy=maxEnergy;
this.maxTransfer=maxTransfer;
this.tier=tier;
this.addPropertyOverride(new ResourceLocation("techreborn:empty"), new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT) public float apply(ItemStack stack, @Nullable World worldIn,
@Nullable EntityLivingBase entityIn)
{
if (stack != null && PoweredItem.getEnergy(stack) == 0.0)
{
return 1.0F;
}
return 0.0F;
}
});
}
public ItemBattery(String name, int maxEnergy, int maxTransfer, int tier) {
super();
setMaxStackSize(1);
setMaxDamage(1);
setUnlocalizedName("techreborn." + name);
this.maxEnergy = maxEnergy;
this.maxTransfer = maxTransfer;
this.tier = tier;
this.addPropertyOverride(new ResourceLocation("techreborn:empty"), new IItemPropertyGetter() {
@SideOnly(Side.CLIENT)
public float apply(ItemStack stack, @Nullable World worldIn,
@Nullable EntityLivingBase entityIn) {
if (stack != null && EnergyItem.getEnergy(stack) == 0.0) {
return 1.0F;
}
return 0.0F;
}
});
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList)
{
ItemStack itemStack = new ItemStack(this, 1);
itemList.add(itemStack);
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> itemList) {
ItemStack itemStack = new ItemStack(this, 1);
itemList.add(itemStack);
ItemStack charged = new ItemStack(this, 1);
PoweredItem.setEnergy(getMaxPower(charged), charged);
itemList.add(charged);
}
ItemStack charged = new ItemStack(this, 1);
EnergyItem.setEnergy(getMaxPower(charged), charged);
itemList.add(charged);
}
@Override
public double getDurabilityForDisplay(ItemStack stack)
{
double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack));
return 1 - charge;
@Override
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
String max = PowerLocalization.getLocalizedPower(getMaxPower(stack));
String energy = PowerLocalization.getLocalizedPower(EnergyItem.getEnergy(stack));
tooltip.add(TextFormatting.GRAY + energy + " / " + max);
}
}
@Override
public boolean showDurabilityBar(ItemStack stack) {
return true;
}
@Override
public boolean showDurabilityBar(ItemStack stack)
{
return true;
}
@Override
public double getDurabilityForDisplay(ItemStack stack) {
return 1 - (EnergyItem.getEnergy(stack) / getMaxPower(stack));
}
@Override
public double getMaxPower(ItemStack stack)
{
return maxEnergy;
}
@Override
public double getMaxPower(ItemStack stack) {
return maxEnergy;
}
@Override
public boolean canAcceptEnergy(ItemStack stack)
{
return true;
}
@Override
public double getMaxTransfer(ItemStack stack) {
return maxTransfer;
}
@Override
public boolean canProvideEnergy(ItemStack stack)
{
return true;
}
@Override
public int getStackTier(ItemStack stack) {
return tier;
}
@Override
public boolean canAcceptEnergy(ItemStack stack) {
return true;
}
@Override
public boolean canProvideEnergy(ItemStack stack) {
return true;
}
@Override
public double getMaxTransfer(ItemStack stack)
{
return maxTransfer;
}
@Override
public int getStackTier(ItemStack stack)
{
return tier;
}
}

View file

@ -5,5 +5,4 @@ public class ItemEnergyCrystal extends ItemBattery {
public ItemEnergyCrystal() {
super("energyCrystal", 100000, 512, 1);
}
}

View file

@ -5,5 +5,4 @@ public class ItemLapotronCrystal extends ItemBattery {
public ItemLapotronCrystal() {
super("lapotronCrystal", 1000000, 512, 2);
}
}

View file

@ -5,6 +5,5 @@ public class ItemLithiumBattery extends ItemBattery {
public ItemLithiumBattery() {
super("lithiumBattery", 100000, 512, 1);
}
}

View file

@ -1,9 +1,10 @@
package techreborn.items.battery;
public class ItemReBattery extends ItemBattery {
public class ItemReBattery extends ItemBattery
{
public ItemReBattery() {
public ItemReBattery()
{
super("rebattery", 10000, 64, 1);
}
}