Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2024-09-27 03:52:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finished LanguageReader for p.msg

Browse Source
This commit is contained in:
Frank Baumann 2013-09-11 13:02:41 +02:00
parent 3d9d0cef70
commit faf984cdcb
6 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/dre/brewery/BCauldron.java
View File

@ -110,9 +110,9 @@ public class BCauldron {
BCauldron bcauldron = get(block);
if (bcauldron != null) {
if (bcauldron.state > 1) {
P.p.msg(player, "Dieser Kessel siedet nun seit " + bcauldron.state + " Minuten");
P.p.msg(player, P.p.languageReader.get(""));//"Dieser Kessel siedet nun seit " + bcauldron.state + " Minuten");
} else {
P.p.msg(player, "Dieser Kessel siedet seit weniger als einer Minute");
P.p.msg(player, P.p.languageReader.get(""));//"Dieser Kessel siedet seit weniger als einer Minute");
}
}
}

6
src/com/dre/brewery/BPlayer.java
View File

@ -104,7 +104,7 @@ public class BPlayer {
} else {
bPlayer.drinkCap(player);
}
P.p.msg(player, "Du bist nun " + bPlayer.drunkeness + "% betrunken, mit einer Qualität von " + bPlayer.getQuality());
P.p.msg(player, P.p.languageReader.get("Player_DrunkInfo", "" + bPlayer.getDrunkeness(), "" + bPlayer.getQuality()));
return true;
}
return false;
@ -118,7 +118,7 @@ public class BPlayer {
quality = getQuality() * 100;
drunkeness = 100;
addPuke(player, 60 + (int) (Math.random() * 60.0));
P.p.msg(player, "Du kannst nicht mehr trinken");
P.p.msg(player, P.p.languageReader.get("Player_CantDrink"));
}
}
@ -259,7 +259,7 @@ public class BPlayer {
Location randomLoc = Wakeup.getRandom(player.getLocation());
if (randomLoc != null) {
player.teleport(randomLoc);
P.p.msg(player, "");
P.p.msg(player, P.p.languageReader.get("Player_Wake"));
}
}

6
src/com/dre/brewery/LanguageReader.java
View File

@ -46,7 +46,7 @@ public class LanguageReader {
defaults.put("Player_WakeNotExist", "&cDer Aufwachpunkt mit der id: &6&v1 &cexistiert nicht!");
defaults.put("Player_WakeDeleted", "&aDer Aufwachpunkt mit der id: &6&v1 &awurde erfolgreich gelöscht!");
defaults.put("Player_WakeAlreadyDeleted", "&cDer Aufwachpunkt mit der id: &6&v1 &cwurde bereits gelöscht!");
defaults.put("Player_WakeFilled", "&cDer Aufwachpunkt mit der id: &6&v1&c An Position &6&v2 &v3, &4, &v5&c ist mit Blöcken gefüllt!");
defaults.put("Player_WakeFilled", "&cDer Aufwachpunkt mit der id: &6&v1&c an Position &6&v2 &v3, &4, &v5&c ist mit Blöcken gefüllt!");
defaults.put("Player_WakeNoPoints", "&cEs wurden noch keine Aufwachpunkte erstellt!");
defaults.put("Player_WakeLast", "&aDies war der letzte Aufwachpunkt");
defaults.put("Player_WakeTeleport", "Teleport zu Aufwachpunkt mit der id: &6&v1&f An Position: &6&v2 &v3, &4, &v5");
@ -60,12 +60,12 @@ public class LanguageReader {
defaults.put("CMD_Player", "&a&v1 ist nun &6&v2% &abetrunken, mit einer Qualität von &6&v3");
defaults.put("CMD_Player_Error", "&cDie Qualität muss zwischen 1 und 10 liegen!");
defaults.put("CMD_Info_NotDrunk", "&v1 ist nicht betrunken");
defaults.put("CMD_Info_Drunkk", "&v1 ist &6&v2% &fbetrunken, mit einer Qualität von &6&v1");
defaults.put("CMD_Info_Drunk", "&v1 ist &6&v2% &fbetrunken, mit einer Qualität von &6&v1");
defaults.put("CMD_Copy_Error", "&6&v1 &cTränke haben nicht mehr in das Inventar gepasst");
/* Error */
defaults.put("Error_NoPermissions", "&cDu hast keine Rechte dies zu tun!");
defaults.put("Error_UnknownCommand", "Unbekannter Befehl.");
defaults.put("Error_UnknownCommand", "Unbekannter Befehl");
defaults.put("Error_ShowHelp", "benutze &6/br help &fum die Hilfe anzuzeigen");
defaults.put("Error_PlayerCommand", "&cDieser Befehl kann nur als Spieler ausgeführt werden");
defaults.put("Error_ItemNotPotion", "&cDas Item in deiner Hand konnte nicht als Trank identifiziert werden");

1
src/com/dre/brewery/P.java
View File

@ -27,7 +27,6 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import com.dre.brewery.listeners.*;
import com.dre.managerxl.LanguageReader;
public class P extends JavaPlugin {
public static P p;

34
src/com/dre/brewery/Wakeup.java
View File

@ -89,16 +89,16 @@ public class Wakeup {
Player player = (Player) sender;
wakeups.add(new Wakeup(player.getLocation()));
p.msg(sender, "&aAufwachpunkt mit id: &6" + (wakeups.size() - 1) + " &awurde erfolgreich erstellt!");
p.msg(sender, p.languageReader.get("Player_WakeCreated", "" + (wakeups.size() - 1)));
} else {
p.msg(sender, "&cDieser Befehl kann nur als Spieler ausgeführt werden");
p.msg(sender, p.languageReader.get("Error_PlayerCommand"));
}
}
public static void remove(CommandSender sender, int id) {
if (wakeups.isEmpty() || id < 0 || id >= wakeups.size()) {
p.msg(sender, "&cDer Aufwachpunkt mit der id: &6" + id + " &cexistiert nicht!");
p.msg(sender, p.languageReader.get("Player_WakeNotExist", "" + id));//"&cDer Aufwachpunkt mit der id: &6" + id + " &cexistiert nicht!");
return;
}
@ -106,16 +106,16 @@ public class Wakeup {
if (wakeup.active) {
wakeup.active = false;
p.msg(sender, "&aDer Aufwachpunkt mit der id: &6" + id + " &awurde erfolgreich gelöscht!");
p.msg(sender, p.languageReader.get("Player_WakeDeleted", "" + id));
} else {
p.msg(sender, "&cDer Aufwachpunkt mit der id: &6" + id + " &cwurde bereits gelöscht!");
p.msg(sender, p.languageReader.get("Player_WakeAlreadyDeleted", "" + id));
}
}
public static void list(CommandSender sender, int page, String worldOnly) {
if (wakeups.isEmpty()) {
p.msg(sender, "&cEs wurden noch keine Aufwachpunkte erstellt!");
p.msg(sender, p.languageReader.get("Player_WakeNoPoints"));
return;
}
@ -148,7 +148,7 @@ public class Wakeup {
if (!all) {
if (wakeups.isEmpty() || id >= wakeups.size()) {
p.msg(sender, "&cDer Aufwachpunkt mit der id: &6" + id + "&c existiert nicht!");
p.msg(sender, p.languageReader.get("Player_WakeNotExist", "" + id));
return;
}
@ -160,12 +160,12 @@ public class Wakeup {
int x = (int) wakeup.loc.getX();
int y = (int) wakeup.loc.getY();
int z = (int) wakeup.loc.getZ();
p.msg(sender, "&cDer Aufwachpunkt mit der id: &6" + id + "&c An Position &6" + world + " " + x + "," + y + "," + z + "&c ist mit Blöcken gefüllt!");
p.msg(sender, p.languageReader.get("Player_WakeFilled", "" + id, world, "" + x , "" + y, "" + z));
}
} else {
if (wakeups.isEmpty()) {
p.msg(sender, "&cEs wurden noch keine Aufwachpunkte erstellt!");
p.msg(sender, p.languageReader.get("Player_WakeNoPoints"));
return;
}
if (checkPlayer != null && checkPlayer != player) {
@ -177,7 +177,7 @@ public class Wakeup {
} else {
p.msg(sender, "&cDieser Befehl kann nur als Spieler ausgeführt werden");
p.msg(sender, p.languageReader.get("Error_PlayerCommand"));
}
}
@ -188,7 +188,7 @@ public class Wakeup {
public static void tpNext() {
checkId++;
if (checkId >= wakeups.size()) {
p.msg(checkPlayer, "&aDies war der letzte Aufwachpunkt");
p.msg(checkPlayer, p.languageReader.get("Player_WakeLast"));
checkId = -1;
checkPlayer = null;
return;
@ -206,23 +206,23 @@ public class Wakeup {
int z = (int) wakeup.loc.getZ();
if (wakeup.check()) {
p.msg(checkPlayer, "Teleport zu Aufwachpunkt mit der id: &6" + checkId + "&f An Position: &6" + world + " " + x + "," + y + "," + z);
p.msg(checkPlayer, p.languageReader.get("Player_WakeTeleport", "" + checkId, world, "" + x , "" + y, "" + z));
checkPlayer.teleport(wakeup.loc);
} else {
p.msg(checkPlayer, "&cDer Aufwachpunkt mit der id: &6" + checkId + "&c An Position &6" + world + " " + x + "," + y + "," + z + "&c ist mit Blöcken gefüllt!");
p.msg(checkPlayer, p.languageReader.get("Player_WakeFilled", "" + checkId, world, "" + x , "" + y, "" + z));
}
p.msg(checkPlayer, "Zum nächsten Aufwachpunkt: Mit Faust in die Luft schlagen");
p.msg(checkPlayer, "Zum Abbrechen: &9/br Wakeup Cancel");
p.msg(checkPlayer, p.languageReader.get("Player_WakeHint1"));
p.msg(checkPlayer, p.languageReader.get("Player_WakeHint2"));
}
public static void cancel(CommandSender sender) {
if (checkPlayer != null) {
checkPlayer = null;
checkId = -1;
p.msg(sender, "&6Aufwachpunkte-Check wurde abgebrochen");
p.msg(sender, p.languageReader.get("Player_WakeCancel"));
return;
}
p.msg(sender, "&cEs läuft kein Aufwachpunkte-Check");
p.msg(sender, p.languageReader.get("Player_WakeNoCheck"));
}

80
src/com/dre/brewery/listeners/CommandListener.java
View File

@ -33,9 +33,9 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.reload")) {
p.reload();
p.msg(sender, P.p.languageReader.get("CMD_Reload"));
p.msg(sender, p.languageReader.get("CMD_Reload"));
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
} else if (cmd.equalsIgnoreCase("wakeup")) {
@ -43,7 +43,7 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.wakeup")) {
cmdWakeup(sender, args);
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
} else if (cmd.equalsIgnoreCase("create")) {
@ -56,13 +56,13 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.infoOther")) {
cmdInfo(sender, args[1]);
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
} else {
if (p.permission.has(sender, "brewery.cmd.info")) {
cmdInfo(sender, null);
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
}
@ -70,12 +70,12 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.copy")) {
if (args.length > 1) {
cmdCopy(sender, P.p.parseInt(args[1]));
cmdCopy(sender, p.parseInt(args[1]));
} else {
cmdCopy(sender, 1);
}
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
} else if (cmd.equalsIgnoreCase("delete") || cmd.equalsIgnoreCase("rm")) {
@ -83,7 +83,7 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.delete")) {
cmdDelete(sender);
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
} else {
@ -98,14 +98,14 @@ public class CommandListener implements CommandExecutor {
if (p.permission.has(sender, "brewery.cmd.player")) {
cmdPlayer(sender, args);
} else {
p.msg(sender, P.p.languageReader.get("Error_NoPermissions"));
p.msg(sender, p.languageReader.get("Error_NoPermissions"));
}
}
} else {
p.msg(sender, P.p.languageReader.get("Error_UnknownCommand"));
p.msg(sender, P.p.languageReader.get("Error_ShowHelp"));
p.msg(sender, p.languageReader.get("Error_UnknownCommand"));
p.msg(sender, p.languageReader.get("Error_ShowHelp"));
}
}
@ -133,39 +133,39 @@ public class CommandListener implements CommandExecutor {
public ArrayList<String> getCommands(CommandSender sender) {
ArrayList<String> cmds = new ArrayList<String>();
cmds.add(P.p.languageReader.get("Help_Help"));
cmds.add(p.languageReader.get("Help_Help"));
if (p.permission.has(sender, "brewery.cmd.player")) {
cmds.add (P.p.languageReader.get("Help_Player"));
cmds.add (p.languageReader.get("Help_Player"));
}
if (p.permission.has(sender, "brewery.cmd.info")) {
cmds.add (P.p.languageReader.get("Help_Info"));
cmds.add (p.languageReader.get("Help_Info"));
}
if (p.permission.has(sender, "brewery.cmd.copy")) {
cmds.add (P.p.languageReader.get("Help_Copy"));
cmds.add (p.languageReader.get("Help_Copy"));
}
if (p.permission.has(sender, "brewery.cmd.delete")) {
cmds.add (P.p.languageReader.get("Help_Delete"));
cmds.add (p.languageReader.get("Help_Delete"));
}
if (p.permission.has(sender, "brewery.cmd.infoOther")) {
cmds.add (P.p.languageReader.get("Help_InfoOther"));
cmds.add (p.languageReader.get("Help_InfoOther"));
}
if (p.permission.has(sender, "brewery.cmd.wakeup")) {
cmds.add(P.p.languageReader.get("Help_Wakeup"));
cmds.add(P.p.languageReader.get("Help_WakeupList"));
cmds.add(P.p.languageReader.get("Help_WakeupCheck"));
cmds.add(P.p.languageReader.get("Help_WakeupCheckSpecific"));
cmds.add(P.p.languageReader.get("Help_WakeupAdd"));
cmds.add(P.p.languageReader.get("Help_WakeupRemove"));
cmds.add(p.languageReader.get("Help_Wakeup"));
cmds.add(p.languageReader.get("Help_WakeupList"));
cmds.add(p.languageReader.get("Help_WakeupCheck"));
cmds.add(p.languageReader.get("Help_WakeupCheckSpecific"));
cmds.add(p.languageReader.get("Help_WakeupAdd"));
cmds.add(p.languageReader.get("Help_WakeupRemove"));
}
if (p.permission.has(sender, "brewery.cmd.reload")) {
cmds.add(P.p.languageReader.get("Help_Reload"));
cmds.add(p.languageReader.get("Help_Reload"));
}
return cmds;
@ -200,8 +200,8 @@ public class CommandListener implements CommandExecutor {
int id = p.parseInt(args[2]);
Wakeup.remove(sender, id);
} else {
p.msg(sender, P.p.languageReader.get("Etc_Usage"));
p.msg(sender, P.p.languageReader.get("Help_WakeupRemove"));
p.msg(sender, p.languageReader.get("Etc_Usage"));
p.msg(sender, p.languageReader.get("Help_WakeupRemove"));
}
} else if (args[1].equalsIgnoreCase("check")){
@ -221,8 +221,8 @@ public class CommandListener implements CommandExecutor {
} else {
p.msg(sender, P.p.languageReader.get("Error_UnknownCommand"));
p.msg(sender, P.p.languageReader.get("Error_ShowHelp"));
p.msg(sender, p.languageReader.get("Error_UnknownCommand"));
p.msg(sender, p.languageReader.get("Error_ShowHelp"));
}
}
@ -234,7 +234,7 @@ public class CommandListener implements CommandExecutor {
if (args.length > 2) {
quality = p.parseInt(args[2]);
if (quality < 1 || quality > 10) {
p.msg(sender, P.p.languageReader.get("CMD_Player_Error"));
p.msg(sender, p.languageReader.get("CMD_Player_Error"));
return;
}
}
@ -255,7 +255,7 @@ public class CommandListener implements CommandExecutor {
bPlayer.setData(drunkeness, quality);
}
p.msg(sender, P.p.languageReader.get("CMD_Player", playerName, "" + drunkeness, "" + bPlayer.getQuality()));
p.msg(sender, p.languageReader.get("CMD_Player", playerName, "" + drunkeness, "" + bPlayer.getQuality()));
if (drunkeness > 100) {
bPlayer.drinkCap(p.getServer().getPlayer(playerName));
}
@ -269,16 +269,16 @@ public class CommandListener implements CommandExecutor {
Player player = (Player) sender;
playerName = player.getName();
} else {
p.msg(sender, P.p.languageReader.get("Error_PlayerCommand"));
p.msg(sender, p.languageReader.get("Error_PlayerCommand"));
return;
}
}
BPlayer bPlayer = BPlayer.get(playerName);
if (bPlayer == null) {
p.msg(sender, P.p.languageReader.get("CMD_Info_NotDrunk", playerName));
p.msg(sender, p.languageReader.get("CMD_Info_NotDrunk", playerName));
} else {
p.msg(sender, P.p.languageReader.get("CMD_Info_Drunk", playerName, "" + bPlayer.getDrunkeness(), "" + bPlayer.getQuality()));
p.msg(sender, p.languageReader.get("CMD_Info_Drunk", playerName, "" + bPlayer.getDrunkeness(), "" + bPlayer.getQuality()));
}
}
@ -287,8 +287,8 @@ public class CommandListener implements CommandExecutor {
if (sender instanceof Player) {
if (count < 1 || count > 36) {
p.msg(sender, P.p.languageReader.get("Etc_Usage"));
p.msg(sender, P.p.languageReader.get("Help_Copy"));
p.msg(sender, p.languageReader.get("Etc_Usage"));
p.msg(sender, p.languageReader.get("Help_Copy"));
return;
}
Player player = (Player) sender;
@ -299,7 +299,7 @@ public class CommandListener implements CommandExecutor {
while (count > 0) {
ItemStack item = brew.copy(hand);
if (!(player.getInventory().addItem(item)).isEmpty()) {
p.msg(sender, P.p.languageReader.get("CMD_Copy_Error", count));
p.msg(sender, p.languageReader.get("CMD_Copy_Error", "" + count));
return;
}
count--;
@ -308,10 +308,10 @@ public class CommandListener implements CommandExecutor {
}
}
p.msg(sender, P.p.languageReader.get("Error_ItemNotPotion"));
p.msg(sender, p.languageReader.get("Error_ItemNotPotion"));
} else {
p.msg(sender, P.p.languageReader.get("Error_PlayerCommand"));
p.msg(sender, p.languageReader.get("Error_PlayerCommand"));
}
}
@ -328,9 +328,9 @@ public class CommandListener implements CommandExecutor {
return;
}
}
p.msg(sender, P.p.languageReader.get("Error_ItemNotPotion"));
p.msg(sender, p.languageReader.get("Error_ItemNotPotion"));
} else {
p.msg(sender, P.p.languageReader.get("Error_PlayerCommand"));
p.msg(sender, p.languageReader.get("Error_PlayerCommand"));
}
}