Skip to content

Commit

Permalink
Release
Browse files Browse the repository at this point in the history
  • Loading branch information
Sn0wStorm committed Oct 27, 2013
1 parent 548c14a commit f4f0bc9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ logRealChat: false
autosave: 3

# Config Version
version: '0.5'
version: '1.0'


# Recipes for Potions
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugin.yml
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.dre</groupId>
<artifactId>brewery</artifactId>
<version>0.5.1</version>
<version>1.0</version>
<name>Brewery</name>

<build>
Expand Down
6 changes: 4 additions & 2 deletions src/com/dre/brewery/LanguageReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ private void setDefaults() {
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!");
Expand Down Expand Up @@ -71,15 +73,15 @@ private void setDefaults() {
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");
defaults.put("CMD_Player", "&a&v1 is now &6&v2% &adrunk, with a quality of &6&v3");
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 */
Expand Down
2 changes: 1 addition & 1 deletion src/com/dre/brewery/P.java
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ public void saveData() {

saveWorldNames(configFile, oldData.getConfigurationSection("Worlds"));

configFile.set("Version", "0.5");
configFile.set("Version", "1.0");

try {
configFile.save(datafile);
Expand Down
5 changes: 3 additions & 2 deletions src/com/dre/brewery/listeners/PlayerListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
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)
Expand Down Expand Up @@ -176,10 +177,10 @@ public void onPlayerLogin(PlayerLoginEvent event) {
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"));
}
}
}
Expand Down

0 comments on commit f4f0bc9

Please sign in to comment.