From f4f0bc9511b63dd86b8fac849c5a229eb6c124de Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Sun, 27 Oct 2013 22:54:48 +0100 Subject: [PATCH] Release --- config.yml | 4 ++-- plugin.yml | 2 +- pom.xml | 2 +- src/com/dre/brewery/LanguageReader.java | 6 ++++-- src/com/dre/brewery/P.java | 2 +- src/com/dre/brewery/listeners/PlayerListener.java | 5 +++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config.yml b/config.yml index 6c8c40d..b1358aa 100644 --- a/config.yml +++ b/config.yml @@ -55,7 +55,7 @@ logRealChat: false autosave: 3 # Config Version -version: '0.5' +version: '1.0' # Recipes for Potions @@ -159,7 +159,7 @@ recipes: - WEAKNESS/15 - POISON/10 8: - name: Poor Absinth/Absinth/Strong Absinth + name: Poor Absinthe/Absinthe/Strong Absinthe ingredients: - LONG_GRASS/15 cookingtime: 3 diff --git a/plugin.yml b/plugin.yml index 8ecb9bd..58b2416 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: Brewery -version: 0.5.1 +version: 1.0 main: com.dre.brewery.P authors: [Milan Albrecht, Frank Baumann] softdepend: [Vault] diff --git a/pom.xml b/pom.xml index a8574d1..4466f02 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.dre brewery - 0.5.1 + 1.0 Brewery diff --git a/src/com/dre/brewery/LanguageReader.java b/src/com/dre/brewery/LanguageReader.java index 319e9c8..79e714f 100644 --- a/src/com/dre/brewery/LanguageReader.java +++ b/src/com/dre/brewery/LanguageReader.java @@ -41,6 +41,8 @@ public class LanguageReader { defaults.put("Player_CauldronInfo2", "This Cauldron seethes since less than one minute"); defaults.put("Player_CantDrink", "You can't drink any more"); defaults.put("Player_DrunkPassOut", "You have drunken too much and fainted!"); + defaults.put("Player_LoginDeny", "Your character is drunk and does not react. Try again!"); + defaults.put("Player_LoginDenyLong", "Your character is really drunk and unconscious. Try again in 10 minutes!"); defaults.put("Player_Wake", "Ohh no! I cannot remember how I got here..."); defaults.put("Player_WakeCreated", "&aWakeup Point with id: &6&v1 &awas created successfully!"); defaults.put("Player_WakeNotExist", "&cThe Wakeup Point with the id: &6&v1 &cdoesn't exist!"); @@ -71,7 +73,7 @@ public class LanguageReader { defaults.put("Brew_Years", "Years"); defaults.put("Brew_HundredsOfYears", "Hundreds of Years"); defaults.put("Brew_Woodtype", "Woodtype"); - defaults.put("Brew_ThickBrew", "Thick Brew"); + defaults.put("Brew_ThickBrew", "Muddy Brew"); /* Commands */ defaults.put("CMD_Reload", "&aConfig was successfully reloaded"); @@ -79,7 +81,7 @@ public class LanguageReader { defaults.put("CMD_Player_Error", "&cThe Quality has to be between 1 and 10!"); defaults.put("CMD_Info_NotDrunk", "&v1 is not drunk"); defaults.put("CMD_Info_Drunk", "&v1 is &6&v2% &fdrunk, with a quality of &6&v3"); - defaults.put("CMD_UnLabel", "&aThe Label was removed"); + defaults.put("CMD_UnLabel", "&aLabel removed!"); defaults.put("CMD_Copy_Error", "&6&v1 &cPotions did not fit into your inventory"); /* Error */ diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 6a0a1dd..98c6318 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -461,7 +461,7 @@ public class P extends JavaPlugin { saveWorldNames(configFile, oldData.getConfigurationSection("Worlds")); - configFile.set("Version", "0.5"); + configFile.set("Version", "1.0"); try { configFile.save(datafile); diff --git a/src/com/dre/brewery/listeners/PlayerListener.java b/src/com/dre/brewery/listeners/PlayerListener.java index 0aad642..116fc9a 100644 --- a/src/com/dre/brewery/listeners/PlayerListener.java +++ b/src/com/dre/brewery/listeners/PlayerListener.java @@ -24,6 +24,7 @@ import com.dre.brewery.Barrel; import com.dre.brewery.BPlayer; import com.dre.brewery.Words; import com.dre.brewery.Wakeup; +import com.dre.brewery.P; public class PlayerListener implements Listener { @EventHandler(priority = EventPriority.HIGH) @@ -176,10 +177,10 @@ public class PlayerListener implements Listener { bplayer.join(player); return; case 2: - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Dein Charakter ist betrunken und reagiert nicht. Versuch es noch einmal!"); + event.disallow(PlayerLoginEvent.Result.KICK_OTHER, P.p.languageReader.get("Player_LoginDeny")); return; case 3: - event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Dein Charakter ist sturzbesoffen und ohne Besinnung. Versuch es in 10 Minuten noch einmal!"); + event.disallow(PlayerLoginEvent.Result.KICK_OTHER, P.p.languageReader.get("Player_LoginDenyLong")); } } }