diff --git a/src/main/java/emt/ElectroMagicTools.java b/src/main/java/emt/ElectroMagicTools.java index 5f79f58..0a202b4 100644 --- a/src/main/java/emt/ElectroMagicTools.java +++ b/src/main/java/emt/ElectroMagicTools.java @@ -41,7 +41,7 @@ public class ElectroMagicTools { public static CommonProxy proxy; public static CreativeTabs tabEMT = new EMTCreativeTab(ModInformation.modid + ".creativeTab"); public static Logger logger = LogManager.getLogger(ModInformation.name); - public static SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT"); + public static SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(ModInformation.channel); @Instance(ModInformation.modid) public static ElectroMagicTools instance; diff --git a/src/main/java/emt/ModInformation.java b/src/main/java/emt/ModInformation.java index 3f6e198..f6ea589 100644 --- a/src/main/java/emt/ModInformation.java +++ b/src/main/java/emt/ModInformation.java @@ -8,6 +8,6 @@ public class ModInformation { public static final String guiFactory = "emt.client.gui.config.EMTGuiFactory"; public static final String clientProxy = "emt.proxy.ClientProxy"; public static final String commonProxy = "emt.proxy.CommonProxy"; - public static final String channel = "ElectroMagicTools"; + public static final String channel = "EMT"; public static final String depend = "required-after:Thaumcraft ; required-after:IC2"; } diff --git a/src/main/java/emt/entity/EntityElectroBall.java b/src/main/java/emt/entity/EntityElectroBall.java new file mode 100644 index 0000000..6e6dd44 --- /dev/null +++ b/src/main/java/emt/entity/EntityElectroBall.java @@ -0,0 +1,23 @@ +package emt.entity; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.projectile.EntityFireball; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityElectroBall extends EntityFireball { + + public EntityElectroBall(World world) { + super(world); + } + + public EntityElectroBall(World world, EntityLivingBase player, double rotX, double rotY, double rotZ) { + super(world, player, rotX, rotY, rotZ); + } + + @Override + protected void onImpact(MovingObjectPosition mop) { + + } + +} diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index 6cbd683..9e95487 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -22,6 +22,7 @@ import emt.item.armor.wings.ItemThaumiumReinforcedWing; import emt.item.focus.ItemChargeFocus; import emt.item.focus.ItemChristmasFocus; import emt.item.focus.ItemExplosionFocus; +import emt.item.focus.ItemNoNameFocus; import emt.item.focus.ItemShieldFocus; import emt.item.focus.ItemWandChargingFocus; import emt.item.tool.ItemElectricHoeGrowth; @@ -62,6 +63,7 @@ public class EMTItems { public static Item explosionFocus; public static Item christmasFocus; public static Item shieldFocus; + public static Item noNameFocus; public static Item electricGoggles; public static Item streamChainsaw; public static Item rockbreakerDrill; @@ -185,5 +187,8 @@ public class EMTItems { wandChargeFocus = new ItemWandChargingFocus(); GameRegistry.registerItem(wandChargeFocus, "WandChargingFocus"); + + noNameFocus = new ItemNoNameFocus(); + GameRegistry.registerItem(noNameFocus, "NoNameFocus"); } } \ No newline at end of file diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index b21eff9..618a95e 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -21,7 +21,7 @@ public class EMTResearches { public static void addResearchTab() { ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); - ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.texturePath, "textures/blocks/electricCloud.png"), background); + ResearchCategories.registerCategory("EMT", new ResourceLocation(ModInformation.texturePath, "textures/misc/emt.png"), background); } public static void addResearch() { @@ -76,8 +76,7 @@ public class EMTResearches { if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { if (!EMTConfigHandler.thaumiumOmnitoolResearch) { - new EMTResearchItem("Thaumium Omnitool", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(EMTItems.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumOmnitool), - new ResearchPage(EMTRecipes.diamondOmnitoolToThaumium)); + new EMTResearchItem("Thaumium Omnitool", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(EMTItems.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.thaumiumOmnitool), new ResearchPage(EMTRecipes.diamondOmnitoolToThaumium)); } } @@ -160,8 +159,7 @@ public class EMTResearches { } if (!EMTConfigHandler.compressedSolarsResearch) { - new EMTResearchItem("Compressed Solars", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(EMTBlocks.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.compressedSolar), new ResearchPage(EMTRecipes.doubleCompressedSolar), - new ResearchPage(EMTRecipes.tripleCompressedSolar)); + new EMTResearchItem("Compressed Solars", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(EMTBlocks.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.compressedSolar), new ResearchPage(EMTRecipes.doubleCompressedSolar), new ResearchPage(EMTRecipes.tripleCompressedSolar)); } if (!EMTConfigHandler.compressedSolarsResearch) { @@ -198,29 +196,25 @@ public class EMTResearches { if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.waterSolarsResearch) { - new EMTResearchItem("Water Infused Solar Panels", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.waterSolar), new ResearchPage(EMTRecipes.doubleWaterSolar), - new ResearchPage(EMTRecipes.tripleWaterSolar)); + new EMTResearchItem("Water Infused Solar Panels", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.waterSolar), new ResearchPage(EMTRecipes.doubleWaterSolar), new ResearchPage(EMTRecipes.tripleWaterSolar)); } } if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.darkSolarsResearch) { - new EMTResearchItem("Entropy Infused Solar Panels", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(EMTBlocks.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.darkSolar), new ResearchPage(EMTRecipes.doubleDarkSolar), - new ResearchPage(EMTRecipes.tripleDarkSolar)); + new EMTResearchItem("Entropy Infused Solar Panels", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(EMTBlocks.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.darkSolar), new ResearchPage(EMTRecipes.doubleDarkSolar), new ResearchPage(EMTRecipes.tripleDarkSolar)); } } if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.orderSolarsResearch) { - new EMTResearchItem("Order Infused Solar Panels", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(EMTBlocks.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.orderSolar), new ResearchPage(EMTRecipes.doubleOrderSolar), - new ResearchPage(EMTRecipes.tripleOrderSolar)); + new EMTResearchItem("Order Infused Solar Panels", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(EMTBlocks.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.orderSolar), new ResearchPage(EMTRecipes.doubleOrderSolar), new ResearchPage(EMTRecipes.tripleOrderSolar)); } } if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.fireSolarsResearch) { - new EMTResearchItem("Fire Infused Solar Panels", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.fireSolar), new ResearchPage(EMTRecipes.doubleFireSolar), - new ResearchPage(EMTRecipes.tripleFireSolar)); + new EMTResearchItem("Fire Infused Solar Panels", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(EMTBlocks.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.fireSolar), new ResearchPage(EMTRecipes.doubleFireSolar), new ResearchPage(EMTRecipes.tripleFireSolar)); } } @@ -232,15 +226,12 @@ public class EMTResearches { if (!EMTConfigHandler.compressedSolarsResearch) { if (!EMTConfigHandler.earthSolarsResearch) { - new EMTResearchItem("Earth Infused Solar Panels", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(EMTBlocks.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.earthSolar), new ResearchPage(EMTRecipes.doubleEarthSolar), - new ResearchPage(EMTRecipes.tripleEarthSolar)); + new EMTResearchItem("Earth Infused Solar Panels", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(EMTBlocks.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.earthSolar), new ResearchPage(EMTRecipes.doubleEarthSolar), new ResearchPage(EMTRecipes.tripleEarthSolar)); } } if (!EMTConfigHandler.uuMInfusionResearch) { - new EMTResearchItem("UU-Matter Infusion", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(EMTItems.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.uuMCrystal), new ResearchPage(EMTRecipes.charcoalToCoal), - new ResearchPage(EMTRecipes.glowstoneDustToBlock), new ResearchPage(EMTRecipes.stoneBricksToIronOre), new ResearchPage(EMTRecipes.arcaneStoneToCopperOre), new ResearchPage(EMTRecipes.arcaneStoneBricksToTinOre), new ResearchPage(EMTRecipes.amberBlockToLeadOre), new ResearchPage(EMTRecipes.amberBricksToUraniumOre), - new ResearchPage(EMTRecipes.shardToResin), new ResearchPage(EMTRecipes.shardToRedstone), new ResearchPage(EMTRecipes.shardToLapis), new ResearchPage(EMTRecipes.ironToGold), new ResearchPage(EMTRecipes.goldToDiamond), new ResearchPage(EMTRecipes.diamondToUranium), new ResearchPage(EMTRecipes.uraniumToIridium)); + new EMTResearchItem("UU-Matter Infusion", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(EMTItems.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(EMTRecipes.uuMCrystal), new ResearchPage(EMTRecipes.charcoalToCoal), new ResearchPage(EMTRecipes.glowstoneDustToBlock), new ResearchPage(EMTRecipes.stoneBricksToIronOre), new ResearchPage(EMTRecipes.arcaneStoneToCopperOre), new ResearchPage(EMTRecipes.arcaneStoneBricksToTinOre), new ResearchPage(EMTRecipes.amberBlockToLeadOre), new ResearchPage(EMTRecipes.amberBricksToUraniumOre), new ResearchPage(EMTRecipes.shardToResin), new ResearchPage(EMTRecipes.shardToRedstone), new ResearchPage(EMTRecipes.shardToLapis), new ResearchPage(EMTRecipes.ironToGold), new ResearchPage(EMTRecipes.goldToDiamond), new ResearchPage(EMTRecipes.diamondToUranium), new ResearchPage(EMTRecipes.uraniumToIridium)); } if (!EMTConfigHandler.portableNodeResarch) { diff --git a/src/main/java/emt/item/block/ItemBlockElectricCloud.java b/src/main/java/emt/item/block/ItemBlockElectricCloud.java index f0de427..4bf2bcf 100644 --- a/src/main/java/emt/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/emt/item/block/ItemBlockElectricCloud.java @@ -25,7 +25,7 @@ public class ItemBlockElectricCloud extends ItemBlock{ @Override public void registerIcons(IIconRegister ir) { - icon = ir.registerIcon(ModInformation.texturePath + ":" + "electricCloud"); + icon = ir.registerIcon(ModInformation.texturePath + ":" + "electric_cloud"); } @Override diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 2db8177..76cd66e 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -23,27 +23,22 @@ import emt.ModInformation; public abstract class ItemBaseFocus extends ItemFocusBasic { - private IIcon ornament, depth; - String textureName = null; + public IIcon ornament; + String textureName = ""; - public ItemBaseFocus(String unlocName, String textureName) { + public ItemBaseFocus(String unlocName) { super(); - - setUnlocalizedName(ModInformation.modid + unlocName); + setUnlocalizedName(ModInformation.modid + ".focus." + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); setMaxDamage(1); setNoRepair(); setMaxStackSize(1); - this.textureName = textureName; - } - - boolean hasOrnament() { - return false; + this.textureName = unlocName; } @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { - this.icon = ir.registerIcon(ModInformation.texturePath + ":" + textureName); + this.icon = ir.registerIcon(ModInformation.texturePath + ":" + "focus_" + textureName); } boolean hasDepth() { @@ -65,20 +60,14 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { return EnumRarity.rare; } - public IIcon getFocusDepthLayerIcon() { - return depth; - } - + @Override public IIcon getOrnament(ItemStack focusstack) { return ornament; } - public WandFocusAnimation getAnimation() { - return WandFocusAnimation.WAVE; - } - - public AspectList getVisCost() { - return null; + @Override + public AspectList getVisCost(ItemStack focusstack) { + return new AspectList(); } public boolean isUseItem(ItemStack stack) { @@ -115,10 +104,6 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { return false; } - public boolean acceptsEnchant(int id) { - return false; - } - @Override public int getItemEnchantability() { return 5; @@ -126,7 +111,7 @@ public abstract class ItemBaseFocus extends ItemFocusBasic { @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - AspectList cost = getVisCost(); + AspectList cost = getVisCost(stack); if (cost != null && cost.size() > 0) { list.add(StatCollector.translateToLocal(isVisCostPerTick() ? "item.Focus.cost2" : "item.Focus.cost1")); for (Aspect aspect : cost.getAspectsSorted()) { diff --git a/src/main/java/emt/item/focus/ItemChargeFocus.java b/src/main/java/emt/item/focus/ItemChargeFocus.java index 197445e..4406c56 100644 --- a/src/main/java/emt/item/focus/ItemChargeFocus.java +++ b/src/main/java/emt/item/focus/ItemChargeFocus.java @@ -20,7 +20,7 @@ public class ItemChargeFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemChargeFocus() { - super(".focus.charge", "focus_charge"); + super("charge"); } @Override @@ -32,7 +32,7 @@ public class ItemChargeFocus extends ItemBaseFocus { public AspectList getVisCost(ItemStack stack) { AspectList actualCost = new AspectList(); for (Entry e : visCost.aspects.entrySet()) - actualCost.add(e.getKey(), (int)(e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); + actualCost.add(e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); return visCost; } @@ -41,16 +41,10 @@ public class ItemChargeFocus extends ItemBaseFocus { return "WANDCHARGING"; } - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) - { - return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; } - - /** - * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" - * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic. - * - */ + public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { return true; } @@ -61,7 +55,7 @@ public class ItemChargeFocus extends ItemBaseFocus { if (player.capabilities.isCreativeMode || wand.consumeAllVis(itemstack, player, getVisCost(itemstack), true, true)) { if (!world.isRemote) { - int energyLeft = (int)(EMTConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + int energyLeft = (int) (EMTConfigHandler.chargeFocusProduction * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); for (int i = 0; i < player.inventory.armorInventory.length; i++) { if (energyLeft > 0) { if ((player.inventory.armorInventory[i] != null) && (player.inventory.armorInventory[i].getItem() instanceof IElectricItem)) { diff --git a/src/main/java/emt/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java index 0d8a10f..653becc 100644 --- a/src/main/java/emt/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -21,7 +21,7 @@ public class ItemChristmasFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 500).add(Aspect.AIR, 500); public ItemChristmasFocus() { - super(".focus.christmas", "focus_christmas"); + super("christmas"); } @Override diff --git a/src/main/java/emt/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java index 14ce1c0..657d05b 100644 --- a/src/main/java/emt/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -17,7 +17,7 @@ public class ItemExplosionFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 200).add(Aspect.ENTROPY, 200); public ItemExplosionFocus() { - super(".focus.explosion", "focus_explosion"); + super("explosion"); } @Override diff --git a/src/main/java/emt/item/focus/ItemNoNameFocus.java b/src/main/java/emt/item/focus/ItemNoNameFocus.java new file mode 100644 index 0000000..014a52c --- /dev/null +++ b/src/main/java/emt/item/focus/ItemNoNameFocus.java @@ -0,0 +1,42 @@ +package emt.item.focus; + +import emt.entity.EntityElectroBall; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityLargeFireball; +import net.minecraft.entity.projectile.EntitySmallFireball; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.ItemFocusBasic; + +public class ItemNoNameFocus extends ItemBaseFocus { + + public ItemNoNameFocus() { + super("noName"); + } + + @Override + public int getFocusColor(ItemStack stack) { + return 0xFFFF00; + } + + @Override + public String getSortingHelper(ItemStack itemstack) { + return "NONAME"; + } + + @Override + public ItemStack onFocusRightClick(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition paramMovingObjectPosition) { + if(!world.isRemote) { + float rotX = (-MathHelper.sin(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI)) * 100; + float rotY = (-MathHelper.sin(player.rotationPitch / 180.0F * (float) Math.PI)) * 100; + float rotZ = (MathHelper.cos(player.rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(player.rotationPitch / 180.0F * (float) Math.PI)) * 100; + world.spawnEntityInWorld(new EntityElectroBall(world, player, rotX, rotY, rotZ)); + } + return stack; + } + +} diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index 4b0f3c4..83c6150 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -27,7 +27,7 @@ public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5); public ItemShieldFocus() { - super(".focus.shield", "focus_shield"); + super("shield"); } @Override diff --git a/src/main/java/emt/item/focus/ItemWandChargingFocus.java b/src/main/java/emt/item/focus/ItemWandChargingFocus.java index 9b92d42..584ca5a 100644 --- a/src/main/java/emt/item/focus/ItemWandChargingFocus.java +++ b/src/main/java/emt/item/focus/ItemWandChargingFocus.java @@ -17,7 +17,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); public ItemWandChargingFocus() { - super(".focus.charge.wand", "focus_chargeWand"); + super("chargeWand"); } @Override @@ -39,20 +39,14 @@ public class ItemWandChargingFocus extends ItemBaseFocus { public AspectList getVisCost(ItemStack stack) { AspectList actualCost = new AspectList(); for (Entry e : visCost.aspects.entrySet()) - actualCost.add(e.getKey(), (int)(e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); + actualCost.add(e.getKey(), (int) (e.getValue() * Math.pow(1.1, getUpgradeLevel(stack, FocusUpgradeType.potency)))); return visCost; } - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) - { - return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; + public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { + return new FocusUpgradeType[] { FocusUpgradeType.potency, FocusUpgradeType.frugal }; } - - /** - * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" - * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic. - * - */ + public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { return true; } @@ -66,7 +60,7 @@ public class ItemWandChargingFocus extends ItemBaseFocus { ItemStack armor = player.inventory.armorInventory[1]; if (armor != null) { if ((ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)) && (ElectricItem.manager.use(armor, EMTConfigHandler.wandChargeFocusCost / 4, player)))) { - int amount = (int)(100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); + int amount = (int) (100 * Math.pow(1.1, getUpgradeLevel(itemstack, FocusUpgradeType.potency))); wandItem.addRealVis(itemstack, Aspect.ORDER, amount, true); wandItem.addRealVis(itemstack, Aspect.FIRE, amount, true); wandItem.addRealVis(itemstack, Aspect.ENTROPY, amount, true); diff --git a/src/main/java/emt/proxy/ClientProxy.java b/src/main/java/emt/proxy/ClientProxy.java index 510729a..0acdc86 100644 --- a/src/main/java/emt/proxy/ClientProxy.java +++ b/src/main/java/emt/proxy/ClientProxy.java @@ -2,6 +2,7 @@ package emt.proxy; import org.lwjgl.input.Keyboard; +import net.minecraft.client.renderer.entity.RenderFireball; import net.minecraft.client.renderer.entity.RenderSnowMan; import net.minecraft.client.settings.KeyBinding; import cpw.mods.fml.client.registry.ClientRegistry; @@ -10,6 +11,7 @@ import emt.client.EMTKeys; import emt.client.renderer.RenderLaser; import emt.client.renderer.RenderShield; import emt.entity.EntityArcher; +import emt.entity.EntityElectroBall; import emt.entity.EntityLaser; import emt.entity.EntityShield; @@ -25,5 +27,6 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); RenderingRegistry.registerEntityRenderingHandler(EntityArcher.class, new RenderSnowMan()); RenderingRegistry.registerEntityRenderingHandler(EntityShield.class, new RenderShield()); + RenderingRegistry.registerEntityRenderingHandler(EntityElectroBall.class, new RenderFireball(2)); } } diff --git a/src/main/resources/assets/emt/lang/en_US.lang b/src/main/resources/assets/emt/lang/en_US.lang index 8d392f3..ade9218 100644 --- a/src/main/resources/assets/emt/lang/en_US.lang +++ b/src/main/resources/assets/emt/lang/en_US.lang @@ -91,7 +91,7 @@ item.EMT.focus.explosion.name=Wand Focus: Explosion item.EMT.focus.christmas.name=Wand Focus: Kris-tmas item.EMT.focus.shield.name=Wand Focus: Shield item.EMT.focus.charge.name=Wand Focus: Charging -item.EMT.focus.charge.wand.name=Wand Focus: Wand Charging +item.EMT.focus.chargeWand.name=Wand Focus: Wand Charging #=============Block Names============= tile.EMT.electricCloud.name=Electric Cloud @@ -126,225 +126,228 @@ 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? -emt.tag.Thaumium Drill=Magical mining -emt.tag.Thaumium Chainsaw=Felling trees and severing heads with a touch of magic -emt.tag.Electric Goggles=The best of both worlds -emt.tag.Nanosuit Goggles of Revealing=Top-tier eye protection -emt.tag.Quantum Goggles of Revealing=Protection coupled with utility -emt.tag.Iron Omnitool=Changing tools is for peasants -emt.tag.Diamond Omnitool=Jack of all trades -emt.tag.Thaumium Omnitool=Mystical multitool -emt.tag.Explosion Focus=Use only in well-ventilated areas -emt.tag.Kris-tmas Focus=Ho! Ho! Ho! -emt.tag.Shield Focus=S.H.I.E.L.D. -emt.tag.Potentia Generator=Harnessing the power-producing potential of Essentia -emt.tag.Ignis Generator=If you can't handle the heat... -emt.tag.Auram Generator=Harnessing the magic in the air -emt.tag.Arbor Generator=Bringing power generation back to its basics -emt.tag.Aer Generator=Compressing your environment -emt.tag.Chainsaw of the Stream=Felling trees in a single swoop -emt.tag.Drill of the Rockbreaker=Mining it big -emt.tag.Shield Block=Magical protection -emt.tag.Tiny Uranium=Some shrinkage may occur -emt.tag.Mjolnir=Godly power -emt.tag.The Legend=Childhood memories... -emt.tag.Lightning Summoner=From vilest enemies -emt.tag.Supercharged Mjolnir=Making it yours -emt.tag.Industrial Wand Charging Station=Charging your wand the industrial way -emt.tag.Compressed Solars=Increase the efficiency! -emt.tag.Solar Helmet of Revealing=The sunlight hurts my eyes -emt.tag.Diamond Chainsaw=Harder, better, faster, stronger -emt.tag.Thaumium Plate=Thaumium, the industrial way -emt.tag.Macerating Native Ore Clusters=Augmenting your yield -emt.tag.Electric Boots of the Traveller=I've got the power -emt.tag.Nano Boots of the Traveller=Speed demon -emt.tag.Quantum Boots of the Traveller=Faster than light -emt.tag.Electric Scribing Tools=Save squiddy! -emt.tag.Etheral Processor=The sky is blue... -emt.tag.Water Infused Solar Panels=Curse you rain! -emt.tag.Entropy Infused Solar Panels=Not afraid of the dark -emt.tag.Order Infused Solar Panels=I've got the power! -emt.tag.Fire Infused Solar Panels=Where it is hot and dangerous... -emt.tag.Air Infused Solar Panels=Don't be afraid of heights -emt.tag.Earth Infused Solar Panels=Not for claustrophobic persons -emt.tag.UU-Matter Infusion=A magically charged metamorphic liquid... -emt.tag.Portable Node=Randomly convenient -emt.tag.Electric Hoe of Growth=Shockingly natural -emt.tag.Wand Focus: Charging=From vis to electricity -emt.tag.Wand Focus: Wand Charging=From electricity to vis -emt.tag.Inventory Charging Ring=Passive charger -emt.tag.Armor Charging Ring=Passive life-saver -emt.tag.The One Ring=Forged inside the pit of the volcanic Mount Doom... -emt.tag.Feather Wings=It only works in anime... -emt.tag.Thaumium Reinforced Wings=Already much better -emt.tag.Nanosuit Wings=Nanotechnologies to the rescue! -emt.tag.Quantum Wings=Quantum technologies. -emt.tag.Infused Quantum Armor=The last step is here... - #=============Thaumonomicon Texts============= emt.rsname.Electric Magic Tools=Electric Magic Tools +emt.tag.Electric Magic Tools=Who says magic and technology can't go together? emt.text.Electric Magic Tools=Who says magic can't work with technology? Our researchers have collaborated with the top mages of the school of Thaumaturgy to bring you the effectiveness of magic coupled with the convenience of electric tools. +emt.rsname.Electric Cloud=Electric Cloud +emt.tag.Electric Cloud=Still the same Nitor +emt.text.Electric Cloud.1=All thaumaturges (except Crimson ones, I guess) enjoy the shine and heat of the magic flame called Nitor, aren't they? You desided to make it more... energetic. Well, you did it.

You have created a new kind of magic flame — the Electric Cloud. It behaves and looks like normal Nitor, but it has purple colour and creates light-purple lightning charges around itself. +emt.text.Electric Cloud.2=emt:textures/researches/electricCloud.png:0:0:255:255:0.6 + emt.rsname.Thaumium Drill=Thaumium Drill +emt.tag.Thaumium Drill=Magical mining emt.text.Thaumium Drill=You have discovered a way to infuse Thaumium with mundane electricity. Fusing Thaumium to a Diamond Drill results in a tool that can dig through stone faster and has a higher capacity.

While Thaumium is a very useful and powerful material, it is nowhere near the strength of Iridium. It is considered a mid-tier tool.

This tool may not be the most powerful, but you have a feeling that you will be able to upgrade it in the near future. emt.rsname.Thaumium Chainsaw=Thaumium Chainsaw +emt.tag.Thaumium Chainsaw=Felling trees and severing heads with a touch of magic emt.text.Thaumium Chainsaw=You have found a way to fuse Thaumium to a Diamond Chainsaw, allowing it to fell trees quicker and hold more power. Nevertheless, these ameliorations do not come without drawbacks: during the process of fusing these materials, the chainsaw loses its ability to shear foliage, tall grass, and animals.

You have an intuition you will be able to upgrade this tool in the near future. emt.rsname.Electric Goggles=Electric Goggles +emt.tag.Electric Goggles=The best of both worlds emt.text.Electric Goggles=You have found a way to detect auras using purely electronic means, no longer requiring mystical energy that can be depleted over time. You can now create a pair of Goggles of Revealing that can be recharged with EU while being able to see Aura Nodes just as you could before. A diamond helmet is required to house the sensitive vis sensing circuitry and prevent it from being damaged, which also has the added benefit of providing extra protection. emt.rsname.Nanosuit Goggles of Revealing=Nanosuit Goggles of Revealing +emt.tag.Nanosuit Goggles of Revealing=Top-tier eye protection emt.text.Nanosuit Goggles of Revealing=You have discovered a way to incorporate your previous vis sensors to a Nanosuit Helmet without moving too much around. By infusing the nano helmet with magic, you will be able to use it to see Aura Nodes. During the magical process, the control circuits for the night vision feature are replaced with capacitors to absorb the excess magical energy and vis-sensing microchips. This will prevent you from turning off the night vision effect of the helmet. emt.rsname.Quantum Goggles of Revealing=Quantum Goggles of Revealing +emt.tag.Quantum Goggles of Revealing=Protection coupled with utility emt.text.Quantum Goggles of Revealing=It took a lot of trial and error, but you have found a way to slip in vis detection sensors to a Quantum Helmet. By infusing the quantum helmet with magic, you will be able to use it to see Aura Nodes. During the design process, you had to replace several control circuits that involve night vision and automatic feeding with vis detecting circuitry and capacitors to absorb the excess magical energy. You find that using a Mining Laser to contain it can safely focus and direct the explosive pulse where the vision effect and the feeding unit of the helmet lie. Have fun getting force-fed energy. This will prevent you from turning off the night vision and feeding features. emt.rsname.Iron Omnitool=Iron Omnitool +emt.tag.Iron Omnitool=Changing tools is for peasants emt.text.Iron Omnitool=While tinkering with the inner workings of some of your tools to see if magical integration is a possibility, you have discovered a way to combine the Mining Drill and the Chainsaw, resulting in a tool capable of both mining, cutting down trees and attacking enemies! As you are working with mundane metals, magic influence is not needed to merge these tools together. emt.rsname.Diamond Omnitool=Diamond Omnitool +emt.tag.Diamond Omnitool=Jack of all trades emt.text.Diamond Omnitool=Your discovery of an Iron Omnitool has driven you to try to accomplish the same with some more powerful devices. You have discovered a way to combine the Diamond Drill and the Diamond Chainsaw, resulting in a tool capable of both mining, cutting down trees and attacking enemies, while maintaining the speed and capacity bonuses of the diamond tools. As diamonds are incredibly tough and nearly impossible to reshape once the raw diamonds have been fashioned into tools such as drills and chainsaws, you will require a little bit of magic to coax them to merge. emt.rsname.Thaumium Omnitool=Thaumium Omnitool +emt.tag.Thaumium Omnitool=Mystical multitool emt.text.Thaumium Omnitool=After creating the Diamond and Iron Omnitools, the next logical step was to do the same with Thaumium. Unfortunately, this isn't as easy. You have discovered a way to combine the Thaumium Drill and the Thaumium Chainsaw, resulting in a tool capable of mining and chopping trees at great speed with a high energy capacity. These tools have already once been infused with magic. You are not sure what will happen if they were to be infused again. emt.rsname.Explosion Focus=Explosion Focus +emt.tag.Explosion Focus=Use only in well-ventilated areas emt.text.Explosion Focus=You have found a way to improve the Nine Hells focus. By exposing the bats to the explosive properties of a Mining Laser, you have built a focus that acts similarly to the Laser but uses vis instead of EU. However, its effects are incredibly unstable, so you make a note to be careful. emt.rsname.Kris-tmas Focus=Kris-tmas Focus +emt.tag.Kris-tmas Focus=Ho! Ho! Ho! emt.text.Kris-tmas Focus=Merry Christmas!

You have found a novel use for the frost focus. By exposing it to the magic of Christmas, you can summon your snowy friends at will to fire snowballs at your Festivus celebrating neighbours! emt.rsname.Shield Focus=Shield Focus +emt.tag.Shield Focus=S.H.I.E.L.D. emt.text.Shield Focus=With some experimentation with the Portable Hole, you have found out more about the transportation of objects to alternate dimensions. You believe you can reverse these effects to summon a swath of blocks from a dimension full of matter to shield you from any oncoming disaster. Caution is to be taken when using this focus, as when bringing these blocks into our dimension, it will transpose any blocks in the way into the dimension it came from, never to return again. You will also be unable to move while this shield is in existence. emt.rsname.Potentia Generator=Potentia Generator +emt.tag.Potentia Generator=Harnessing the power-producing potential of Essentia emt.text.Potentia Generator=After much studying and research, you have finally discovered how to create electricity from your leftover Essentia.

Simply place a Warded Jar containing Potentia in a 8 blocks radius of the machine and it will draw it in to create EU.

While Potentia seems like the most logical choice for producing Essentia with EU, you believe you will be able to generate electricity from different Essentia in the near future with a bit of tinkering. emt.rsname.Ignis Generator=Ignis Generator +emt.tag.Ignis Generator=If you can't handle the heat... emt.text.Ignis Generator=Just as you thought, with a bit of tweaking, you have found a way to instead use Ignis Essentia to produce power. On the inside, this machine is able to heat water by consuming Ignis. The steam produced by this heat then spins the turbines, similar to a typical Generator. emt.rsname.Auram Generator=Auram Generator +emt.tag.Auram Generator=Harnessing the magic in the air emt.text.Auram Generator=Though it took a bit more work than you initially thought, you have found a way to produce EU using Auram Essenita. This required a complete reworking of the machine, relying on Auram's pulsating magical power to spin a Generator. emt.rsname.Arbor Generator=Arbor Generator +emt.tag.Arbor Generator=Bringing power generation back to its basics emt.text.Arbor Generator=You always seem to have excess Arbor Essentia sitting around. Not anymore! By modifying your original Potentia Generator, you have found a way to produce energy using Arbor Essentia instead. emt.rsname.Aer Generator=Aer Generator +emt.tag.Aer Generator=Compressing your environment emt.text.Aer Generator=You have discovered the enormous power of the air, and therefore decided to try out a modification of your original Potentia Generator capable of compressing air from Aer Essentia in a nearby jar. emt.rsname.Chainsaw of the Stream=Chainsaw of the Stream +emt.tag.Chainsaw of the Stream=Felling trees in a single swoop emt.text.Chainsaw of the Stream=After studying both the Axe of the Stream and the Thaumium Chainsaw, you managed to combine most of their abilities, resulting in an electric tool that can chop down whole trees without much effort. emt.rsname.Drill of the Rockbreaker=Drill of the Rockbreaker +emt.tag.Drill of the Rockbreaker=Mining it big emt.text.Drill of the Rockbreaker=After studying the Pickaxe of the Core, the Shovel of the Earthmover and the Thaumium Drill, you have managed to combine most of their abilities, resulting in an electric tool that can mine a whole 3x3x1 area of pickaxe and dirt materials very quickly.

This marvelous device is able to find the closest ore clusters on a shift-right click, though at the cost of some EU. emt.rsname.Shield Block=Shield Block +emt.tag.Shield Block=Magical protection emt.text.Shield Block=After studying the blocks created by the shield focus, you have discovered how to recreate them yourself, without relying on them to be summoned by the focus. They are highly blast resistant, and even resistant to nukes. However, in the event of an actual nuclear explosion, while the shield blocks will survive the aftermath, the surrounding blocks will not.

These blocks are unstable and do not drop when broken, even when Silk Touch is used. emt.rsname.Tiny Uranium=Tiny Uranium +emt.tag.Tiny Uranium=Some shrinkage may occur emt.text.Tiny Uranium=After processing all your ores and using them for the creation of nuclear reactors, you have finally run out of uranium nuggets, needed to make your beloved fuel rods. After long research sessions, you have managed to transform your leftover uranium into much-needed nuggets!

Unfortunately, this process is a bit wasteful, but you believe it to be worth the cost. emt.rsname.Mjolnir=Mjolnir +emt.tag.Mjolnir=Godly power emt.text.Mjolnir=You have travelled the world, in quest for the mighty Hammer of Thor. One day, you stumbled upon its broken remains, and your heart crumbled with it. After some long and tedious research, you found a way to restore this magnificent tool to its past greatness.

You have an odd feeling,(you seem to have a lot of these), that although this tool is amazingly powerful, you could do more with it. emt.rsname.The Legend=The Legend +emt.tag.The Legend=Childhood memories... emt.text.The Legend=You have always heard about the Legend of the Hammer.

It is said that the god of Lightning, Thor, had a hammer capable of summoning lightning.

The legend also states that, when the god retired in his dimension, he left his hammer, hidden somewhere in a well protected dungeon, where only a worthy mortal could find it.

You have long since wanted to go explore the world, to try and find it. emt.rsname.Lightning Summoner=Lightning Summoner +emt.tag.Lightning Summoner=From vilest enemies emt.text.Lightning Summoner=This item is dropped by your archenemy, the Supercharged Creeper. You feel it is going to be very useful later on. emt.rsname.Supercharged Mjolnir=Supercharged Mjolnir +emt.tag.Supercharged Mjolnir=Making it yours emt.text.Supercharged Mjolnir=After some more exploring of the dungeons existing all around the worlds and dimensions, you have managed to find a method that makes you able to overpower Thor's power, making his Hammer yours. Furthermore, you have managed to make your Hammer summon defenders, some strange Snow-Golems like creature that shall protect you. However, the hammer lost its power to summon lightning where you desire it to, and creates a ring of lightning around you. emt.rsname.Industrial Wand Charging Station=Industrial Wand Charging Station +emt.tag.Industrial Wand Charging Station=Charging your wand the industrial way emt.text.Industrial Wand Charging Station=You have managed to combine the powers of the Wand Pedestal with those of the mighty UU-Matter, resulting in a machine capable of replicating aspects on your wand, at the cost of 50000 EU to recharge every aspect on the wand of 1 unit. emt.rsname.Compressed Solars=Compressed Solars +emt.tag.Compressed Solars=Increase the efficiency! emt.text.Compressed Solars=You have found a way to compress 9 mundane Solar Panels in a magical one, that acts as if it was made of 10 mundane solar panels, generating 10 EU/t. You may repeat this process with compressed solar panels, allowing you to increase the power potential per block even higher. You can also, by magical infusion, create triple compressed solar panels, taking the folly a step further. emt.rsname.Solar Helmet of Revealing=Solar Helmet of Revealing +emt.tag.Solar Helmet of Revealing=The sunlight hurts my eyes emt.text.Solar Helmet of Revealing=You now have a helmet that acts exactly like your quantum goggles of revealing, but can also recharge your chest armor! It generates 128 EU/t during the day, and nothing at night. emt.rsname.Diamond Chainsaw=Diamond Chainsaw +emt.tag.Diamond Chainsaw=Harder, better, faster, stronger emt.text.Diamond Chainsaw=You are unsure why the thought of upgrading a Chainsaw with diamonds similarly to what you have done with a Drill has never occurred to you. This upgrade makes the Chainsaw capable of holding more energy and breaking blocks faster. emt.rsname.Thaumium Plate=Thaumium Plate +emt.tag.Thaumium Plate=Thaumium, the industrial way emt.text.Thaumium Plate=As every electrical engineer knows, plates are the basis of many devices. We knew that pressing Thaumium into plates would be a neccesary step to facilitate integration of magic into our tools, but this made the mages of the school of Thaumaturgy very upset. The don't like us tampering with their precious metal. You can produce these plates as shown, which is a bit more expensive, or in a metal former, requiring only one Thaumium Ingot. Keep an eye out for angry mages. emt.rsname.Macerating Native Ore Clusters=Macerating Native Ore Clusters +emt.tag.Macerating Native Ore Clusters=Augmenting your yield emt.text.Macerating Native Ore Clusters=You can macerate all Native Ore Clusters, except cinnabar. You will get 22 tiny dusts per Native Ore Cluster macerated. emt.rsname.Electric Boots of the Traveller=Electric Boots of the Traveller +emt.tag.Electric Boots of the Traveller=I've got the power emt.text.Electric Boots of the Traveller=With lots of precise mechanical components and a touch of magic, you have recreated the effects of the Boots of the Traveller in a more stable form. These boots, unlike the original, will not wear away over time, but instead use EU. These boots negate all fall damage, and have all the normal properties of the Boots of the Traveller. emt.rsname.Nano Boots of the Traveller=Nano Boots of the Traveller +emt.tag.Nano Boots of the Traveller=Speed demon emt.text.Nano Boots of the Traveller=Your Electric Boots of the Traveller are nice, but you think you can do better. You have found a way to upgrade these boots to the Nano tier, improving the mechanical components and improving the spell cast on the footwear. These boots allow for higher jumps and faster running than before. emt.rsname.Quantum Boots of the Traveller=Quantum Boots of the Traveller +emt.tag.Quantum Boots of the Traveller=Faster than light emt.text.Quantum Boots of the Traveller=You have meddled with Quantum Physics, making these Quantum Boots of the Traveller so fast, that you appear to be in multiple places at once. But do not forget what happened to Schrodinger's cat... emt.rsname.Electric Scribing Tools=Electric Scribing Tools +emt.tag.Electric Scribing Tools=Save squiddy! emt.text.Electric Scribing Tools=You have decided not to kill any more squid. Therefore, you researched a way to charge your scribing tools, in a way which would make them not needing any ink. Thanks to static electricity, and the ball pen technology, you managed to make the ink inside the scribing tools spin so quickly, that EU could recharge it. emt.rsname.Etheral Processor=Etheral Processor +emt.tag.Etheral Processor=The sky is blue... emt.text.Etheral Processor=After taping into hell's power with the Infernal Furnace to get some rewards out of your mining sessions, you have something totally different in mind. You are now using the power of the "Good", the sky and the so called "Paradise". This Ethereal Processor doubles the yield of every smelting recipe, and gives a 10% chance of getting a Thaumium Nugget as a bonus. You can see two drawbacks to this : as it doubles your smelting yield, it takes twice the time to process an item. As it is a highly magical device, some mundane smelting recipes do not seem to work. You are confident that smelting cobblestone into stone will not work into this wonder-machine. emt.rsname.Water Infused Solar Panels=Water Infused Solar Panels +emt.tag.Water Infused Solar Panels=Curse you rain! emt.text.Water Infused Solar Panels=You always hated rain, especially when all your power came from Solar Panels. You hated it so much that you decided to find a way to make your Solar Panels keep running during rain. You managed... kind of. The Water Infused Solar Panels work during rain, and during rain only. emt.rsname.Entropy Infused Solar Panels=Entropy Infused Solar Panels +emt.tag.Entropy Infused Solar Panels=Not afraid of the dark emt.text.Entropy Infused Solar Panels=You know that Solar Panels stop working at nightime. To counter that, you found a way to make your Solar Panels produce energy at night! emt.rsname.Order Infused Solar Panels=Order Infused Solar Panels +emt.tag.Order Infused Solar Panels=I've got the power! emt.text.Order Infused Solar Panels=Harnessing the power of Order, you have managed to triple the output of your Solar Panels at day! emt.rsname.Fire Infused Solar Panels=Fire Infused Solar Panels +emt.tag.Fire Infused Solar Panels=Where it is hot and dangerous... emt.text.Fire Infused Solar Panels=Fascinated by the Nether, you created a monster. These Solar Panels work like normal in the Overworld, but also produce more energy when they are located in the Nether! A monster I tell you... emt.rsname.Air Infused Solar Panels=Air Infused Solar Panels +emt.tag.Air Infused Solar Panels=Don't be afraid of heights emt.text.Air Infused Solar Panels=Your adventurous mind and the natural amount of air existing at the top of the world make these Solar Panels yield more energy when located over Y = 160. emt.rsname.Earth Infused Solar Panels=Earth Infused Solar Panels +emt.tag.Earth Infused Solar Panels=Not for claustrophobic persons emt.text.Earth Infused Solar Panels=You have decided to get closer to the core. These Solar Panels produce more energy under Y = 10, but keep in mind the rebellious spirits need to be able to see the sun to work. emt.rsname.UU-Matter Infusion=UU-Matter Infusion +emt.tag.UU-Matter Infusion=A magically charged metamorphic liquid... emt.text.UU-Matter Infusion=You have always found the powers possessed by UU-Mater very strange, even... magical looking, especially the ability to take a large number of shapes if manipulated correctly. And here you are, having discovered a way to shape the liquid through the process of Infusion Crafting. Many recipes are available, and all of them use between 4 to 32 of each primal aspect. emt.rsname.Portable Node=Portable Node +emt.tag.Portable Node=Randomly convenient emt.text.Portable Node=After studying in an in-depth manner of the wonders of Node Jarring, you have managed to create an item capable of spawning a random node. However, due to some parts of node magic which you cannot understand, this Portable Node will always be Fading and Unstable.

You can only get rid of it by a shift-right click, and you think that you should dispose of it as soon as possible, for unstable nodes are... rather unpredictable. emt.rsname.Electric Hoe of Growth=Electric Hoe of Growth +emt.tag.Electric Hoe of Growth=Shockingly natural emt.text.Electric Hoe of Growth=You have managed to upgrade your Hoe of Growth. It now delivers little shocks to the land and plants around it, much like your regular Hoe of Growth would do.

However, the magic contained within this tool is too powerful for you to convert it fully to using mundane electricity, for the tool still has a limited number of uses before it breaks, but is rechargeable. emt.rsname.Wand Focus: Charging=Wand Focus: Charging +emt.tag.Wand Focus: Charging=From vis to electricity emt.text.Wand Focus: Charging=You realized you always carry a wand with you, along with your electric stuff. But sometimes, you have ran out of juice in your electric tools. That's why you created this wand focus. It is very simple, yet very useful, for it drains vis from your wand storage, and charges the items using mundane electricity. emt.rsname.Wand Focus: Wand Charging=Wand Focus: Wand Charging +emt.tag.Wand Focus: Wand Charging=From electricity to vis emt.text.Wand Focus: Wand Charging=You've discovered a way to take the benefits of the Industrial Recharge station and house them inside of a Charging Focus, reversing its polarity. Now it will drain electricity from your items in order to recharge your wand, albeit at a rather high cost. Furthermore, you have realized than you need a full set of Electric Armor to be able to start the wand charging process. emt.rsname.Inventory Charging Ring=Inventory Charging Ring +emt.tag.Inventory Charging Ring=Passive charger emt.text.Inventory Charging Ring=While other thaumaturgists use rings to charge their runic shields, you feel that there are better applications for them. By fusing power sources into a mundane ring, you have learned how to funnel its charging effects into electric items in your inventory instead. It doesn't generate much at only 32 EU per tick, but that just means there's room for improvement. emt.rsname.Armor Charging Ring=Armor Charging Ring +emt.tag.Armor Charging Ring=Passive life-saver emt.text.Armor Charging Ring=You have found the low but constant recharge rate of your new ring to be more useful than anticipated, but it would be nice if it charged your armor when there wasn't a tool in need of power. By infusing a few more power sources and a piece of armor, you have found a way to have it do just that. Sadly, the new power sources do not increase the recharge rate, but progress is progress. emt.rsname.The One Ring=The One Ring +emt.tag.The One Ring=Forged inside the pit of the volcanic Mount Doom... emt.text.The One Ring=Three Rings for the Elven-kings under the sky, Seven for the Dwarf-lords in their halls of stone, Nine for Mortal Men doomed to die, One for the Dark Lord on his dark throne in the Land of Mordor where the Shadows lie. One Ring to rule them all, One Ring to find them, One Ring to bring them all and in the darkness bind them in the Land of Mordor where the Shadows lie. -J.R.R. Tolkien's epigraph to The Lord of The Rings.
You dream of being able to disappear from sight , therefore becoming invulnerable to any attack. You have heard that this Ring lays somewhere in ruins, unaltered by time... emt.rsname.Feather Wings=Feather Wings +emt.tag.Feather Wings=It only works in anime... emt.text.Feather Wings=Duct-taping feathers to cardboard sheets, formed in the shape of wings sounded like a good idea. At least, you can thrust yourself in the air when the spacebar is hit. Not much, but it'll work. Using any wings underwater or during the rain sounds like a very bad idea. Included: fall damage reduction, 25%. emt.rsname.Thaumium Reinforced Wings=Thaumium Reinforced Wings +emt.tag.Thaumium Reinforced Wings=Already much better emt.text.Thaumium Reinforced Wings=The magic infusing Thaumium is well known. Therefore, reinforcing your cardboard wings with Thaumium sounded like a good idea. You can thrust yourself much higher on spacebar hit, and slow your fall down when spacebar is held. Sneak to go down at a steady pace. Included: fall damage reduction, 50%. emt.rsname.Nanosuit Wings=Nanosuit Wings +emt.tag.Nanosuit Wings=Nanotechnologies to the rescue! emt.text.Nanosuit Wings=Combining the magic harnessed by Thaumium with the nanotechnologies in your wings.. seemed like the logical way to go. You can thrust yourself way higher than before, and fall even slower when holding spacebar. Included: fall damage reduction, 75%. emt.rsname.Quantum Wings=Quantum Wings +emt.tag.Quantum Wings=Quantum technologies. 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.Infused Quantum Armor=Infused Quantum Сhestplate. +emt.tag.Infused Quantum Armor=The last step is here... emt.text.Infused Quantum Armor=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). \ No newline at end of file diff --git a/src/main/resources/assets/emt/lang/ru_RU.lang b/src/main/resources/assets/emt/lang/ru_RU.lang index 04dda4d..a52ddae 100644 --- a/src/main/resources/assets/emt/lang/ru_RU.lang +++ b/src/main/resources/assets/emt/lang/ru_RU.lang @@ -91,7 +91,7 @@ item.EMT.focus.explosion.name=Набалдашник: Взрыв item.EMT.focus.christmas.name=Набалдашник: Рождество item.EMT.focus.shield.name=Набалдашник: Щит item.EMT.focus.charge.name=Набалдашник: Зарядка -item.EMT.focus.charge.wand.name=Набалдашник: Зарядка жезла +item.EMT.focus.charge_wand.name=Набалдашник: Зарядка жезла #=============Block Names============= tile.EMT.electricCloud.name=Наэлектризованное облако @@ -127,15 +127,15 @@ tile.EMT.solar2.doubleearth.name=Наполненная землёй, дважд tile.EMT.solar2.tripleearth.name=Наполненная землёй, трижды сжатая солнечная панель #=============Thaumonomicon============= +emt.rsname.Electric Magic Tools=Electric Magic Tools +emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? +emt.text.Electric Magic Tools=Кто сказал, что магия не может дружить с технологией? Наши исследователи сотрудничали с лучшими магами школы тауматургов, чтобы приподнести Вам эффективность магии, в сочетании с удобством электроинструментов. + emt.rsname.Electric Cloud=Наэлектризованное облако emt.tag.Electric Cloud=Всё тот же Нитор emt.text.Electric Cloud.1=Наверное, каждому Тауматургу нравится пламя, которое ещё называют Нитором. Вы, решив сделать его более "живым", сумели наэлектризовать его.

Теперь, это всё тот же Нитор, но от него ещё и исходят электрические искровые разряды. emt.text.Electric Cloud.2=emt:textures/researches/electricCloud.png:0:0:255:255:0.6 -emt.rsname.Electric Magic Tools=Electric Magic Tools -emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? -emt.text.Electric Magic Tools=Кто сказал, что магия не может дружить с технологией? Наши исследователи сотрудничали с лучшими магами школы тауматургов, чтобы приподнести Вам эффективность магии, в сочетании с удобством электроинструментов. - emt.rsname.Thaumium Drill=Таум-бур emt.tag.Thaumium Drill=Магическая добыча emt.text.Thaumium Drill=Вы обнаружили способ наполнения таум-металла земным электричеством. Результатом соединения таум-металла с алмазным буром, стал инструмент, который может добывать камень быстрее и который имеет большую ёмкость.

Несмотря на то, что таум-металл очень полезный и прочный материал, его прочность близка к прочности иридия. Этот инструмент считается инструментом среднего уровня.

Этот инструмент, возможно, не самый мощный, но у Вас есть ощущение, что Вы сможете улучшить его в ближайшем будущем. diff --git a/src/main/resources/assets/emt/textures/blocks/electricCloud.png b/src/main/resources/assets/emt/textures/blocks/electricCloud.png deleted file mode 100644 index 1c7c189..0000000 Binary files a/src/main/resources/assets/emt/textures/blocks/electricCloud.png and /dev/null differ diff --git a/src/main/resources/assets/emt/textures/blocks/electric_cloud.png b/src/main/resources/assets/emt/textures/blocks/electric_cloud.png new file mode 100644 index 0000000..d6d3859 Binary files /dev/null and b/src/main/resources/assets/emt/textures/blocks/electric_cloud.png differ diff --git a/src/main/resources/assets/emt/textures/researches/electricCloud.png b/src/main/resources/assets/emt/textures/researches/electric_cloud.png similarity index 100% rename from src/main/resources/assets/emt/textures/researches/electricCloud.png rename to src/main/resources/assets/emt/textures/researches/electric_cloud.png