mirror of
https://github.com/DieReicheErethons/Brewery.git
synced 2024-09-27 03:52:38 +02:00
show who brewed potion, methods for Depenizen support
This commit is contained in:
parent
3203ecff10
commit
4eefbe3476
4
pom.xml
4
pom.xml
@ -3,9 +3,9 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>com.dre</groupId>
|
<groupId>com.dre</groupId>
|
||||||
<artifactId>Brewery</artifactId>
|
<artifactId>BreweryX</artifactId>
|
||||||
<version>3.1.7</version>
|
<version>3.1.7</version>
|
||||||
<name>Brewery</name>
|
<name>BreweryX</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
@ -68,6 +68,9 @@ alwaysShowQuality: true
|
|||||||
# Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
|
# Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
|
||||||
alwaysShowAlc: 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]
|
# 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
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: 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]
|
# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# 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
|
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]
|
# Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: 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]
|
# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -68,6 +68,9 @@ alwaysShowQuality: true
|
|||||||
# Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
|
# Ob in den Iteminformationen immer der Alkoholgehalt angezeigt weden soll, oder nur im Braustand [false]
|
||||||
alwaysShowAlc: 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]
|
# 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
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: 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]
|
# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: 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]
|
# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# 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
|
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]
|
# Combien de boissons de brasserie peuvent être mises dans les barils -Minecraft- [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: 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]
|
# If aging in -Minecraft- Barrels in enabled [true] and how many Brewery drinks can be put into them [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -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]
|
# Always show the alcohol content on the item. If false, it will only show in the brewing stand [false]
|
||||||
alwaysShowAlc: false
|
alwaysShowAlc: false
|
||||||
|
|
||||||
|
# If we should show who brewed the drink [false]
|
||||||
|
showBrewer: false
|
||||||
|
|
||||||
# MC自带的桶内可以存放多少饮品 [6]
|
# MC自带的桶内可以存放多少饮品 [6]
|
||||||
ageInMCBarrels: true
|
ageInMCBarrels: true
|
||||||
maxBrewsInMCBarrels: 6
|
maxBrewsInMCBarrels: 6
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: Jahre
|
|||||||
Brew_fermented: gegärt
|
Brew_fermented: gegärt
|
||||||
Brew_minute: minute
|
Brew_minute: minute
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &cTränke haben nicht mehr in das Inventar gepasst'
|
CMD_Copy_Error: '&6&v1 &cTränke haben nicht mehr in das Inventar gepasst'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: Years
|
|||||||
Brew_fermented: fermented
|
Brew_fermented: fermented
|
||||||
Brew_minute: minute
|
Brew_minute: minute
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &cPotions did not fit into your inventory'
|
CMD_Copy_Error: '&6&v1 &cPotions did not fit into your inventory'
|
||||||
|
@ -17,6 +17,7 @@ Brew_Years: Años
|
|||||||
Brew_fermented: fermentado
|
Brew_fermented: fermentado
|
||||||
Brew_minute: minuto
|
Brew_minute: minuto
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &cLas pociones no cabían en tu inventario'
|
CMD_Copy_Error: '&6&v1 &cLas pociones no cabían en tu inventario'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: Années
|
|||||||
Brew_fermented: fermenté
|
Brew_fermented: fermenté
|
||||||
Brew_minute: minute
|
Brew_minute: minute
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &cCes potions ne rentrent pas dans votre inventaire.'
|
CMD_Copy_Error: '&6&v1 &cCes potions ne rentrent pas dans votre inventaire.'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: Anni
|
|||||||
Brew_fermented: fermentata
|
Brew_fermented: fermentata
|
||||||
Brew_minute: minuto
|
Brew_minute: minuto
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# Comandi
|
# Comandi
|
||||||
CMD_Copy_Error: '&6&v1 &cLe copie di questa pozione non stavano nell''inventario.'
|
CMD_Copy_Error: '&6&v1 &cLe copie di questa pozione non stavano nell''inventario.'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: года
|
|||||||
Brew_fermented: ферментировано
|
Brew_fermented: ферментировано
|
||||||
Brew_minute: минут
|
Brew_minute: минут
|
||||||
Brew_Alc: Алк &v1ml
|
Brew_Alc: Алк &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &cЗелья не поместились в инвентарь'
|
CMD_Copy_Error: '&6&v1 &cЗелья не поместились в инвентарь'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: 年
|
|||||||
Brew_fermented: 發酵
|
Brew_fermented: 發酵
|
||||||
Brew_minute: 分鐘
|
Brew_minute: 分鐘
|
||||||
Brew_Alc: Alc &v1ml
|
Brew_Alc: Alc &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1 &c藥水不適合你的庫存'
|
CMD_Copy_Error: '&6&v1 &c藥水不適合你的庫存'
|
||||||
|
@ -16,6 +16,7 @@ Brew_Years: 年
|
|||||||
Brew_fermented: 炖煮发酵
|
Brew_fermented: 炖煮发酵
|
||||||
Brew_minute: 分钟
|
Brew_minute: 分钟
|
||||||
Brew_Alc: 酒精度 &v1ml
|
Brew_Alc: 酒精度 &v1ml
|
||||||
|
Brew_Brewer: 'Brewer: &v1'
|
||||||
|
|
||||||
# CMD
|
# CMD
|
||||||
CMD_Copy_Error: '&6&v1&r, &c你的背包塞不下了.'
|
CMD_Copy_Error: '&6&v1&r, &c你的背包塞不下了.'
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
name: Brewery
|
name: BreweryX
|
||||||
version: '${project.version}'
|
version: '${project.version}'
|
||||||
website: 'https://www.spigotmc.org/resources/breweryx.114777/'
|
website: 'https://www.spigotmc.org/resources/breweryx.114777/'
|
||||||
main: com.dre.brewery.BreweryPlugin
|
main: com.dre.brewery.BreweryPlugin
|
||||||
|
@ -168,7 +168,7 @@ public class BCauldron {
|
|||||||
BreweryPlugin.getInstance().msg(player, BreweryPlugin.getInstance().languageReader.get("Perms_NoCauldronFill"));
|
BreweryPlugin.getInstance().msg(player, BreweryPlugin.getInstance().languageReader.get("Perms_NoCauldronFill"));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
ItemStack potion = ingredients.cook(state);
|
ItemStack potion = ingredients.cook(state, player.getName());
|
||||||
if (potion == null) return false;
|
if (potion == null) return false;
|
||||||
|
|
||||||
if (BreweryPlugin.use1_13) {
|
if (BreweryPlugin.use1_13) {
|
||||||
|
@ -101,7 +101,7 @@ public class BIngredients {
|
|||||||
/**
|
/**
|
||||||
* returns an Potion item with cooked ingredients
|
* 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);
|
ItemStack potion = new ItemStack(Material.POTION);
|
||||||
PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
|
PotionMeta potionMeta = (PotionMeta) potion.getItemMeta();
|
||||||
@ -125,6 +125,7 @@ public class BIngredients {
|
|||||||
lore.updateQualityStars(false);
|
lore.updateQualityStars(false);
|
||||||
lore.updateCustomLore();
|
lore.updateCustomLore();
|
||||||
lore.updateAlc(false);
|
lore.updateAlc(false);
|
||||||
|
lore.updateBrewer(brewer);
|
||||||
lore.addOrReplaceEffects(brew.getEffects(), brew.getQuality());
|
lore.addOrReplaceEffects(brew.getEffects(), brew.getQuality());
|
||||||
lore.write();
|
lore.write();
|
||||||
|
|
||||||
|
@ -435,6 +435,10 @@ public class BPlayer {
|
|||||||
|
|
||||||
// #### Login ####
|
// #### Login ####
|
||||||
|
|
||||||
|
public boolean canJoinSimpleStatus() {
|
||||||
|
return canJoin() == 0;
|
||||||
|
}
|
||||||
|
|
||||||
// can the player login or is he too drunk
|
// can the player login or is he too drunk
|
||||||
public int canJoin() {
|
public int canJoin() {
|
||||||
if (drunkeness <= 70) {
|
if (drunkeness <= 70) {
|
||||||
@ -906,4 +910,17 @@ public class BPlayer {
|
|||||||
public void setAlcRecovery(int alcRecovery) {
|
public void setAlcRecovery(int alcRecovery) {
|
||||||
this.alcRecovery = 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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,6 +88,7 @@ public class BConfig {
|
|||||||
public static boolean enableEncode;
|
public static boolean enableEncode;
|
||||||
public static boolean alwaysShowQuality; // Always show quality stars
|
public static boolean alwaysShowQuality; // Always show quality stars
|
||||||
public static boolean alwaysShowAlc; // Always show alc%
|
public static boolean alwaysShowAlc; // Always show alc%
|
||||||
|
public static boolean showBrewer;
|
||||||
public static boolean brewHopperDump; // Allow Dumping of Brew liquid into Hoppers
|
public static boolean brewHopperDump; // Allow Dumping of Brew liquid into Hoppers
|
||||||
|
|
||||||
//Features
|
//Features
|
||||||
@ -239,6 +240,7 @@ public class BConfig {
|
|||||||
colorInBrewer = config.getBoolean("colorInBrewer", false);
|
colorInBrewer = config.getBoolean("colorInBrewer", false);
|
||||||
alwaysShowQuality = config.getBoolean("alwaysShowQuality", false);
|
alwaysShowQuality = config.getBoolean("alwaysShowQuality", false);
|
||||||
alwaysShowAlc = config.getBoolean("alwaysShowAlc", false);
|
alwaysShowAlc = config.getBoolean("alwaysShowAlc", false);
|
||||||
|
showBrewer = config.getBoolean("showBrewer", false);
|
||||||
enableEncode = config.getBoolean("enableEncode", false);
|
enableEncode = config.getBoolean("enableEncode", false);
|
||||||
openEverywhere = config.getBoolean("openLargeBarrelEverywhere", false);
|
openEverywhere = config.getBoolean("openLargeBarrelEverywhere", false);
|
||||||
enableCauldronParticles = BreweryPlugin.use1_9 && config.getBoolean("enableCauldronParticles", false);
|
enableCauldronParticles = BreweryPlugin.use1_9 && config.getBoolean("enableCauldronParticles", false);
|
||||||
|
@ -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
|
* Converts to/from qualitycolored Lore
|
||||||
*/
|
*/
|
||||||
@ -577,7 +585,8 @@ public class BrewLore {
|
|||||||
DISTILL("§p"),
|
DISTILL("§p"),
|
||||||
AGE("§y"),
|
AGE("§y"),
|
||||||
WOOD("§z"),
|
WOOD("§z"),
|
||||||
ALC("§q");
|
ALC("§q"),
|
||||||
|
BREWER("§g");
|
||||||
|
|
||||||
public final String id;
|
public final String id;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user