lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Localized some routing tooltips/chat

Browse source
This commit is contained in:
Nick 2016-03-26 12:32:51 -07:00
parent b2818e643d
commit 30bc020055
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
View file

@ -55,11 +55,6 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
@Override @Override
public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand)
{ {
if (world.isRemote)
{
return EnumActionResult.SUCCESS;
}
TileEntity tileHit = world.getTileEntity(pos); TileEntity tileHit = world.getTileEntity(pos);
if (!(tileHit instanceof IRoutingNode)) if (!(tileHit instanceof IRoutingNode))
@ -69,7 +64,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
if (!containedPos.equals(BlockPos.ORIGIN)) if (!containedPos.equals(BlockPos.ORIGIN))
{ {
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
ChatUtil.sendChat(player, "Removing contained location"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.remove"));
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
} }
return EnumActionResult.FAIL; return EnumActionResult.FAIL;
@ -79,7 +74,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
if (containedPos.equals(BlockPos.ORIGIN)) if (containedPos.equals(BlockPos.ORIGIN))
{ {
this.setBlockPos(stack, pos); this.setBlockPos(stack, pos);
ChatUtil.sendChat(player, "Setting node location"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.set"));
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} else } else
{ {
@ -99,7 +94,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
master.addConnection(pos, containedPos); master.addConnection(pos, containedPos);
master.addNodeToList(node); master.addNodeToList(node);
node.addConnection(containedPos); node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked node to master!"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link.master"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
@ -107,7 +102,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
{ {
master.addConnection(pos, containedPos); master.addConnection(pos, containedPos);
node.addConnection(containedPos); node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked node to master!"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link.master"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
@ -124,7 +119,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
master.addConnection(pos, containedPos); master.addConnection(pos, containedPos);
pastNode.addConnection(pos); pastNode.addConnection(pos);
master.addNodeToList(pastNode); master.addNodeToList(pastNode);
ChatUtil.sendChat(player, "Linked node to master!"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link.master"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
@ -132,7 +127,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
{ {
master.addConnection(pos, containedPos); master.addConnection(pos, containedPos);
pastNode.addConnection(pos); pastNode.addConnection(pos);
ChatUtil.sendChat(player, "Linked node to master!"); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link.master"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
@ -152,7 +147,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
} }
pastNode.addConnection(pos); pastNode.addConnection(pos);
node.addConnection(containedPos); node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together."); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} else if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //pastNode is not connected to a master, but node is } else if (pastNode.getMasterPos().equals(BlockPos.ORIGIN)) //pastNode is not connected to a master, but node is
@ -167,7 +162,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
} }
pastNode.addConnection(pos); pastNode.addConnection(pos);
node.addConnection(containedPos); node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together."); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} else if (node.getMasterPos().equals(BlockPos.ORIGIN)) //node is not connected to a master, but pastNode is } else if (node.getMasterPos().equals(BlockPos.ORIGIN)) //node is not connected to a master, but pastNode is
@ -182,7 +177,7 @@ public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvi
} }
pastNode.addConnection(pos); pastNode.addConnection(pos);
node.addConnection(containedPos); node.addConnection(containedPos);
ChatUtil.sendChat(player, "Linked nodes together."); ChatUtil.sendChat(player, TextHelper.localize("chat.BloodMagic.routing.link"));
this.setBlockPos(stack, BlockPos.ORIGIN); this.setBlockPos(stack, BlockPos.ORIGIN);
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} else } else

5
src/main/java/WayofTime/bloodmagic/util/handler/ClientEventHandler.java
View file

@ -8,6 +8,7 @@ import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.client.render.RenderFakeBlocks; import WayofTime.bloodmagic.client.render.RenderFakeBlocks;
import WayofTime.bloodmagic.item.ItemRitualDiviner; import WayofTime.bloodmagic.item.ItemRitualDiviner;
import WayofTime.bloodmagic.util.GhostItemHelper; import WayofTime.bloodmagic.util.GhostItemHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
@ -46,10 +47,10 @@ public class ClientEventHandler
int amount = GhostItemHelper.getItemGhostAmount(stack); int amount = GhostItemHelper.getItemGhostAmount(stack);
if (amount == 0) if (amount == 0)
{ {
event.getToolTip().add("Everything"); event.getToolTip().add(TextHelper.localize("tooltip.BloodMagic.ghost.everything"));
} else } else
{ {
event.getToolTip().add("Ghost item amount: " + amount); event.getToolTip().add(TextHelper.localize("tooltip.BloodMagic.ghost.amount", amount));
} }
} }
} }

9
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -261,7 +261,6 @@ tooltip.BloodMagic.sigil.seer.currentBonus=Current Bonus: +%,d%%
tooltip.BloodMagic.sigil.phantomBridge.desc=&oWalking on thin air... tooltip.BloodMagic.sigil.phantomBridge.desc=&oWalking on thin air...
tooltip.BloodMagic.sigil.whirlwind.desc=&oBest not to wear a skirt tooltip.BloodMagic.sigil.whirlwind.desc=&oBest not to wear a skirt
tooltip.BloodMagic.sigil.enderSeverance.desc=&oPutting Endermen in Dire situations! tooltip.BloodMagic.sigil.enderSeverance.desc=&oPutting Endermen in Dire situations!
tooltip.BloodMagic.sigil.teleposition.desc=I am very close to being moved by this. tooltip.BloodMagic.sigil.teleposition.desc=I am very close to being moved by this.
tooltip.BloodMagic.sigil.transposition.desc=Feel the power of the Force, my young apprentice. tooltip.BloodMagic.sigil.transposition.desc=Feel the power of the Force, my young apprentice.
@ -338,6 +337,9 @@ tooltip.BloodMagic.fluid.type=Fluid Contained
tooltip.BloodMagic.fluid.amount=Amount tooltip.BloodMagic.fluid.amount=Amount
tooltip.BloodMagic.fluid.capacity=Capacity tooltip.BloodMagic.fluid.capacity=Capacity
tooltip.BloodMagic.ghost.everything=Everything
tooltip.BloodMagic.ghost.amount=Ghost item amount: %d
# Ritual # Ritual
ritual.BloodMagic.testRitual=Test Ritual ritual.BloodMagic.testRitual=Test Ritual
ritual.BloodMagic.waterRitual=Ritual of the Full Spring ritual.BloodMagic.waterRitual=Ritual of the Full Spring
@ -386,6 +388,11 @@ chat.BloodMagic.livingArmour.upgrade.poisonRemove=You are starting to feel bette
chat.BloodMagic.livingArmour.upgrade.grimReaper=&6A shadowy force pulls you from the brink of death! chat.BloodMagic.livingArmour.upgrade.grimReaper=&6A shadowy force pulls you from the brink of death!
chat.BloodMagic.livingArmour.newUpgrade=&4Upgrade acquired! chat.BloodMagic.livingArmour.newUpgrade=&4Upgrade acquired!
chat.BloodMagic.routing.remove=Removing contained location
chat.BloodMagic.routing.set=Setting node location
chat.BloodMagic.routing.link.master=Linked node to master!
chat.BloodMagic.routing.link=Linked nodes together
# Commands # Commands
commands.error.arg.invalid=Invalid arguments commands.error.arg.invalid=Invalid arguments
commands.error.arg.missing=Not enough arguments commands.error.arg.missing=Not enough arguments