Update to support RC changes

This commit is contained in:
modmuss50 2017-06-12 20:06:15 +01:00
parent f3726fd174
commit 0cf3e43992
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
28 changed files with 29 additions and 169 deletions

View file

@ -42,9 +42,8 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
String name;
int maxEnergy = 0;
int maxTransfer = 0;
int tier = 0;
public ItemBattery(String name, int maxEnergy, int maxTransfer, int tier) {
public ItemBattery(String name, int maxEnergy, int maxTransfer) {
super();
setMaxStackSize(1);
setMaxDamage(1);
@ -52,7 +51,6 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
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,
@ -87,9 +85,4 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo {
public double getMaxTransfer(ItemStack stack) {
return maxTransfer;
}
@Override
public int getStackTier(ItemStack stack) {
return tier;
}
}

View file

@ -35,7 +35,7 @@ import techreborn.init.ModItems;
public class ItemEnergyCrystal extends ItemBattery {
public ItemEnergyCrystal() {
super("energyCrystal", 100000, 512, 1);
super("energyCrystal", 100000, 512);
}
@SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -35,7 +35,7 @@ import techreborn.init.ModItems;
public class ItemLapotronCrystal extends ItemBattery {
public ItemLapotronCrystal() {
super("lapotronCrystal", 1000000, 512, 2);
super("lapotronCrystal", 1000000, 512);
}
@SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -36,7 +36,7 @@ import techreborn.init.ModItems;
public class ItemLapotronicOrb extends ItemBattery {
public ItemLapotronicOrb() {
super("lapotronicorb", ConfigTechReborn.LapotronicOrbMaxCharge, 10000, ConfigTechReborn.LapotronicOrbTier);
super("lapotronicorb", ConfigTechReborn.LapotronicOrbMaxCharge, 10000);
}
@SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -35,7 +35,7 @@ import techreborn.init.ModItems;
public class ItemLithiumBattery extends ItemBattery {
public ItemLithiumBattery() {
super("lithiumBattery", 100000, 512, 1);
super("lithiumBattery", 100000, 512);
}
@SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -35,7 +35,7 @@ import techreborn.init.ModItems;
public class ItemReBattery extends ItemBattery {
public ItemReBattery() {
super("rebattery", 10000, 64, 1);
super("rebattery", 10000, 64);
}
@SuppressWarnings({ "rawtypes", "unchecked" })