From 170a499cab66cbf76d0f8e3848f2b1011702a883 Mon Sep 17 00:00:00 2001 From: fewizz Date: Tue, 15 Dec 2015 16:02:36 +0300 Subject: [PATCH] cleanup --- .../emt/common/block/BlockBaseContainer.java | 3 +- .../emt/common/block/BlockEMT.java | 86 ------------------- .../emt/common/block/BlockEMTMachines.java | 9 +- .../emt/common/block/BlockEMTSolars.java | 5 +- .../emt/common/block/BlockEMTSolars2.java | 4 +- .../common/block/BlockEssentiaGenerators.java | 4 +- .../emt/common/block/BlockPortableNode.java | 3 +- .../emt/common/block/BlockShield.java | 3 +- .../emt/common/entity/EntityShield.java | 4 +- .../emt/common/init/BlockRegistry.java | 12 +-- .../emt/common/item/ItemBase.java | 3 +- .../assets/electromagictools/lang/en_US.lang | 58 ++++++------- .../assets/electromagictools/lang/ru_RU.lang | 58 ++++++------- 13 files changed, 82 insertions(+), 170 deletions(-) delete mode 100644 src/main/java/tombenpotter/emt/common/block/BlockEMT.java diff --git a/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java b/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java index f97d4bf..55481ef 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java @@ -25,8 +25,7 @@ public abstract class BlockBaseContainer extends BlockContainer { public BlockBaseContainer(String unlocName, Material material, SoundType soundType, float hardness) { super(material); - - setBlockName(ModInformation.modid + ".module.base." + unlocName); + setBlockName(ModInformation.modid + "." + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); setStepSound(soundType); setHardness(hardness); diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEMT.java b/src/main/java/tombenpotter/emt/common/block/BlockEMT.java deleted file mode 100644 index 8b4140d..0000000 --- a/src/main/java/tombenpotter/emt/common/block/BlockEMT.java +++ /dev/null @@ -1,86 +0,0 @@ -package tombenpotter.emt.common.block; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import tombenpotter.emt.common.tile.TileEntityEMT; - -public abstract class BlockEMT extends BlockContainer { - public IIcon[] top = new IIcon[16]; - public IIcon[] bottom = new IIcon[16]; - public IIcon[] side = new IIcon[16]; - public IIcon[] frontOff = new IIcon[16]; - public IIcon[] frontOn = new IIcon[16]; - - protected BlockEMT(Material material) { - super(material); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return null; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { - TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z); - int i = access.getBlockMetadata(x, y, z); - if (side == 0) { - return this.bottom[i]; - } - else if (side == 1) { - return this.top[i]; - } - else if (side != tile.facing) { - return this.side[i]; - } - else if (tile.isOn) { - return this.frontOn[i]; - } - else { - return this.frontOff[i]; - } - } - - @Override - public IIcon getIcon(int side, int meta) { - if (side < 1) { - return this.bottom[meta]; - } - if (side == 1) { - return this.top[meta]; - } - if (side == 3) { - return this.frontOff[meta]; - } - return this.side[meta]; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { - int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z); - if (facing == 0) - tile.facing = 2; - else if (facing == 1) - tile.facing = 5; - else if (facing == 2) - tile.facing = 3; - else if (facing == 3) - tile.facing = 4; - } - - @Override - public int damageDropped(int meta) { - return meta; - } -} diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java index 1b5ceff..dbdc1d2 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTMachines.java @@ -24,10 +24,10 @@ import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockEMTMachines extends BlockEMT { +public class BlockEMTMachines extends BlockBaseContainer { - public BlockEMTMachines() { - super(Material.iron); + public BlockEMTMachines(String name) { + super(name, Material.iron, soundTypeMetal, 4.0F); } @Override @@ -80,8 +80,7 @@ public class BlockEMTMachines extends BlockEMT { } @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { + public Item getItemDropped(int meta, Random random, int fortune){ return IC2Items.getItem("machine").getItem(); } diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java index 732ccda..ed388ea 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars.java @@ -32,8 +32,8 @@ import java.util.List; public class BlockEMTSolars extends BlockBaseContainer { - public BlockEMTSolars() { - super("solars", Material.iron, soundTypeMetal, 4.0F); + public BlockEMTSolars(String name) { + super(name, Material.iron, soundTypeMetal, 4.0F); } @Override @@ -109,7 +109,6 @@ public class BlockEMTSolars extends BlockBaseContainer { } @SideOnly(Side.CLIENT) - @SuppressWarnings({ "unchecked", "rawtypes" }) public void getSubBlocks(Item id, CreativeTabs tab, List list) { for (int i = 0; i <= 15; i++) { list.add(new ItemStack(id, 1, i)); diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java index b522f23..fc82d06 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEMTSolars2.java @@ -21,8 +21,8 @@ import java.util.List; public class BlockEMTSolars2 extends BlockBaseContainer { - public BlockEMTSolars2() { - super("solars.2", Material.iron, soundTypeMetal, 4.0F); + public BlockEMTSolars2(String name) { + super(name, Material.iron, soundTypeMetal, 4.0F); } @Override diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java index f1bf852..456e842 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java @@ -21,8 +21,8 @@ import org.lwjgl.opengl.GL11; public class BlockEssentiaGenerators extends BlockBaseContainer { - public BlockEssentiaGenerators() { - super("generator.essentia.2", Material.iron, soundTypeMetal, 4.0F); + public BlockEssentiaGenerators(String name) { + super(name, Material.iron, soundTypeMetal, 4.0F); } @Override diff --git a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java index 7b49bbe..ebc02dc 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java @@ -24,8 +24,9 @@ public class BlockPortableNode extends BlockAiry { public IIcon[] texture = new IIcon[1]; - public BlockPortableNode() { + public BlockPortableNode(String name) { this.setCreativeTab(ElectroMagicTools.tabEMT); + setBlockName(ModInformation.modid + "." + name); setBlockUnbreakable(); } diff --git a/src/main/java/tombenpotter/emt/common/block/BlockShield.java b/src/main/java/tombenpotter/emt/common/block/BlockShield.java index 1b00cf4..761ee02 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockShield.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockShield.java @@ -17,8 +17,9 @@ import java.util.Random; public class BlockShield extends Block { - public BlockShield() { + public BlockShield(String name) { super(Material.rock); + setBlockName(ModInformation.modid + "." + name); this.setCreativeTab(ElectroMagicTools.tabEMT); this.setHardness(1F); this.setResistance(10000000000000000000000000000000000000F); diff --git a/src/main/java/tombenpotter/emt/common/entity/EntityShield.java b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java index 305fe36..3a748bf 100644 --- a/src/main/java/tombenpotter/emt/common/entity/EntityShield.java +++ b/src/main/java/tombenpotter/emt/common/entity/EntityShield.java @@ -109,8 +109,8 @@ public class EntityShield extends Entity implements IProjectile { ePosZ *= 0.05000000074505806D; ePosX *= (double) (1.0F - this.entityCollisionReduction); ePosZ *= (double) (1.0F - this.entityCollisionReduction); - this.addVelocity(-ePosX * 1000, 0.0D, -ePosZ * 1000); - entity.addVelocity(ePosX * 1000, 0.0D, ePosZ * 1000); + this.addVelocity(-ePosX * 100, 0.0D, -ePosZ * 100); + entity.addVelocity(ePosX * 100, 0.0D, ePosZ * 100); } } diff --git a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java index e169f8a..3eed886 100644 --- a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java @@ -30,22 +30,22 @@ public class BlockRegistry { public static Block emtSolars2; public static void registerBlocks() { - portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); + portableNode = new BlockPortableNode("portablenode"); GameRegistry.registerBlock(portableNode, "PortableNode"); - shield = new BlockShield().setBlockName(ModInformation.modid + ".shield"); + shield = new BlockShield("shield"); GameRegistry.registerBlock(shield, "ShieldBlock"); - emtSolars = new BlockEMTSolars().setBlockName(ModInformation.modid + ".emtsolars"); + emtSolars = new BlockEMTSolars("solar"); GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMTSolars"); - emtSolars2 = new BlockEMTSolars2().setBlockName(ModInformation.modid + ".emtsolars2"); + emtSolars2 = new BlockEMTSolars2("solar2"); GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMTSolars2"); - emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines").setHardness(2.F); + emtMachines = new BlockEMTMachines("machine"); GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMTMachines"); - essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens"); + essentiaGens = new BlockEssentiaGenerators("essentia"); GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); } diff --git a/src/main/java/tombenpotter/emt/common/item/ItemBase.java b/src/main/java/tombenpotter/emt/common/item/ItemBase.java index b7708d2..d36a742 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemBase.java +++ b/src/main/java/tombenpotter/emt/common/item/ItemBase.java @@ -22,8 +22,7 @@ public class ItemBase extends Item { setCreativeTab(ElectroMagicTools.tabEMT); } - public String getItemStackDisplayName(ItemStack stack) - { + public String getItemStackDisplayName(ItemStack stack){ return (EMTTextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 0456df5..017b407 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -39,6 +39,7 @@ tooltip.EMT.output.double.half.low=when the block is under Y = 10 #=============Entity Names============= entity.EMT.laser.name=Laser entity.EMT.archer.name=Guardian Snowman +entity.EMT.shield.name=Shield #=============Item Names============= item.EMT.oreClusterUranium=Uranium Native Cluster @@ -95,35 +96,34 @@ item.EMT.focus.charge.wand.name=Wand Focus: Wand Charging #=============Block Names============= tile.EMT.shield.name=Shield Block tile.EMT.portablenode.name=Portable Node -tile.EMT.essentiaGens.potentia.name=Potentia Generator -tile.EMT.essentiaGens.ignis.name=Ignis Generator -tile.EMT.essentiaGens.auram.name=Auram Generator -tile.EMT.essentiaGens.arbor.name=Arbor Generator -tile.EMT.essentiaGens.aer.name=Aer Generator -tile.EMT.emtmachines.wandrecharge.name=Industrial Wand Charging Station -tile.EMT.emtmachines.etheralprocessor.name=Ethereal Processor -tile.EMT.emtsolars.compressed.name=Compressed Solar Panel -tile.EMT.emtsolars.doublecompressed.name=Double Compressed Solar Panel -tile.EMT.emtsolars.triplecompressed.name=Triple Compressed Solar Panel -tile.EMT.emtsolars.water.name=Water Infused Compressed Solar Panel -tile.EMT.emtsolars.doublewater.name=Water Infused Double Compressed Solar Panel -tile.EMT.emtsolars.triplewater.name=Water Infused Triple Compressed Solar Panel -tile.EMT.emtsolars.dark.name=Entropy Infused Compressed Solar Panel -tile.EMT.emtsolars.doubledark.name=Entropy Double Infused Compressed Solar Panel -tile.EMT.emtsolars.tripledark.name=Entropy Triple Infused Compressed Solar Panel -tile.EMT.emtsolars.order.name=Order Infused Compressed Solar Panel -tile.EMT.emtsolars.doubleorder.name=Order Infused Double Compressed Solar Panel -tile.EMT.emtsolars.tripleorder.name=Order Infused Triple Compressed Solar Panel -tile.EMT.emtsolars.fire.name=Fire Infused Compressed Solar Panel -tile.EMT.emtsolars.doublefire.name=Fire Infused Double Compressed Solar Panel -tile.EMT.emtsolars.triplefire.name=Fire Infused Triple Compressed Solar Panel -tile.EMT.emtsolars.air.name=Air Infused Compressed Solar Panel -tile.EMT.emtsolars2.doubleair.name=Air Infused Double Compressed Solar Panel -tile.EMT.emtsolars2.tripleair.name=Air Infused Triple Compressed Solar Panel -tile.EMT.emtsolars2.earth.name=Earth Infused Compressed Solar Panel -tile.EMT.emtsolars2.doubleearth.name=Earth Infused Double Compressed Solar Panel -tile.EMT.emtsolars2.tripleearth.name=Earth Infused Triple Compressed Solar Panel -tile.EMT.essentiaGenerator.name=Essentia Generator +tile.EMT.essentia.potentia.name=Potentia Generator +tile.EMT.essentia.ignis.name=Ignis Generator +tile.EMT.essentia.auram.name=Auram Generator +tile.EMT.essentia.arbor.name=Arbor Generator +tile.EMT.essentia.aer.name=Aer Generator +tile.EMT.machine.wandrecharge.name=Industrial Wand Charging Station +tile.EMT.machine.etheralprocessor.name=Ethereal Processor +tile.EMT.solar.compressed.name=Compressed Solar Panel +tile.EMT.solar.doublecompressed.name=Double Compressed Solar Panel +tile.EMT.solar.triplecompressed.name=Triple Compressed Solar Panel +tile.EMT.solar.water.name=Water Infused Compressed Solar Panel +tile.EMT.solar.doublewater.name=Water Infused Double Compressed Solar Panel +tile.EMT.solar.triplewater.name=Water Infused Triple Compressed Solar Panel +tile.EMT.solar.dark.name=Entropy Infused Compressed Solar Panel +tile.EMT.solar.doubledark.name=Entropy Double Infused Compressed Solar Panel +tile.EMT.solar.tripledark.name=Entropy Triple Infused Compressed Solar Panel +tile.EMT.solar.order.name=Order Infused Compressed Solar Panel +tile.EMT.solar.doubleorder.name=Order Infused Double Compressed Solar Panel +tile.EMT.solar.tripleorder.name=Order Infused Triple Compressed Solar Panel +tile.EMT.solar.fire.name=Fire Infused Compressed Solar Panel +tile.EMT.solar.doublefire.name=Fire Infused Double Compressed Solar Panel +tile.EMT.solar.triplefire.name=Fire Infused Triple Compressed Solar Panel +tile.EMT.solar.air.name=Air Infused Compressed Solar Panel +tile.EMT.solar2.doubleair.name=Air Infused Double Compressed Solar Panel +tile.EMT.solar2.tripleair.name=Air Infused Triple Compressed Solar Panel +tile.EMT.solar2.earth.name=Earth Infused Compressed Solar Panel +tile.EMT.solar2.doubleearth.name=Earth Infused Double Compressed Solar Panel +tile.EMT.solar2.tripleearth.name=Earth Infused Triple Compressed Solar Panel #=============Thaumonomicon Flavor Text============= emt.tag.Electric Magic Tools=Who says magic and technology can't go together? diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index ce4334e..0f88c33 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -39,6 +39,7 @@ tooltip.EMT.output.double.half.low=если она находится ниже Y #=============Enity Names============= entity.EMT.laser.name=Лазер entity.EMT.archer.name=Снеговик-хранитель +entity.EMT.shield.name=Щит #=============Item Names============= item.EMT.oreClusterUranium=Скопление чистого урана @@ -95,35 +96,34 @@ item.EMT.focus.charge.wand.name=Набалдашник: Зарядка жезл #=============Block Names============= tile.EMT.shield.name=Щит-блок tile.EMT.portablenode.name=Переносной узел -tile.EMT.essentiaGens.potentia.name=Potentia генератор -tile.EMT.essentiaGens.ignis.name=Ignis генератор -tile.EMT.essentiaGens.auram.name=Auram генератор -tile.EMT.essentiaGens.arbor.name=Arbor генератор -tile.EMT.essentiaGens.aer.name=Aer генератор -tile.EMT.emtmachines.wandrecharge.name=Промышленная станция зарядки жезлов -tile.EMT.emtmachines.etheralprocessor.name=Эфирный обработчик -tile.EMT.emtsolars.compressed.name=Сжатая солнечная панель -tile.EMT.emtsolars.doublecompressed.name=Дважды сжатая солнечная панель -tile.EMT.emtsolars.triplecompressed.name=Трижды сжатая солнечная панель -tile.EMT.emtsolars.water.name=Наполненная водой, сжатая солнечная панель -tile.EMT.emtsolars.doublewater.name=Наполненная водой, дважды сжатая солнечная панель -tile.EMT.emtsolars.triplewater.name=Наполненная водой, трижды сжатая солнечная панель -tile.EMT.emtsolars.dark.name=Наполненная энтропией, сжатая солнечная панель -tile.EMT.emtsolars.doubledark.name=Наполненная энтропией, дважды сжатая солнечная панель -tile.EMT.emtsolars.tripledark.name=Наполненная энтропией, трижды сжатая солнечная панель -tile.EMT.emtsolars.order.name=Наполненная порядком, сжатая солнечная панель -tile.EMT.emtsolars.doubleorder.name=Наполненная порядком, дважды сжатая солнечная панель -tile.EMT.emtsolars.tripleorder.name=Наполненная порядком, трижды сжатая солнечная панель -tile.EMT.emtsolars.fire.name=Наполненная огнём, сжатая солнечная панель -tile.EMT.emtsolars.doublefire.name=Наполненная огнём, дважды сжатая солнечная панель -tile.EMT.emtsolars.triplefire.name=Наполненная огнём, трижды сжатая солнечная панель -tile.EMT.emtsolars.air.name=Наполненная воздухом, сжатая солнечная панель -tile.EMT.emtsolars2.doubleair.name=Наполненная воздухом, дважды сжатая солнечная панель -tile.EMT.emtsolars2.tripleair.name=Наполненная воздухом, трижды сжатая солнечная панель -tile.EMT.emtsolars2.earth.name=Наполненная землёй, сжатая солнечная панель -tile.EMT.emtsolars2.doubleearth.name=Наполненная землёй, дважды сжатая солнечная панель -tile.EMT.emtsolars2.tripleearth.name=Наполненная землёй, трижды сжатая солнечная панель -tile.EMT.essentiaGenerator.name=Генератор эссенции +tile.EMT.essentia.potentia.name=Potentia генератор +tile.EMT.essentia.ignis.name=Ignis генератор +tile.EMT.essentia.auram.name=Auram генератор +tile.EMT.essentia.arbor.name=Arbor генератор +tile.EMT.essentia.aer.name=Aer генератор +tile.EMT.machine.wandrecharge.name=Промышленная станция зарядки жезлов +tile.EMT.machine.etheralprocessor.name=Эфирный обработчик +tile.EMT.solar.compressed.name=Сжатая солнечная панель +tile.EMT.solar.doublecompressed.name=Дважды сжатая солнечная панель +tile.EMT.solar.triplecompressed.name=Трижды сжатая солнечная панель +tile.EMT.solar.water.name=Наполненная водой, сжатая солнечная панель +tile.EMT.solar.doublewater.name=Наполненная водой, дважды сжатая солнечная панель +tile.EMT.solar.triplewater.name=Наполненная водой, трижды сжатая солнечная панель +tile.EMT.solar.dark.name=Наполненная энтропией, сжатая солнечная панель +tile.EMT.solar.doubledark.name=Наполненная энтропией, дважды сжатая солнечная панель +tile.EMT.solar.tripledark.name=Наполненная энтропией, трижды сжатая солнечная панель +tile.EMT.solar.order.name=Наполненная порядком, сжатая солнечная панель +tile.EMT.solar.doubleorder.name=Наполненная порядком, дважды сжатая солнечная панель +tile.EMT.solar.tripleorder.name=Наполненная порядком, трижды сжатая солнечная панель +tile.EMT.solar.fire.name=Наполненная огнём, сжатая солнечная панель +tile.EMT.solar.doublefire.name=Наполненная огнём, дважды сжатая солнечная панель +tile.EMT.solar.triplefire.name=Наполненная огнём, трижды сжатая солнечная панель +tile.EMT.solar.air.name=Наполненная воздухом, сжатая солнечная панель +tile.EMT.solar2.doubleair.name=Наполненная воздухом, дважды сжатая солнечная панель +tile.EMT.solar2.tripleair.name=Наполненная воздухом, трижды сжатая солнечная панель +tile.EMT.solar2.earth.name=Наполненная землёй, сжатая солнечная панель +tile.EMT.solar2.doubleearth.name=Наполненная землёй, дважды сжатая солнечная панель +tile.EMT.solar2.tripleearth.name=Наполненная землёй, трижды сжатая солнечная панель #=============Thaumonomicon============= emt.rsname.Electric Magic Tools=Electric Magic Tools