diff --git a/build.properties b/build.properties index 21b740d..12df6f7 100644 --- a/build.properties +++ b/build.properties @@ -3,5 +3,5 @@ package_group=com.tombenpotter.emt mc_version=1.7.10 forge_version=10.13.4.1566 -mod_version=1.2.5 +mod_version=1.2.6 mod_name=ElectroMagicTools diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java index b915de6..4d8115e 100644 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ b/src/main/java/tombenpotter/emt/ModInformation.java @@ -4,7 +4,7 @@ public class ModInformation { public static final String name = "Electro-Magic Tools"; public static final String modid = "EMT"; - public static final String version = "1.2.5"; + public static final String version = "1.2.6"; public static final String texturePath = "electromagictools"; public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "tombenpotter.emt.proxy.ClientProxy"; diff --git a/src/main/java/tombenpotter/emt/common/block/BlockBase.java b/src/main/java/tombenpotter/emt/common/block/BlockBase.java index fc0c37c..5bcefeb 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockBase.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockBase.java @@ -6,21 +6,21 @@ import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; public abstract class BlockBase extends Block { - + public final String name; + public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { super(material); + name = unlocName; setBlockName(ModInformation.modid + ".block." + unlocName); - setBlockTextureName(ModInformation.texturePath + ":" + textureName); + if (textureName != null) { + setBlockTextureName(ModInformation.texturePath + ":" + textureName); + } setCreativeTab(ElectroMagicTools.tabEMT); setStepSound(soundType); setHardness(hardness); } public BlockBase(String unlocName, Material material, SoundType soundType, float hardness) { - super(material); - setBlockName(ModInformation.modid + ".block." + unlocName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); + this(unlocName, material, null, soundType, hardness); } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java b/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java index 9aab90f..f76565e 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java @@ -1,12 +1,18 @@ package tombenpotter.emt.common.block; +import java.util.List; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.client.fx.ParticleEngine; @@ -15,12 +21,15 @@ import thaumcraft.client.fx.particles.FXWisp; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; import thaumcraft.common.tiles.TileNitor; +import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.tile.TileElectricCloud; public class BlockElectricCloud extends BlockBase { - + public IIcon icon; + public BlockElectricCloud(String unlocName) { super(unlocName, Material.cloth, soundTypeCloth, 1); + setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); } @Override @@ -34,6 +43,31 @@ public class BlockElectricCloud extends BlockBase { public TileEntity createTileEntity(World world, int metadata) { return new TileElectricCloud(); } + + @Override + public String getUnlocalizedName() { + return "tile.EMT." + super.getUnlocalizedName().substring(15); + } + + @Override + public void registerBlockIcons(IIconRegister ir) { + icon = ir.registerIcon(ModInformation.texturePath + ":empty"); + } + + @Override + public IIcon getIcon(int side, int meta) { + return icon; + } + + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) + { + return null; + } + + @Override + public int getLightValue() { + return 15; + } @Override public boolean isAir(IBlockAccess world, int x, int y, int z) { diff --git a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java index ebc02dc..8c5dde2 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java +++ b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java @@ -22,7 +22,7 @@ import java.util.Random; public class BlockPortableNode extends BlockAiry { - public IIcon[] texture = new IIcon[1]; + public IIcon texture; public BlockPortableNode(String name) { this.setCreativeTab(ElectroMagicTools.tabEMT); @@ -65,17 +65,12 @@ public class BlockPortableNode extends BlockAiry { @SideOnly(Side.CLIENT) @Override public void registerBlockIcons(IIconRegister ri) { - this.texture[0] = ri.registerIcon(ModInformation.texturePath + ":portablenode"); + texture = ri.registerIcon(ModInformation.texturePath + ":portablenode"); } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - return this.texture[0]; - } - - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item id, CreativeTabs tab, List list) { - list.add(new ItemStack(id, 1, 0)); + return texture; } @Override diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java index 189392b..74e96eb 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java @@ -1,12 +1,34 @@ package tombenpotter.emt.common.item.block; import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; +import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.util.EMTTextHelper; public class ItemBlockElectricCloud extends ItemBlock{ + public IIcon icon; public ItemBlockElectricCloud(Block block) { super(block); } + @Override + public IIcon getIconFromDamage(int meta) { + return icon; + } + + @Override + public void registerIcons(IIconRegister ir) { + icon = ir.registerIcon(ModInformation.texturePath + ":" + "electricCloud"); + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + return EMTTextHelper.PURPLE + EMTTextHelper.BOLD + StatCollector.translateToLocal(getUnlocalizedName() + ".name"); + } } diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java index ce8a8a2..2563832 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java +++ b/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java @@ -22,73 +22,73 @@ public class ItemBlockSolars extends ItemBlock { public String getUnlocalizedName(ItemStack itemstack) { String name = ""; switch (itemstack.getItemDamage()) { - case 0: { - name = "compressed"; - break; - } - case 1: { - name = "doublecompressed"; - break; - } - case 2: { - name = "triplecompressed"; - break; - } - case 3: { - name = "water"; - break; - } - case 4: { - name = "doublewater"; - break; - } - case 5: { - name = "triplewater"; - break; - } - case 6: { - name = "dark"; - break; - } - case 7: { - name = "doubledark"; - break; - } - case 8: { - name = "tripledark"; - break; - } - case 9: { - name = "order"; - break; - } - case 10: { - name = "doubleorder"; - break; - } - case 11: { - name = "tripleorder"; - break; - } - case 12: { - name = "fire"; - break; - } - case 13: { - name = "doublefire"; - break; - } - case 14: { - name = "triplefire"; - break; - } - case 15: { - name = "air"; - break; - } - default: - name = "nothing"; - break; + case 0: { + name = "compressed"; + break; + } + case 1: { + name = "doublecompressed"; + break; + } + case 2: { + name = "triplecompressed"; + break; + } + case 3: { + name = "water"; + break; + } + case 4: { + name = "doublewater"; + break; + } + case 5: { + name = "triplewater"; + break; + } + case 6: { + name = "dark"; + break; + } + case 7: { + name = "doubledark"; + break; + } + case 8: { + name = "tripledark"; + break; + } + case 9: { + name = "order"; + break; + } + case 10: { + name = "doubleorder"; + break; + } + case 11: { + name = "tripleorder"; + break; + } + case 12: { + name = "fire"; + break; + } + case 13: { + name = "doublefire"; + break; + } + case 14: { + name = "triplefire"; + break; + } + case 15: { + name = "air"; + break; + } + default: + name = "nothing"; + break; } return getUnlocalizedName() + "." + name; } @@ -102,83 +102,83 @@ public class ItemBlockSolars extends ItemBlock { @SuppressWarnings({ "unchecked", "rawtypes" }) public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean par4) { switch (itemstack.getItemDamage()) { - case 0: { - list.add(EMTConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 1: { - list.add(EMTConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 2: { - list.add(EMTConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); - break; - } - case 3: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 4: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 5: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); - break; - } - case 6: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 7: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 8: { - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); - break; - } - case 9: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } - case 10: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } + case 0: { + list.add(EMTConfigHandler.compressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 1: { + list.add(EMTConfigHandler.doubleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 2: { + list.add(EMTConfigHandler.tripleCompressedSolarOutput + localize("tooltip.EMT.euPerTick")); + break; + } + case 3: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 4: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 5: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.raining")); + break; + } + case 6: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 7: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 8: { + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick") + " " + localize("tooltip.EMT.night")); + break; + } + case 9: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } + case 10: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } - case 11: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); - break; - } - case 12: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 13: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 14: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.lava")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); - break; - } - case 15: { - list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); - list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); - break; - } - default: { - list.add(localize("tooltip.EMT.forget")); - break; - } + case 11: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.triple")); + break; + } + case 12: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 13: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.doubleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 14: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.tripleCompressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.lava")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double") + " " + localize("tooltip.EMT.output.double.nether")); + break; + } + case 15: { + list.add(EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY + EMTConfigHandler.compressedSolarOutput + " " + localize("tooltip.EMT.euPerTick")); + list.add(EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY + localize("tooltip.EMT.output.double.half") + " " + localize("tooltip.EMT.output.double.half.height")); + break; + } + default: { + list.add(localize("tooltip.EMT.forget")); + break; + } } } } diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 017b407..8d392f3 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -94,6 +94,7 @@ item.EMT.focus.charge.name=Wand Focus: Charging item.EMT.focus.charge.wand.name=Wand Focus: Wand Charging #=============Block Names============= +tile.EMT.electricCloud.name=Electric Cloud tile.EMT.shield.name=Shield Block tile.EMT.portablenode.name=Portable Node tile.EMT.essentia.potentia.name=Potentia Generator diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 0f88c33..33586c5 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -94,6 +94,7 @@ item.EMT.focus.charge.name=Набалдашник: Зарядка item.EMT.focus.charge.wand.name=Набалдашник: Зарядка жезла #=============Block Names============= +tile.EMT.electricCloud.name=Электронное облако tile.EMT.shield.name=Щит-блок tile.EMT.portablenode.name=Переносной узел tile.EMT.essentia.potentia.name=Potentia генератор diff --git a/src/main/resources/assets/electromagictools/lang/zh_CN.lang b/src/main/resources/assets/electromagictools/lang/zh_CN.lang index 04f6ac3..5baa7c7 100644 --- a/src/main/resources/assets/electromagictools/lang/zh_CN.lang +++ b/src/main/resources/assets/electromagictools/lang/zh_CN.lang @@ -94,6 +94,7 @@ item.EMT.focus.charge.name=法杖核心:充电 item.EMT.focus.charge.wand.name=法杖核心:化魔 #=============Block Names============= +tile.EMT.electricCloud.name=Electric Cloud tile.EMT.shield.name=护盾方块 tile.EMT.portablenode.name=便携式节点 tile.EMT.essentia.potentia.name=能量源质发电机 diff --git a/src/main/resources/assets/electromagictools/textures/blocks/ElectricCloud.png b/src/main/resources/assets/electromagictools/textures/blocks/ElectricCloud.png new file mode 100644 index 0000000..c1f19dd Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/ElectricCloud.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/empty.png b/src/main/resources/assets/electromagictools/textures/blocks/empty.png new file mode 100644 index 0000000..f278e89 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/empty.png differ