Update to support RC changes
This commit is contained in:
parent
f3726fd174
commit
0cf3e43992
28 changed files with 29 additions and 169 deletions
|
@ -44,7 +44,6 @@ import techreborn.init.ModItems;
|
|||
public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
||||
|
||||
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
|
||||
public static final int tier = ConfigTechReborn.LapotronPackTier;
|
||||
public double transferLimit = 100000;
|
||||
|
||||
public ItemLapotronPack() {
|
||||
|
@ -80,11 +79,6 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo {
|
|||
return transferLimit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item,
|
||||
|
|
|
@ -43,7 +43,6 @@ import techreborn.init.ModItems;
|
|||
public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
||||
|
||||
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
|
||||
public static final int tier = ConfigTechReborn.LithiumBatpackTier;
|
||||
public double transferLimit = 10000;
|
||||
|
||||
public ItemLithiumBatpack() {
|
||||
|
@ -97,11 +96,6 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
|||
return transferLimit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -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" })
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
|||
|
||||
public ItemAdvancedChainsaw() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.advancedChainsaw", ConfigTechReborn.AdvancedChainsawCharge,
|
||||
ConfigTechReborn.AdvancedDrillTier, 4.0F);
|
||||
4.0F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ public class ItemAdvancedDrill extends ItemDrill {
|
|||
|
||||
public ItemAdvancedDrill() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.advancedDrill", ConfigTechReborn.AdvancedDrillCharge,
|
||||
ConfigTechReborn.AdvancedDrillTier, 4.0F, 20F);
|
||||
4.0F, 20F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,8 +36,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemAdvancedJackhammer extends ItemJackhammer {
|
||||
|
||||
public ItemAdvancedJackhammer() {
|
||||
super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge,
|
||||
ConfigTechReborn.AdvancedJackhammerTier);
|
||||
super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge);
|
||||
this.cost = 250;
|
||||
this.efficiencyOnProperMaterial = 60F;
|
||||
}
|
||||
|
|
|
@ -46,14 +46,13 @@ import java.util.Random;
|
|||
|
||||
public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
||||
|
||||
public static int tier = 1;
|
||||
public int maxCharge = 1;
|
||||
public int cost = 250;
|
||||
public float unpoweredSpeed = 2.0F;
|
||||
public double transferLimit = 100;
|
||||
public boolean isBreaking = false;
|
||||
|
||||
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, int tier,
|
||||
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity,
|
||||
float unpoweredSpeed) {
|
||||
super(material);
|
||||
efficiencyOnProperMaterial = 20F;
|
||||
|
@ -61,7 +60,6 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
|||
setMaxStackSize(1);
|
||||
setUnlocalizedName(unlocalizedName);
|
||||
this.maxCharge = energyCapacity;
|
||||
this.tier = tier;
|
||||
this.unpoweredSpeed = unpoweredSpeed;
|
||||
|
||||
this.addPropertyOverride(new ResourceLocation("techreborn:animated"), new IItemPropertyGetter() {
|
||||
|
@ -125,9 +123,4 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo {
|
|||
return transferLimit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -41,7 +41,6 @@ import techreborn.init.ModItems;
|
|||
import techreborn.items.ItemTRNoDestroy;
|
||||
|
||||
public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemInfo {
|
||||
public static int Teir = ConfigTechReborn.CloakingDeviceTier;
|
||||
public static int MaxCharge = ConfigTechReborn.CloakingDeviceCharge;
|
||||
public static int Limit = 100;
|
||||
public static boolean isActive;
|
||||
|
@ -85,11 +84,6 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn
|
|||
return Limit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return Teir;
|
||||
}
|
||||
|
||||
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
|
||||
ItemStack itemstack1 = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
|||
|
||||
public ItemDiamondChainsaw() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondChainsaw", ConfigTechReborn.DiamondChainsawCharge,
|
||||
ConfigTechReborn.DiamondChainsawTier, 2.5F);
|
||||
2.5F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemDiamondDrill extends ItemDrill {
|
|||
|
||||
public ItemDiamondDrill() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondDrill", ConfigTechReborn.DiamondDrillCharge,
|
||||
ConfigTechReborn.DiamondDrillTier, 0.5F, 15F);
|
||||
0.5F, 15F);
|
||||
this.cost = 250;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,8 +36,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemDiamondJackhammer extends ItemJackhammer {
|
||||
|
||||
public ItemDiamondJackhammer() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge,
|
||||
ConfigTechReborn.DiamondJackhammerTier);
|
||||
super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge);
|
||||
this.cost = 100;
|
||||
this.efficiencyOnProperMaterial = 16F;
|
||||
}
|
||||
|
|
|
@ -41,20 +41,18 @@ import java.util.Random;
|
|||
|
||||
public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
|
||||
|
||||
public static int tier = 1;
|
||||
public int maxCharge = 1;
|
||||
public int cost = 250;
|
||||
public float unpoweredSpeed = 2.0F;
|
||||
public double transferLimit = 100;
|
||||
|
||||
public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, int tier, float unpoweredSpeed, float efficiencyOnProperMaterial) {
|
||||
public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) {
|
||||
super(material);
|
||||
this.efficiencyOnProperMaterial = efficiencyOnProperMaterial;
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
setMaxStackSize(1);
|
||||
setUnlocalizedName(unlocalizedName);
|
||||
this.maxCharge = energyCapacity;
|
||||
this.tier = tier;
|
||||
this.unpoweredSpeed = unpoweredSpeed;
|
||||
}
|
||||
|
||||
|
@ -112,9 +110,4 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo {
|
|||
return transferLimit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -92,11 +92,6 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
|
|||
return 200;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
|
|
@ -47,12 +47,11 @@ import java.util.Random;
|
|||
|
||||
public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
||||
|
||||
public static int tier = 1;
|
||||
public int maxCharge = 1;
|
||||
public int cost = 250;
|
||||
public double transferLimit = 100;
|
||||
|
||||
public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity, int tier) {
|
||||
public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) {
|
||||
super(material);
|
||||
efficiencyOnProperMaterial = 20F;
|
||||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -60,7 +59,6 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
|||
setMaxDamage(240);
|
||||
setUnlocalizedName(unlocalizedName);
|
||||
this.maxCharge = energyCapacity;
|
||||
this.tier = tier;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -118,11 +116,6 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
|||
return transferLimit;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return tier;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
|
|
@ -217,8 +217,4 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
|||
return 512;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -50,7 +50,6 @@ import java.util.List;
|
|||
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
||||
|
||||
public static final int maxCharge = ConfigTechReborn.OmniToolCharge;
|
||||
public static final int tier = ConfigTechReborn.OmniToolTier;
|
||||
public int cost = 100;
|
||||
public int hitCost = 125;
|
||||
|
||||
|
@ -135,11 +134,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
|||
return 200;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
|
|
|
@ -51,7 +51,6 @@ import java.util.Random;
|
|||
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
||||
|
||||
public static final int maxCharge = ConfigTechReborn.RockCutterCharge;
|
||||
public static final int tier = ConfigTechReborn.RockCutterTier;
|
||||
public int cost = 500;
|
||||
|
||||
public ItemRockCutter() {
|
||||
|
@ -132,10 +131,6 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
return 200;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getStackTier(ItemStack stack) {
|
||||
return 2;
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "rawtypes", "unchecked" })
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
|||
|
||||
public ItemSteelChainsaw() {
|
||||
super(ToolMaterial.IRON, "techreborn.ironChainsaw", ConfigTechReborn.IronChainsawCharge,
|
||||
ConfigTechReborn.IronChainsawTier, 2.0F);
|
||||
2.0F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ public class ItemSteelDrill extends ItemDrill {
|
|||
|
||||
public ItemSteelDrill() {
|
||||
super(ToolMaterial.IRON, "techreborn.ironDrill", ConfigTechReborn.IronDrillCharge,
|
||||
ConfigTechReborn.IronDrillTier, 0.5F, 10F);
|
||||
0.5F, 10F);
|
||||
this.cost = 50;
|
||||
}
|
||||
|
||||
|
|
|
@ -36,8 +36,7 @@ import techreborn.init.ModItems;
|
|||
public class ItemSteelJackhammer extends ItemJackhammer {
|
||||
|
||||
public ItemSteelJackhammer() {
|
||||
super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge,
|
||||
ConfigTechReborn.SteelJackhammerTier);
|
||||
super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge);
|
||||
this.cost = 50;
|
||||
this.efficiencyOnProperMaterial = 12F;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue