diff --git a/src/main/java/net/machinemuse/api/IPowerModule.java b/src/main/java/net/machinemuse/api/IPowerModule.java index 86c0f98..c834e66 100644 --- a/src/main/java/net/machinemuse/api/IPowerModule.java +++ b/src/main/java/net/machinemuse/api/IPowerModule.java @@ -24,8 +24,6 @@ public interface IPowerModule { String getDataName(); // Use StatCollector.translateToLocal("module." + m.getUnlocalizedName + ".name") instead - @Deprecated - String getLocalizedName(); double applyPropertyModifiers(NBTTagCompound itemTag, String propertyName, double propertyValue); diff --git a/src/main/java/net/machinemuse/api/ModuleManager.java b/src/main/java/net/machinemuse/api/ModuleManager.java index 0b30c4a..1ea2636 100644 --- a/src/main/java/net/machinemuse/api/ModuleManager.java +++ b/src/main/java/net/machinemuse/api/ModuleManager.java @@ -6,7 +6,6 @@ import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.numina.item.NuminaItemUtils; import net.machinemuse.powersuits.item.IModeChangingModularItem; -import net.machinemuse.utils.MuseItemUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -111,10 +110,7 @@ public class ModuleManager { public static boolean isModuleOnline(NBTTagCompound itemTag, String moduleName) { if (tagHasModule(itemTag, moduleName) && !itemTag.getCompoundTag(moduleName).hasKey(ONLINE)) { return true; - } else if (tagHasModule(itemTag, moduleName) && itemTag.getCompoundTag(moduleName).getBoolean(ONLINE)) { - return true; - } - return false; + } else return tagHasModule(itemTag, moduleName) && itemTag.getCompoundTag(moduleName).getBoolean(ONLINE); } public static void toggleModule(NBTTagCompound itemTag, String name, boolean toggleval) { diff --git a/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java b/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java index d7ed2be..eb3ced9 100644 --- a/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java +++ b/src/main/java/net/machinemuse/general/gui/clickable/ClickableModule.java @@ -44,13 +44,13 @@ public class ClickableModule extends Clickable { public String getLocalizedName(IPowerModule m) { if (m instanceof ILocalizeableModule) return StatCollector.translateToLocal("module." + ((ILocalizeableModule) m).getUnlocalizedName() + ".name"); - return m.getLocalizedName(); + return "module has localization issue"; } public String getLocalizedDescription(IPowerModule m) { if (m instanceof ILocalizeableModule) return StatCollector.translateToLocal("module." + ((ILocalizeableModule) m).getUnlocalizedName() + ".desc"); - return m.getDescription(); + return "module has localization issue"; } @Override diff --git a/src/main/java/net/machinemuse/general/gui/frame/ColourPickerFrame.java b/src/main/java/net/machinemuse/general/gui/frame/ColourPickerFrame.java index 58e80d9..4ce38d3 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/ColourPickerFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/ColourPickerFrame.java @@ -13,9 +13,7 @@ import net.machinemuse.utils.MuseItemUtils; import net.machinemuse.utils.render.GuiIcons; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.util.StatCollector; diff --git a/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java b/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java index 99615e6..a9346ea 100644 --- a/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java +++ b/src/main/java/net/machinemuse/general/gui/frame/KeybindConfigFrame.java @@ -43,9 +43,7 @@ public class KeybindConfigFrame implements IGuiFrame { public KeybindConfigFrame(MuseGui gui, MusePoint2D ul, MusePoint2D br, EntityPlayer player) { modules = new HashSet(); for (ClickableKeybinding kb : KeybindManager.getKeybindings()) { - for (ClickableModule module : kb.getBoundModules()) { - modules.add(module); - } + modules.addAll(kb.getBoundModules()); } this.gui = gui; this.ul = ul; diff --git a/src/main/java/net/machinemuse/powersuits/client/render/modelspec/ModelSpec.java b/src/main/java/net/machinemuse/powersuits/client/render/modelspec/ModelSpec.java index 2867c45..ff19351 100644 --- a/src/main/java/net/machinemuse/powersuits/client/render/modelspec/ModelSpec.java +++ b/src/main/java/net/machinemuse/powersuits/client/render/modelspec/ModelSpec.java @@ -23,7 +23,7 @@ public class ModelSpec extends MuseRegistry this.textures = textures; this.offset = offset; this.rotation = rotation; - this.filename = filename; + ModelSpec.filename = filename; } public void applyOffsetAndRotation() { diff --git a/src/main/java/net/machinemuse/powersuits/common/Config.java b/src/main/java/net/machinemuse/powersuits/common/Config.java index cfd3492..2dbda7d 100644 --- a/src/main/java/net/machinemuse/powersuits/common/Config.java +++ b/src/main/java/net/machinemuse/powersuits/common/Config.java @@ -4,9 +4,9 @@ import com.google.gson.Gson; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; +import net.machinemuse.api.IModularItem; import net.machinemuse.api.IPowerModule; import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.IModularItem; import net.machinemuse.numina.basemod.Numina; import net.machinemuse.numina.general.MuseLogger; import net.machinemuse.powersuits.common.proxy.CommonProxy; diff --git a/src/main/java/net/machinemuse/powersuits/common/ModularPowersuits.java b/src/main/java/net/machinemuse/powersuits/common/ModularPowersuits.java index af26ac5..4203648 100644 --- a/src/main/java/net/machinemuse/powersuits/common/ModularPowersuits.java +++ b/src/main/java/net/machinemuse/powersuits/common/ModularPowersuits.java @@ -5,21 +5,9 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.EntityRegistry; import net.machinemuse.powersuits.common.proxy.CommonProxy; -import net.machinemuse.powersuits.entity.EntityLuxCapacitor; -import net.machinemuse.powersuits.entity.EntityPlasmaBolt; -import net.machinemuse.powersuits.entity.EntitySpinningBlade; -import net.machinemuse.powersuits.event.HarvestEventHandler; -import net.machinemuse.powersuits.event.MovementManager; -import net.machinemuse.powersuits.network.packets.MPSPacketList; -import net.machinemuse.powersuits.powermodule.tool.TerminalHandler; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import javax.annotation.Nonnull; -import java.io.File; import static net.machinemuse.powersuits.common.ModularPowersuits.MODID; import static net.machinemuse.powersuits.common.ModularPowersuits.VERSION; diff --git a/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java b/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java index d89543b..b2a78f7 100644 --- a/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java +++ b/src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java @@ -77,9 +77,9 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new MovementManager()); } - public void registerHandlers() {}; + public void registerHandlers() {} - public void registerRenderers() {}; + public void registerRenderers() {} - public void sendModeChange(int dMode, String newMode) {}; + public void sendModeChange(int dMode, String newMode) {} } \ No newline at end of file diff --git a/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java b/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java index cace541..860e1b6 100644 --- a/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java +++ b/src/main/java/net/machinemuse/powersuits/control/KeybindKeyHandler.java @@ -10,7 +10,6 @@ import net.machinemuse.powersuits.item.IModeChangingModularItem; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/net/machinemuse/powersuits/event/ClientTickHandler.java b/src/main/java/net/machinemuse/powersuits/event/ClientTickHandler.java index 10d3ace..c2a6b0f 100644 --- a/src/main/java/net/machinemuse/powersuits/event/ClientTickHandler.java +++ b/src/main/java/net/machinemuse/powersuits/event/ClientTickHandler.java @@ -11,7 +11,6 @@ import net.machinemuse.general.gui.WaterMeter; import net.machinemuse.general.gui.clickable.ClickableKeybinding; import net.machinemuse.numina.network.MusePacket; import net.machinemuse.numina.network.PacketSender; -import net.machinemuse.powersuits.block.BlockTinkerTable; import net.machinemuse.powersuits.common.Config; import net.machinemuse.powersuits.control.KeybindManager; import net.machinemuse.powersuits.control.PlayerInputMap; diff --git a/src/main/java/net/machinemuse/powersuits/event/RenderEventHandler.java b/src/main/java/net/machinemuse/powersuits/event/RenderEventHandler.java index 51af439..5c47b7a 100644 --- a/src/main/java/net/machinemuse/powersuits/event/RenderEventHandler.java +++ b/src/main/java/net/machinemuse/powersuits/event/RenderEventHandler.java @@ -34,7 +34,7 @@ public class RenderEventHandler { private final DrawableMuseRect frame = new DrawableMuseRect(Config.keybindHUDx(), Config.keybindHUDy(), Config.keybindHUDx() + (double)16, Config.keybindHUDy() + (double)16, true, Colour.DARKGREEN.withAlpha(0.2), Colour.GREEN.withAlpha(0.2)); public RenderEventHandler() { - this.ownFly = false; + ownFly = false; } @SubscribeEvent diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java index 6f021d2..a38728e 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerArmor.java @@ -5,9 +5,7 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.machinemuse.api.IApiaristArmor; -import net.machinemuse.api.IModularItem; import net.machinemuse.api.ModuleManager; -import net.machinemuse.numina.geometry.Colour; import net.machinemuse.powersuits.client.render.item.ArmorModelInstance; import net.machinemuse.powersuits.client.render.item.IArmorModel; import net.machinemuse.powersuits.common.Config; diff --git a/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java b/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java index d7d3856..ceefbcf 100644 --- a/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java +++ b/src/main/java/net/machinemuse/powersuits/item/ItemPowerFist.java @@ -3,7 +3,7 @@ package net.machinemuse.powersuits.item; import appeng.api.implementations.items.IAEWrench; import buildcraft.api.tools.IToolWrench; import cofh.api.item.IToolHammer; -import com.bluepowermod.api.misc.IScrewdriver; +import com.google.common.collect.Multimap; import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +17,6 @@ import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IBlockBreakingModule; import net.machinemuse.api.moduletrigger.IRightClickModule; import net.machinemuse.general.gui.MuseIcon; -import net.machinemuse.numina.item.IModeChangingItem; import net.machinemuse.numina.item.NuminaItemUtils; import net.machinemuse.numina.network.MusePacketModeChangeRequest; import net.machinemuse.numina.network.PacketSender; @@ -29,8 +28,9 @@ import net.machinemuse.utils.ElectricItemUtils; import net.machinemuse.utils.MuseHeatUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -41,8 +41,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import powercrystals.minefactoryreloaded.api.IMFRHammer; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.List; /** @@ -73,7 +71,8 @@ public class ItemPowerFist extends MPSItemElectricTool implements IToolWrench, com.bluepowermod.api.misc.IScrewdriver, mrtjp.projectred.api.IScrewdriver, - ITool, IMekWrench, + ITool, + IMekWrench, IModeChangingModularItem { public final String iconpath = MuseIcon.ICON_PREFIX + "handitem"; @@ -163,18 +162,11 @@ public class ItemPowerFist extends MPSItemElectricTool implements return true; } - /** - * An itemstack sensitive version of getDamageVsEntity - allows items to - * handle damage based on - * itemstack data, like tags. Falls back to getDamageVsEntity. - * - * @param entity The entity being attacked (or the attacking mob, if it's a mob - * - vanilla bug?) - * @param itemStack The itemstack - * @return the damage - */ - public float getDamageVsEntity(Entity entity, ItemStack itemStack){ - return (float) ModuleManager.computeModularProperty(itemStack, MeleeAssistModule.PUNCH_DAMAGE); + @Override + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap multimap = super.getAttributeModifiers(stack); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", ModuleManager.computeModularProperty(stack, MeleeAssistModule.PUNCH_DAMAGE), 0)); + return multimap; } @SideOnly(Side.CLIENT) @@ -249,10 +241,6 @@ public class ItemPowerFist extends MPSItemElectricTool implements ((IRightClickModule)module).onPlayerStoppedUsing(itemStack, world, player, par4); } - public boolean shouldPassSneakingClickToBlock(World world, int x, int y, int z) { - return true; - } - @Override public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { String mode = getActiveMode(itemStack, player); @@ -299,56 +287,67 @@ public class ItemPowerFist extends MPSItemElectricTool implements } /* TE Crescent Hammer */ + @Optional.Method(modid = "CoFHCore") @Override public void toolUsed(ItemStack itemStack, EntityLivingBase entityLivingBase, int i, int i1, int i2) {} /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public boolean canWhack(EntityPlayer entityPlayer, ItemStack itemStack, int i, int i1, int i2) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public boolean canLink(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public boolean canBoost(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public void onLink(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) {} /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public void onWhack(EntityPlayer entityPlayer, ItemStack itemStack, int i, int i1, int i2) {} /* Railcraft Crowbar */ + @Optional.Method(modid = "Railcraft") @Override public void onBoost(EntityPlayer entityPlayer, ItemStack itemStack, EntityMinecart entityMinecart) {} /* AE wrench */ + @Optional.Method(modid = "appliedenergistics2") @Override public boolean canWrench(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Buildcraft Wrench */ + @Optional.Method(modid = "BuildCraft|Core") @Override public void wrenchUsed(EntityPlayer entityPlayer, int i, int i1, int i2) {} /* Buildcraft Wrench */ + @Optional.Method(modid = "BuildCraft|Core") @Override public boolean canWrench(EntityPlayer entityPlayer, int i, int i1, int i2) { return getActiveMode(entityPlayer.getHeldItem(), entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Bluepower Screwdriver */ + @Optional.Method(modid = "ProjRed|Core") @Override public boolean damage(ItemStack itemStack, int i, EntityPlayer entityPlayer, boolean b) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); @@ -359,28 +358,33 @@ public class ItemPowerFist extends MPSItemElectricTool implements public void damageScrewdriver(EntityPlayer entityPlayer, ItemStack itemStack) {} /* ProjectRed Screwdriver */ + @Optional.Method(modid = "ProjRed|Core") @Override public boolean canUse(EntityPlayer entityPlayer, ItemStack itemStack) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* EnderIO Tool */ + @Optional.Method(modid = "EnderIO") @Override public void used(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) {} /* EnderIO Tool */ + @Optional.Method(modid = "EnderIO") @Override public boolean canUse(ItemStack itemStack, EntityPlayer entityPlayer, int i, int i1, int i2) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* EnderIO Tool */ + @Optional.Method(modid = "EnderIO") @Override public boolean shouldHideFacades(ItemStack itemStack, EntityPlayer entityPlayer) { return getActiveMode(itemStack, entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); } /* Mekanism Wrench */ + @Optional.Method(modid = "Mekanism") @Override public boolean canUseWrench(EntityPlayer entityPlayer, int i, int i1, int i2) { return getActiveMode(entityPlayer.getHeldItem(), entityPlayer).equals(OmniWrenchModule.MODULE_OMNI_WRENCH); diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java index cbc5a15..7c9615c 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModule.java @@ -22,12 +22,6 @@ public class PowerModule extends PowerModuleBase { return name; } - @Override - public String getLocalizedName() { - return "This module did not correctly label its name."; - } - - @Override public String getDescription() { return description; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java index eed8c68..7208355 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/PowerModuleBase.java @@ -1,10 +1,6 @@ package net.machinemuse.powersuits.powermodule; -import net.machinemuse.api.ILocalizeableModule; -import net.machinemuse.api.IPowerModule; -import net.machinemuse.api.IPropertyModifier; -import net.machinemuse.api.ModuleManager; -import net.machinemuse.api.IModularItem; +import net.machinemuse.api.*; import net.machinemuse.general.gui.MuseIcon; import net.machinemuse.numina.render.MuseTextureUtils; import net.machinemuse.powersuits.common.Config; @@ -166,11 +162,6 @@ public abstract class PowerModuleBase implements ILocalizeableModule { // return "/terrain.png"; } - @Override - public String getLocalizedName() { - return StatCollector.translateToLocal("module." + getUnlocalizedName() + ".name"); - } - @Override public String getDescription() { return StatCollector.translateToLocal("module." + getUnlocalizedName() + ".desc"); diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java index 49ab4fd..58c8d38 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/EliteBatteryModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.energy; -import net.machinemuse.api.electricity.ElectricConversions; import net.machinemuse.api.IModularItem; +import net.machinemuse.api.electricity.ElectricConversions; import net.machinemuse.powersuits.item.ItemComponent; import net.machinemuse.powersuits.powermodule.PowerModuleBase; import net.machinemuse.utils.ElectricItemUtils; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java index 43a642e..6487402 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/energy/KineticGeneratorModule.java @@ -1,8 +1,8 @@ package net.machinemuse.powersuits.powermodule.energy; -import net.machinemuse.api.ModuleManager; import net.machinemuse.api.IModularItem; +import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java index bd0ab97..a58fdb4 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/misc/CoolingSystemModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.misc; -import net.machinemuse.api.ModuleManager; import net.machinemuse.api.IModularItem; +import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java index e11bb5d..9bd8a9f 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.java @@ -1,7 +1,7 @@ package net.machinemuse.powersuits.powermodule.movement; -import net.machinemuse.api.ModuleManager; import net.machinemuse.api.IModularItem; +import net.machinemuse.api.ModuleManager; import net.machinemuse.api.moduletrigger.IPlayerTickModule; import net.machinemuse.api.moduletrigger.IToggleableModule; import net.machinemuse.powersuits.item.ItemComponent; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java index 0cb0956..aeba9bb 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AppEngWirelessFluidModule.java @@ -63,7 +63,7 @@ public class AppEngWirelessFluidModule extends PowerModuleBase implements IRight @Override public void onRightClick(EntityPlayer player, World world, ItemStack item) { - ECApi.instance().openWirelessTerminal(player, player.getHeldItem(), world); + ECApi.instance().openWirelessFluidTerminal(player, player.getHeldItem(), world); } @Override diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java index 4f7d19b..5308403 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/AxeModule.java @@ -88,9 +88,7 @@ public class AxeModule extends PowerModuleBase implements IBlockBreakingModule, @Override public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (istEffectiveHarvestTool(block, meta)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, AXE_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, AXE_ENERGY_CONSUMPTION); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java index 290dcef..7de2d9a 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ChiselModule.java @@ -72,9 +72,7 @@ public class ChiselModule extends PowerModuleBase implements IBlockBreakingModul public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (ModCompatibility.isChiselLoaded() && ITEM_CHISEL != null) { if (ForgeHooks.canToolHarvestBlock(block, meta, new ItemStack(ITEM_CHISEL))) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, CHISEL_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, CHISEL_ENERGY_CONSUMPTION); } } return false; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java index a0a6ddd..7496f62 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/DiamondPickUpgradeModule.java @@ -55,9 +55,7 @@ public class DiamondPickUpgradeModule extends PowerModuleBase implements IBlockB public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (!Items.iron_pickaxe.canHarvestBlock(block, stack)) { if (Items.diamond_pickaxe.canHarvestBlock(block, stack)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, PickaxeModule.PICKAXE_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, PickaxeModule.PICKAXE_ENERGY_CONSUMPTION); } } return false; diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java index 3e1ec08..05c809f 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PersonalShrinkingModule.java @@ -73,9 +73,7 @@ public class PersonalShrinkingModule extends PowerModuleBase implements IRightCl int block = Block.getIdFromBlock(world.getBlock(x, y, z)); if (block == Block.getIdFromBlock(GameRegistry.findBlock("CompactMachines", "machine"))) { return false; - } else if (block == Block.getIdFromBlock(GameRegistry.findBlock("CompactMachines", "innerwall"))) { - return true; - } + } else return block == Block.getIdFromBlock(GameRegistry.findBlock("CompactMachines", "innerwall")); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java index ee03c4a..6926038 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/PickaxeModule.java @@ -90,10 +90,7 @@ public class PickaxeModule extends PowerModuleBase implements IBlockBreakingModu // some blocks like stairs do no not have a tool assigned to them if (effectiveHarvestTool == null) { - if (emulatedTool.func_150997_a/*getStrVsBlock*/(block) >= ((ItemTool) emulatedTool.getItem()).func_150913_i/*getToolMaterial*/().getEfficiencyOnProperMaterial()) - { - return true; - } + return emulatedTool.func_150997_a/*getStrVsBlock*/(block) >= ((ItemTool) emulatedTool.getItem()).func_150913_i/*getToolMaterial*/().getEfficiencyOnProperMaterial(); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java index 344c298..72ac0b7 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ScoopModule.java @@ -66,9 +66,7 @@ public class ScoopModule extends PowerModuleBase implements IBlockBreakingModule @Override public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (ForgeHooks.canToolHarvestBlock(block, meta, scoop)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SCOOP_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SCOOP_ENERGY_CONSUMPTION); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java index a284e99..aa75331 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShearsModule.java @@ -111,9 +111,7 @@ public class ShearsModule extends PowerModuleBase implements IBlockBreakingModul @Override public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (ForgeHooks.canToolHarvestBlock(block, meta, shears)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SHEARING_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SHEARING_ENERGY_CONSUMPTION); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java index 751c052..0a104be 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/ShovelModule.java @@ -79,9 +79,7 @@ public class ShovelModule extends PowerModuleBase implements IBlockBreakingModul @Override public boolean canHarvestBlock(ItemStack stack, Block block, int meta, EntityPlayer player) { if (istEffectiveHarvestTool(block, meta)) { - if (ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SHOVEL_ENERGY_CONSUMPTION)) { - return true; - } + return ElectricItemUtils.getPlayerEnergy(player) > ModuleManager.computeModularProperty(stack, SHOVEL_ENERGY_CONSUMPTION); } return false; } diff --git a/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java b/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java index b92c66e..f6b9809 100644 --- a/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java +++ b/src/main/java/net/machinemuse/powersuits/powermodule/tool/TerminalHandler.java @@ -37,9 +37,7 @@ public class TerminalHandler implements IWirelessTermHandler, IWirelessFluidTerm return false; if(is.getUnlocalizedName() == null) return false; - if(is.getUnlocalizedName().equals("item.powerFist")) - return true; - return false; + return is.getUnlocalizedName().equals("item.powerFist"); } @Optional.Method(modid = "appliedenergistics2") @@ -115,7 +113,7 @@ public class TerminalHandler implements IWirelessTermHandler, IWirelessFluidTerm @Optional.Method(modid = "extracells") private static void registerECHandler(TerminalHandler handler){ - ECApi.instance().registerWirelessFluidTermHandler(handler); + ECApi.instance().registerWirelessTermHandler(handler); } public static void registerHandler() { diff --git a/src/main/java/net/machinemuse/utils/MuseStringUtils.java b/src/main/java/net/machinemuse/utils/MuseStringUtils.java index 8ce8ce7..9bb4bdb 100644 --- a/src/main/java/net/machinemuse/utils/MuseStringUtils.java +++ b/src/main/java/net/machinemuse/utils/MuseStringUtils.java @@ -233,7 +233,7 @@ public abstract class MuseStringUtils { * * @author MachineMuse */ - public static enum FormatCodes { + public enum FormatCodes { Black('0'), DarkBlue('1'), DarkGreen('2'), @@ -259,7 +259,7 @@ public abstract class MuseStringUtils { public char character; - private FormatCodes(char character) { + FormatCodes(char character) { this.character = character; } } diff --git a/src/main/resources/assets/powersuits/lang/de_DE.lang b/src/main/resources/assets/powersuits/lang/de_DE.lang index 1168dfd..5226f16 100644 --- a/src/main/resources/assets/powersuits/lang/de_DE.lang +++ b/src/main/resources/assets/powersuits/lang/de_DE.lang @@ -1,9 +1,9 @@ -#Made by users: KazoBurg, Vexatos, Dongonzales -#Last edited on 7/2/13 tile.luxCapacitor.name=Luxkompensator tile.tinkerTable.name=Energierüstungsbasteltisch +itemGroup.powersuits=Modular Powersuits + item.powerArmorBoots.name=Energiestiefel item.powerArmorLeggings.name=Energiehose item.powerArmorChestplate.name=Energiebrustplatte @@ -31,6 +31,9 @@ item.powerArmorComponent.componentArtificialMuscle.name=Künstlicher Muskel item.powerArmorComponent.componentSolarPanel.name=Solarzelle item.powerArmorComponent.componentMagnet.name=Magnet item.powerArmorComponent.componentComputerChip.name=Mikroprozessor +item.powerArmorComponent.componentLiquidNitrogen.name=Liquid Nitrogen Bucket +item.powerArmorComponent.componentRubberHose.name=Insulated Rubber Hose +item.powerArmorComponent.componentRawCarbon.name=Raw Carbon module.basicPlating.name=Eisenplatte module.diamondPlating.name=Diamantplatte @@ -74,6 +77,7 @@ module.transparentArmor.name=Transparentrüstung module.cosmeticGlow.name=Leuchtmodul module.mffsFieldTeleporter.name=MFFS-Kraftfeldteleporter module.grafter.name=Gartenschere +module.scoop.name=Scoop module.apiaristArmor.name=Imkerrüstung module.hazmat.name=Strahlungsschild module.redstoneLaser.name=Rotsteinlaser @@ -96,11 +100,15 @@ module.clock.name=Uhr module.compass.name=Kompass module.lightningSummoner.name=Blitz-o-Mat module.waterTank.name=Wassertank -module.euReader.name=EU-Lesegerät -module.treetap.name=Kautschukhahn module.teMultimeter.name=TE-Multimeter module.appengWireless.name=Kabelloses ME-Terminal -module.bucket.name=Eimer +module.appengECWirelessFluid.name=ExtraCells Wireless Fluid Terminal +module.advSolarGenerator.name=High Efficiency Solar Generator +module.nitrogenCoolingSystem.name=Liquid Nitrogen Cooling System +module.mechAssistance.name=Mechanical Assistance +module.cmPSD.name=Personal Shrinking Device +module.omniProbe.name=Prototype OmniProbe +module.dimRiftGen.name=Dimensional Tear Generator module.basicPlating.desc=Basic plating is heavy but protective. module.diamondPlating.desc=Advanced plating is lighter, harder, and more protective than Basic but much harder to make. @@ -142,7 +150,36 @@ module.coolingSystem.desc=Cools down heat-producing modules quicker. module.tint.desc=Give your armor some coloured tinting to customize your armor's appearance. module.transparentArmor.desc=Make the item transparent, so you can show off your skin without losing armor. module.cosmeticGlow.desc=Change the appearance of the glowy bits on your armor. - +module.hazmat.desc=Protect yourself from electricity and radiation poisoning. *Must be on every piece for 100% protection* +module.aurameter.desc=Connect up some Thaumic goggles to have them embedded in your helmet. (Does not give Vis usage discount) +module.airtightSeal.desc=Seal the suit against hostile atmospheres for venturing to other planets. +module.grafter.desc=A Forestry grafter integrated into your power tool. +module.scoop.desc=A Forestry Scoop integrated into your power tool. +module.apiaristArmor.desc=A set of Forestry apiarist armor integrated into your armor. +module.chisel.desc=This won't let you chisel blocks, but it will at least let you harvest them. +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. +module.portableCraftingTable.desc=A larger crafting grid, on the go. +module.kineticGenerator.desc=Generate power with your movement. +module.solarGenerator.desc=Let the sun power your adventures. +module.thermalGenerator.desc=Generate power from extreme amounts of heat. +module.autoFeeder.desc=Whenever you're hungry, this module will grab the bottom-left-most food item from your inventory and feed it to you, storing the rest for later. +module.magnet.desc=Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k) +module.oreScanner.desc=A way to see how valuable the land around you is. +module.leafBlower.desc=Create a torrent of air to knock plants out of the ground and leaves off of trees. +module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. +module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. +module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. +module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. +module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. +module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. +module.appengECWirelessFluid.desc=An Applied Energistics ExtraCells wireless fluid terminal integrated into your power tool. +module.advSolarGenerator.desc=A solar generator with 3 times the power generation of the standard solar generator. +module.nitrogenCoolingSystem.desc=Cools down heat-producing modules even faster than the standard cooling system. +module.mechAssistance.desc=Robotic assistance to reduce the effect of weight on the user +module.cmPSD.desc=A Compact Machines Personal Shrinking Device integrated into your power tool. +module.omniProbe.desc=A prototype multi-use probe integrated into your power tool. +module.dimRiftGen.desc=Generate a tear in the space-time continuum that will teleport the player to its relative coordinates in the nether or overworld. gui.noModulesFound.line1=Keine Energierüstungs-Items gui.noModulesFound.line2=im Inventar gefunden. Bastle welche! @@ -160,8 +197,27 @@ gui.pressKey=Drücke Taste gui.keybindInstructions1=Nutze "Neu", um neue Tastenfunktionen zu konfigurieren. gui.keybindInstructions2=Ziehe Module hierhin, um sie mit Tasten zu verbinden. gui.keybindInstructions3=Ziehe Tasten auf das "Entfernen"-Feld, um die Konfiguration zu entfernen. +gui.keybindInstructions4=Right-click keybinds to add them to the HUD. gui.keybindTaken=Bereits in gebrauch! gui.tab.tinker=Bastlen gui.tab.keybinds=Tastenkombinationen gui.tab.visual=Visuelles + +gui.equippedTotals=Equipped Totals +gui.energyStorage=Energy Storage +gui.weight=Weight +gui.armor=Armor + +nei.jsonShaped=JSON Shaped + +tooltip.pressShift=Press SHIFT for more information. +tooltip.componentTooltip=For use in Tinker Table. +tooltip.changeModes=Change modes: Sneak+mousewheel. +tooltip.energy=Energy: +tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. +tooltip.installedModules=Installed Modules: +tooltip.mode=Mode: +module.bucket.name=Eimer +module.euReader.name=EU-Lesegerät +module.treetap.name=Kautschukhahn diff --git a/src/main/resources/assets/powersuits/lang/en_US.lang b/src/main/resources/assets/powersuits/lang/en_US.lang index 82409cf..3315cbe 100644 --- a/src/main/resources/assets/powersuits/lang/en_US.lang +++ b/src/main/resources/assets/powersuits/lang/en_US.lang @@ -1,5 +1,5 @@ -Made by users: Andrew2448, MachineMuse -Last edited on 6/25/13 12:18AM EST +# Made by users: Andrew2448, MachineMuse +# Last edited on 6/25/13 12:18AM EST tile.luxCapacitor.name=Lux Capacitor tile.tinkerTable.name=Power Armor Tinker Table diff --git a/src/main/resources/assets/powersuits/lang/fr_FR.lang b/src/main/resources/assets/powersuits/lang/fr_FR.lang index e2f834a..a610453 100644 --- a/src/main/resources/assets/powersuits/lang/fr_FR.lang +++ b/src/main/resources/assets/powersuits/lang/fr_FR.lang @@ -1,88 +1,114 @@ -Made by users: Mazdallier, AegisLesha, solomon56 -Last edited on 08/31/15 -tile.luxCapacitor.name=Condensateur Lux -tile.tinkerTable.name=Table de bricolage d'Armure énergétique +tile.luxCapacitor.name=Condensateur Lux +tile.tinkerTable.name=Table de bricolage d'Armure énergétique -itemGroup.powersuits=Armure énergétique modulaire +itemGroup.powersuits=Armure énergétique modulaire -item.powerArmorBoots.name=Bottes d'Armure énergétique +item.powerArmorBoots.name=Bottes d'Armure énergétique item.powerArmorLeggings.name=Pantalon d'Armure énergétique -item.powerArmorChestplate.name=Plastron d'Armure énergétique +item.powerArmorChestplate.name=Plastron d'Armure énergétique item.powerArmorHelmet.name=Casque d'Armure énergétique item.powerFist.name=Poing énergétique item.powerArmorComponent.componentWiring.name=Câblage item.powerArmorComponent.componentSolenoid.name=Solénoïde -item.powerArmorComponent.componentServo.name=Servo Moteur +item.powerArmorComponent.componentServo.name=Servo Moteur item.powerArmorComponent.componentGliderWing.name=Ailes de planeur -item.powerArmorComponent.componentIonThruster.name=Propulseur Ionique -item.powerArmorComponent.componentLVCapacitor.name=Condensateur BT -item.powerArmorComponent.componentMVCapacitor.name=Condensateur MT +item.powerArmorComponent.componentIonThruster.name=Propulseur Ionique +item.powerArmorComponent.componentLVCapacitor.name=Condensateur BT +item.powerArmorComponent.componentMVCapacitor.name=Condensateur MT item.powerArmorComponent.componentHVCapacitor.name=Condensateur HT -item.powerArmorComponent.componentParachute.name=Parachute -item.powerArmorComponent.componentPlatingBasic.name=Plaquage de base -item.powerArmorComponent.componentPlatingAdvanced.name=Plaquage avancé +item.powerArmorComponent.componentParachute.name=Parachute +item.powerArmorComponent.componentPlatingBasic.name=Plaquage de base +item.powerArmorComponent.componentPlatingAdvanced.name=Plaquage avancé item.powerArmorComponent.componentFieldEmitter.name=Emetteur de champ de force -item.powerArmorComponent.componentLaserEmitter.name=Emetteur d'hologramme +item.powerArmorComponent.componentLaserEmitter.name=Emetteur d'hologramme item.powerArmorComponent.componentCarbonMyofiber.name=Myofibre carbone item.powerArmorComponent.componentControlCircuit.name=Circuit de contrôle item.powerArmorComponent.componentMyofiberGel.name=Gel myofibre -item.powerArmorComponent.componentArtificialMuscle.name=Muscle artificiel +item.powerArmorComponent.componentArtificialMuscle.name=Muscle artificiel item.powerArmorComponent.componentSolarPanel.name=Panneau Solaire item.powerArmorComponent.componentMagnet.name=Aimant item.powerArmorComponent.componentComputerChip.name=Puce informatique +item.powerArmorComponent.componentLiquidNitrogen.name=Liquid Nitrogen Bucket +item.powerArmorComponent.componentRubberHose.name=Insulated Rubber Hose +item.powerArmorComponent.componentRawCarbon.name=Raw Carbon -module.basicPlating.name=Plaquage en Fer -module.diamondPlating.name=Plaquage en Diamant -module.energyShield.name=Champ énergétique -module.heatSink.name=Dissipateur de chaleur -module.axe.name=Hache -module.pickaxe.name=Pioche -module.shovel.name=Pelle -module.shears.name=Ciseaux -module.hoe.name=Houe -module.luxCapacitor.name=Condensateur Lux -module.omniwrench.name=Prototype Multiclef +module.basicPlating.name=Plaquage en Fer +module.diamondPlating.name=Plaquage en Diamant +module.energyShield.name=Champ énergétique +module.heatSink.name=Dissipateur de chaleur +module.axe.name=Hache +module.pickaxe.name=Pioche +module.shovel.name=Pelle +module.shears.name=Ciseaux +module.hoe.name=Houe +module.luxCapacitor.name=Condensateur Lux +module.omniwrench.name=Prototype Multiclef module.fieldTinkerer.name=Module de champ ambulant -module.meleeAssist.name=Assistant de combat +module.meleeAssist.name=Assistant de combat module.plasmaCannon.name=Canon à plasma -module.railgun.name=Railgun +module.railgun.name=Railgun module.bladeLauncher.name=Lanceur de lame -module.basicBattery.name=Batterie de base -module.eliteBattery.name=batterie élite -module.advancedBattery.name=Batterie avancée -module.parachute.name=Parachute -module.glider.name=Planneur -module.jetpack.name=Jetpack +module.basicBattery.name=Batterie de base +module.eliteBattery.name=batterie élite +module.advancedBattery.name=Batterie avancée +module.parachute.name=Parachute +module.glider.name=Planneur +module.jetpack.name=Jetpack module.sprintAssist.name=Assistant de course -module.jumpAssist.name=Assistant de saut -module.swimAssist.name=Amplificateur de nage -module.climbAssist.name=Assistant de monté de bloc -module.jetBoots.name=Bottes Jet -module.shockAbsorber.name=Absorbeur de choc -module.waterElectrolyzer.name=Electrolyseur d'eau -module.binoculars.name=Binoculaires -module.nightVision.name=Vision nocturne -module.flightControl.name=Contrôleur de vol -module.invisibility.name=Camouflage actif -module.blinkDrive.name=Pilote de clignotement -module.diamondPickUpgrade.name=Mise à jour foret diamant -module.aquaAffinity.name=Affinité aquatique +module.jumpAssist.name=Assistant de saut +module.swimAssist.name=Amplificateur de nage +module.climbAssist.name=Assistant de monté de bloc +module.jetBoots.name=Bottes Jet +module.shockAbsorber.name=Absorbeur de choc +module.waterElectrolyzer.name=Electrolyseur d'eau +module.binoculars.name=Binoculaires +module.nightVision.name=Vision nocturne +module.flightControl.name=Contrôleur de vol +module.invisibility.name=Camouflage actif +module.blinkDrive.name=Pilote de clignotement +module.diamondPickUpgrade.name=Mise à jour foret diamant +module.aquaAffinity.name=Affinité aquatique module.coolingSystem.name=Système de refroidissement -module.tint.name=Module de couleur personnalisée -module.transparentArmor.name=Armure transparente -module.cosmeticGlow.name=Module lumineux +module.tint.name=Module de couleur personnalisée +module.transparentArmor.name=Armure transparente +module.cosmeticGlow.name=Module lumineux module.mffsFieldTeleporter.name=Téléporteur de champ MFFS -module.grafter.name=Greffeur -module.apiaristArmor.name=Armure de l'apiariste -module.hazmat.name=Protection anti-radiation -module.redstoneLaser.name=Laser de Redstone -module.aurameter.name=Auramètre -module.airtightSeal.name=Etanchéité à l'air +module.grafter.name=Greffeur +module.scoop.name=Scoop +module.apiaristArmor.name=Armure de l'apiariste +module.hazmat.name=Protection anti-radiation +module.redstoneLaser.name=Laser de Redstone +module.aurameter.name=Auramètre +module.airtightSeal.name=Etanchéité à l'air module.citizenJoe.name=Armure Citizen Joe -module.sonicWeapon.name=Arme sonique +module.sonicWeapon.name=Arme sonique + +module.portableCraftingTable.name=Poche Tableau Artisanat +module.kineticGenerator.name=Générateur Cinétique +module.solarGenerator.name=Générateur Solaire +module.thermalGenerator.name=Générateur Thermique +module.autoFeeder.name=Nourriture-Automatique +module.magnet.name=Aimant +module.oreScanner.name=Scanneur des Minerais +module.leafBlower.name=Souffleur +module.mobRepulsor.name=Repousseur de Monstre +module.flintAndSteel.name=Briquet +module.clock.name=Montre +module.compass.name=Boussole +module.lightningSummoner.name=Porteur de la Foudre +module.waterTank.name=Réservoir d'eau +module.teMultimeter.name=Multimètre de TE +module.appengWireless.name=Terminal sans fil d'AppEng +module.appengECWirelessFluid.name=ExtraCells Wireless Fluid Terminal +module.advSolarGenerator.name=High Efficiency Solar Generator +module.nitrogenCoolingSystem.name=Liquid Nitrogen Cooling System +module.mechAssistance.name=Mechanical Assistance +module.cmPSD.name=Personal Shrinking Device +module.omniProbe.name=Prototype OmniProbe +module.dimRiftGen.name=Dimensional Tear Generator module.basicPlating.desc=Le plaquage en fer est lourd mais efficace. module.diamondPlating.desc=Le plaquage en diamant est plus léger, plus dur et protège plus mais est aussi plus difficile à faire. @@ -125,26 +151,35 @@ module.tint.desc=Permet à votre armure de se tinter pour la customisation de so module.transparentArmor.desc=Rend l'objet transparent, pour que vous puissiez montrer votre skin sans perdre la protection offerte par l'armure. module.cosmeticGlow.desc=Change l'apparence des parties lumineuse de l'armure. module.hazmat.desc=Vous protège de l'électricité et de l'empoisonnement dû aux radiations. (Doit être présent sur toutes les parties de l'armure pour une protection totale) - -module.portableCraftingTable.name=Poche Tableau Artisanat -module.kineticGenerator.name=Générateur Cinétique -module.solarGenerator.name=Générateur Solaire -module.thermalGenerator.name=Générateur Thermique -module.autoFeeder.name=Nourriture-Automatique -module.magnet.name=Aimant -module.oreScanner.name=Scanneur des Minerais -module.leafBlower.name=Souffleur -module.mobRepulsor.name=Repousseur de Monstre -module.flintAndSteel.name=Briquet -module.clock.name=Montre -module.compass.name=Boussole -module.lightningSummoner.name=Porteur de la Foudre -module.waterTank.name=Réservoir d'eau -module.euReader.name= Interpréteur d'EU -module.treetap.name=Sève prise -module.teMultimeter.name=Multimètre de TE -module.appengWireless.name=Terminal sans fil d'AppEng -module.bucket.name=Seau +module.aurameter.desc=Connect up some Thaumic goggles to have them embedded in your helmet. (Does not give Vis usage discount) +module.airtightSeal.desc=Seal the suit against hostile atmospheres for venturing to other planets. +module.grafter.desc=A Forestry grafter integrated into your power tool. +module.scoop.desc=A Forestry Scoop integrated into your power tool. +module.apiaristArmor.desc=A set of Forestry apiarist armor integrated into your armor. +module.chisel.desc=This won't let you chisel blocks, but it will at least let you harvest them. +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. +module.portableCraftingTable.desc=A larger crafting grid, on the go. +module.kineticGenerator.desc=Generate power with your movement. +module.solarGenerator.desc=Let the sun power your adventures. +module.thermalGenerator.desc=Generate power from extreme amounts of heat. +module.autoFeeder.desc=Whenever you're hungry, this module will grab the bottom-left-most food item from your inventory and feed it to you, storing the rest for later. +module.magnet.desc=Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k) +module.oreScanner.desc=A way to see how valuable the land around you is. +module.leafBlower.desc=Create a torrent of air to knock plants out of the ground and leaves off of trees. +module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. +module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. +module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. +module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. +module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. +module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. +module.appengECWirelessFluid.desc=An Applied Energistics ExtraCells wireless fluid terminal integrated into your power tool. +module.advSolarGenerator.desc=A solar generator with 3 times the power generation of the standard solar generator. +module.nitrogenCoolingSystem.desc=Cools down heat-producing modules even faster than the standard cooling system. +module.mechAssistance.desc=Robotic assistance to reduce the effect of weight on the user +module.cmPSD.desc=A Compact Machines Personal Shrinking Device integrated into your power tool. +module.omniProbe.desc=A prototype multi-use probe integrated into your power tool. +module.dimRiftGen.desc=Generate a tear in the space-time continuum that will teleport the player to its relative coordinates in the nether or overworld. gui.noModulesFound.line1=Aucune armure énergétique modulaire gui.noModulesFound.line2=trouvée dans les alentours. @@ -162,10 +197,27 @@ gui.pressKey=Appuyer sur une touche gui.keybindInstructions1=Utiliser 'Nouvelle' pour créer de nouvelles combinaisons de touches. gui.keybindInstructions2=Glisser-déposer des modules pour les lier avec des touches. gui.keybindInstructions3=Déposer des touches dans la corbeille pour annuler les liaisons. +gui.keybindInstructions4=Right-click keybinds to add them to the HUD. gui.keybindTaken=Occupée! gui.tab.tinker=Bricolage gui.tab.keybinds=Combinaisons gui.tab.visual=Apparence +gui.equippedTotals=Equipped Totals +gui.energyStorage=Energy Storage +gui.weight=Weight +gui.armor=Armor + nei.jsonShaped=JSON Shaped + +tooltip.pressShift=Press SHIFT for more information. +tooltip.componentTooltip=For use in Tinker Table. +tooltip.changeModes=Change modes: Sneak+mousewheel. +tooltip.energy=Energy: +tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. +tooltip.installedModules=Installed Modules: +tooltip.mode=Mode: +module.bucket.name=Seau +module.euReader.name= Interpréteur d'EU +module.treetap.name=Sève prise diff --git a/src/main/resources/assets/powersuits/lang/pt_BR.lang b/src/main/resources/assets/powersuits/lang/pt_BR.lang index 3f80345..a8af99d 100644 --- a/src/main/resources/assets/powersuits/lang/pt_BR.lang +++ b/src/main/resources/assets/powersuits/lang/pt_BR.lang @@ -1,5 +1,3 @@ -Made by users: EzerArch -Last edited on 12/24/14 07:02AM GMT-2 tile.luxCapacitor.name=Capacitor de Luz tile.tinkerTable.name=Mesa de Trabalho Power Armor @@ -25,11 +23,18 @@ item.powerArmorComponent.componentPlatingBasic.name=Blindagem Básica item.powerArmorComponent.componentPlatingAdvanced.name=Blindagem Avançada item.powerArmorComponent.componentFieldEmitter.name=Emissor de Campo de Força item.powerArmorComponent.componentLaserEmitter.name=Emissor de Holograma -item.powerArmorComponent.componentCarbonMyofiber.name=Miofibra de Carbono -item.powerArmorComponent.componentControlCircuit.name=Circuito de Controle +item.powerArmorComponent.componentCarbonMyofiber.name=Miofibra de Carbono +item.powerArmorComponent.componentControlCircuit.name=Circuito de Controle item.powerArmorComponent.componentMyofiberGel.name=Gel de Miofibra item.powerArmorComponent.componentArtificialMuscle.name=Músculo Artificial +item.powerArmorComponent.componentSolarPanel.name=Solar Panel +item.powerArmorComponent.componentMagnet.name=Magnet +item.powerArmorComponent.componentComputerChip.name=Computer Chip +item.powerArmorComponent.componentLiquidNitrogen.name=Liquid Nitrogen Bucket +item.powerArmorComponent.componentRubberHose.name=Insulated Rubber Hose +item.powerArmorComponent.componentRawCarbon.name=Raw Carbon + module.basicPlating.name=Blindagem de Ferro module.diamondPlating.name=Blindagem de Diamante module.energyShield.name=Campo de Energia @@ -64,7 +69,7 @@ module.nightVision.name=Visão Noturna module.flightControl.name=Controle de Voo module.invisibility.name=Camuflagem Ativa module.blinkDrive.name=Blink Drive -module.diamondPickUpgrade.name=Melhoramento da Broca de Diamante +module.diamondPickUpgrade.name=Melhoramento da Broca de Diamante module.aquaAffinity.name=Afinidade Aquática module.coolingSystem.name=Sistema de Resfriamento module.tint.name=Módulo de Cores Personalizáveis @@ -72,6 +77,7 @@ module.transparentArmor.name=Armadura Transparente module.cosmeticGlow.name=Módulo de Brilho module.mffsFieldTeleporter.name=Teleportador MFFS Field module.grafter.name=Enxertador +module.scoop.name=Scoop module.apiaristArmor.name=Armadura para Apicultor module.hazmat.name=Proteção contra Radiação module.redstoneLaser.name=Redstone Laser @@ -80,6 +86,29 @@ module.airtightSeal.name=Vedação Hermética module.citizenJoe.name=Armadura Citizen Joe module.sonicWeapon.name=Arma Sônica +module.portableCraftingTable.name=In-Place Assembler +module.kineticGenerator.name=Kinetic Generator +module.solarGenerator.name=Solar Generator +module.thermalGenerator.name=Thermal Generator +module.autoFeeder.name=Auto-Feeder +module.magnet.name=Magnet +module.oreScanner.name=Ore Scanner +module.leafBlower.name=Leaf Blower +module.mobRepulsor.name=Mob Repulsor +module.flintAndSteel.name=Flint and Steel +module.clock.name=Clock +module.compass.name=Compass +module.lightningSummoner.name=Lightning Summoner +module.waterTank.name=Water Tank +module.teMultimeter.name=TE Multimeter +module.appengWireless.name=AppEng Wireless Terminal +module.appengECWirelessFluid.name=ExtraCells Wireless Fluid Terminal +module.advSolarGenerator.name=High Efficiency Solar Generator +module.nitrogenCoolingSystem.name=Liquid Nitrogen Cooling System +module.mechAssistance.name=Mechanical Assistance +module.cmPSD.name=Personal Shrinking Device +module.omniProbe.name=Prototype OmniProbe +module.dimRiftGen.name=Dimensional Tear Generator module.basicPlating.desc=Basic plating is heavy but protective. module.diamondPlating.desc=Advanced plating is lighter, harder, and more protective than Basic but much harder to make. @@ -121,7 +150,36 @@ module.coolingSystem.desc=Cools down heat-producing modules quicker. module.tint.desc=Give your armor some coloured tinting to customize your armor's appearance. module.transparentArmor.desc=Make the item transparent, so you can show off your skin without losing armor. module.cosmeticGlow.desc=Change the appearance of the glowy bits on your armor. - +module.hazmat.desc=Protect yourself from electricity and radiation poisoning. *Must be on every piece for 100% protection* +module.aurameter.desc=Connect up some Thaumic goggles to have them embedded in your helmet. (Does not give Vis usage discount) +module.airtightSeal.desc=Seal the suit against hostile atmospheres for venturing to other planets. +module.grafter.desc=A Forestry grafter integrated into your power tool. +module.scoop.desc=A Forestry Scoop integrated into your power tool. +module.apiaristArmor.desc=A set of Forestry apiarist armor integrated into your armor. +module.chisel.desc=This won't let you chisel blocks, but it will at least let you harvest them. +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. +module.portableCraftingTable.desc=A larger crafting grid, on the go. +module.kineticGenerator.desc=Generate power with your movement. +module.solarGenerator.desc=Let the sun power your adventures. +module.thermalGenerator.desc=Generate power from extreme amounts of heat. +module.autoFeeder.desc=Whenever you're hungry, this module will grab the bottom-left-most food item from your inventory and feed it to you, storing the rest for later. +module.magnet.desc=Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k) +module.oreScanner.desc=A way to see how valuable the land around you is. +module.leafBlower.desc=Create a torrent of air to knock plants out of the ground and leaves off of trees. +module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. +module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. +module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. +module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. +module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. +module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. +module.appengECWirelessFluid.desc=An Applied Energistics ExtraCells wireless fluid terminal integrated into your power tool. +module.advSolarGenerator.desc=A solar generator with 3 times the power generation of the standard solar generator. +module.nitrogenCoolingSystem.desc=Cools down heat-producing modules even faster than the standard cooling system. +module.mechAssistance.desc=Robotic assistance to reduce the effect of weight on the user +module.cmPSD.desc=A Compact Machines Personal Shrinking Device integrated into your power tool. +module.omniProbe.desc=A prototype multi-use probe integrated into your power tool. +module.dimRiftGen.desc=Generate a tear in the space-time continuum that will teleport the player to its relative coordinates in the nether or overworld. gui.noModulesFound.line1=No modular powersuit items gui.noModulesFound.line2=found in inventory. Make some! @@ -139,8 +197,24 @@ gui.pressKey=Press Key gui.keybindInstructions1=Use 'new' to bind new keys. gui.keybindInstructions2=Drag and drop modules to bind them to keys. gui.keybindInstructions3=Drop keys on 'trash' to unbind them. +gui.keybindInstructions4=Right-click keybinds to add them to the HUD. gui.keybindTaken=Taken! gui.tab.tinker=Tinker gui.tab.keybinds=Keybinds -gui.tab.visual=Visual \ No newline at end of file +gui.tab.visual=Visual + +gui.equippedTotals=Equipped Totals +gui.energyStorage=Energy Storage +gui.weight=Weight +gui.armor=Armor + +nei.jsonShaped=JSON Shaped + +tooltip.pressShift=Press SHIFT for more information. +tooltip.componentTooltip=For use in Tinker Table. +tooltip.changeModes=Change modes: Sneak+mousewheel. +tooltip.energy=Energy: +tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. +tooltip.installedModules=Installed Modules: +tooltip.mode=Mode: diff --git a/src/main/resources/assets/powersuits/lang/pt_PT.lang b/src/main/resources/assets/powersuits/lang/pt_PT.lang index fae5728..13e6a1b 100644 --- a/src/main/resources/assets/powersuits/lang/pt_PT.lang +++ b/src/main/resources/assets/powersuits/lang/pt_PT.lang @@ -1,5 +1,3 @@ -Made by users: EzerArch -Last edited on 12/24/14 07:02AM GMT-2 tile.luxCapacitor.name=Condensador de Luz tile.tinkerTable.name=Mesa de Trabalho Power Armor @@ -25,11 +23,18 @@ item.powerArmorComponent.componentPlatingBasic.name=Blindagem Básica item.powerArmorComponent.componentPlatingAdvanced.name=Blindagem Avançada item.powerArmorComponent.componentFieldEmitter.name=Emissor de Campo de Força item.powerArmorComponent.componentLaserEmitter.name=Emissor de Holograma -item.powerArmorComponent.componentCarbonMyofiber.name=Miofibra de Carbono -item.powerArmorComponent.componentControlCircuit.name=Circuito de Controle +item.powerArmorComponent.componentCarbonMyofiber.name=Miofibra de Carbono +item.powerArmorComponent.componentControlCircuit.name=Circuito de Controle item.powerArmorComponent.componentMyofiberGel.name=Gel de Miofibra item.powerArmorComponent.componentArtificialMuscle.name=Músculo Artificial +item.powerArmorComponent.componentSolarPanel.name=Solar Panel +item.powerArmorComponent.componentMagnet.name=Magnet +item.powerArmorComponent.componentComputerChip.name=Computer Chip +item.powerArmorComponent.componentLiquidNitrogen.name=Liquid Nitrogen Bucket +item.powerArmorComponent.componentRubberHose.name=Insulated Rubber Hose +item.powerArmorComponent.componentRawCarbon.name=Raw Carbon + module.basicPlating.name=Blindagem de Ferro module.diamondPlating.name=Blindagem de Diamante module.energyShield.name=Campo de Energia @@ -64,7 +69,7 @@ module.nightVision.name=Visão Noturna module.flightControl.name=Controlo de Voo module.invisibility.name=Camuflagem Ativa module.blinkDrive.name=Blink Drive -module.diamondPickUpgrade.name=Melhoramento da Broca de Diamante +module.diamondPickUpgrade.name=Melhoramento da Broca de Diamante module.aquaAffinity.name=Afinidade Aquática module.coolingSystem.name=Sistema de Resfriamento module.tint.name=Módulo de Cores Personalizáveis @@ -72,6 +77,7 @@ module.transparentArmor.name=Armadura Transparente module.cosmeticGlow.name=Módulo de Brilho module.mffsFieldTeleporter.name=Teleportador MFFS Field module.grafter.name=Enxertador +module.scoop.name=Scoop module.apiaristArmor.name=Armadura para Apicultor module.hazmat.name=Proteção contra Radiação module.redstoneLaser.name=Redstone Laser @@ -80,6 +86,29 @@ module.airtightSeal.name=Vedação Hermética module.citizenJoe.name=Armadura Citizen Joe module.sonicWeapon.name=Arma Sônica +module.portableCraftingTable.name=In-Place Assembler +module.kineticGenerator.name=Kinetic Generator +module.solarGenerator.name=Solar Generator +module.thermalGenerator.name=Thermal Generator +module.autoFeeder.name=Auto-Feeder +module.magnet.name=Magnet +module.oreScanner.name=Ore Scanner +module.leafBlower.name=Leaf Blower +module.mobRepulsor.name=Mob Repulsor +module.flintAndSteel.name=Flint and Steel +module.clock.name=Clock +module.compass.name=Compass +module.lightningSummoner.name=Lightning Summoner +module.waterTank.name=Water Tank +module.teMultimeter.name=TE Multimeter +module.appengWireless.name=AppEng Wireless Terminal +module.appengECWirelessFluid.name=ExtraCells Wireless Fluid Terminal +module.advSolarGenerator.name=High Efficiency Solar Generator +module.nitrogenCoolingSystem.name=Liquid Nitrogen Cooling System +module.mechAssistance.name=Mechanical Assistance +module.cmPSD.name=Personal Shrinking Device +module.omniProbe.name=Prototype OmniProbe +module.dimRiftGen.name=Dimensional Tear Generator module.basicPlating.desc=Basic plating is heavy but protective. module.diamondPlating.desc=Advanced plating is lighter, harder, and more protective than Basic but much harder to make. @@ -121,7 +150,36 @@ module.coolingSystem.desc=Cools down heat-producing modules quicker. module.tint.desc=Give your armor some coloured tinting to customize your armor's appearance. module.transparentArmor.desc=Make the item transparent, so you can show off your skin without losing armor. module.cosmeticGlow.desc=Change the appearance of the glowy bits on your armor. - +module.hazmat.desc=Protect yourself from electricity and radiation poisoning. *Must be on every piece for 100% protection* +module.aurameter.desc=Connect up some Thaumic goggles to have them embedded in your helmet. (Does not give Vis usage discount) +module.airtightSeal.desc=Seal the suit against hostile atmospheres for venturing to other planets. +module.grafter.desc=A Forestry grafter integrated into your power tool. +module.scoop.desc=A Forestry Scoop integrated into your power tool. +module.apiaristArmor.desc=A set of Forestry apiarist armor integrated into your armor. +module.chisel.desc=This won't let you chisel blocks, but it will at least let you harvest them. +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. +module.portableCraftingTable.desc=A larger crafting grid, on the go. +module.kineticGenerator.desc=Generate power with your movement. +module.solarGenerator.desc=Let the sun power your adventures. +module.thermalGenerator.desc=Generate power from extreme amounts of heat. +module.autoFeeder.desc=Whenever you're hungry, this module will grab the bottom-left-most food item from your inventory and feed it to you, storing the rest for later. +module.magnet.desc=Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k) +module.oreScanner.desc=A way to see how valuable the land around you is. +module.leafBlower.desc=Create a torrent of air to knock plants out of the ground and leaves off of trees. +module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. +module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. +module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. +module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. +module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. +module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. +module.appengECWirelessFluid.desc=An Applied Energistics ExtraCells wireless fluid terminal integrated into your power tool. +module.advSolarGenerator.desc=A solar generator with 3 times the power generation of the standard solar generator. +module.nitrogenCoolingSystem.desc=Cools down heat-producing modules even faster than the standard cooling system. +module.mechAssistance.desc=Robotic assistance to reduce the effect of weight on the user +module.cmPSD.desc=A Compact Machines Personal Shrinking Device integrated into your power tool. +module.omniProbe.desc=A prototype multi-use probe integrated into your power tool. +module.dimRiftGen.desc=Generate a tear in the space-time continuum that will teleport the player to its relative coordinates in the nether or overworld. gui.noModulesFound.line1=No modular powersuit items gui.noModulesFound.line2=found in inventory. Make some! @@ -139,8 +197,24 @@ gui.pressKey=Press Key gui.keybindInstructions1=Use 'new' to bind new keys. gui.keybindInstructions2=Drag and drop modules to bind them to keys. gui.keybindInstructions3=Drop keys on 'trash' to unbind them. +gui.keybindInstructions4=Right-click keybinds to add them to the HUD. gui.keybindTaken=Taken! gui.tab.tinker=Tinker gui.tab.keybinds=Keybinds -gui.tab.visual=Visual \ No newline at end of file +gui.tab.visual=Visual + +gui.equippedTotals=Equipped Totals +gui.energyStorage=Energy Storage +gui.weight=Weight +gui.armor=Armor + +nei.jsonShaped=JSON Shaped + +tooltip.pressShift=Press SHIFT for more information. +tooltip.componentTooltip=For use in Tinker Table. +tooltip.changeModes=Change modes: Sneak+mousewheel. +tooltip.energy=Energy: +tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. +tooltip.installedModules=Installed Modules: +tooltip.mode=Mode: diff --git a/src/main/resources/assets/powersuits/lang/ru_RU.lang b/src/main/resources/assets/powersuits/lang/ru_RU.lang index 4ed751a..3738d24 100644 --- a/src/main/resources/assets/powersuits/lang/ru_RU.lang +++ b/src/main/resources/assets/powersuits/lang/ru_RU.lang @@ -1,6 +1,3 @@ -Made by users: Adaptivity -Last edited on 9/08/15 - tile.luxCapacitor.name=Конденсатор света tile.tinkerTable.name=Верстак для создания силовой брони @@ -30,6 +27,13 @@ item.powerArmorComponent.componentControlCircuit.name=Микросхема уп item.powerArmorComponent.componentMyofiberGel.name=Гель из мышечного волокна item.powerArmorComponent.componentArtificialMuscle.name=Искусственные мышцы +item.powerArmorComponent.componentSolarPanel.name=Solar Panel +item.powerArmorComponent.componentMagnet.name=Magnet +item.powerArmorComponent.componentComputerChip.name=Computer Chip +item.powerArmorComponent.componentLiquidNitrogen.name=Liquid Nitrogen Bucket +item.powerArmorComponent.componentRubberHose.name=Insulated Rubber Hose +item.powerArmorComponent.componentRawCarbon.name=Raw Carbon + module.basicPlating.name=Железная обшивка module.diamondPlating.name=Алмазная обшивка module.energyShield.name=Энергетический щит @@ -81,6 +85,30 @@ module.airtightSeal.name=Герметичность module.citizenJoe.name=Броня гражданина Джо module.sonicWeapon.name=Звуковое оружие +module.portableCraftingTable.name=In-Place Assembler +module.kineticGenerator.name=Kinetic Generator +module.solarGenerator.name=Solar Generator +module.thermalGenerator.name=Thermal Generator +module.autoFeeder.name=Auto-Feeder +module.magnet.name=Magnet +module.oreScanner.name=Ore Scanner +module.leafBlower.name=Leaf Blower +module.mobRepulsor.name=Mob Repulsor +module.flintAndSteel.name=Flint and Steel +module.clock.name=Clock +module.compass.name=Compass +module.lightningSummoner.name=Lightning Summoner +module.waterTank.name=Water Tank +module.teMultimeter.name=TE Multimeter +module.appengWireless.name=AppEng Wireless Terminal +module.appengECWirelessFluid.name=ExtraCells Wireless Fluid Terminal +module.advSolarGenerator.name=High Efficiency Solar Generator +module.nitrogenCoolingSystem.name=Liquid Nitrogen Cooling System +module.mechAssistance.name=Mechanical Assistance +module.cmPSD.name=Personal Shrinking Device +module.omniProbe.name=Prototype OmniProbe +module.dimRiftGen.name=Dimensional Tear Generator + module.basicPlating.desc=Основная обшивка достаточна тяжела, но хорошо защищает. module.diamondPlating.desc=Продвинутая обшивка легче, прочнее и защищает ещё лучше основной, но её непросто получить. module.energyShield.desc=Энергетические щиты намного легче обшивок, но потребляют энергию. @@ -92,6 +120,7 @@ module.shears.desc=Подходят для стрижки листьев, шер module.hoe.desc=Автоматическое вспахивающее дополнение, подходящее для вспахивания больших кусков земли. module.luxCapacitor.desc=Излучает практически бесконечное число источников света на стены. module.omniwrench.desc=Ключ, который может взаимодействовать почти с каждым модом. +module.fieldTinkerer.desc=Maybe you can't memorize the blueprints, but you should at least be able to fine tune your modules without Inspiration™ Inc. LLC. module.meleeAssist.desc=Простое дополнение, усиливает удары Вашего силового инструмента. module.plasmaCannon.desc=Use electrical arcs in a containment field to superheat air to a plasma and launch it at enemies. module.railgun.desc=Сборка, которая ускоряет снаряд до сверхзвуковой скорости, применяя магнитную силу. Большая отдача. @@ -100,10 +129,15 @@ module.basicBattery.desc=Аккумулятор, позволяющий пред module.advancedBattery.desc=Продвинутый аккумулятор, позволяющий предмету хранить больше энергии. module.eliteBattery.desc=Самый продвинутый аккумулятор, позволяющий предмету хранить ещё больше энергии. module.parachute.desc=Парашют для замедления падений. Активируется нажатием клавиши приседания (по-умолч. Shift) в воздухе. +module.glider.desc=Tack on some wings to turn downward into forward momentum. Press sneak+forward while falling to activate. module.jetpack.desc=Реактивный ранец позволит Вам прыгать сколько угодно или, по крайней мере, пока у Вас не кончится энергия. module.sprintAssist.desc=Набор серводвигателей, который поможет Вам бежать (дважды нажмите вперёд) и ходить быстрее. module.jumpAssist.desc=Ещё один набор серводвигателей, который поможет Вам прыгать выше. +module.swimAssist.desc=By refitting an ion thruster for underwater use, you may be able to add extra forward (or backward) thrust when underwater. module.climbAssist.desc=Пара дополнительных серводвигателей позволит Вам перешагивать выступы высотой 1 метр. +module.jetBoots.desc=Jet boots are not as strong as a jetpack, but they should at least be strong enough to counteract gravity. +module.shockAbsorber.desc=With some servos, springs, and padding, you should be able to negate a portion of fall damage. +module.waterElectrolyzer.desc=When you run out of air, this module will jolt the water around you, electrolyzing a small bubble to breathe from. module.nightVision.desc=Пара усиленных очков поможет Вам хорошо видеть как и в ночное время, так и под водой. module.binoculars.desc=Из-за многочисленных графических проблем с модификацией Optifine, Вы решили взять способность "Приближения" под свой контроль. module.flightControl.desc=Интегрированная схема управления поможет Вам в полёте. Нажмите Z, чтобы снизиться. @@ -119,9 +153,32 @@ module.hazmat.desc=Защитит Вас от удара электрическ module.aurameter.desc=Встраивает очки Откровения в Ваш шлем. (Не понижает затраты Вис) module.airtightSeal.desc=Делает Вашу броню герметичной, позволяет Вам отправиться на другие планеты. module.grafter.desc=Интегрирует садовый нож модификации Forestry в Ваш силовой инструмент. +module.scoop.desc=Сачок, интегрированный в силовой кулак. module.apiaristArmor.desc=Интегрирует костюм пчеловода модификации Forestry в Вашу броню. module.chisel.desc=Это улучшение не позволит Вам обрабатывать блоки, но позволит Вам добывать уже обработанные блоки. -module.scoop.desc=Сачок, интегрированный в силовой кулак. +module.lightningSummoner.desc=Allows you to summon lightning for a large energy cost. +module.portableCraftingTable.desc=A larger crafting grid, on the go. +module.kineticGenerator.desc=Generate power with your movement. +module.solarGenerator.desc=Let the sun power your adventures. +module.thermalGenerator.desc=Generate power from extreme amounts of heat. +module.autoFeeder.desc=Whenever you're hungry, this module will grab the bottom-left-most food item from your inventory and feed it to you, storing the rest for later. +module.magnet.desc=Generates a magnetic field strong enough to attract items towards the player. WARNING: This module drains power continuously. Turn it off when not needed. (Keybind menu: k) +module.oreScanner.desc=A way to see how valuable the land around you is. +module.leafBlower.desc=Create a torrent of air to knock plants out of the ground and leaves off of trees. +module.mobRepulsor.desc=Pushes mobs away from you when activated, but constantly drains power. It is highly recommended that you set this module to a keybind because of the high energy draw. +module.flintAndSteel.desc=A portable igniter that creates fire through the power of energy. +module.clock.desc=A clock on the run that shows you the time, no matter where you are. Toggleable by keybinds. +module.compass.desc=A compass on the run that shows you your direction, no matter where you are. Toggleable by keybinds. +module.waterTank.desc=Store water which can later be used to cool yourself in emergency situations. +module.teMultimeter.desc=A prototype multi-use probe integrated into your power tool. +module.appengWireless.desc=An Applied Energistics wireless terminal integrated into your power tool. +module.appengECWirelessFluid.desc=An Applied Energistics ExtraCells wireless fluid terminal integrated into your power tool. +module.advSolarGenerator.desc=A solar generator with 3 times the power generation of the standard solar generator. +module.nitrogenCoolingSystem.desc=Cools down heat-producing modules even faster than the standard cooling system. +module.mechAssistance.desc=Robotic assistance to reduce the effect of weight on the user +module.cmPSD.desc=A Compact Machines Personal Shrinking Device integrated into your power tool. +module.omniProbe.desc=A prototype multi-use probe integrated into your power tool. +module.dimRiftGen.desc=Generate a tear in the space-time continuum that will teleport the player to its relative coordinates in the nether or overworld. gui.noModulesFound.line1=Части модульной силовой брони gui.noModulesFound.line2=не найдены в инвентаре. Сделайте несколько! @@ -152,3 +209,11 @@ gui.weight=Вес gui.armor=Броня nei.jsonShaped=Форменное JSON + +tooltip.pressShift=Press SHIFT for more information. +tooltip.componentTooltip=For use in Tinker Table. +tooltip.changeModes=Change modes: Sneak+mousewheel. +tooltip.energy=Energy: +tooltip.noModules=No installed modules! This item is useless until you add some modules at a Tinker Table. +tooltip.installedModules=Installed Modules: +tooltip.mode=Mode: diff --git a/src/main/resources/assets/powersuits/lang/zh_CN.lang b/src/main/resources/assets/powersuits/lang/zh_CN.lang index 94ed35d..f717721 100644 --- a/src/main/resources/assets/powersuits/lang/zh_CN.lang +++ b/src/main/resources/assets/powersuits/lang/zh_CN.lang @@ -1,5 +1,5 @@ -Made by users: crafteverywhere, 3TUSK, Joccob -Last edited on 8/30/15 1:35 AM EST +# Made by users: crafteverywhere, 3TUSK, Joccob +# Last edited on 8/30/15 1:35 AM EST tile.luxCapacitor.name=光能容器 tile.tinkerTable.name=动力装甲改装台