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

Quick Fixes (#1362)

Browse source 
* Add modid to command localizations to prevent conflicts

* Corrected localizations of other lang files

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
This commit is contained in:
Arcaratus 2018-07-22 10:07:27 -04:00 committed by Nick Ignoffo
parent e82510d553
commit 6c5bbed348
8 changed files with 226 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/client/hud/element/ElementHolding.java
View file

@ -44,7 +44,7 @@ public class ElementHolding extends HUDElement {
List<ItemStack> inventory = ItemSigilHolding.getInternalInventory(sigilHolding); List<ItemStack> inventory = ItemSigilHolding.getInternalInventory(sigilHolding);
int xOffset = 0; int xOffset = 0;
for (ItemStack stack : inventory) { for (ItemStack stack : inventory) {
renderHotbarItem(drawX + 3 + xOffset, drawY - 4, partialTicks, minecraft.player, stack); renderHotbarItem(drawX + 3 + xOffset, drawY + 3, partialTicks, minecraft.player, stack);
xOffset += 20; xOffset += 20;
} }
} }

8
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java
View file

@ -21,7 +21,7 @@ public class SubCommandBind extends CommandBase {
@Override @Override
public String getUsage(ICommandSender commandSender) { public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.bind.usage"); return TextHelper.localizeEffect("commands.bloodmagic.bind.usage");
} }
@Override @Override
@ -58,17 +58,17 @@ public class SubCommandBind extends CommandBase {
if (bind) { if (bind) {
Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName()); Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName());
BindableHelper.applyBinding(held, binding); BindableHelper.applyBinding(held, binding);
commandSender.sendMessage(new TextComponentTranslation("commands.bind.success")); commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success"));
} else { } else {
Binding binding = ((IBindable) held.getItem()).getBinding(held); Binding binding = ((IBindable) held.getItem()).getBinding(held);
if (binding != null) { if (binding != null) {
held.getTagCompound().removeTag("binding"); held.getTagCompound().removeTag("binding");
commandSender.sendMessage(new TextComponentTranslation("commands.bind.remove.success")); commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success"));
} }
} }
} }
} catch (PlayerNotFoundException e) { } catch (PlayerNotFoundException e) {
commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.error.404"))); commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.bloodmagic.error.404")));
} }
} }

38
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
View file

@ -23,7 +23,7 @@ public class SubCommandNetwork extends CommandBase {
@Override @Override
public String getUsage(ICommandSender commandSender) { public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.network.usage"); return TextHelper.localizeEffect("commands.bloodmagic.network.usage");
} }
@Override @Override
@ -50,12 +50,12 @@ public class SubCommandNetwork extends CommandBase {
CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage()); CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage());
} }
} else { } else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing"); CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing");
} }
} }
private enum ValidCommands { private enum ValidCommands {
SYPHON("commands.network.syphon.help") { SYPHON("commands.bloodmagic.network.syphon.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -67,16 +67,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) { if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]); int amount = Integer.parseInt(args[2]);
NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, amount); NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, amount);
CommandBloodMagic.displaySuccessString(sender, "commands.network.syphon.success", amount, player.getDisplayName().getFormattedText()); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.syphon.success", amount, player.getDisplayName().getFormattedText());
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
} }
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing");
} }
} }
}, },
ADD("commands.network.add.help") { ADD("commands.bloodmagic.network.add.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -90,16 +90,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) { if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]); int amount = Integer.parseInt(args[2]);
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
CommandBloodMagic.displaySuccessString(sender, "commands.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText()); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText());
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
} }
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing");
} }
} }
}, },
SET("commands.network.set.help") { SET("commands.bloodmagic.network.set.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -113,16 +113,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) { if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]); int amount = Integer.parseInt(args[2]);
network.setCurrentEssence(amount); network.setCurrentEssence(amount);
CommandBloodMagic.displaySuccessString(sender, "commands.network.set.success", player.getDisplayName().getFormattedText(), amount); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.set.success", player.getDisplayName().getFormattedText(), amount);
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
} }
} else { } else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing"); CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.missing");
} }
} }
}, },
GET("commands.network.get.help") { GET("commands.bloodmagic.network.get.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -137,7 +137,7 @@ public class SubCommandNetwork extends CommandBase {
} }
}, },
FILL("commands.network.fill.help") { FILL("commands.bloodmagic.network.fill.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -149,11 +149,11 @@ public class SubCommandNetwork extends CommandBase {
if (args.length > 1) { if (args.length > 1) {
network.setCurrentEssence(Integer.MAX_VALUE); network.setCurrentEssence(Integer.MAX_VALUE);
CommandBloodMagic.displaySuccessString(sender, "commands.network.fill.success", player.getDisplayName().getFormattedText()); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.fill.success", player.getDisplayName().getFormattedText());
} }
} }
}, },
CAP("commands.network.cap.help") { CAP("commands.bloodmagic.network.cap.help") {
@Override @Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) { public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) { if (displayHelp) {
@ -166,7 +166,7 @@ public class SubCommandNetwork extends CommandBase {
if (args.length > 1) { if (args.length > 1) {
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier()); int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
network.setCurrentEssence(maxOrb); network.setCurrentEssence(maxOrb);
CommandBloodMagic.displaySuccessString(sender, "commands.network.cap.success", player.getDisplayName().getFormattedText()); CommandBloodMagic.displaySuccessString(sender, "commands.bloodmagic.network.cap.success", player.getDisplayName().getFormattedText());
} }
} }
},; },;

16
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java
View file

@ -24,7 +24,7 @@ public class SubCommandOrb extends CommandBase {
@Override @Override
public String getUsage(ICommandSender commandSender) { public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.orb.usage"); return TextHelper.localizeEffect("commands.bloodmagic.orb.usage");
} }
@Override @Override
@ -63,12 +63,12 @@ public class SubCommandOrb extends CommandBase {
if (Utils.isInteger(args[2])) { if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]); int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount); network.setOrbTier(amount);
CommandBloodMagic.displaySuccessString(commandSender, "commands.success"); CommandBloodMagic.displaySuccessString(commandSender, "commands.bloodmagic.success");
} else { } else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.invalid"); CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.invalid");
} }
} else { } else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing"); CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing");
} }
break; break;
@ -86,17 +86,17 @@ public class SubCommandOrb extends CommandBase {
} }
} }
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.404"); CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404");
} }
} catch (PlayerNotFoundException e) { } catch (PlayerNotFoundException e) {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.404"); CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404");
} }
} }
} }
private enum ValidCommands { private enum ValidCommands {
SET("commands.orb.set.help"), SET("commands.bloodmagic.orb.set.help"),
GET("commands.orb.get.help"); GET("commands.bloodmagic.orb.get.help");
public String help; public String help;

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

@ -794,60 +794,60 @@ entity.bloodmagic.SentientSpecter.name=Sentient Specter
entity.bloodmagic.Mimic.name=Mimic entity.bloodmagic.Mimic.name=Mimic
# Commands # Commands
commands.error.arg.invalid=Invalid arguments commands.bloodmagic.error.arg.invalid=Invalid arguments
commands.error.arg.missing=Not enough arguments commands.bloodmagic.error.arg.missing=Not enough arguments
commands.error.arg.player.missing=You must specify which player you wish to perform this action on. commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on.
commands.error.404=Command not found! commands.bloodmagic.error.404=Command not found!
commands.error.unknown=Unknown command! commands.bloodmagic.error.unknown=Unknown command!
commands.error.perm=You do not have permission to use this command. commands.bloodmagic.error.perm=You do not have permission to use this command.
commands.success=Executed successfully commands.bloodmagic.success=Executed successfully
commands.format.help=%s - %s commands.bloodmagic.format.help=%s - %s
commands.format.error=%s - %s commands.bloodmagic.format.error=%s - %s
commands.help.usage=/bloodmagic help commands.bloodmagic.help.usage=/bloodmagic help
commands.help.help=Displays the help information for the "/bloodmagic" command. commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command.
commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount]
commands.network.help=LP network utilities commands.bloodmagic.network.help=LP network utilities
commands.network.syphon.help=Removes the given amount of LP from the given player's LP network. commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network.
commands.network.syphon.success=Successfully syphoned %d LP from %s. commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s.
commands.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules.
commands.network.add.success=Successfully added %d LP to %s's LP network. commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network.
commands.network.set.help=Sets the given player's LP to the given amount. commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount.
commands.network.set.success=Successfully set %s's LP network to %d LP. commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP.
commands.network.get.help=Returns the amount of LP in the given player's LP network. commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network.
commands.network.fill.help=Fills the given player's LP network to %d. commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d.
commands.network.fill.success=Successfully filled %s's LP network. commands.bloodmagic.network.fill.success=Successfully filled %s's LP network.
commands.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store.
commands.network.cap.success=Successfully capped off %s's LP network. commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network.
commands.bind.usage=/bloodmagic bind [true|false] [player] commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player]
commands.bind.help=Attempts to (un)bind the currently held item. commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item.
commands.bind.success=Binding successful commands.bloodmagic.bind.success=Binding successful
commands.bind.remove.success=Unbinding successful commands.bloodmagic.bind.remove.success=Unbinding successful
commands.orb.usage=/bloodmagic orb [set|get] player [tier] commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier]
commands.orb.help=Used to set or get the Player's max Blood Orb tier. commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier.
commands.bind.failed.noPlayer=There is no player specified commands.bloodmagic.bind.failed.noPlayer=There is no player specified
commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it
commands.bind.failed.notBindable=Item cannot be bound commands.bloodmagic.bind.failed.notBindable=Item cannot be bound
commands.unbind.usage=/unbind commands.bloodmagic.unbind.usage=/unbind
commands.unbind.success=Item successfully unbound! commands.bloodmagic.unbind.success=Item successfully unbound!
commands.unbind.failed.notBindable=Item cannot be unbound commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound
commands.soulnetwork.usage=/soulnetwork <player> <add|subtract|fill|empty|get> [amount] commands.bloodmagic.soulnetwork.usage=/soulnetwork <player> <add|subtract|fill|empty|get> [amount]
commands.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network!
commands.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network!
commands.soulnetwork.fill.success=Successfully filled %s's Soul Network! commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network!
commands.soulnetwork.empty.success=Successfully emptied %s's Soul Network! commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network!
commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network!
commands.soulnetwork.noPlayer=There is no player specified commands.bloodmagic.soulnetwork.noPlayer=There is no player specified
commands.soulnetwork.noCommand=There is no command specified commands.bloodmagic.soulnetwork.noCommand=There is no command specified
commands.soulnetwork.notACommand=That is not a valid command commands.bloodmagic.soulnetwork.notACommand=That is not a valid command
commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max!
commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d)
# GUI # GUI
tile.bloodmagic.inputNode.name=Input Node tile.bloodmagic.inputNode.name=Input Node

98
src/main/resources/assets/bloodmagic/lang/fr_FR.lang
View file

@ -552,62 +552,62 @@ secret.bloodmagic.bread.bloody=&r&cBloody Bread
secret.bloodmagic.bread.bloody.desc=Only for &odire &r&7emergencies. secret.bloodmagic.bread.bloody.desc=Only for &odire &r&7emergencies.
# Commands # Commands
commands.error.arg.invalid=Invalid arguments commands.bloodmagic.error.arg.invalid=Invalid arguments
commands.error.arg.missing=Not enough arguments commands.bloodmagic.error.arg.missing=Not enough arguments
commands.error.arg.player.missing=You must specify which player you wish to perform this action on. commands.bloodmagic.error.arg.player.missing=You must specify which player you wish to perform this action on.
commands.error.404=Command not found! commands.bloodmagic.error.404=Command not found!
commands.error.unknown=Unknown command! commands.bloodmagic.error.unknown=Unknown command!
commands.error.perm=You do not have permission to use this command. commands.bloodmagic.error.perm=You do not have permission to use this command.
commands.success=Executed successfully commands.bloodmagic.success=Executed successfully
commands.format.help=%s - %s commands.bloodmagic.format.help=%s - %s
commands.format.error=%s - %s commands.bloodmagic.format.error=%s - %s
commands.help.usage=/bloodmagic help commands.bloodmagic.help.usage=/bloodmagic help
commands.help.help=Displays the help information for the "/bloodmagic" command. commands.bloodmagic.help.help=Displays the help information for the "/bloodmagic" command.
commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount] commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] player [amount]
commands.network.help=LP network utilities commands.bloodmagic.network.help=LP network utilities
commands.network.syphon.help=Removes the given amount of LP from the given player's LP network. commands.bloodmagic.network.syphon.help=Removes the given amount of LP from the given player's LP network.
commands.network.syphon.success=Successfully syphoned %d LP from %s. commands.bloodmagic.network.syphon.success=Successfully syphoned %d LP from %s.
commands.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules. commands.bloodmagic.network.add.help=Adds the given amount of LP to the given player's LP network. Follows standard LP gain rules.
commands.network.add.success=Successfully added %d LP to %s's LP network. commands.bloodmagic.network.add.success=Successfully added %d LP to %s's LP network.
commands.network.set.help=Sets the given player's LP to the given amount. commands.bloodmagic.network.set.help=Sets the given player's LP to the given amount.
commands.network.set.success=Successfully set %s's LP network to %d LP. commands.bloodmagic.network.set.success=Successfully set %s's LP network to %d LP.
commands.network.get.help=Returns the amount of LP in the given player's LP network. commands.bloodmagic.network.get.help=Returns the amount of LP in the given player's LP network.
commands.network.fill.help=Fills the given player's LP network to %d. commands.bloodmagic.network.fill.help=Fills the given player's LP network to %d.
commands.network.fill.success=Successfully filled %s's LP network. commands.bloodmagic.network.fill.success=Successfully filled %s's LP network.
commands.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store. commands.bloodmagic.network.cap.help=Fills the given player's LP network to the max that their highest Blood Orb can store.
commands.network.cap.success=Successfully capped off %s's LP network. commands.bloodmagic.network.cap.success=Successfully capped off %s's LP network.
commands.bind.usage=/bloodmagic bind [true|false] [player] commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [player]
commands.bind.help=Attempts to (un)bind the currently held item. commands.bloodmagic.bind.help=Attempts to (un)bind the currently held item.
commands.bind.success=Binding successful commands.bloodmagic.bind.success=Binding successful
commands.bind.remove.success=Unbinding successful commands.bloodmagic.bind.remove.success=Unbinding successful
commands.orb.usage=/bloodmagic orb [set|get] player [tier] commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] player [tier]
commands.orb.help=Used to set or get the Player's max Blood Orb tier. commands.bloodmagic.orb.help=Used to set or get the Player's max Blood Orb tier.
commands.bind.usage=/bind <player> commands.bloodmagic.bind.usage=/bind <player>
commands.bind.success=Item successfully bound! commands.bloodmagic.bind.success=Item successfully bound!
commands.bind.failed.noPlayer=There is no player specified commands.bloodmagic.bind.failed.noPlayer=There is no player specified
commands.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it commands.bloodmagic.bind.failed.alreadyBound=Item is already bound; use /unbind to unbind it
commands.bind.failed.notBindable=Item cannot be bound commands.bloodmagic.bind.failed.notBindable=Item cannot be bound
commands.unbind.usage=/unbind commands.bloodmagic.unbind.usage=/unbind
commands.unbind.success=Item successfully unbound! commands.bloodmagic.unbind.success=Item successfully unbound!
commands.unbind.failed.notBindable=Item cannot be unbound commands.bloodmagic.unbind.failed.notBindable=Item cannot be unbound
commands.soulnetwork.usage=/soulnetwork <player> <add|subtract|fill|empty|get> [amount] commands.bloodmagic.soulnetwork.usage=/soulnetwork <player> <add|subtract|fill|empty|get> [amount]
commands.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network! commands.bloodmagic.soulnetwork.add.success=Successfully added %dLP to %s's Soul Network!
commands.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network! commands.bloodmagic.soulnetwork.subtract.success=Successfully subtracted %dLP from %s's Soul Network!
commands.soulnetwork.fill.success=Successfully filled %s's Soul Network! commands.bloodmagic.soulnetwork.fill.success=Successfully filled %s's Soul Network!
commands.soulnetwork.empty.success=Successfully emptied %s's Soul Network! commands.bloodmagic.soulnetwork.empty.success=Successfully emptied %s's Soul Network!
commands.soulnetwork.get.success=There is %dLP in %s's Soul Network! commands.bloodmagic.soulnetwork.get.success=There is %dLP in %s's Soul Network!
commands.soulnetwork.noPlayer=There is no player specified commands.bloodmagic.soulnetwork.noPlayer=There is no player specified
commands.soulnetwork.noCommand=There is no command specified commands.bloodmagic.soulnetwork.noCommand=There is no command specified
commands.soulnetwork.notACommand=That is not a valid command commands.bloodmagic.soulnetwork.notACommand=That is not a valid command
commands.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max! commands.bloodmagic.soulnetwork.fillMax.success=Successfully filled %s's Soul Network to their orb max!
commands.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d) commands.bloodmagic.soulnetwork.create.success=Successfully created %s's Soul Network (Orb tier: %d)
# Keybinds # Keybinds
bloodmagic.keybind.openSigilHolding=Open Sigil of Holding bloodmagic.keybind.openSigilHolding=Open Sigil of Holding

98
src/main/resources/assets/bloodmagic/lang/ja_JP.lang
View file

@ -785,62 +785,62 @@ entity.bloodmagic.SentientSpecter.name=理力の霊魂
entity.bloodmagic.Mimic.name=ミミック entity.bloodmagic.Mimic.name=ミミック
# Commands # Commands
commands.error.arg.invalid=無効な引数です commands.bloodmagic.error.arg.invalid=無効な引数です
commands.error.arg.missing=引数が足りません commands.bloodmagic.error.arg.missing=引数が足りません
commands.error.arg.player.missing=あなたは実行する対象プレイヤーを指定する必要があります。 commands.bloodmagic.error.arg.player.missing=あなたは実行する対象プレイヤーを指定する必要があります。
commands.error.404=コマンドが見つかりません！ commands.bloodmagic.error.404=コマンドが見つかりません！
commands.error.unknown=未知のコマンドです！ commands.bloodmagic.error.unknown=未知のコマンドです！
commands.error.perm=このコマンドを実行する権限がありません。 commands.bloodmagic.error.perm=このコマンドを実行する権限がありません。
commands.success=正常に実行されました commands.bloodmagic.success=正常に実行されました
commands.format.help=%s - %s commands.bloodmagic.format.help=%s - %s
commands.format.error=%s - %s commands.bloodmagic.format.error=%s - %s
commands.help.usage=/bloodmagic help commands.bloodmagic.help.usage=/bloodmagic help
commands.help.help="/bloodmagic" コマンドでヘルプ情報が表示されます。 commands.bloodmagic.help.help="/bloodmagic" コマンドでヘルプ情報が表示されます。
commands.network.usage=/bloodmagic network [syphon|add|get|fill|cap] <プレイヤー> [量] commands.bloodmagic.network.usage=/bloodmagic network [syphon|add|get|fill|cap] <プレイヤー> [量]
commands.network.help=LP ネットワークユーティリティ commands.bloodmagic.network.help=LP ネットワークユーティリティ
commands.network.syphon.help=指定したプレイヤーのLPネットワークからLPを削減します commands.bloodmagic.network.syphon.help=指定したプレイヤーのLPネットワークからLPを削減します
commands.network.syphon.success=%d LPだけ、%sのソウルネットワークを削減することに成功しました。 commands.bloodmagic.network.syphon.success=%d LPだけ、%sのソウルネットワークを削減することに成功しました。
commands.network.add.help=指定されたプレイヤーのLPネットワークのLPを、LP増加ルールの範囲内で増加させます。 commands.bloodmagic.network.add.help=指定されたプレイヤーのLPネットワークのLPを、LP増加ルールの範囲内で増加させます。
commands.network.add.success=%d LPだけ、%sのLPネットワークを増加させることに成功しました。 commands.bloodmagic.network.add.success=%d LPだけ、%sのLPネットワークを増加させることに成功しました。
commands.network.set.help=指定したプレイヤーのLPを設定します。 commands.bloodmagic.network.set.help=指定したプレイヤーのLPを設定します。
commands.network.set.success=%sのLPネットワークを%d LPに設定することに成功しました。 commands.bloodmagic.network.set.success=%sのLPネットワークを%d LPに設定することに成功しました。
commands.network.get.help=指定したプレイヤーのLPネットワークのLP量を返します。 commands.bloodmagic.network.get.help=指定したプレイヤーのLPネットワークのLP量を返します。
commands.network.fill.help=指定したプレイヤーのLPネットワークを%d LPまで満たします。 commands.bloodmagic.network.fill.help=指定したプレイヤーのLPネットワークを%d LPまで満たします。
commands.network.fill.success=%sのLPネットワークを最大まで付与することに成功しました。 commands.bloodmagic.network.fill.success=%sのLPネットワークを最大まで付与することに成功しました。
commands.network.cap.help=プレイヤーが入手できる最高位のブラッドオーブで貯蔵可能な最大値のLPを付与します。 commands.bloodmagic.network.cap.help=プレイヤーが入手できる最高位のブラッドオーブで貯蔵可能な最大値のLPを付与します。
commands.network.cap.success=%sのLPネットワークの限界値までLPを付与することに成功しました。 commands.bloodmagic.network.cap.success=%sのLPネットワークの限界値までLPを付与することに成功しました。
commands.bind.usage=/bloodmagic bind [true|false] [プレイヤー] commands.bloodmagic.bind.usage=/bloodmagic bind [true|false] [プレイヤー]
commands.bind.help=手に所持したアイテムを結合／分離します。 commands.bloodmagic.bind.help=手に所持したアイテムを結合／分離します。
commands.bind.success=結合に成功しました commands.bloodmagic.bind.success=結合に成功しました
commands.bind.remove.success=分離に成功しました commands.bloodmagic.bind.remove.success=分離に成功しました
commands.orb.usage=/bloodmagic orb [set|get] <プレイヤー> [グレード] commands.bloodmagic.orb.usage=/bloodmagic orb [set|get] <プレイヤー> [グレード]
commands.orb.help=対象プレイヤーのブラッドオーブのグレードの最大値を設定、取得するために使います。 commands.bloodmagic.orb.help=対象プレイヤーのブラッドオーブのグレードの最大値を設定、取得するために使います。
commands.bind.usage=/bind <プレイヤー> commands.bloodmagic.bind.usage=/bind <プレイヤー>
commands.bind.success=アイテムの登録が成功しました！ commands.bloodmagic.bind.success=アイテムの登録が成功しました！
commands.bind.failed.noPlayer=指定されたプレイヤーは存在しません commands.bloodmagic.bind.failed.noPlayer=指定されたプレイヤーは存在しません
commands.bind.failed.alreadyBound=アイテムは既に登録済みです； /unbind コマンドで登録解除してください commands.bloodmagic.bind.failed.alreadyBound=アイテムは既に登録済みです； /unbind コマンドで登録解除してください
commands.bind.failed.notBindable=アイテムの登録が出来ませんでした commands.bloodmagic.bind.failed.notBindable=アイテムの登録が出来ませんでした
commands.unbind.usage=/unbind commands.bloodmagic.unbind.usage=/unbind
commands.unbind.success=アイテムの登録解除が成功しました！ commands.bloodmagic.unbind.success=アイテムの登録解除が成功しました！
commands.unbind.failed.notBindable=アイテムの登録解除が出来ませんでした commands.bloodmagic.unbind.failed.notBindable=アイテムの登録解除が出来ませんでした
commands.soulnetwork.usage=/soulnetwork <プレイヤー> <add|subtract|fill|empty|get> [量] commands.bloodmagic.soulnetwork.usage=/soulnetwork <プレイヤー> <add|subtract|fill|empty|get> [量]
commands.soulnetwork.add.success=%d LPだけ、%sのソウルネットワークを増加させることに成功しました！ commands.bloodmagic.soulnetwork.add.success=%d LPだけ、%sのソウルネットワークを増加させることに成功しました！
commands.soulnetwork.subtract.success=%d LPだけ、%sのソウルネットワークを減少させることに成功しました！ commands.bloodmagic.soulnetwork.subtract.success=%d LPだけ、%sのソウルネットワークを減少させることに成功しました！
commands.soulnetwork.fill.success=正常に%sのソウルネットワークを満たしました！ commands.bloodmagic.soulnetwork.fill.success=正常に%sのソウルネットワークを満たしました！
commands.soulnetwork.empty.success=正常に%sのソウルネットワークを空にしました！ commands.bloodmagic.soulnetwork.empty.success=正常に%sのソウルネットワークを空にしました！
commands.soulnetwork.get.success=%dだけ%sのソウルネットワークにはLPがあります！ commands.bloodmagic.soulnetwork.get.success=%dだけ%sのソウルネットワークにはLPがあります！
commands.soulnetwork.noPlayer=指定されたプレイヤーは存在しません commands.bloodmagic.soulnetwork.noPlayer=指定されたプレイヤーは存在しません
commands.soulnetwork.noCommand=指定されたコマンドはありません commands.bloodmagic.soulnetwork.noCommand=指定されたコマンドはありません
commands.soulnetwork.notACommand=有効なコマンドではありません commands.bloodmagic.soulnetwork.notACommand=有効なコマンドではありません
commands.soulnetwork.fillMax.success=正常に%sのソウルネットワークにオーブの最大値までLPを供給しました！ commands.bloodmagic.soulnetwork.fillMax.success=正常に%sのソウルネットワークにオーブの最大値までLPを供給しました！
commands.soulnetwork.create.success=正常に%sのソウルネットワークを構築しました(オーブのグレード： %d) commands.bloodmagic.soulnetwork.create.success=正常に%sのソウルネットワークを構築しました(オーブのグレード： %d)
# GUI # GUI
tile.bloodmagic.inputNode.name=入力ノード tile.bloodmagic.inputNode.name=入力ノード

98
src/main/resources/assets/bloodmagic/lang/zh_CN.lang
View file

@ -783,62 +783,62 @@ entity.bloodmagic.SentientSpecter.name=感知之灵
entity.bloodmagic.Mimic.name=拟态 entity.bloodmagic.Mimic.name=拟态
# Commands # Commands
commands.error.arg.invalid=无效参数 commands.bloodmagic.error.arg.invalid=无效参数
commands.error.arg.missing=参数不足 commands.bloodmagic.error.arg.missing=参数不足
commands.error.arg.player.missing=你必须指定一个玩家来执行该命令。 commands.bloodmagic.error.arg.player.missing=你必须指定一个玩家来执行该命令。
commands.error.404=命令未找到！ commands.bloodmagic.error.404=命令未找到！
commands.error.unknown=未知的命令！ commands.bloodmagic.error.unknown=未知的命令！
commands.error.perm=你没有使用该命令的权限。 commands.bloodmagic.error.perm=你没有使用该命令的权限。
commands.success=成功执行 commands.bloodmagic.success=成功执行
commands.format.help=%s - %s commands.bloodmagic.format.help=%s - %s
commands.format.error=%s - %s commands.bloodmagic.format.error=%s - %s
commands.help.usage=/bloodmagic help commands.bloodmagic.help.usage=/bloodmagic help
commands.help.help=使用"/bloodmagic help"命令显示指令列表。 commands.bloodmagic.help.help=使用"/bloodmagic help"命令显示指令列表。
commands.network.usage=/bloodmagic network [吸取(syphon)|添加(add)|查看(get)|填充(fill)|填满(cap)] <玩家> [数量] commands.bloodmagic.network.usage=/bloodmagic network [吸取(syphon)|添加(add)|查看(get)|填充(fill)|填满(cap)] <玩家> [数量]
commands.network.help=灵魂网络实用工具 commands.bloodmagic.network.help=灵魂网络实用工具
commands.network.syphon.help=从指定玩家的灵魂网络中移出指定的LP值。 commands.bloodmagic.network.syphon.help=从指定玩家的灵魂网络中移出指定的LP值。
commands.network.syphon.success=成功从 %s 吸取出 %dLP。 commands.bloodmagic.network.syphon.success=成功从 %s 吸取出 %dLP。
commands.network.add.help=添加指定的LP值到指定玩家的灵魂网络中。服从标准的LP增加规则。 commands.bloodmagic.network.add.help=添加指定的LP值到指定玩家的灵魂网络中。服从标准的LP增加规则。
commands.network.add.success=成功添加 %dLP 到 %s 的灵魂网络。 commands.bloodmagic.network.add.success=成功添加 %dLP 到 %s 的灵魂网络。
commands.network.set.help=将指定玩家的LP设置为所给数值。 commands.bloodmagic.network.set.help=将指定玩家的LP设置为所给数值。
commands.network.set.success=成功将 %s 灵魂网络中的LP设置为 %d。 commands.bloodmagic.network.set.success=成功将 %s 灵魂网络中的LP设置为 %d。
commands.network.get.help=返还指定玩家灵魂网络中的LP值。 commands.bloodmagic.network.get.help=返还指定玩家灵魂网络中的LP值。
commands.network.fill.help=将指定玩家的LP填充为 %d。 commands.bloodmagic.network.fill.help=将指定玩家的LP填充为 %d。
commands.network.fill.success=成功填充 %s 的灵魂网络。 commands.bloodmagic.network.fill.success=成功填充 %s 的灵魂网络。
commands.network.cap.help=填充指定玩家的灵魂网络至其所持有的最高阶气血宝珠容量的最大值。 commands.bloodmagic.network.cap.help=填充指定玩家的灵魂网络至其所持有的最高阶气血宝珠容量的最大值。
commands.network.cap.success=成功填满 %s 的灵魂网络。 commands.bloodmagic.network.cap.success=成功填满 %s 的灵魂网络。
commands.bind.usage=/bind <玩家> commands.bloodmagic.bind.usage=/bind <玩家>
commands.bind.help=用于设置/解除对手持物品的绑定情况。 commands.bloodmagic.bind.help=用于设置/解除对手持物品的绑定情况。
commands.bind.success=物品成功绑定！ commands.bloodmagic.bind.success=物品成功绑定！
commands.bind.remove.success=解除绑定成功 commands.bloodmagic.bind.remove.success=解除绑定成功
commands.orb.usage=/bloodmagic orb [设置(set)|查看(get)] <玩家> [等级] commands.bloodmagic.orb.usage=/bloodmagic orb [设置(set)|查看(get)] <玩家> [等级]
commands.orb.help=用于设置或查看玩家的最高血宝珠等级. commands.bloodmagic.orb.help=用于设置或查看玩家的最高血宝珠等级.
commands.bind.usage=/bind <玩家> commands.bloodmagic.bind.usage=/bind <玩家>
commands.bind.success=物品成功绑定！ commands.bloodmagic.bind.success=物品成功绑定！
commands.bind.failed.noPlayer=没有指定玩家 commands.bloodmagic.bind.failed.noPlayer=没有指定玩家
commands.bind.failed.alreadyBound=物品已经被绑定；使用 /unbind 来解除绑定 commands.bloodmagic.bind.failed.alreadyBound=物品已经被绑定；使用 /unbind 来解除绑定
commands.bind.failed.notBindable=物品无法被绑定 commands.bloodmagic.bind.failed.notBindable=物品无法被绑定
commands.unbind.usage=/unbind commands.bloodmagic.unbind.usage=/unbind
commands.unbind.success=物品成功解除绑定！ commands.bloodmagic.unbind.success=物品成功解除绑定！
commands.unbind.failed.notBindable=物品无法解除绑定 commands.bloodmagic.unbind.failed.notBindable=物品无法解除绑定
commands.soulnetwork.usage=/soulnetwork <玩家> <添加(add)|减去(subtract)|填满(fill)|清空(empty)|查看(get)> [数量] commands.bloodmagic.soulnetwork.usage=/soulnetwork <玩家> <添加(add)|减去(subtract)|填满(fill)|清空(empty)|查看(get)> [数量]
commands.soulnetwork.add.success=成功添加 %dLP 到 %s 的灵魂网络！ commands.bloodmagic.soulnetwork.add.success=成功添加 %dLP 到 %s 的灵魂网络！
commands.soulnetwork.subtract.success=成功从 %s 的灵魂网络中减去 %dLP！ commands.bloodmagic.soulnetwork.subtract.success=成功从 %s 的灵魂网络中减去 %dLP！
commands.soulnetwork.fill.success=成功填满 %s 的灵魂网络！ commands.bloodmagic.soulnetwork.fill.success=成功填满 %s 的灵魂网络！
commands.soulnetwork.empty.success=成功清空 %s 的灵魂网络！ commands.bloodmagic.soulnetwork.empty.success=成功清空 %s 的灵魂网络！
commands.soulnetwork.get.success=%s 的灵魂网络中有 %dLP！ commands.bloodmagic.soulnetwork.get.success=%s 的灵魂网络中有 %dLP！
commands.soulnetwork.noPlayer=没有指定玩家 commands.bloodmagic.soulnetwork.noPlayer=没有指定玩家
commands.soulnetwork.noCommand=这不符命令规定 commands.bloodmagic.soulnetwork.noCommand=这不符命令规定
commands.soulnetwork.notACommand=这不是有效的命令 commands.bloodmagic.soulnetwork.notACommand=这不是有效的命令
commands.soulnetwork.fillMax.success=成功将 %s 的灵魂网络填满至其宝珠的最大值！ commands.bloodmagic.soulnetwork.fillMax.success=成功将 %s 的灵魂网络填满至其宝珠的最大值！
commands.soulnetwork.create.success=创建 %s 的灵魂网络成功（宝珠等级：%d） commands.bloodmagic.soulnetwork.create.success=创建 %s 的灵魂网络成功（宝珠等级：%d）
# GUI # GUI
tile.bloodmagic.inputNode.name=输入节点 tile.bloodmagic.inputNode.name=输入节点