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

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
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);
int xOffset = 0;
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;
}
}

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

@ -21,7 +21,7 @@ public class SubCommandBind extends CommandBase {
@Override
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.bind.usage");
return TextHelper.localizeEffect("commands.bloodmagic.bind.usage");
}
@Override
@ -58,17 +58,17 @@ public class SubCommandBind extends CommandBase {
if (bind) {
Binding binding = new Binding(player.getGameProfile().getId(), player.getGameProfile().getName());
BindableHelper.applyBinding(held, binding);
commandSender.sendMessage(new TextComponentTranslation("commands.bind.success"));
commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.success"));
} else {
Binding binding = ((IBindable) held.getItem()).getBinding(held);
if (binding != null) {
held.getTagCompound().removeTag("binding");
commandSender.sendMessage(new TextComponentTranslation("commands.bind.remove.success"));
commandSender.sendMessage(new TextComponentTranslation("commands.bloodmagic.bind.remove.success"));
}
}
}
} 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
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.network.usage");
return TextHelper.localizeEffect("commands.bloodmagic.network.usage");
}
@Override
@ -50,12 +50,12 @@ public class SubCommandNetwork extends CommandBase {
CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage());
}
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing");
CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing");
}
}
private enum ValidCommands {
SYPHON("commands.network.syphon.help") {
SYPHON("commands.bloodmagic.network.syphon.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -67,16 +67,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
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 {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
}
} 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
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -90,16 +90,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
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 {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
}
} 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
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -113,16 +113,16 @@ public class SubCommandNetwork extends CommandBase {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
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 {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
CommandBloodMagic.displayErrorString(sender, "commands.bloodmagic.error.arg.invalid");
}
} 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
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -137,7 +137,7 @@ public class SubCommandNetwork extends CommandBase {
}
},
FILL("commands.network.fill.help") {
FILL("commands.bloodmagic.network.fill.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -149,11 +149,11 @@ public class SubCommandNetwork extends CommandBase {
if (args.length > 1) {
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
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
@ -166,7 +166,7 @@ public class SubCommandNetwork extends CommandBase {
if (args.length > 1) {
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
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
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.orb.usage");
return TextHelper.localizeEffect("commands.bloodmagic.orb.usage");
}
@Override
@ -63,12 +63,12 @@ public class SubCommandOrb extends CommandBase {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount);
CommandBloodMagic.displaySuccessString(commandSender, "commands.success");
CommandBloodMagic.displaySuccessString(commandSender, "commands.bloodmagic.success");
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.invalid");
CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.invalid");
}
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing");
CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.arg.missing");
}
break;
@ -86,17 +86,17 @@ public class SubCommandOrb extends CommandBase {
}
}
} catch (IllegalArgumentException e) {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.404");
CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404");
}
} catch (PlayerNotFoundException e) {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.404");
CommandBloodMagic.displayErrorString(commandSender, "commands.bloodmagic.error.404");
}
}
}
private enum ValidCommands {
SET("commands.orb.set.help"),
GET("commands.orb.get.help");
SET("commands.bloodmagic.orb.set.help"),
GET("commands.bloodmagic.orb.get.help");
public String help;