diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/tombenpotter/emt/ElectroMagicTools.java index 18a8c99..2136aa5 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/tombenpotter/emt/ElectroMagicTools.java @@ -22,21 +22,26 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + import tombenpotter.emt.common.commands.CommandOutputs; import tombenpotter.emt.common.Registry; import tombenpotter.emt.common.entities.BaseEntityRegistry; +import tombenpotter.emt.common.network.PacketEMTKeys; import tombenpotter.emt.common.util.*; import tombenpotter.emt.proxies.CommonProxy; - import static tombenpotter.emt.common.util.TextHelper.localize; @Mod(modid = ModInformation.modid, name = ModInformation.name, version = ModInformation.version, guiFactory = ModInformation.guiFactory, dependencies = ModInformation.depend) public class ElectroMagicTools { + public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT"); @SidedProxy(clientSide = ModInformation.clientProxy, serverSide = ModInformation.commonProxy) public static CommonProxy proxy; @@ -56,6 +61,7 @@ public class ElectroMagicTools { Registry.register(); EssentiasOutputs.addPrimalOutputs(); EssentiasOutputs.addOutputs(); + registerPackets(); ElectroMagicTools.logger.info(localize("console.EMT.preInit.end")); } @@ -93,4 +99,8 @@ public class ElectroMagicTools { public void onFMLServerStart(FMLServerStartingEvent event) { event.registerServerCommand(new CommandOutputs()); } + + public void registerPackets(){ + INSTANCE.registerMessage(PacketEMTKeys.class, PacketEMTKeys.class, 0, Side.SERVER); + } } diff --git a/src/main/java/tombenpotter/emt/client/EMTKeys.java b/src/main/java/tombenpotter/emt/client/EMTKeys.java new file mode 100644 index 0000000..8fa688e --- /dev/null +++ b/src/main/java/tombenpotter/emt/client/EMTKeys.java @@ -0,0 +1,39 @@ +package tombenpotter.emt.client; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.lwjgl.input.Keyboard; + +import cpw.mods.fml.client.registry.ClientRegistry; +import net.minecraft.client.settings.KeyBinding; + +public class EMTKeys{ + private static Map keys = new HashMap(); + + public static void addKey(KeyBinding kb, String name){ + keys.put(name, kb); + } + + public static void registerKeys(){ + addKey(new KeyBinding("UnEquip", Keyboard.KEY_Z, "EMT"), "UnEquip"); + + for(Entry entry : keys.entrySet()){ + ClientRegistry.registerKeyBinding(entry.getValue()); + } + } + + public static KeyBinding getKey(String name){ + + for(Entry entry : keys.entrySet()){ + if(name.equals(entry.getKey())){ + return entry.getValue(); + } + } + + return null; + } +} \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/EMTResearch.java b/src/main/java/tombenpotter/emt/common/EMTResearch.java index addf798..3b1e7b6 100644 --- a/src/main/java/tombenpotter/emt/common/EMTResearch.java +++ b/src/main/java/tombenpotter/emt/common/EMTResearch.java @@ -19,6 +19,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.RecipeRegistry; import tombenpotter.emt.common.blocks.BlockRegistry; import tombenpotter.emt.common.items.ItemRegistry; diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java index bae6b85..79468cb 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars.java @@ -105,19 +105,19 @@ public class BlockEMTSolars extends BlockBaseContainer { this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); + this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); + this.side[5] = ri.registerIcon(ModInformation.texturePath + ":solars/water/waterside"); + this.side[6] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); + this.side[7] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); + this.side[8] = ri.registerIcon(ModInformation.texturePath + ":solars/dark/darkside"); + this.side[9] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); + this.side[10] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); + this.side[11] = ri.registerIcon(ModInformation.texturePath + ":solars/order/orderside"); + this.side[12] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); + this.side[13] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); + this.side[14] = ri.registerIcon(ModInformation.texturePath + ":solars/fire/fireside"); + this.side[15] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java index 9fb0301..60a43eb 100644 --- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTSolars2.java @@ -58,11 +58,11 @@ public class BlockEMTSolars2 extends BlockBaseContainer { this.frontOff[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); this.frontOff[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); - this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); - this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/side"); + this.side[0] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); + this.side[1] = ri.registerIcon(ModInformation.texturePath + ":solars/air/airside"); + this.side[2] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); + this.side[3] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); + this.side[4] = ri.registerIcon(ModInformation.texturePath + ":solars/earth/earthside"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java index 71ffcc9..2cdc2f7 100644 --- a/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java +++ b/src/main/java/tombenpotter/emt/common/entities/EntityLaser.java @@ -163,11 +163,17 @@ public class EntityLaser extends Entity implements IProjectile { if (this.inGround) { Block j = this.worldObj.getBlock(this.xTile, this.yTile, this.zTile); int k = this.worldObj.getBlockMetadata(this.xTile, this.yTile, this.zTile); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 3, true); + this.worldObj.createExplosion(this, (int)this.posX, (int)this.posY, (int)this.posZ, 3, true); this.setDead(); + //for(int x = 0; x < 6; x++){ + // for(int z = 0; z < 6; z++){ + // this.worldObj.setBlockToAir((int)this.posX + x, (int)this.posY, (int)this.posZ + z); + // } + //} + //this.setDead(); if (j == this.inTile && k == this.inData) { ++this.ticksInGround; - + if (this.ticksInGround == 1200) { this.setDead(); } @@ -184,7 +190,7 @@ public class EntityLaser extends Entity implements IProjectile { Vec3 vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); Vec3 vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); MovingObjectPosition movingobjectposition = this.worldObj.func_147447_a(vec31, vec3, false, true, false); - vec31 = Vec3.createVectorHelper(this.posX, this.posY, this.posZ); + vec31 = Vec3.createVectorHelper(this.posX - 5, this.posY, this.posZ); vec3 = Vec3.createVectorHelper(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ); if (movingobjectposition != null) { diff --git a/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java b/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java index 2c93d0d..ad50b12 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/ItemEMTQuantum.java @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Random; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; @@ -67,10 +68,9 @@ public class ItemEMTQuantum extends ItemArmorElectric { IIcon icon2; IIcon icon3; IIcon icon4; - public int f = 0; - boolean isHolding = false; + Random rnd; + protected static final Map potionRemovalCost = new HashMap(); - private float jumpCharge; public static AudioSource audioSource; private static boolean lastJetpackUsed = false; @@ -84,6 +84,7 @@ public class ItemEMTQuantum extends ItemArmorElectric { potionRemovalCost.put(Integer.valueOf(Potion.poison.id), Integer.valueOf(10000)); potionRemovalCost.put(Integer.valueOf(IC2Potion.radiation.id), Integer.valueOf(10000)); potionRemovalCost.put(Integer.valueOf(Potion.wither.id), Integer.valueOf(25000)); + rnd = new Random(); } @@ -218,7 +219,7 @@ public class ItemEMTQuantum extends ItemArmorElectric { } } - if(player.inventory.getCurrentItem() == null && IC2.keyboard.isBoostKeyDown(player) && IC2.keyboard.isSneakKeyDown(player) && toggleTimer == 0 && IC2.platform.isSimulating()){ + if(player.inventory.getCurrentItem() == null && nbtData.getBoolean("unequip") && player.isSneaking() && toggleTimer == 0 && IC2.platform.isSimulating()){ toggleTimer = 30; if(player.inventory.armorInventory[2] == itemStack){ if(player.inventory.getCurrentItem() == null){ @@ -261,6 +262,8 @@ public class ItemEMTQuantum extends ItemArmorElectric { ElectricItem.manager.charge(charged, 1, 1, true, false); player.inventory.setInventorySlotContents(player.inventory.currentItem, charged); } + + nbtData.setBoolean("unequip", false); } } } @@ -343,12 +346,28 @@ public class ItemEMTQuantum extends ItemArmorElectric { return icon0; } - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int par1) - { - return icon0; - } + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining){ + try{ + if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ + return icon1; + } + if((stack.stackTagCompound.getString("useother")).equals("TW")){ + return icon2; + } + if((stack.stackTagCompound.getString("useother")).equals("NW")){ + return icon3; + } + if((stack.stackTagCompound.getString("useother")).equals("QW")){ + return icon4; + } + } + catch(Exception e){ + return icon0; + } + + return icon0; + } @Override public int getItemEnchantability() { @@ -394,16 +413,18 @@ public class ItemEMTQuantum extends ItemArmorElectric { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - list.add(String.valueOf((int)ElectricItem.manager.getCharge(stack)) + "EU"); - if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ - list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK"); - } - if((stack.stackTagCompound.getString("useother")).equals("NW")){ - list.add((stack.stackTagCompound.getInteger("NWCharge")) + " EU NW"); - } - if((stack.stackTagCompound.getString("useother")).equals("QW")){ - list.add((stack.stackTagCompound.getInteger("QWCharge")) + " EU QW"); - } + try{ + if((stack.stackTagCompound.getString("useother")).equals("Jetpack")){ + list.add((stack.stackTagCompound.getInteger("jetpackCharge")) + " EU JETPACK"); + } + if((stack.stackTagCompound.getString("useother")).equals("NW")){ + list.add((stack.stackTagCompound.getInteger("NWCharge")) + " EU NW"); + } + if((stack.stackTagCompound.getString("useother")).equals("QW")){ + list.add((stack.stackTagCompound.getInteger("QWCharge")) + " EU QW"); + } + } + catch(NullPointerException e){} } public boolean useJetpack(EntityPlayer player, boolean hoverMode, ItemStack stack) { @@ -480,9 +501,14 @@ public class ItemEMTQuantum extends ItemArmorElectric { else if(nbtData.getBoolean("isHolding")){ nbtData.setBoolean("isHolding", false); player.motionY = motionY * nbtData.getInteger("f"); - player.motionX /= motionXZ; - player.motionZ /= motionXZ; - world.playSoundEffect(player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, "mob.ghast.fireball", 1.0F, 0.7F + 0.3F); + if(player.motionX < 0.7 && player.motionZ < 0.7){ + player.motionX /= motionXZ; + player.motionZ /= motionXZ; + } + world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1); + for(int i = 0; i < 4; i++){ + world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0); + } nbtData.setInteger("f", 0); } diff --git a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java index f50bfd3..1166a7d 100644 --- a/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java +++ b/src/main/java/tombenpotter/emt/common/items/armor/wings/ItemFeatherWing.java @@ -1,5 +1,7 @@ package tombenpotter.emt.common.items.armor.wings; +import java.util.Random; + import ic2.core.IC2; import ic2.core.util.StackUtil; import cpw.mods.fml.relauncher.Side; @@ -22,7 +24,7 @@ import tombenpotter.emt.common.util.ConfigHandler; public class ItemFeatherWing extends ItemArmor { public int visDiscount = 0; - int f; + Random rnd; public ItemFeatherWing(ArmorMaterial material, int par3, int par4) { super(material, par3, par4); @@ -30,6 +32,7 @@ public class ItemFeatherWing extends ItemArmor { this.setMaxDamage(120); this.setCreativeTab(ElectroMagicTools.tabEMT); this.isDamageable(); + rnd = new Random(); } @SideOnly(Side.CLIENT) @@ -74,9 +77,14 @@ public class ItemFeatherWing extends ItemArmor { nbtData.setBoolean("isHolding", false); player.motionY = motionY * nbtData.getInteger("f"); - player.motionX /= motionXZ; - player.motionZ /= motionXZ; - world.playSoundEffect(player.posX + 0.5D, player.posY + 0.5D, player.posZ + 0.5D, "mob.ghast.fireball", 1.0F, 0.7F + 0.3F); + if(player.motionX < 0.7 && player.motionZ < 0.7){ + player.motionX /= motionXZ; + player.motionZ /= motionXZ; + } + world.playSoundEffect(player.posX, player.posY, player.posZ, "mob.ghast.fireball", 1, 1); + for(int i = 0; i < 4; i++){ + world.spawnParticle("cloud", player.posX - 1 + (rnd.nextInt(100) / 50d), player.posY - 1, player.posZ - 1 + (rnd.nextInt(100) / 50d), 0, -0.5, 0); + } nbtData.setInteger("f", 0); } diff --git a/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java b/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java new file mode 100644 index 0000000..4b7c67b --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java @@ -0,0 +1,31 @@ +package tombenpotter.emt.common.network; + +import tombenpotter.emt.common.items.ItemRegistry; +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; + +public class PacketEMTKeys implements IMessage, IMessageHandler{ + + @Override + public IMessage onMessage(PacketEMTKeys message, MessageContext ctx) { + if(ctx.getServerHandler().playerEntity.inventory.armorInventory[2] != null && ctx.getServerHandler().playerEntity.inventory.armorInventory[2].getItem() == ItemRegistry.quantumArmor){ + System.out.println("Odel."); + ctx.getServerHandler().playerEntity.inventory.armorInventory[2].stackTagCompound.setBoolean("unequip", true); + } + System.out.println("Prinyal."); + return null; + } + + @Override + public void fromBytes(ByteBuf buf) { + + } + + @Override + public void toBytes(ByteBuf buf) { + } +} diff --git a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java index 2d1b433..7443aad 100644 --- a/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java +++ b/src/main/java/tombenpotter/emt/common/util/EventHandlerEMT.java @@ -15,6 +15,8 @@ package tombenpotter.emt.common.util; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +25,11 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.common.items.ItemRegistry; import tombenpotter.emt.common.items.ItemShardCarver; +import tombenpotter.emt.common.network.PacketEMTKeys; +import tombenpotter.emt.proxies.ClientProxy; public class EventHandlerEMT { @@ -51,8 +56,8 @@ public class EventHandlerEMT { } @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { - if (eventArgs.modID.equals(ModInformation.modid)) { + public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.modID.equals(ModInformation.modid)) { ConfigHandler.syncConfig(); ElectroMagicTools.logger.info(TextHelper.localize("console.EMT.config.refresh")); } @@ -67,4 +72,11 @@ public class EventHandlerEMT { } } } + + @SubscribeEvent + public void clientTick(ClientTickEvent e) { + if(EMTKeys.getKey("UnEquip").getIsKeyPressed()){ + ElectroMagicTools.INSTANCE.sendToServer(new PacketEMTKeys()); + } + } } diff --git a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java index fc76928..706307c 100644 --- a/src/main/java/tombenpotter/emt/proxies/ClientProxy.java +++ b/src/main/java/tombenpotter/emt/proxies/ClientProxy.java @@ -12,7 +12,12 @@ package tombenpotter.emt.proxies; +import org.lwjgl.input.Keyboard; + +import net.minecraft.client.settings.KeyBinding; +import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; +import tombenpotter.emt.client.EMTKeys; import tombenpotter.emt.client.renderer.RenderArcher; import tombenpotter.emt.client.renderer.RenderLaser; import tombenpotter.emt.common.entities.EntityArcher; @@ -23,6 +28,7 @@ public class ClientProxy extends CommonProxy { @Override public void load() { registerRenders(); + EMTKeys.registerKeys(); } public void registerRenders() { diff --git a/src/main/resources/assets/electromagictools/lang/en_US.lang b/src/main/resources/assets/electromagictools/lang/en_US.lang index 45ee07d..e16b41f 100644 --- a/src/main/resources/assets/electromagictools/lang/en_US.lang +++ b/src/main/resources/assets/electromagictools/lang/en_US.lang @@ -77,7 +77,7 @@ item.EMT.wing.feather.name=Feather Duct-Taped Wings item.EMT.wing.thaumium.name=Thaumium Reinforced Wings item.EMT.wing.nano.name=Nanosuit Wings item.EMT.wing.quantum.name=Quantum Wings -ic2.EMT.quantum=Infused Quantum Сhestplate +ic2.EMT.quantum=Infused Quantum Chestplate item.EMT.hammer.broken.name=Broken Relic of Mjolnir item.EMT.hammer.name=Mjolnir @@ -356,7 +356,7 @@ emt.rsname.Quantum Wings=Quantum Wings emt.text.Quantum Wings=After exploring all the possibilities of nanotechnologies, you decided to do the last jump. Quantum. You can thrust yourself many blocks high, have a very good protection, and your fall is slowed down a lot. However, the quantum unpredictability happened once again. Your fall will be completely stopped when spacebar and sneak are maintained. You don't know why, but it works. Included: fall damage reduction, 100%. emt.rsname.InfusedQuantumArmor=Infused Quantum Сhestplate. -emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + Ctrl. +emt.text.InfusedQuantumArmor=You had been nothing to do and you decided to do something useful. You had an idea in your head of making armor which you can fasten the wings or backpack for being protected in flight. Take the wings or backpack in your hands and sit down to put their on armor. To remove them, hold Shift + "Unequip"(see in options). #=============Console Logging============= console.EMT.preInit.begin=Starting planning the world domination console.EMT.preInit.configRead=Creating/Reading the config file diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 8f7a125..993ad64 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -354,7 +354,7 @@ emt.text.Quantum Wings=После исследования всех возмож emt.rsname.InfusedQuantumArmor=Наполненный квантовый нагрудник. emt.tag.InfusedQuantumArmor=Последний шаг... -emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + LCtrl. +emt.text.InfusedQuantumArmor=Вам было нечего делать, и Вы решили заняться хоть чем-то полезным. Вам в голову пришла идея создания брони, на которую можно нацепить крылья или ранец, чтобы быть защищёнными в полёте. Возмите в руку крылья или ранец, и присядьте чтобы надеть их на броню. Чтобы снять их, зажмите Shift + "Снять"(Смотрите в настройках). #=============Console Logging============= console.EMT.preInit.begin=Начало планирования над мировым господством diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png index d0da022..15a9035 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png new file mode 100644 index 0000000..c8995c7 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/air/airside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png index 23964cf..9ddf27c 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png new file mode 100644 index 0000000..68c7fe5 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/bottom32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png index 60e0fc2..bd4b554 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png new file mode 100644 index 0000000..454852c Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/dark/darkside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png index 49c6438..797aa00 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png new file mode 100644 index 0000000..5f56441 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/doublesolartop32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png index a8d1558..e860147 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png new file mode 100644 index 0000000..a6d05e5 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/earth/earthside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png index 06ab98a..06ce193 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png new file mode 100644 index 0000000..d902d48 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/fire/fireside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png index 6291f21..ec7191a 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png new file mode 100644 index 0000000..b3e6582 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/order/orderside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png index e9bb63a..1ded25e 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/side.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png new file mode 100644 index 0000000..f9515c6 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/side32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png index 5c4da47..ddf4eb3 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png new file mode 100644 index 0000000..39b5f9b Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/solartop32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png index 25aeee7..efe16f0 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png new file mode 100644 index 0000000..192696c Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/triplesolartop32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png index 29b2f84..e30fe95 100644 Binary files a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png and b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside.png differ diff --git a/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png new file mode 100644 index 0000000..77fd802 Binary files /dev/null and b/src/main/resources/assets/electromagictools/textures/blocks/solars/water/waterside32.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png b/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png index edf8672..8c35005 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png and b/src/main/resources/assets/electromagictools/textures/items/armor/wing_nano.png differ diff --git a/src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png b/src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png index 83fdf5d..e0cc660 100644 Binary files a/src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png and b/src/main/resources/assets/electromagictools/textures/items/hammer/thorhammer.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/electricgoggles.png b/src/main/resources/assets/electromagictools/textures/models/electricgoggles.png index 54a6eae..8ccbde5 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/electricgoggles.png and b/src/main/resources/assets/electromagictools/textures/models/electricgoggles.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png b/src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png index 8229384..fd5d16c 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png and b/src/main/resources/assets/electromagictools/textures/models/solarrevealinghelmet.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png b/src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png index a480cf6..012384f 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png and b/src/main/resources/assets/electromagictools/textures/models/thaumicnanohelmet.png differ diff --git a/src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png b/src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png index 45ae097..ff6fcc5 100644 Binary files a/src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png and b/src/main/resources/assets/electromagictools/textures/models/thaumicquantumhelmet.png differ