Merge f99df7139e into ba75403f3b

resources/config/v12/de/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v12/en/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v12/fr/config.yml

@@ -69,6 +69,9 @@ alwaysShowQuality: true
 # Toujours indiquer la teneur en alcool sur les objets. S'il est false, il n'apparaîtra que dans le stand de brassage. [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v12/it/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/de/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Ob das reifen in -Minecraft- Fässern aktiviert ist und wie viele Brewery Getränke in die diese getan werden können [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/en/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/es/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/fr/config.yml

@@ -69,6 +69,9 @@ alwaysShowQuality: true
 # Toujours indiquer la teneur en alcool sur les objets. S'il est false, il n'apparaîtra que dans le stand de brassage. [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/it/config.yml

@@ -68,6 +68,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/config/v13/zh/config.yml

@@ -70,6 +70,9 @@ alwaysShowQuality: true
 # Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
 alwaysShowAlc: false
 
+# If we should show who brewed the drink [false]
+showBrewer: false
+
 # MC自带的桶内可以存放多少饮品 [6]
 ageInMCBarrels: true
 maxBrewsInMCBarrels: 6

resources/languages/de.yml

@@ -16,6 +16,7 @@ Brew_Years: Jahre
 Brew_fermented: gegärt
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cTränke haben nicht mehr in das Inventar gepasst'

resources/languages/en.yml

@@ -16,6 +16,7 @@ Brew_Years: Years
 Brew_fermented: fermented
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cPotions did not fit into your inventory'

resources/languages/es.yml

@@ -17,6 +17,7 @@ Brew_Years: Años
 Brew_fermented: fermentado
 Brew_minute: minuto
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cLas pociones no cabían en tu inventario'

resources/languages/fr.yml

@@ -16,6 +16,7 @@ Brew_Years: Années
 Brew_fermented: fermenté
 Brew_minute: minute
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cCes potions ne rentrent pas dans votre inventaire.'

resources/languages/it.yml

@@ -16,6 +16,7 @@ Brew_Years: Anni
 Brew_fermented: fermentata
 Brew_minute: minuto
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # Comandi
 CMD_Copy_Error: '&6&v1 &cLe copie di questa pozione non stavano nell''inventario.'

resources/languages/ru.yml

@@ -16,6 +16,7 @@ Brew_Years: года
 Brew_fermented: ферментировано
 Brew_minute: минут
 Brew_Alc: Алк &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &cЗелья не поместились в инвентарь'

resources/languages/tw.yml

@@ -16,6 +16,7 @@ Brew_Years: 年
 Brew_fermented: 發酵
 Brew_minute: 分鐘
 Brew_Alc: Alc &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1 &c藥水不適合你的庫存'

resources/languages/zh.yml

@@ -16,6 +16,7 @@ Brew_Years: 年
 Brew_fermented: 炖煮发酵
 Brew_minute: 分钟
 Brew_Alc: 酒精度 &v1ml
+Brew_Brewer: 'Brewer: &v1'
 
 # CMD
 CMD_Copy_Error: '&6&v1&r, &c你的背包塞不下了.'

src/com/dre/brewery/BCauldron.java

@@ -168,7 +168,7 @@ public class BCauldron {
 			BreweryPlugin.getInstance().msg(player, BreweryPlugin.getInstance().languageReader.get("Perms_NoCauldronFill"));
 			return true;
 		}
-		ItemStack potion = ingredients.cook(state);
+		ItemStack potion = ingredients.cook(state, player.getName());
 		if (potion == null) return false;
 
 		if (BreweryPlugin.use1_13) {

src/com/dre/brewery/BIngredients.java

@@ -101,7 +101,7 @@ public class BIngredients {
 	/**
 	 * returns an Potion item with cooked ingredients
 	 */
-	public ItemStack cook(int state) {
+	public ItemStack cook(int state, String brewer) {
 
 		ItemStack potion = new ItemStack(Material.POTION);
 		PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
@@ -125,6 +125,7 @@ public class BIngredients {
 			lore.updateQualityStars(false);
 			lore.updateCustomLore();
 			lore.updateAlc(false);
+			lore.updateBrewer(brewer);
 			lore.addOrReplaceEffects(brew.getEffects(), brew.getQuality());
 			lore.write();
 

src/com/dre/brewery/BPlayer.java

@@ -435,6 +435,10 @@ public class BPlayer {
 
 	// #### Login ####
 
+	public boolean canJoinSimpleStatus() {
+        return canJoin() == 0;
+    }
+
 	// can the player login or is he too drunk
 	public int canJoin() {
 		if (drunkeness <= 70) {
@@ -906,4 +910,17 @@ public class BPlayer {
 	public void setAlcRecovery(int alcRecovery) {
 		this.alcRecovery = alcRecovery;
 	}
+
+
+	public String getName() {
+		Player player = BUtil.getPlayerfromString(uuid);
+		OfflinePlayer offlinePlayer;
+
+		if (player != null) {
+			return player.getName();
+		} else {
+			offlinePlayer = Bukkit.getOfflinePlayer(UUID.fromString(uuid));
+		}
+		return offlinePlayer.getName();
+	}
 }

src/com/dre/brewery/filedata/BConfig.java

@@ -88,6 +88,7 @@ public class BConfig {
 	public static boolean enableEncode;
 	public static boolean alwaysShowQuality; // Always show quality stars
 	public static boolean alwaysShowAlc; // Always show alc%
+	public static boolean showBrewer;
 	public static boolean brewHopperDump; // Allow Dumping of Brew liquid into Hoppers
 
 	//Features
@@ -239,6 +240,7 @@ public class BConfig {
 		colorInBrewer = config.getBoolean("colorInBrewer", false);
 		alwaysShowQuality = config.getBoolean("alwaysShowQuality", false);
 		alwaysShowAlc = config.getBoolean("alwaysShowAlc", false);
+		showBrewer = config.getBoolean("showBrewer", false);
 		enableEncode = config.getBoolean("enableEncode", false);
 		openEverywhere = config.getBoolean("openLargeBarrelEverywhere", false);
 		enableCauldronParticles = BreweryPlugin.use1_9 && config.getBoolean("enableCauldronParticles", false);

src/com/dre/brewery/lore/BrewLore.java

@@ -291,6 +291,14 @@ public class BrewLore {
 		}
 	}
 
+	public void updateBrewer(String name) {
+		if (name != null && BConfig.showBrewer) {
+			addOrReplaceLore(Type.BREWER, "§8", BreweryPlugin.getInstance().languageReader.get("Brew_Brewer", name));
+		} else {
+			removeLore(Type.BREWER);
+		}
+	}
+
 	/**
 	 * Converts to/from qualitycolored Lore
  	 */
@@ -577,7 +585,8 @@ public class BrewLore {
 		DISTILL("§p"),
 		AGE("§y"),
 		WOOD("§z"),
-		ALC("§q");
+		ALC("§q"),
+		BREWER("§g");
 
 		public final String id;