This commit is contained in:
Sn0wStorm
2013-10-27 22:54:48 +01:00
parent 548c14ae89
commit f4f0bc9511
6 changed files with 12 additions and 9 deletions
+2 -2
View File
@@ -55,7 +55,7 @@ logRealChat: false
autosave: 3 autosave: 3
# Config Version # Config Version
version: '0.5' version: '1.0'
# Recipes for Potions # Recipes for Potions
@@ -159,7 +159,7 @@ recipes:
- WEAKNESS/15 - WEAKNESS/15
- POISON/10 - POISON/10
8: 8:
name: Poor Absinth/Absinth/Strong Absinth name: Poor Absinthe/Absinthe/Strong Absinthe
ingredients: ingredients:
- LONG_GRASS/15 - LONG_GRASS/15
cookingtime: 3 cookingtime: 3
+1 -1
View File
@@ -1,5 +1,5 @@
name: Brewery name: Brewery
version: 0.5.1 version: 1.0
main: com.dre.brewery.P main: com.dre.brewery.P
authors: [Milan Albrecht, Frank Baumann] authors: [Milan Albrecht, Frank Baumann]
softdepend: [Vault] softdepend: [Vault]
+1 -1
View File
@@ -3,7 +3,7 @@
<groupId>com.dre</groupId> <groupId>com.dre</groupId>
<artifactId>brewery</artifactId> <artifactId>brewery</artifactId>
<version>0.5.1</version> <version>1.0</version>
<name>Brewery</name> <name>Brewery</name>
<build> <build>
+4 -2
View File
@@ -41,6 +41,8 @@ public class LanguageReader {
defaults.put("Player_CauldronInfo2", "This Cauldron seethes since less than one minute"); 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_CantDrink", "You can't drink any more");
defaults.put("Player_DrunkPassOut", "You have drunken too much and fainted!"); 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_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_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!"); 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_Years", "Years");
defaults.put("Brew_HundredsOfYears", "Hundreds of Years"); defaults.put("Brew_HundredsOfYears", "Hundreds of Years");
defaults.put("Brew_Woodtype", "Woodtype"); defaults.put("Brew_Woodtype", "Woodtype");
defaults.put("Brew_ThickBrew", "Thick Brew"); defaults.put("Brew_ThickBrew", "Muddy Brew");
/* Commands */ /* Commands */
defaults.put("CMD_Reload", "&aConfig was successfully reloaded"); 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_Player_Error", "&cThe Quality has to be between 1 and 10!");
defaults.put("CMD_Info_NotDrunk", "&v1 is not drunk"); 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_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"); defaults.put("CMD_Copy_Error", "&6&v1 &cPotions did not fit into your inventory");
/* Error */ /* Error */
+1 -1
View File
@@ -461,7 +461,7 @@ public class P extends JavaPlugin {
saveWorldNames(configFile, oldData.getConfigurationSection("Worlds")); saveWorldNames(configFile, oldData.getConfigurationSection("Worlds"));
configFile.set("Version", "0.5"); configFile.set("Version", "1.0");
try { try {
configFile.save(datafile); configFile.save(datafile);
@@ -24,6 +24,7 @@ import com.dre.brewery.Barrel;
import com.dre.brewery.BPlayer; import com.dre.brewery.BPlayer;
import com.dre.brewery.Words; import com.dre.brewery.Words;
import com.dre.brewery.Wakeup; import com.dre.brewery.Wakeup;
import com.dre.brewery.P;
public class PlayerListener implements Listener { public class PlayerListener implements Listener {
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
@@ -176,10 +177,10 @@ public class PlayerListener implements Listener {
bplayer.join(player); bplayer.join(player);
return; return;
case 2: 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; return;
case 3: 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"));
} }
} }
} }