EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 11:14:44 +02:00
Code Issues Projects Releases Wiki Activity

Locale changes, part 1.

Browse Source
This commit is contained in:
GJ
2012-04-11 15:28:30 -04:00
parent 32422646e4
commit 248f24d4b9
19 changed files with 612 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/skills/Acrobatics.java
View File

@ -68,10 +68,10 @@ public class Acrobatics {
}
if (gracefulRoll) {
player.sendMessage(mcLocale.getString("Acrobatics.GracefulRoll"));
player.sendMessage(mcLocale.getString("Acrobatics.Ability.Proc"));
}
else {
player.sendMessage(mcLocale.getString("Acrobatics.Roll"));
player.sendMessage(mcLocale.getString("Acrobatics.Roll.Text"));
}
}
}
@ -108,7 +108,7 @@ public class Acrobatics {
int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
if (random.nextInt(4000) <= skillCheck && mcPermissions.getInstance().dodge(defender)) {
defender.sendMessage(mcLocale.getString("Acrobatics.Dodge"));
defender.sendMessage(mcLocale.getString("Acrobatics.Combat.Proc"));
if (System.currentTimeMillis() >= (5000 + PPd.getRespawnATS()) && defender.getHealth() >= 1) {
PPd.addXP(SkillType.ACROBATICS, damage * DODGE_MODIFIER);

6
src/main/java/com/gmail/nossr50/skills/Axes.java
View File

@ -82,12 +82,12 @@ public class Axes {
if (entity instanceof Player){
event.setDamage((int) (damage * PVP_MODIFIER));
Player player = (Player) entity;
player.sendMessage(mcLocale.getString("Axes.HitCritically"));
player.sendMessage(mcLocale.getString("Axes.Combat.CritStruck"));
}
else {
event.setDamage(damage * PVE_MODIFIER);
}
attacker.sendMessage(mcLocale.getString("Axes.CriticalHit"));
attacker.sendMessage(mcLocale.getString("Axes.Combat.CriticalHit"));
}
}
@ -140,7 +140,7 @@ public class Axes {
if (random.nextInt(100) <= GREATER_IMPACT_CHANCE) {
event.setDamage(event.getDamage() + 2);
target.setVelocity(attacker.getLocation().getDirection().normalize().multiply(GREATER_IMPACT_MULTIPLIER));
attacker.sendMessage(mcLocale.getString("Axes.GreaterImpactOnEnemy"));
attacker.sendMessage(mcLocale.getString("Axes.Combat.GI.Proc"));
}
}

2
src/main/java/com/gmail/nossr50/skills/BlastMining.java
View File

@ -273,7 +273,7 @@ public class BlastMining {
}
}
player.sendMessage(mcLocale.getString("BlastMining.Boom"));
player.sendMessage(mcLocale.getString("Mining.Blast.Boom"));
/* Create the TNT entity */
TNTPrimed tnt = player.getWorld().spawn(block.getLocation(), TNTPrimed.class);

2
src/main/java/com/gmail/nossr50/skills/Fishing.java
View File

@ -97,7 +97,7 @@ public class Fishing {
break;
}
if (LoadProperties.fishingDrops) {
if (LoadProperties.fishingDrops && rewards.size() > 0) {
FishingTreasure treasure = rewards.get(random.nextInt(rewards.size()));
if (random.nextDouble() * 100 <= treasure.getDropChance()) {

24
src/main/java/com/gmail/nossr50/skills/Repair.java
View File

@ -102,7 +102,7 @@ public class Repair {
}
}
else {
player.sendMessage(mcLocale.getString("Skills.FullDurability"));
player.sendMessage(mcLocale.getString("Repair.Skills.FullDurability"));
}
}
@ -189,7 +189,7 @@ public class Repair {
for (Enchantment x : enchants.keySet()) {
is.removeEnchantment(x);
}
player.sendMessage(mcLocale.getString("Repair.LostEnchants"));
player.sendMessage(mcLocale.getString("Repair.Arcane.Lost"));
return;
}
@ -216,13 +216,13 @@ public class Repair {
Map<Enchantment, Integer> newEnchants = is.getEnchantments();
if (newEnchants.isEmpty()) {
player.sendMessage(mcLocale.getString("Repair.ArcaneFailed"));
player.sendMessage(mcLocale.getString("Repair.Arcane.Fail"));
}
else if (downgraded || newEnchants.size() < enchants.size()) {
player.sendMessage(mcLocale.getString("Repair.Downgraded"));
player.sendMessage(mcLocale.getString("Repair.Arcane.Downgrade"));
}
else {
player.sendMessage(mcLocale.getString("Repair.ArcanePerfect"));
player.sendMessage(mcLocale.getString("Repair.Arcane.Perfect"));
}
}
@ -349,12 +349,12 @@ public class Repair {
int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
if (is.getAmount() != 1) {
player.sendMessage(mcLocale.getString("Skills.StackedItems"));
player.sendMessage(mcLocale.getString("Repair.Skills.StackedItems"));
}
else {
if (ItemChecks.isDiamondTool(is) || ItemChecks.isDiamondArmor(is)) {
if (skillLevel < LoadProperties.repairdiamondlevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptDiamond"));
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptDiamond"));
}
else {
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.BLUE + m.prettyItemString(LoadProperties.rDiamond));
@ -362,7 +362,7 @@ public class Repair {
}
else if (ItemChecks.isIronTool(is) || ItemChecks.isIronArmor(is)) {
if (skillLevel < LoadProperties.repairIronLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptIron"));
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptIron"));
}
else {
player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.rIron));
@ -370,7 +370,7 @@ public class Repair {
}
else if (ItemChecks.isGoldTool(is) || ItemChecks.isGoldArmor(is)) {
if (skillLevel < LoadProperties.repairGoldLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptGold"));
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptGold"));
}
else {
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GOLD + m.prettyItemString(LoadProperties.rGold));
@ -378,7 +378,7 @@ public class Repair {
}
else if (ItemChecks.isStoneTool(is)) {
if (skillLevel < LoadProperties.repairStoneLevel) {
player.sendMessage(mcLocale.getString("Skills.AdeptStone"));
player.sendMessage(mcLocale.getString("Repair.Skills.AdeptStone"));
}
else {
player.sendMessage(mcLocale.getString("Skills.NeedMore") + " " + ChatColor.GRAY + m.prettyItemString(LoadProperties.rStone));
@ -408,7 +408,7 @@ public class Repair {
int skillLevel = Users.getProfile(player).getSkillLevel(SkillType.REPAIR);
if ((skillLevel > MAX_BONUS_LEVEL || random.nextInt(1000) <= skillLevel) && mcPermissions.getInstance().repairBonus(player)) {
player.sendMessage(mcLocale.getString("Skills.FeltEasy"));
player.sendMessage(mcLocale.getString("Repair.Skills.FeltEasy"));
return true;
}
@ -467,7 +467,7 @@ public class Repair {
}
}
else {
player.sendMessage(mcLocale.getString("mcBlockListener.PlacedAnvil"));
player.sendMessage(mcLocale.getString("Repair.Listener.Anvil"));
}
PP.togglePlacedAnvil();

4
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -224,11 +224,11 @@ public class Skills {
}
}
else {
player.sendMessage(mcLocale.getString("Skills."+capitalized+"Up", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
player.sendMessage(mcLocale.getString(capitalized + "Skillup", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
}
}
else {
player.sendMessage(mcLocale.getString("Skills."+capitalized+"Up", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
player.sendMessage(mcLocale.getString(capitalized + "Skillup", new Object[] {String.valueOf(skillups), PP.getSkillLevel(skillType)}));
}
}

6
src/main/java/com/gmail/nossr50/skills/Swords.java
View File

@ -73,7 +73,7 @@ public class Swords {
else {
mcBleedTimer.add(entity);
}
attacker.sendMessage(mcLocale.getString("Swords.EnemyBleeding"));
attacker.sendMessage(mcLocale.getString("Swords.Combat.Bleeding"));
}
}
@ -104,10 +104,10 @@ public class Swords {
if (random.nextInt(2000) <= skillCheck) {
Combat.dealDamage((LivingEntity) attacker, event.getDamage() / COUNTER_ATTACK_MODIFIER);
defender.sendMessage(mcLocale.getString("Swords.CounterAttacked"));
defender.sendMessage(mcLocale.getString("Swords.Combat.Countered"));
if (attacker instanceof Player) {
((Player) attacker).sendMessage(mcLocale.getString("Swords.HitByCounterAttack"));
((Player) attacker).sendMessage(mcLocale.getString("Swords.Combat.Counter.Hit"));
}
}
}

8
src/main/java/com/gmail/nossr50/skills/Taming.java
View File

@ -154,7 +154,7 @@ public class Taming {
}
wolf.teleport(master.getLocation());
master.sendMessage(mcLocale.getString("mcEntityListener.WolfComesBack"));
master.sendMessage(mcLocale.getString("Taming.Listener.Wolf"));
}
}
break;
@ -232,11 +232,11 @@ public class Taming {
if (x.getType().equals(type)) {
switch (type) {
case WOLF:
player.sendMessage(mcLocale.getString("m.TamingSummonWolfFailed"));
player.sendMessage(mcLocale.getString("Taming.Summon.Fail.Wolf"));
return;
case OCELOT:
player.sendMessage(mcLocale.getString("m.TamingSummonOcelotFailed"));
player.sendMessage(mcLocale.getString("Taming.Summon.Fail.Ocelot"));
return;
default:
@ -258,7 +258,7 @@ public class Taming {
}
player.setItemInHand(new ItemStack(summonItem, item.getAmount() - summonAmount));
player.sendMessage(mcLocale.getString("m.TamingSummon"));
player.sendMessage(mcLocale.getString("Taming.Summon.Complete"));
}
else {
player.sendMessage(mcLocale.getString("Skills.NeedMore")+ " " + ChatColor.GRAY + m.prettyItemString(summonItem.getId()));

4
src/main/java/com/gmail/nossr50/skills/WoodCutting.java
View File

@ -54,7 +54,7 @@ public class WoodCutting {
*/
private static void removeBlocks(ArrayList<Block> toBeFelled, Player player, PlayerProfile PP) {
if (toBeFelled.size() > LoadProperties.treeFellerThreshold) {
player.sendMessage(mcLocale.getString("Skills.Woodcutting.TreeFellerThreshold"));
player.sendMessage(mcLocale.getString("Woodcutting.Skills.TreeFellerThreshold"));
return;
}
@ -67,7 +67,7 @@ public class WoodCutting {
/* This is to prevent using wood axes everytime you tree fell */
if ((inHand.getDurability() + durabilityLoss >= inHand.getType().getMaxDurability()) || inHand.getType().equals(Material.AIR)) {
player.sendMessage(mcLocale.getString("TreeFeller.AxeSplinters"));
player.sendMessage(mcLocale.getString("Woodcutting.Skills.TreeFeller.Splinter"));
int health = player.getHealth();