From b8d24b5c2de7b8916f455fc51a8bbb8e2a61ac12 Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 20 Aug 2024 16:30:15 +0200 Subject: [PATCH] battery packs --- .../java/api/hbm/energymk2/IBatteryItem.java | 2 +- .../com/hbm/blocks/generic/HEVBattery.java | 2 +- .../java/com/hbm/handler/ArmorModHandler.java | 20 ++++++++++++++- src/main/java/com/hbm/items/ModItems.java | 3 +++ .../com/hbm/items/armor/ArmorFSBPowered.java | 24 ++++++++++-------- .../java/com/hbm/items/armor/ArmorHEV.java | 2 +- .../java/com/hbm/items/food/ItemPancake.java | 2 +- .../com/hbm/items/machine/ItemBattery.java | 9 ++++--- .../hbm/items/machine/ItemSelfcharger.java | 2 +- .../com/hbm/items/special/ItemGlitch.java | 2 +- .../com/hbm/items/special/ItemPotatos.java | 2 +- .../com/hbm/items/tool/ItemFusionCore.java | 2 +- .../hbm/items/tool/ItemSwordAbilityPower.java | 2 +- .../hbm/items/tool/ItemToolAbilityPower.java | 2 +- .../weapon/gununified/ItemEnergyGunBase.java | 6 ++--- src/main/java/com/hbm/lib/Library.java | 2 +- .../bomb/TileEntityNukeBalefire.java | 4 +-- .../tileentity/machine/TileEntityCharger.java | 4 +-- .../machine/TileEntityMachineDiesel.java | 2 +- .../storage/TileEntityMachineBattery.java | 2 +- src/main/java/com/hbm/util/BobMathUtil.java | 11 ++++++++ src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../hbm/textures/items/armor_battery.png | Bin 367 -> 403 bytes .../hbm/textures/items/armor_battery_base.png | Bin 0 -> 367 bytes 25 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/armor_battery_base.png diff --git a/src/main/java/api/hbm/energymk2/IBatteryItem.java b/src/main/java/api/hbm/energymk2/IBatteryItem.java index 19202cfa1..d0d5931b7 100644 --- a/src/main/java/api/hbm/energymk2/IBatteryItem.java +++ b/src/main/java/api/hbm/energymk2/IBatteryItem.java @@ -10,7 +10,7 @@ public interface IBatteryItem { public void setCharge(ItemStack stack, long i); public void dischargeBattery(ItemStack stack, long i); public long getCharge(ItemStack stack); - public long getMaxCharge(); + public long getMaxCharge(ItemStack stack); public long getChargeRate(); public long getDischargeRate(); diff --git a/src/main/java/com/hbm/blocks/generic/HEVBattery.java b/src/main/java/com/hbm/blocks/generic/HEVBattery.java index e65f03038..388728e79 100644 --- a/src/main/java/com/hbm/blocks/generic/HEVBattery.java +++ b/src/main/java/com/hbm/blocks/generic/HEVBattery.java @@ -67,7 +67,7 @@ public class HEVBattery extends Block { if(st.getItem() instanceof IBatteryItem) { - long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(); + long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st); long charge = ((IBatteryItem) st.getItem()).getCharge(st); long newcharge = Math.min(charge + 150000, maxcharge); diff --git a/src/main/java/com/hbm/handler/ArmorModHandler.java b/src/main/java/com/hbm/handler/ArmorModHandler.java index f7b8780ca..04877a1df 100644 --- a/src/main/java/com/hbm/handler/ArmorModHandler.java +++ b/src/main/java/com/hbm/handler/ArmorModHandler.java @@ -134,7 +134,7 @@ public class ArmorModHandler { } /** - * Does what the name implies + * Does what the name implies. Returns true if the stack has NBT and that NBT has the MOD_COMPOUND_KEY tag. * @param armor * @return */ @@ -171,4 +171,22 @@ public class ArmorModHandler { return slots; } + + public static ItemStack pryMod(ItemStack armor, int slot) { + + if(!hasMods(armor)) + return null; + + NBTTagCompound nbt = armor.getTagCompound(); + NBTTagCompound mods = nbt.getCompoundTag(MOD_COMPOUND_KEY); + NBTTagCompound cmp = mods.getCompoundTag(MOD_SLOT_KEY + slot); + ItemStack stack = ItemStack.loadItemStackFromNBT(cmp); + + if(stack != null) + return stack; + + removeMod(armor, slot); + + return null; + } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f3309fb32..d20976e44 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2174,6 +2174,7 @@ public class ModItems { public static Item card_aos; public static Item card_qos; public static Item australium_iii; + public static Item armor_battery; public static Item hazmat_helmet; public static Item hazmat_plate; @@ -3353,6 +3354,7 @@ public class ModItems { card_aos = new ItemModCard().setUnlocalizedName("card_aos").setTextureName(RefStrings.MODID + ":card_aos"); card_qos = new ItemModCard().setUnlocalizedName("card_qos").setTextureName(RefStrings.MODID + ":card_qos"); australium_iii = new ItemModShield(25F).setUnlocalizedName("australium_iii").setTextureName(RefStrings.MODID + ":australium_iii"); + armor_battery = new ItemModBattery(1.25D).setUnlocalizedName("armor_battery").setTextureName(RefStrings.MODID + ":armor_battery"); cap_nuka = new Item().setUnlocalizedName("cap_nuka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_nuka"); cap_quantum = new Item().setUnlocalizedName("cap_quantum").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":cap_quantum"); @@ -7388,6 +7390,7 @@ public class ModItems { GameRegistry.registerItem(card_aos, card_aos.getUnlocalizedName()); GameRegistry.registerItem(card_qos, card_qos.getUnlocalizedName()); GameRegistry.registerItem(australium_iii, australium_iii.getUnlocalizedName()); + GameRegistry.registerItem(armor_battery, armor_battery.getUnlocalizedName()); //Chaos GameRegistry.registerItem(chocolate_milk, chocolate_milk.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java index 0daddf0fb..d5368b5f3 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java @@ -2,6 +2,7 @@ package com.hbm.items.armor; import java.util.List; +import com.hbm.handler.ArmorModHandler; import com.hbm.util.BobMathUtil; import api.hbm.energymk2.IBatteryItem; @@ -30,9 +31,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { - - list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(maxPower)); - + list.add("Charge: " + BobMathUtil.getShortNumber(getCharge(stack)) + " / " + BobMathUtil.getShortNumber(getMaxCharge(stack))); super.addInformation(stack, player, list, ext); } @@ -72,7 +71,7 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { stack.stackTagCompound.setLong("charge", stack.stackTagCompound.getLong("charge") - i); } else { stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", this.maxPower - i); + stack.stackTagCompound.setLong("charge", getMaxCharge(stack) - i); } if(stack.stackTagCompound.getLong("charge") < 0) @@ -84,10 +83,10 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { public long getCharge(ItemStack stack) { if(stack.getItem() instanceof ArmorFSBPowered) { if(stack.hasTagCompound()) { - return stack.stackTagCompound.getLong("charge"); + return Math.min(stack.stackTagCompound.getLong("charge"), getMaxCharge(stack)); } else { stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ArmorFSBPowered) stack.getItem()).maxPower); + stack.stackTagCompound.setLong("charge", getMaxCharge(stack)); return stack.stackTagCompound.getLong("charge"); } } @@ -97,18 +96,23 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { @Override public boolean showDurabilityBar(ItemStack stack) { - - return getCharge(stack) < maxPower; + return getCharge(stack) < getMaxCharge(stack); } @Override public double getDurabilityForDisplay(ItemStack stack) { - return 1 - (double) getCharge(stack) / (double) maxPower; + return 1 - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { + if(ArmorModHandler.hasMods(stack)) { + ItemStack mod = ArmorModHandler.pryMod(stack, ArmorModHandler.battery); + if(mod != null && mod.getItem() instanceof ItemModBattery) { + return (long) (maxPower * ((ItemModBattery) mod.getItem()).mod); + } + } return maxPower; } diff --git a/src/main/java/com/hbm/items/armor/ArmorHEV.java b/src/main/java/com/hbm/items/armor/ArmorHEV.java index df2666d68..5aa336fa9 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHEV.java +++ b/src/main/java/com/hbm/items/armor/ArmorHEV.java @@ -108,7 +108,7 @@ public class ArmorHEV extends ArmorFSBPowered { ItemStack armor = player.inventory.armorInventory[i]; ArmorFSBPowered item = ((ArmorFSBPowered) player.inventory.armorInventory[i].getItem()); - c += (double) item.getCharge(armor) / (double) item.getMaxCharge(); + c += (double) item.getCharge(armor) / (double) item.getMaxCharge(armor); } int aX = (int) (70 / scale); diff --git a/src/main/java/com/hbm/items/food/ItemPancake.java b/src/main/java/com/hbm/items/food/ItemPancake.java index 784ee8995..2498e393c 100644 --- a/src/main/java/com/hbm/items/food/ItemPancake.java +++ b/src/main/java/com/hbm/items/food/ItemPancake.java @@ -30,7 +30,7 @@ public class ItemPancake extends ItemFood { continue; if(st.getItem() instanceof IBatteryItem) { - ((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge()); + ((IBatteryItem)st.getItem()).setCharge(st, ((IBatteryItem)st.getItem()).getMaxCharge(st)); } } } diff --git a/src/main/java/com/hbm/items/machine/ItemBattery.java b/src/main/java/com/hbm/items/machine/ItemBattery.java index cefa97fce..fe31ec3b9 100644 --- a/src/main/java/com/hbm/items/machine/ItemBattery.java +++ b/src/main/java/com/hbm/items/machine/ItemBattery.java @@ -105,14 +105,17 @@ public class ItemBattery extends Item implements IBatteryItem { return 0; } - public long getMaxCharge() { + @Override + public long getMaxCharge(ItemStack stack) { return maxCharge; } + @Override public long getChargeRate() { return chargeRate; } + @Override public long getDischargeRate() { return dischargeRate; } @@ -134,7 +137,7 @@ public class ItemBattery extends Item implements IBatteryItem { if(item instanceof ItemBattery) { ItemStack stack = new ItemStack(item); stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge()); + stack.stackTagCompound.setLong("charge", ((ItemBattery) item).getMaxCharge(stack)); return stack.copy(); } @@ -146,7 +149,7 @@ public class ItemBattery extends Item implements IBatteryItem { } public double getDurabilityForDisplay(ItemStack stack) { - return 1D - (double) getCharge(stack) / (double) getMaxCharge(); + return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override diff --git a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java b/src/main/java/com/hbm/items/machine/ItemSelfcharger.java index 67c05fb7b..419f5401d 100644 --- a/src/main/java/com/hbm/items/machine/ItemSelfcharger.java +++ b/src/main/java/com/hbm/items/machine/ItemSelfcharger.java @@ -38,7 +38,7 @@ public class ItemSelfcharger extends Item implements IBatteryItem { } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return charge; } diff --git a/src/main/java/com/hbm/items/special/ItemGlitch.java b/src/main/java/com/hbm/items/special/ItemGlitch.java index 715eacd17..4145b0fbf 100644 --- a/src/main/java/com/hbm/items/special/ItemGlitch.java +++ b/src/main/java/com/hbm/items/special/ItemGlitch.java @@ -241,7 +241,7 @@ public class ItemGlitch extends Item implements IBatteryItem { @Override public void setCharge(ItemStack stack, long i) { } @Override public void dischargeBattery(ItemStack stack, long i) { } @Override public long getCharge(ItemStack stack) { return 200; } - @Override public long getMaxCharge() { return 200; } + @Override public long getMaxCharge(ItemStack stack) { return 200; } @Override public long getChargeRate() { return 0; } @Override public long getDischargeRate() { return 200; } } diff --git a/src/main/java/com/hbm/items/special/ItemPotatos.java b/src/main/java/com/hbm/items/special/ItemPotatos.java index 69aefa465..46c636689 100644 --- a/src/main/java/com/hbm/items/special/ItemPotatos.java +++ b/src/main/java/com/hbm/items/special/ItemPotatos.java @@ -28,7 +28,7 @@ public class ItemPotatos extends ItemBattery { if(p.getHeldItem() == stack) { - float pitch = (float)getCharge(stack) / (float)this.getMaxCharge() * 0.5F + 0.5F; + float pitch = (float)getCharge(stack) / (float)this.getMaxCharge(stack) * 0.5F + 0.5F; world.playSoundAtEntity(p, "hbm:potatos.random", 1.0F, pitch); setTimer(stack, 200 + itemRand.nextInt(100)); diff --git a/src/main/java/com/hbm/items/tool/ItemFusionCore.java b/src/main/java/com/hbm/items/tool/ItemFusionCore.java index 473f6f62b..b72ee8d4f 100644 --- a/src/main/java/com/hbm/items/tool/ItemFusionCore.java +++ b/src/main/java/com/hbm/items/tool/ItemFusionCore.java @@ -33,7 +33,7 @@ public class ItemFusionCore extends Item { if(st.getItem() instanceof IBatteryItem) { - long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(); + long maxcharge = ((IBatteryItem) st.getItem()).getMaxCharge(st); long charge = ((IBatteryItem) st.getItem()).getCharge(st); long newcharge = Math.min(charge + this.charge, maxcharge); diff --git a/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java b/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java index 674fb7572..943dfd7ab 100644 --- a/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java +++ b/src/main/java/com/hbm/items/tool/ItemSwordAbilityPower.java @@ -106,7 +106,7 @@ public class ItemSwordAbilityPower extends ItemSwordAbility implements IBatteryI } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return maxPower; } diff --git a/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java b/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java index 52b8686b4..c0c025d35 100644 --- a/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java +++ b/src/main/java/com/hbm/items/tool/ItemToolAbilityPower.java @@ -102,7 +102,7 @@ public class ItemToolAbilityPower extends ItemToolAbility implements IBatteryIte } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return maxPower; } diff --git a/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java b/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java index d93a73f4a..554f5a6ea 100644 --- a/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java +++ b/src/main/java/com/hbm/items/weapon/gununified/ItemEnergyGunBase.java @@ -181,7 +181,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { } public double getDurabilityForDisplay(ItemStack stack) { - return 1D - (double) getCharge(stack) / (double) getMaxCharge(); + return 1D - (double) getCharge(stack) / (double) getMaxCharge(stack); } @Override @@ -236,7 +236,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { } @Override - public long getMaxCharge() { + public long getMaxCharge(ItemStack stack) { return mainConfig.maxCharge; } @@ -266,7 +266,7 @@ public class ItemEnergyGunBase extends ItemGunBase implements IBatteryItem { ItemStack stack = new ItemStack(item); stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge()); + stack.stackTagCompound.setLong("charge", ((ItemEnergyGunBase) item).getMaxCharge(stack)); list.add(stack); } diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 6da55124b..828433470 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -243,7 +243,7 @@ public class Library { IBatteryItem battery = (IBatteryItem) slots[index].getItem(); - long batMax = battery.getMaxCharge(); + long batMax = battery.getMaxCharge(slots[index]); long batCharge = battery.getCharge(slots[index]); long batRate = battery.getChargeRate(); long toCharge = Math.min(Math.min(power, batRate), batMax - batCharge); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java index 51bef052f..db18d4bfb 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java @@ -103,12 +103,12 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGU public int getBattery() { if(slots[1] != null && slots[1].getItem() == ModItems.battery_spark && - ((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge()) { + ((IBatteryItem)ModItems.battery_spark).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_spark).getMaxCharge(slots[1])) { return 1; } if(slots[1] != null && slots[1].getItem() == ModItems.battery_trixite && - ((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge()) { + ((IBatteryItem)ModItems.battery_trixite).getCharge(slots[1]) == ((IBatteryItem)ModItems.battery_trixite).getMaxCharge(slots[1])) { return 2; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java index e747c3a5d..6df1f8bf9 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCharger.java @@ -47,7 +47,7 @@ public class TileEntityCharger extends TileEntityLoadedBase implements IEnergyRe if(stack != null && stack.getItem() instanceof IBatteryItem) { IBatteryItem battery = (IBatteryItem) stack.getItem(); - charge += Math.min(battery.getMaxCharge() - battery.getCharge(stack), battery.getChargeRate()); + charge += Math.min(battery.getMaxCharge(stack) - battery.getCharge(stack), battery.getChargeRate()); } } } @@ -127,7 +127,7 @@ public class TileEntityCharger extends TileEntityLoadedBase implements IEnergyRe if(stack != null && stack.getItem() instanceof IBatteryItem) { IBatteryItem battery = (IBatteryItem) stack.getItem(); - long toCharge = Math.min(battery.getMaxCharge() - battery.getCharge(stack), battery.getChargeRate()); + long toCharge = Math.min(battery.getMaxCharge(stack) - battery.getCharge(stack), battery.getChargeRate()); toCharge = Math.min(toCharge, power / 5); battery.chargeBattery(stack, toCharge); power -= toCharge; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 85ebe4747..d36cb4336 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -111,7 +111,7 @@ public class TileEntityMachineDiesel extends TileEntityMachinePolluting implemen } } if(i == 2) { - if(stack.getItem() instanceof IBatteryItem && ((IBatteryItem) stack.getItem()).getCharge(stack) == ((IBatteryItem) stack.getItem()).getMaxCharge()) { + if(stack.getItem() instanceof IBatteryItem && ((IBatteryItem) stack.getItem()).getCharge(stack) == ((IBatteryItem) stack.getItem()).getMaxCharge(stack)) { return true; } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index 665d18317..f61193726 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -141,7 +141,7 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I if(i == 0 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == 0) { return true; } - if(i == 1 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == ((IBatteryItem)itemStack.getItem()).getMaxCharge()) { + if(i == 1 && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == ((IBatteryItem)itemStack.getItem()).getMaxCharge(itemStack)) { return true; } } diff --git a/src/main/java/com/hbm/util/BobMathUtil.java b/src/main/java/com/hbm/util/BobMathUtil.java index dde5fe762..3330cda22 100644 --- a/src/main/java/com/hbm/util/BobMathUtil.java +++ b/src/main/java/com/hbm/util/BobMathUtil.java @@ -206,4 +206,15 @@ public class BobMathUtil { double delta = (beta - alpha + 180) % 360 - 180; return delta < -180 ? delta + 360 : delta; } + + /** Soft peak sine */ + public static double sps(double x) { + return Math.sin(Math.PI / 2D * Math.cos(x)); + } + + /** Square wave sine, make sure squarination is [0;1] */ + public static double sws(double x, double squarination) { + double s = Math.sin(x); + return Math.pow(Math.abs(s), 2 - squarination) / s; + } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index f14a5d786..49512628c 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -119,6 +119,7 @@ armorMod.chestplates=Brustplatten armorMod.helmets=Helme armorMod.leggings=Beinschienen armorMod.insertHere=Rüstung zum Modifizieren einlegen... +armorMod.type.battery=Batterie armorMod.type.boots=Stiefel armorMod.type.chestplate=Brustplatte armorMod.type.cladding=Beschläge @@ -1188,6 +1189,7 @@ item.arc_electrode_burnt.graphite.name=Geschmolzene Graphitelektrode item.arc_electrode_burnt.lanthanium.name=Geschmolzene Lanthanelektrode item.arc_electrode_burnt.saturnite.name=Geschmolzene Saturnitelektrode item.arc_electrode_desh.name=Desh-Elektrode +item.armor_battery.name=Powerrüstung-Akkusatz item.armor_polish.name=ShiningArmor™ Rüstungspolitur item.asbestos_boots.name=Hitzeschutzstiefel item.asbestos_cloth.name=Hitzeschutzanzugsstoff diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index c9f28f764..caa5b6145 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -174,6 +174,7 @@ armorMod.chestplates=Chestplates armorMod.helmets=Helmets armorMod.insertHere=Insert armor to modify... armorMod.leggings=Leggings +armorMod.type.battery=Battery armorMod.type.boots=Boots armorMod.type.chestplate=Chestplate armorMod.type.cladding=Cladding @@ -1900,6 +1901,7 @@ item.arc_electrode_burnt.graphite.name=Molten Graphite Electrode item.arc_electrode_burnt.lanthanium.name=Molten Lanthanium Electrode item.arc_electrode_burnt.saturnite.name=Molten Saturnite Electrode item.arc_electrode_desh.name=Desh Electrode +item.armor_battery.name=Power Armor Battery Pack item.armor_polish.name=ShiningArmor™ Armor Polish item.asbestos_boots.name=Fire Proximity Boots item.asbestos_cloth.name=Fire Proximity Cloth diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery.png b/src/main/resources/assets/hbm/textures/items/armor_battery.png index ad4e8b8af75b426746dd384cb3cb0faa78a80a20..86a0cb9a15a2cf609a9ddea0cc58b4a8ae88c072 100644 GIT binary patch delta 360 zcmV-u0hj*o0+R!fG=EA-L_t(IjbmV-CiwGi>HkMp`~Q=ohY7~$-?;1l<6FxZ-ap;Q z(7$mP(S|U>H0#%wF(}TEX882!E5qBe4-6L@yHFGs`nxgydAIccv*)iE zMg@-^Lr2CXI9qVhHWUN;H}3lX^l#ktztG=}5r6Ii_uzv69&uhM8kTo2 zL3Jx%Jj1H`K8BAUzcQpwsAY&u|I1M5@5Tss!Ks}m;A({=gc%}BW6%s-$Pm_41mS#I z$iTo5gX#rj@b1N1hEp%zVlnV9R3wJs9aJ8x0SpWb4DVjPgJ>2P!fK$9xDW#a15z}i zYZek0f?x?@Tw!+LHh>hs!oa}5@E&R-+=)mwze935P6JLIS;QzPUO-Y3Mlpbafq`M? z+6j!v67IpM1|qwVfdLW7D4OsAWCMl7g&3Akt0P)3UH|}3^?7?}lPsYC0000K~WSeS4Vt~$5x?~(rE+iRYBl+jF*4$!GCS7@TN~s2L%IUWT2i%`2pzIYk zm8L0anzjJfWk!+bc{iYfROU9I>$(68y3B81S6nX^2qC(9bOQh$R(DJeA9tFeTp`bM ztCJ9d7vJZcS3PU=PCy*Tj#8@k^=$zFqA0R1tqE-YMV4hic}RV<2^2yQhGB2-PW=L{ WBXbsJLV)1_0000lG^l+tMf>{UVFd5o8T@xgq)HQ~kk46=;b@TLYj07@w{8jUPN z6h+oM8{G4}FDZ%wpC@iF*GMUydV(ZL>S7@TN~s2L%IUWT2i%`2pzIYkm8L0anzjJf zWk!+bc{iYfROU9I>$(68y3B81S6nX^2qC(9bOQh$R(DJeA9tFeTp`bMtCJ9d7vJZc zS8Mc6Kpe-8QmXg$Z2