This commit is contained in:
modmuss50 2019-06-04 12:05:18 +01:00
parent e8396dbc33
commit d18d1b820e
65 changed files with 287 additions and 520 deletions

View file

@ -119,11 +119,6 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo
return PowerSystem.getDisplayPower().colour;
}
@Override
@Nullable
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) {
return new PoweredItemContainerProvider(stack);
}
// IEnergyItemInfo
@Override

View file

@ -38,6 +38,7 @@ import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.ItemPowerManager;
import reborncore.common.util.ItemDurabilityExtensions;
import reborncore.common.util.ItemUtils;
import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn;
@ -45,7 +46,7 @@ import techreborn.init.TRContent;
import javax.annotation.Nullable;
public class ItemLapotronicOrbpack extends ArmorItem implements IEnergyItemInfo {
public class ItemLapotronicOrbpack extends ArmorItem implements IEnergyItemInfo, ItemDurabilityExtensions {
// 400M FE maxCharge and 100k FE\t charge rate. Fully charged in 3 mins.
public static final int maxCharge = ConfigTechReborn.LapotronPackCharge;
@ -92,13 +93,6 @@ public class ItemLapotronicOrbpack extends ArmorItem implements IEnergyItemInfo
return PowerSystem.getDisplayPower().colour;
}
@Override
@Nullable
public ICapabilityProvider initCapabilities(ItemStack stack,
@Nullable
CompoundTag nbt) {
return new PoweredItemContainerProvider(stack);
}
@Override
@Environment(EnvType.CLIENT)

View file

@ -37,8 +37,8 @@ import net.fabricmc.api.Environment;
import reborncore.api.power.IEnergyItemInfo;
import reborncore.common.powerSystem.ExternalPowerSystems;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.PoweredItemContainerProvider;
import reborncore.common.powerSystem.ItemPowerManager;
import reborncore.common.util.ItemDurabilityExtensions;
import reborncore.common.util.ItemUtils;
import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn;
@ -46,7 +46,7 @@ import techreborn.init.TRContent;
import javax.annotation.Nullable;
public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo {
public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo, ItemDurabilityExtensions {
// 8M FE maxCharge and 2k FE\t charge rate. Fully charged in 3 mins.
public static final int maxCharge = ConfigTechReborn.LithiumBatpackCharge;
@ -93,12 +93,6 @@ public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo
return PowerSystem.getDisplayPower().colour;
}
@Override
@Nullable
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) {
return new PoweredItemContainerProvider(stack);
}
@Override
@Environment(EnvType.CLIENT)
public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) {

View file

@ -29,6 +29,7 @@ import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import reborncore.common.util.ItemDurabilityExtensions;
import reborncore.common.util.ItemUtils;
import techreborn.TechReborn;
import techreborn.events.TRRecipeHandler;
@ -36,7 +37,7 @@ import techreborn.events.TRRecipeHandler;
/**
* Created by modmuss50 on 26/02/2016.
*/
public class ItemTRArmour extends ArmorItem {
public class ItemTRArmour extends ArmorItem implements ItemDurabilityExtensions {
String repairOreDict = "";