Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-24 19:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixed #22

Browse Source
This commit is contained in:
Grafe 2013-01-12 04:22:02 +01:00
parent 84dfb069e6
commit 8145fae487
25 changed files with 330 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/dre/dungeonsxl/DGSign.java
View File

@ -248,7 +248,7 @@ public class DGSign {
if(file!=null){
ConfigReader confReader=new ConfigReader(file);
if(confReader!=null){
P.p.msg(player, P.p.language.get("player_join_error",""+confReader.timeToNextPlay));
P.p.msg(player, P.p.language.get("Error_Cooldown",""+confReader.timeToNextPlay));
}
}
}

4
src/com/dre/dungeonsxl/DMobType.java
View File

@ -178,7 +178,7 @@ public class DMobType {
itemMeta.addEnchant(Enchantment.getByName(splittedEnchantment[0].toUpperCase()), 1, true);
}
} else {
P.p.log(Level.WARNING, P.p.language.get("log_error_mobenchantment",splittedEnchantment[0]));
P.p.log(Level.WARNING, P.p.language.get("Log_Error_MobEnchantment",splittedEnchantment[0]));
}
}
}
@ -205,7 +205,7 @@ public class DMobType {
}
}
} else {
P.p.log(Level.WARNING, P.p.language.get("log_error_mobtype",configFile.getString(mobName+".Type")));
P.p.log(Level.WARNING, P.p.language.get("Log_Error_MobType",configFile.getString(mobName+".Type")));
}
}
}

4
src/com/dre/dungeonsxl/DPlayer.java
View File

@ -237,7 +237,7 @@ public class DPlayer {
}
public void finish(){
P.p.msg(this.player, p.language.get("player_finisheddungeon"));//ChatColor.YELLOW+"Du hast den Dungeon erfolgreich beendet!");
P.p.msg(this.player, p.language.get("Player_FinishedDungeon"));//ChatColor.YELLOW+"Du hast den Dungeon erfolgreich beendet!");
this.isFinished=true;
DGroup dgroup=DGroup.get(this.player);
@ -246,7 +246,7 @@ public class DPlayer {
for(Player player:dgroup.players){
DPlayer dplayer=get(player);
if(!dplayer.isFinished){
P.p.msg(this.player, p.language.get("player_waitforotherplayers"));//ChatColor.YELLOW+"Noch auf Mitspieler warten...");
P.p.msg(this.player, p.language.get("Player_WaitForOtherPlayers"));//ChatColor.YELLOW+"Noch auf Mitspieler warten...");
return;
}
}

4
src/com/dre/dungeonsxl/DPortal.java
View File

@ -110,10 +110,10 @@ public class DPortal {
new DPlayer(player,dgroup.gworld.world,dgroup.gworld.locLobby, false);
}
}else{
p.msg(player,p.language.get("player_dungeon_error",DGroup.get(player).dungeonname));
p.msg(player,p.language.get("Error_DungeonNotExist",DGroup.get(player).dungeonname));
}
}else{
p.msg(player,p.language.get("player_group_error"));
p.msg(player,p.language.get("Error_NotInGroup"));
}
}
}

125
src/com/dre/dungeonsxl/LanguageReader.java
View File

@ -36,80 +36,73 @@ public class LanguageReader {
}
private void setDefaults(){
defaults.put("error_tutorialnotexist","&4Tutorial Dungeon existiert nicht!");
/* Log */
defaults.put("log_newdungeon","New Dungeon: ");
defaults.put("log_generatenewworld","Generate new world...");
defaults.put("log_worldgenerationfinished","World generation finished!");
defaults.put("log_error_mobenchantment","Error at loading mob.yml: Enchantmet &v1 doesn't exist!");
defaults.put("log_error_mobtype","Error at loading mob.yml: Mob &v1 doesn't exist!");
defaults.put("Log_NewDungeon","New Dungeon: ");
defaults.put("Log_GenerateNewWorld","Generate new world...");
defaults.put("Log_WorldGenerationFinished","World generation finished!");
defaults.put("Log_Error_MobEnchantment","Error at loading mob.yml: Enchantmet &v1 doesn't exist!");
defaults.put("Log_Error_MobType","Error at loading mob.yml: Mob &v1 doesn't exist!");
/* Player */
defaults.put("player_checkpoint_reached","&6Checkpoint erreicht!");
defaults.put("player_lootadded","&6Deinem Belohnungsinventar sind&4&v1&6 hinzugefügt worden!");
defaults.put("player_enderchest_error","&4Du kannst keine Enderchest in einem Dungeon verwenden!");
defaults.put("player_ready","&6Du bist nun bereit für den Dungeon!");
defaults.put("player_ready_error","&4Wähle zuerst eine Klasse aus!");
defaults.put("player_leftklick_error","&4Du musst das Schild mit Links-klick berühren!");
defaults.put("player_drop_error","&4Du kannst keine sicheren Objekte droppen");
defaults.put("player_cmd_error","&4Befehle sind während des Dungeons nicht erlaubt!");
defaults.put("player_join_error","&4Du kannst den Dungeon nur alle &6&v1&4 Stunden betreten!");
defaults.put("player_finisheddungeon","&6Du hast den Dungeon erfolgreich beendet!");
defaults.put("player_waitforotherplayers","&6Noch auf Mitspieler warten...");
defaults.put("player_dungeon_error","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("player_group_error","&4Du musst zuerst einer Gruppe beitreten!");
defaults.put("player_leavegroup","&6Du hast deine Gruppe erfolgreich verlassen!");
defaults.put("Player_CheckpointReached","&6Checkpoint erreicht!");
defaults.put("Player_LootAdded","&6Deinem Belohnungsinventar sind&4&v1&6 hinzugefügt worden!");
defaults.put("Player_Ready","&6Du bist nun bereit für den Dungeon!");
defaults.put("Player_FinishedDungeon","&6Du hast den Dungeon erfolgreich beendet!");
defaults.put("Player_WaitForOtherPlayers","&6Noch auf Mitspieler warten...");
defaults.put("Player_LeaveGroup","&6Du hast deine Gruppe erfolgreich verlassen!");
/* Cmds */
defaults.put("cmd_chat_dungeonchat","&6Du bist nun im Dungeon-Chat");
defaults.put("cmd_chat_error1","&4Du bist in keinem Dungeon!");
defaults.put("cmd_chat_normalchat","&6Du bist nun im öffentlichen Chat");
defaults.put("cmd_chatspy_stopped","&6Du hast aufgehört den DXL-Chat auszuspähen!");
defaults.put("cmd_chatspy_start","&Du hast begonnen den DXL-Chat auszuspähen!");
defaults.put("cmd_create_error1","&4Der Name darf nicht länger sein als 15 Zeichen!");
defaults.put("cmd_create_error2","&4Du musst zuerst aus dem aktuellen Dungeon raus!");
defaults.put("cmd_edit_error1","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("cmd_edit_error2","&4Du musst zuerst deine Gruppe verlassen!");
defaults.put("cmd_edit_error3","&4Du musst zuerst den aktuellen Dungeon verlassen!");
defaults.put("cmd_invite_success","&6Spieler &4&v1&6 wurde erfolgreich eingeladen am Dungeon &4&v2&6 zu arbeiten!");
defaults.put("cmd_invite_error1","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("cmd_leave_error1","&4You aren't in a dungeon!");
defaults.put("cmd_leave_error2","&4Du kannst diesen Befehl nicht in einem Tutorial benutzen!");
defaults.put("cmd_leave_success","&6Du hast deine Gruppe erfolgreich verlassen!");
defaults.put("cmd_msg_error1","&4Nachricht mit der Id &6&v1&4 existiert nicht!");
defaults.put("cmd_msg_error2","&4Die Nachricht muss zwischen '' liegen!");
defaults.put("cmd_msg_error3","&4Parameter <id> muss eine Zahl beinhalten!");
defaults.put("cmd_msg_error4","&4Du musst einen Dungeon bearbeiten um diesen Befehl zu benutzen!");
defaults.put("cmd_msg_added","&6Neue Nachricht (&4&v1&6) hinzugefügt!");
defaults.put("cmd_msg_updated","&6Nachricht (&4&v1&6) aktualisiert!");
defaults.put("cmd_reload_start","&6DungeonsXL wird neu geladen");
defaults.put("cmd_reload_done","&6DungeonsXL erfolgreich neu geladen!");
defaults.put("cmd_save_success","&6Dungeon erfolgreich gespeichert!");
defaults.put("cmd_save_error1","&4Du musst einen Dungeon editieren, um ihn zu speichern!");
defaults.put("cmd_test_error1","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("cmd_test_error2","&4Du must zuerst den aktuellen Dungeon verlassen!");
defaults.put("cmd_uninvite_success","&4&v1&6 wurde erfolgreich ausgeladen an &4&v1&6 zu arbeiten!");
defaults.put("cmd_uninvite_error1","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("cmd_nopermissions","&4Du hast keine Erlaubnis dies zu tun!");
defaults.put("cmd_notexist1","&4Befehl &6&v1&4 existiert nicht!");
defaults.put("cmd_notexist2","&4Bitte gib &6/dxl help&4 für Hilfe ein!");
defaults.put("Cmd_Chat_DungeonChat","&6Du bist nun im Dungeon-Chat");
defaults.put("Cmd_Chat_NormalChat","&6Du bist nun im öffentlichen Chat");
defaults.put("Cmd_Chatspy_Stopped","&6Du hast aufgehört den DXL-Chat auszuspähen!");
defaults.put("Cmd_Chatspy_Start","&Du hast begonnen den DXL-Chat auszuspähen!");
defaults.put("Cmd_Invite_Success","&6Spieler &4&v1&6 wurde erfolgreich eingeladen am Dungeon &4&v2&6 zu arbeiten!");
defaults.put("Cmd_Leave_Success","&6Du hast deine Gruppe erfolgreich verlassen!");
defaults.put("Cmd_Msg_Added","&6Neue Nachricht (&4&v1&6) hinzugefügt!");
defaults.put("Cmd_Msg_Updated","&6Nachricht (&4&v1&6) aktualisiert!");
defaults.put("Cmd_Reload_Start","&6DungeonsXL wird neu geladen");
defaults.put("Cmd_Reload_Done","&6DungeonsXL erfolgreich neu geladen!");
defaults.put("Cmd_Save_Success","&6Dungeon erfolgreich gespeichert!");
defaults.put("Cmd_Uninvite_Success","&4&v1&6 wurde erfolgreich ausgeladen an &4&v1&6 zu arbeiten!");
/* Errors */
defaults.put("Error_Enderchest","&4Du kannst keine Enderchest in einem Dungeon verwenden!");
defaults.put("Error_Ready","&4Wähle zuerst eine Klasse aus!");
defaults.put("Error_Cooldown","&4Du kannst den Dungeon nur alle &6&v1&4 Stunden betreten!");
defaults.put("Error_Leftklick","&4Du musst das Schild mit Links-klick berühren!");
defaults.put("Error_Drop","&4Du kannst keine sicheren Objekte droppen");
defaults.put("Error_Cmd","&4Befehle sind während des Dungeons nicht erlaubt!");
defaults.put("Error_NotInGroup","&4Du musst zuerst einer Gruppe beitreten!");
defaults.put("Error_NoPermissions","&4Du hast keine Erlaubnis dies zu tun!");
defaults.put("Error_CmdNotExist1","&4Befehl &6&v1&4 existiert nicht!");
defaults.put("Error_CmdNotExist2","&4Bitte gib &6/dxl help&4 für Hilfe ein!");
defaults.put("Error_NotInDungeon","&4Du bist in keinem Dungeon!");
defaults.put("Error_DungeonNotExist","&4Dungeon &6&v1&4 existiert nicht!");
defaults.put("Error_LeaveDungeon","&4Du musst zuerst den aktuellen Dungeon verlassen!");
defaults.put("Error_NameToLong","&4Der Name darf nicht länger sein als 15 Zeichen!");
defaults.put("Error_LeaveGroup","&4Du musst zuerst deine Gruppe verlassen!");
defaults.put("Error_NoLeaveInTutorial","&4Du kannst diesen Befehl nicht in einem Tutorial benutzen!");
defaults.put("Error_MsgIdNotExist","&4Nachricht mit der Id &6&v1&4 existiert nicht!");
defaults.put("Error_MsgFormat","&4Die Nachricht muss zwischen '' liegen!");
defaults.put("Error_MsgNoInt","&4Parameter <id> muss eine Zahl beinhalten!");
defaults.put("Error_TutorialNotExist","&4Tutorial Dungeon existiert nicht!");
/* Help */
defaults.put("help_cmd_chat","/dxl chat - Ändert den Chat-Modus");
defaults.put("help_cmd_chatspy","/dxl chatspy - De/Aktiviert den Spioniermodus");
defaults.put("help_cmd_create","/dxl create <name> - Erstellt einen neuen Dungeon");
defaults.put("help_cmd_edit","/dxl edit <name> - Editiere einen existierenden Dungeon");
defaults.put("help_cmd_help","/dxl help - Zeigt die Hilfeseite an");
defaults.put("help_cmd_invite","/dxl invite <player> <dungeon> - Ladet einen Spieler dazu ein den Dungeon zu editieren");
defaults.put("help_cmd_leave","/dxl leave - Verlässt den aktuellen Dungeon");
defaults.put("help_cmd_list","/dxl list - Zeigt alle Dungeons an");
defaults.put("help_cmd_msg","/dxl msg <id> '[msg]' - Zeigt oder editiert eine Nachricht");
defaults.put("help_cmd_portal","/dxl portal - Erstellt ein Portal welches in Dungeons führt");
defaults.put("help_cmd_reload","/dxl reload - Ladet das Plugin neu");
defaults.put("help_cmd_save","/dxl save - Speichert den aktuellen Dungeon");
defaults.put("help_cmd_test","/dxl test [dungeon] - Testet einen Dungeon");
defaults.put("help_cmd_uninvite","/dxl uninvite <player> <dungeon> - Lädt einen Spieler aus den Dungeon zu editieren");
defaults.put("Help_Cmd_Chat","/dxl chat - Ändert den Chat-Modus");
defaults.put("Help_Cmd_Chatspy","/dxl chatspy - De/Aktiviert den Spioniermodus");
defaults.put("Help_Cmd_Create","/dxl create <name> - Erstellt einen neuen Dungeon");
defaults.put("Help_Cmd_Edit","/dxl edit <name> - Editiere einen existierenden Dungeon");
defaults.put("Help_Cmd_Help","/dxl help - Zeigt die Hilfeseite an");
defaults.put("Help_Cmd_Invite","/dxl invite <player> <dungeon> - Ladet einen Spieler dazu ein den Dungeon zu editieren");
defaults.put("Help_Cmd_Leave","/dxl leave - Verlässt den aktuellen Dungeon");
defaults.put("Help_Cmd_List","/dxl list - Zeigt alle Dungeons an");
defaults.put("Help_Cmd_Msg","/dxl msg <id> '[msg]' - Zeigt oder editiert eine Nachricht");
defaults.put("Help_Cmd_Portal","/dxl portal - Erstellt ein Portal welches in Dungeons führt");
defaults.put("Help_Cmd_Reload","/dxl reload - Ladet das Plugin neu");
defaults.put("Help_Cmd_Save","/dxl save - Speichert den aktuellen Dungeon");
defaults.put("Help_Cmd_Test","/dxl test [dungeon] - Testet einen Dungeon");
defaults.put("Help_Cmd_Uninvite","/dxl uninvite <player> <dungeon> - Lädt einen Spieler aus den Dungeon zu editieren");
}
private void check(){

2
src/com/dre/dungeonsxl/LeaveSign.java
View File

@ -42,7 +42,7 @@ public class LeaveSign{
DGroup dgroup=DGroup.get(player);
if(dgroup!=null){
dgroup.removePlayer(player);
P.p.msg(player,P.p.language.get("player_leavegroup"));//ChatColor.YELLOW+"Du hast deine Gruppe erfolgreich verlassen!");
P.p.msg(player,P.p.language.get("Player_LeaveGroup"));//ChatColor.YELLOW+"Du hast deine Gruppe erfolgreich verlassen!");
return true;
}
}

2
src/com/dre/dungeonsxl/P.java
View File

@ -139,7 +139,7 @@ public class P extends JavaPlugin{
new DPlayer(player,dgroup.gworld.world,dgroup.gworld.locLobby, false);
}
}else{
p.msg(player,p.language.get("error_tutorialnotexist"));//ChatColor.RED+"Tutorial Dungeon existiert nicht!");
p.msg(player,p.language.get("Error_TutorialNotExist"));
}
}
}

8
src/com/dre/dungeonsxl/commands/CMDChat.java
View File

@ -9,7 +9,7 @@ public class CMDChat extends DCommand{
public CMDChat(){
this.command="chat";
this.args=0;
this.help=p.language.get("help_cmd_chat");//"/dxl chat - Ändert den Chat-Modus";
this.help=p.language.get("Help_Cmd_Chat");
}
@ -19,13 +19,13 @@ public class CMDChat extends DCommand{
if(dplayer!=null){
if(dplayer.isInWorldChat) {
dplayer.isInWorldChat=false;
p.msg(player,p.language.get("cmd_chat_normalchat"));
p.msg(player,p.language.get("Cmd_Chat_NormalChat"));
}else{
dplayer.isInWorldChat=true;
p.msg(player,p.language.get("cmd_chat_dungeonchat"));
p.msg(player,p.language.get("Cmd_Chat_DungeonChat"));
}
}else{
p.msg(player,p.language.get("cmd_chat_error1"));
p.msg(player,p.language.get("Error_NotInDungeon"));
}
}

6
src/com/dre/dungeonsxl/commands/CMDChatSpy.java
View File

@ -6,7 +6,7 @@ public class CMDChatSpy extends DCommand{
public CMDChatSpy(){
this.command="chatspy";
this.args=0;
this.help=p.language.get("help_cmd_chatspy");
this.help=p.language.get("Help_Cmd_Chatspy");
this.permissions="dxl.chatspy";
}
@ -14,12 +14,12 @@ public class CMDChatSpy extends DCommand{
public void onExecute(String[] args, Player player) {
if(p.chatSpyer.contains(player)){
p.chatSpyer.remove(player);
p.msg(player, p.language.get("cmd_chatspy_stopped"));//ChatColor.GOLD+"Du hast aufgehört den DXL-Chat auszuspähen!");
p.msg(player, p.language.get("Cmd_Chatspy_Stopped"));
}
else{
p.chatSpyer.add(player);
p.msg(player, p.language.get("cmd_chatspy_start"));//ChatColor.GOLD+"Du hast begonnen den DXL-Chat auszuspähen!");
p.msg(player, p.language.get("Cmd_Chatspy_Start"));
}
}
}

12
src/com/dre/dungeonsxl/commands/CMDCreate.java
View File

@ -10,7 +10,7 @@ public class CMDCreate extends DCommand {
public CMDCreate(){
this.args=1;
this.command="create";
this.help=p.language.get("help_cmd_create");
this.help=p.language.get("Help_Cmd_Create");
this.permissions="dxl.create";
}
@ -22,8 +22,8 @@ public class CMDCreate extends DCommand {
if(name.length()<=15){
//Msg create
p.log(p.language.get("log_newdungeon"));//"New Dungeon: "+name);
p.log(p.language.get("log_generatenewworld"));//"Generate new world...");
p.log(p.language.get("Log_NewDungeon"));
p.log(p.language.get("Log_GenerateNewWorld"));
//Create World
EditWorld eworld=new EditWorld();
@ -31,7 +31,7 @@ public class CMDCreate extends DCommand {
eworld.dungeonname=name;
//MSG Done
p.log(p.language.get("log_worldgenerationfinished"));//"World generation finished!"
p.log(p.language.get("Log_WorldGenerationFinished"));
//Tp Player
if(eworld.lobby==null){
@ -40,10 +40,10 @@ public class CMDCreate extends DCommand {
new DPlayer(player,eworld.world,eworld.lobby, true);
}
}else{
p.msg(player, p.language.get("cmd_create_error1"));//ChatColor.RED+"Der Name darf nicht länger sein als 15 Zeichen!");
p.msg(player, p.language.get("Error_NameToLong"));
}
}else{
p.msg(player, p.language.get("cmd_create_error2"));//ChatColor.RED+"Du musst zuerst aus dem aktuellen Dungeon raus!");
p.msg(player, p.language.get("Error_LeaveDungeon"));
}
}

8
src/com/dre/dungeonsxl/commands/CMDEdit.java
View File

@ -11,7 +11,7 @@ public class CMDEdit extends DCommand{
public CMDEdit(){
this.command="edit";
this.args=1;
this.help=p.language.get("help_cmd_edit");//"/dxl edit <name> - Edit a existing dungeon";
this.help=p.language.get("Help_Cmd_Edit");
}
@Override
@ -34,13 +34,13 @@ public class CMDEdit extends DCommand{
new DPlayer(player,eworld.world,eworld.lobby, true);
}
}else{
p.msg(player,p.language.get("cmd_edit_error1",dungeonname));
p.msg(player,p.language.get("Error_DungeonNotExist",dungeonname));
}
}else{
p.msg(player,p.language.get("cmd_edit_error2"));
p.msg(player,p.language.get("Error_LeaveGroup"));
}
}else{
p.msg(player,p.language.get("cmd_edit_error3"));
p.msg(player,p.language.get("Error_LeaveDungeon"));
}
}

2
src/com/dre/dungeonsxl/commands/CMDHelp.java
View File

@ -8,7 +8,7 @@ public class CMDHelp extends DCommand{
public CMDHelp(){
this.command="help";
this.args=-1;
this.help=p.language.get("help_cmd_help");//"/dxl help - Displays the Help-Page";
this.help=p.language.get("Help_Cmd_Help");
}
@Override

6
src/com/dre/dungeonsxl/commands/CMDInvite.java
View File

@ -8,16 +8,16 @@ public class CMDInvite extends DCommand{
public CMDInvite(){
this.args=2;
this.command="invite";
this.help=p.language.get("help_cmd_invite");//"/dxl invite <player> <dungeon> - Invites a Player to edit a Dungeon";
this.help=p.language.get("Help_Cmd_Invite");
this.permissions="dxl.invite";
}
@Override
public void onExecute(String[] args, Player player) {
if(EditWorld.addInvitedPlayer(args[2], args[1])){
p.msg(player, p.language.get("cmd_invite_success",args[1],args[2]));//ChatColor.GREEN+"Spieler "+ChatColor.GOLD+args[1]+ChatColor.GREEN+" wurde erfolgreich eingeladen am Dungeon "+ChatColor.GOLD+args[2]+ChatColor.GREEN+" zu arbeiten!");
p.msg(player, p.language.get("Cmd_Invite_Success",args[1],args[2]));
}else{
p.msg(player, p.language.get("cmd_invite_error1",args[2]));//ChatColor.RED+"Spieler "+ChatColor.GOLD+args[1]+ChatColor.RED+" konnte nicht eingeladen werden. Existiert der Dungeon?");
p.msg(player, p.language.get("Error_DungeonNotExist",args[2]));
}
}

8
src/com/dre/dungeonsxl/commands/CMDLeave.java
View File

@ -11,7 +11,7 @@ public class CMDLeave extends DCommand {
public CMDLeave(){
this.command="leave";
this.args=0;
this.help=p.language.get("help_cmd_leave");//"/dxl leave - leaves the current dungeon.";
this.help=p.language.get("Help_Cmd_Leave");
}
@Override
@ -20,7 +20,7 @@ public class CMDLeave extends DCommand {
if(GameWorld.get(player.getWorld())!=null){
if(GameWorld.get(player.getWorld()).isTutorial){
p.msg(player,p.language.get("cmd_leave_error2"));//ChatColor.RED+"Du kannst diesen Befehl nicht in einem Tutorial benutzen!");
p.msg(player,p.language.get("Error_NoLeaveInTutorial"));
return;
}
}
@ -32,10 +32,10 @@ public class CMDLeave extends DCommand {
DGroup dgroup=DGroup.get(player);
if(dgroup!=null){
dgroup.removePlayer(player);
p.msg(player,p.language.get("cmd_leave_success"));//ChatColor.YELLOW+"Du hast deine Gruppe erfolgreich verlassen!");
p.msg(player,p.language.get("Cmd_Leave_Success"));
return;
}
p.msg(player,p.language.get("cmd_leave_error1"));//ChatColor.RED+"You aren't in a dungeon!");
p.msg(player,p.language.get("Error_NotInDungeon"));
}
}
}

2
src/com/dre/dungeonsxl/commands/CMDList.java
View File

@ -10,7 +10,7 @@ public class CMDList extends DCommand{
public CMDList(){
this.command="list";
this.args=0;
this.help=p.language.get("help_cmd_list");//"/dxl list - Zeigt alle Dungeons an";
this.help=p.language.get("Help_Cmd_List");
}

14
src/com/dre/dungeonsxl/commands/CMDMsg.java
View File

@ -12,7 +12,7 @@ public class CMDMsg extends DCommand{
public CMDMsg(){
this.args=-1;
this.command="msg";
this.help=p.language.get("help_cmd_msg");//"/dxl msg <id> '[msg]' - Display the msg or change the msg";
this.help=p.language.get("Help_Cmd_Msg");
this.permissions="dxl.msg";
}
@ -32,7 +32,7 @@ public class CMDMsg extends DCommand{
if(msg!=null){
p.msg(player, ChatColor.WHITE+msg);
}else{
p.msg(player, p.language.get("cmd_msg_error1",""+id));//ChatColor.RED+"Nachricht mit der Id "+ChatColor.GOLD+id+ChatColor.RED+" existiert nicht!");
p.msg(player, p.language.get("Error_MsgIdNotExist",""+id));
}
}else{
@ -50,26 +50,26 @@ public class CMDMsg extends DCommand{
msg=splitMsg[1];
String old=confreader.msgs.get(id);
if(old==null){
p.msg(player, p.language.get("cmd_msg_added",""+id));//ChatColor.GREEN+"Neue Nachricht ("+ChatColor.GOLD+id+ChatColor.GREEN+") hinzugefügt!");
p.msg(player, p.language.get("Cmd_Msg_Added",""+id));
}else{
p.msg(player, p.language.get("cmd_msg_updated",""+id));//ChatColor.GREEN+"Nachricht ("+ChatColor.GOLD+id+ChatColor.GREEN+") aktualisiert!");
p.msg(player, p.language.get("Cmd_Msg_Updated",""+id));
}
confreader.msgs.put(id, msg);
confreader.save();
}else{
p.msg(player, p.language.get("cmd_msg_error2"));//ChatColor.RED+"Du musst die Nachricht zwischen ' einfügen!");
p.msg(player, p.language.get("Error_MsgFormat"));
}
}
}catch(NumberFormatException e){
p.msg(player, p.language.get("cmd_msg_error3"));//ChatColor.RED+"Parameter <id> muss eine Zahl beinhalten!");
p.msg(player, p.language.get("Error_MsgNoInt"));
}
}else{
this.displayhelp(player);
}
}else{
p.msg(player, p.language.get("cmd_msg_error4"));//ChatColor.RED+"Du musst einen Dungeon bearbeiten um diesen Befehl zu benutzen!");
p.msg(player, p.language.get("Error_NotInDungeon"));
}
}

2
src/com/dre/dungeonsxl/commands/CMDPortal.java
View File

@ -11,7 +11,7 @@ public class CMDPortal extends DCommand{
public CMDPortal(){
this.command="portal";
this.args=0;
this.help=p.language.get("help_cmd_portal");//"/dxl portal - Create a portal that goes in a dungeon or out a dungeon";
this.help=p.language.get("Help_Cmd_Portal");
this.permissions="dxl.portal";
}

6
src/com/dre/dungeonsxl/commands/CMDReload.java
View File

@ -8,15 +8,15 @@ public class CMDReload extends DCommand{
public CMDReload(){
this.command="reload";
this.args=0;
this.help=p.language.get("help_cmd_reload");//"/dxl reload - Reloadet das Plugin";
this.help=p.language.get("Help_Cmd_Reload");
this.permissions="dxl.reload";
}
@Override
public void onExecute(String[] args, Player player) {
p.msg(player, p.language.get("cmd_reload_start"));//ChatColor.GREEN+"DungeonsXL wird neu geladen");
p.msg(player, p.language.get("Cmd_Reload_Start"));
p.onDisable();
p.onEnable();
p.msg(player, p.language.get("cmd_reload_done"));//ChatColor.GREEN+"DungeonsXL neuladen erfolgreich!");
p.msg(player, p.language.get("Cmd_Reload_Done"));
}
}

6
src/com/dre/dungeonsxl/commands/CMDSave.java
View File

@ -9,7 +9,7 @@ public class CMDSave extends DCommand{
public CMDSave(){
this.command="save";
this.args=0;
this.help=p.language.get("help_cmd_save");//"/dxl save - Save the current dungeon.";
this.help=p.language.get("Help_Cmd_Save");
this.permissions="dxl.save";
}
@ -19,9 +19,9 @@ public class CMDSave extends DCommand{
EditWorld eworld=EditWorld.get(player.getWorld());
if(eworld!=null){
eworld.save();
p.msg(player,p.language.get("cmd_save_success"));//ChatColor.GOLD+"Dungeon erfolgreich gespeichert!");
p.msg(player,p.language.get("Cmd_Save_Success"));
}else{
p.msg(player,p.language.get("cmd_save_error1"));//ChatColor.RED+"Du musst einen Dungeon editieren, um ihn zu speichern!");
p.msg(player,p.language.get("Error_NotInDungeon"));
}
}
}

6
src/com/dre/dungeonsxl/commands/CMDTest.java
View File

@ -12,7 +12,7 @@ public class CMDTest extends DCommand {
public CMDTest(){
this.command="test";
this.args=-1;
this.help=p.language.get("help_cmd_test");//"/dxl test [dungeon] - Test a Dungeon";
this.help=p.language.get("Help_Cmd_Test");
this.permissions="dxl.test";
}
@ -42,7 +42,7 @@ public class CMDTest extends DCommand {
newDPlayer.isinTestMode=2;
}
}else{
p.msg(player, p.language.get("cmd_test_error1",dungeonname));
p.msg(player, p.language.get("Error_DungeonNotExist",dungeonname));
}
}else{
this.displayhelp(player);
@ -74,7 +74,7 @@ public class CMDTest extends DCommand {
}
}else{
p.msg(player, p.language.get("cmd_test_error2"));
p.msg(player, p.language.get("Error_LeaveDungeon"));
}

6
src/com/dre/dungeonsxl/commands/CMDUninvite.java
View File

@ -8,16 +8,16 @@ public class CMDUninvite extends DCommand{
public CMDUninvite(){
this.args=2;
this.command="uninvite";
this.help=p.language.get("help_cmd_uninvite");
this.help=p.language.get("Help_Cmd_Uninvite");
this.permissions="dxl.uninvite";
}
@Override
public void onExecute(String[] args, Player player) {
if(EditWorld.removeInvitedPlayer(args[2], args[1])){
p.msg(player, p.language.get("cmd_uninvite_success",args[1],args[2]));
p.msg(player, p.language.get("Cmd_Uninvite_Success",args[1],args[2]));
}else{
p.msg(player, p.language.get("cmd_uninvite_error1",args[2]));
p.msg(player, p.language.get("Error_DungeonNotExist",args[2]));
}
}
}

2
src/com/dre/dungeonsxl/game/GameCheckpoint.java
View File

@ -37,7 +37,7 @@ public class GameCheckpoint {
if(!gpoint.dplayerHasUsed.contains(dplayer)){
if(dplayer.player.getLocation().distance(gpoint.location)<=gpoint.radius){
dplayer.setCheckpoint(gpoint);
P.p.msg(dplayer.player, P.p.language.get("player_checkpoint_reached"));//ChatColor.GOLD+"Checkpoint erreicht!");
P.p.msg(dplayer.player, P.p.language.get("Player_CheckpointReached"));//ChatColor.GOLD+"Checkpoint erreicht!");
gpoint.dplayerHasUsed.add(dplayer);
}
}

2
src/com/dre/dungeonsxl/game/GameChest.java
View File

@ -44,7 +44,7 @@ public class GameChest {
}
msg=msg.substring(0,msg.length()-1);
P.p.msg(player, P.p.language.get("player_lootadded",msg));
P.p.msg(player, P.p.language.get("Player_LootAdded",msg));
}
}
}

6
src/com/dre/dungeonsxl/listener/CommandListener.java
View File

@ -30,14 +30,14 @@ public class CommandListener implements CommandExecutor {
}
}
else{
P.p.msg(player, P.p.language.get("cmd_nopermissions"));//ChatColor.RED+"Du hast keine Permissions dazu!");
P.p.msg(player, P.p.language.get("Error_NoPermissions"));
}
return true;
}
}
P.p.msg(player, P.p.language.get("cmd_notexist1",cmd));//ChatColor.RED+"Befehl "+ChatColor.GOLD+cmd+ChatColor.RED+" existiert nicht!");
P.p.msg(player, P.p.language.get("cmd_notexist2"));//ChatColor.RED+"Bitte gib "+ChatColor.GOLD+"/dxl help"+ChatColor.RED+" für Hilfe ein!");
P.p.msg(player, P.p.language.get("Error_CmdNotExist1",cmd));
P.p.msg(player, P.p.language.get("Error_CmdNotExist2"));
}else{
DCommandRoot.root.cmdHelp.onExecute(args,player);
}

21
src/com/dre/dungeonsxl/listener/PlayerListener.java
View File

@ -48,7 +48,7 @@ public class PlayerListener implements Listener{
if(GameWorld.get(player.getWorld())!=null || EditWorld.get(player.getWorld())!=null){
if(event.getAction()!=Action.LEFT_CLICK_BLOCK){
if(clickedBlock.getType()==Material.ENDER_CHEST){
p.msg(player, p.language.get("player_enderchest_error"));//ChatColor.RED+"Du kannst keine Enderchest in einem Dungeon verwenden!");
p.msg(player, p.language.get("Error_Enderchest"));
event.setCancelled(true);
}
}
@ -108,10 +108,10 @@ public class PlayerListener implements Listener{
if(!dplayer.isReady){
if(gworld.signClass.isEmpty() || dplayer.dclass!=null){
dplayer.ready();
p.msg(player,p.language.get("player_ready"));//ChatColor.GOLD+"Du bist nun bereit für den Dungeon!");
p.msg(player,p.language.get("Player_Ready"));
return;
}else{
p.msg(player,p.language.get("player_ready_error"));//ChatColor.RED+"Wähle zuerst eine Klasse!");
p.msg(player,p.language.get("Error_Ready"));
}
}
}
@ -125,7 +125,7 @@ public class PlayerListener implements Listener{
dplayer.finish();
return;
}else{
p.msg(player,p.language.get("player_leftklick_error"));//ChatColor.RED+"Du musst das Schild mit Links-klick berühren!");
p.msg(player,p.language.get("Error_Leftklick"));
}
}
}
@ -147,7 +147,7 @@ public class PlayerListener implements Listener{
if(event.getAction()==Action.LEFT_CLICK_BLOCK){
dplayer.setClass(ChatColor.stripColor(classSign.getLine(1)));
}else{
p.msg(player,p.language.get("player_leftklick_error"));//+"Du musst die Klasse mit Links-klick auswählen!");
p.msg(player,p.language.get("Error_Leftklick"));
}
return;
}
@ -182,17 +182,10 @@ public class PlayerListener implements Listener{
for(Material material:gworld.confReader.secureobjects){
if(material==event.getItemDrop().getItemStack().getType()){
event.setCancelled(true);
p.msg(player,p.language.get("player_drop_error"));//ChatColor.RED+"Du kannst keine sicheren Objekte droppen");
p.msg(player,p.language.get("Error_Drop"));
return;
}
}
/*if(dplayer.invItemInHand==event.getItemDrop().getItemStack().getTypeId()){
dplayer.invItemInHand=0;
}else{
p.msg(player,ChatColor.RED+"Du kannst keine sicheren Objekte droppen");
event.setCancelled(true);
return;
}*/
}
}
}
@ -314,7 +307,7 @@ public class PlayerListener implements Listener{
if(!dplayer.isEditing){
String[] splittedCmd=event.getMessage().split(" ");
if(!splittedCmd[0].equalsIgnoreCase("/dungeon") && !splittedCmd[0].equalsIgnoreCase("/dungeonsxl") && !splittedCmd[0].equalsIgnoreCase("/dxl")){
p.msg(event.getPlayer(), p.language.get("player_cmd_error"));//ChatColor.RED+"Befehle sind während des Dungeons nicht erlaubt");
p.msg(event.getPlayer(), p.language.get("Error_Cmd"));
event.setCancelled(true);
}
}